From 7ed5e249ff2f0010f13687966faa4092ac4b31cd Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Wed, 19 Jun 2019 16:00:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       | 37 ++++++++++++++++++++++
 .../operate/web/facade/PatientServiceFacade.java   |  4 ++-
 .../web/result/MatdeliverFollowListResult.java     | 26 +++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 2b07f60..cc62bd2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
+import com.alibaba.fastjson.JSONObject;
 import com.lyms.hospitalapi.lcdcf.LcdcfFmService;
 import com.lyms.hospitalapi.lcdcf.LcdcfHisModel;
 import com.lyms.hospitalapi.lcdcf.LcdcfHisService;
@@ -2072,6 +2073,41 @@ public class MatDeliverFacade {
                     String streetPostRest = getAddressNameById(streetPostRestId);
                     matdeliverFollowListResult.setPostpartumAddress(provincePostRest + cityPostRest + areaPostRest + streetPostRest + addressPostRest);
                 }
+
+                //  添加高危等级、失败原因
+                String riskLevelId = patient.getRiskLevelId();
+                List<Map<String, Object>> objects = new ArrayList<>();
+                if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskLevelId)) {
+                    List<String> ids = JsonUtil.toList(riskLevelId, String.class);
+                    for (String id : ids) {
+                        String s = HosptialHighRiskFacade.colorMap.get(id);
+                        HashMap<String, Object> map = new HashMap<>();
+                        map.put("color", s);
+                        map.put("id", id);
+                        objects.add(map);
+                    }
+                }
+               matdeliverFollowListResult.setHighRiskLevels(objects);
+
+                List<MatdeliverFollowModel> followModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(patient.getPid())), MatdeliverFollowModel.class);
+                //  1-无人接听电话、2-拒绝访视、3-其他
+                String contactReasonStr = "";
+                if (CollectionUtils.isNotEmpty(followModels)) {
+                    MatdeliverFollowModel model = followModels.get(followModels.size() - 1);
+                    Integer contactReason = model.getContactReason();
+                    if (contactReason != null) {
+                        if (contactReason == 1) {
+                            contactReasonStr = "无人接听电话";
+                        }
+                        if (contactReason == 2) {
+                            contactReasonStr = "拒绝访视";
+                        }
+                        if (contactReason == 3) {
+                            contactReasonStr = "其他";
+                        }
+                    }
+                }
+                matdeliverFollowListResult.setCauseFailure(contactReasonStr);
             }
 
             matdeliverFollowListResult.setTaoCheng(isTaocheng);
@@ -2083,6 +2119,7 @@ public class MatDeliverFacade {
         return listResponse;
     }
 
+
     /**
      * 获取name 根据id
      *
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
index c197666..2e5bab9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
@@ -200,7 +200,9 @@ public class PatientServiceFacade {
         List<Map> towns = new ArrayList<>();
 
         //所有数据 由原来的baseConfing ==> Organization
-        List<String> hospPermissions = areaCountFacade.getCurrentUserHospPermissions(id, null, null, null);
+        //List<String> hospPermissions = areaCountFacade.getCurrentUserHospPermissions(id, null, null, null);
+        List<String> hospPermissions = new ArrayList<>();
+        hospPermissions.add(id.toString());
         if (CollectionUtils.isNotEmpty(hospPermissions)) {
             List<Organization> organizations = organizationService.getOrganizationByHosps(hospPermissions);
             if (CollectionUtils.isNotEmpty(organizations)) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java
index 967c202..3bbfa2c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java
@@ -145,6 +145,32 @@ public class MatdeliverFollowListResult {
      */
     private String postpartumAddress;
 
+    /**
+     * 高危等级
+     */
+    private List<Map<String, Object>> highRiskLevels;
+
+    /**
+     * 失败原因
+     */
+    private String causeFailure;
+
+    public List<Map<String, Object>> getHighRiskLevels() {
+        return highRiskLevels;
+    }
+
+    public void setHighRiskLevels(List<Map<String, Object>> highRiskLevels) {
+        this.highRiskLevels = highRiskLevels;
+    }
+
+    public String getCauseFailure() {
+        return causeFailure;
+    }
+
+    public void setCauseFailure(String causeFailure) {
+        this.causeFailure = causeFailure;
+    }
+
     public boolean isTaoCheng() {
         return isTaoCheng;
     }
-- 
1.8.3.1