From f7d1b085eefc6b50f52178e270665cdf3f2d287b Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 22 Feb 2021 13:48:53 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/BabyBookbuildingFacade.java         | 14 ++++++++++++++
 .../com/lyms/platform/operate/web/facade/ViewFacade.java   | 14 ++++++++++++++
 .../operate/web/request/BabyBookbuildingAddRequest.java    | 11 +++++++++++
 .../lyms/platform/operate/web/result/BabyBuildResult.java  | 10 ++++++++++
 .../lyms/platform/operate/web/result/BabyPageResult.java   | 10 ++++++++++
 5 files changed, 59 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index f267ebd..955dc86 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -1294,6 +1294,7 @@ public class BabyBookbuildingFacade {
     private BabyModel getBabyModel(BabyBookbuildingAddRequest b, boolean isAdd, Integer userId, String hospitalId) {
         // hujiaqi添加了一个字段，判断是插入还是更新，如果是更新，就不更新birth字段
         BabyModel bm = new BabyModel();
+        bm.setDiseases(b.getDiseases());
         bm.setNextDate(DateUtil.parseYMD(b.getNextDate()));
         bm.setYlSelect(b.getYlSelect());
         bm.setIsUNHS(b.getIsUNHS());
@@ -1722,6 +1723,19 @@ public class BabyBookbuildingFacade {
                 result.setBuildDate(DateUtil.getyyyy_MM_dd(new Date()));
             }
 
+
+            List <Map> diseses = new ArrayList <>();
+            if (CollectionUtils.isNotEmpty(model.getDiseases())) {
+                for (String key : model.getDiseases()) {
+                    Map map = new HashMap();
+                    map.put("id", key);
+                    map.put("name", BabyDiseaseEnums.getNameById(Integer.parseInt(key)));
+                    diseses.add(map);
+                }
+            }
+            result.setDiseses(diseses);
+
+
             BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id);
             List <PatientSerResult> patientSerResults = (List <PatientSerResult>) baseResponse.getObject();
             result.setPatientSerResults(patientSerResults);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 14584fb..449c086 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -5339,6 +5339,20 @@ public class ViewFacade {
                 }
             }
 
+
+            StringBuffer diseases = new StringBuffer();
+            if (CollectionUtils.isNotEmpty(model.getDiseases())) {
+                for (int i = 0, len = model.getDiseases().size(); i < len; i++) {
+                    if (i != len - 1) {
+                        diseases.append(BabyDiseaseEnums.getNameById(Integer.parseInt(model.getDiseases().get(i))));
+                        diseases.append(",");
+                    } else {
+                        diseases.append(BabyDiseaseEnums.getNameById(Integer.parseInt(model.getDiseases().get(i))));
+                    }
+                }
+            }
+            result.setDiseases(diseases.toString());
+
             result.setRiskCode(com.lyms.platform.common.utils.StringUtils.riskCodeStr(model.getRiskCode()));
         }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
index 5b5c0d4..7244d25 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
@@ -401,6 +401,17 @@ public class BabyBookbuildingAddRequest {
 	private String openDisease;
 	private String openDiseaseType; //1一个月  12一年
 
+	//儿童疾病
+	private List<String> diseases;
+
+	public List<String> getDiseases() {
+		return diseases;
+	}
+
+	public void setDiseases(List<String> diseases) {
+		this.diseases = diseases;
+	}
+
 	public void setTxngNew(Map <String, Object> txngNew) {
 		this.txngNew = txngNew;
 	}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
index e7adcc6..66ce710 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
@@ -344,6 +344,16 @@ public class BabyBuildResult {
 
     private String openDiseaseType; //1一个月  12一年
 
+    private List<Map> diseses;
+
+    public List<Map> getDiseses() {
+        return diseses;
+    }
+
+    public void setDiseses(List<Map> diseses) {
+        this.diseses = diseses;
+    }
+
     public String getOpenDiseaseType() {
         return openDiseaseType;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
index 07775fb..36a637a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
@@ -337,6 +337,16 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
     private String openDiseaseEndTime;
     private String riskCode;
 
+    private String diseases;
+
+    public String getDiseases() {
+        return diseases;
+    }
+
+    public void setDiseases(String diseases) {
+        this.diseases = diseases;
+    }
+
     public String getRiskCode() {
         return riskCode;
     }
-- 
1.8.3.1