From 06442ce10e854dac11936f915c9a7657fec9c68f Mon Sep 17 00:00:00 2001
From: shiyang <wtt@qq.com>
Date: Wed, 18 Aug 2021 18:07:17 +0800
Subject: [PATCH] update

---
 .../java/com/lyms/platform/pojo/BabyModel.java     | 16 ++++++++++++++++
 .../com/lyms/platform/query/BabyModelQuery.java    | 16 ++++++++++++++++
 .../operate/web/facade/BabyBookbuildingFacade.java |  4 ++++
 .../platform/operate/web/facade/ViewFacade.java    |  1 -
 .../web/request/BabyBookbuildingAddRequest.java    | 16 ++++++++++++++++
 .../operate/web/result/BabyPageResult.java         | 22 ++++++++++++++++++++++
 6 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
index dfcb404..27bd32a 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
@@ -608,6 +608,22 @@ public class BabyModel extends BaseModel {
     //检查医生
     private String deafnessCheckDoctor;
 
+    /**
+     * 围场-儿童建档和儿童体检 添加字段
+     */
+    //儿童高危-其它高危
+    private String wcOtherHighRisk;
+
+    public String getWcOtherHighRisk() {
+        return wcOtherHighRisk;
+    }
+
+    public void setWcOtherHighRisk(String wcOtherHighRisk) {
+        this.wcOtherHighRisk = wcOtherHighRisk;
+    }
+
+    /********************************************/
+
     public Integer getDeafnessGene() {
         return deafnessGene;
     }
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index d7a94c2..20f3a6c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -373,6 +373,22 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
     private Integer dueWeekEnd;
     private Boolean existSource;
 
+    /**
+     * 围场-儿童建档和儿童体检 添加字段
+     */
+    //儿童高危-其它高危
+    private String wcOtherHighRisk;
+
+    public String getWcOtherHighRisk() {
+        return wcOtherHighRisk;
+    }
+
+    public void setWcOtherHighRisk(String wcOtherHighRisk) {
+        this.wcOtherHighRisk = wcOtherHighRisk;
+    }
+
+    /********************************************/
+
     public Boolean getExistSource() {
         return existSource;
     }
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 826d02e..5785832 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
@@ -1542,6 +1542,10 @@ public class BabyBookbuildingFacade {
         bm.setOpenDisease(b.getOpenDisease());
         bm.setOpenDiseaseType(b.getOpenDiseaseType());
         Date endTime = null;
+
+        //围场-儿童建档-儿童高危-其它高危
+        bm.setWcOtherHighRisk(b.getWcOtherHighRisk());
+
         if (b.getOpenDiseaseType() != null) {
             endTime = "1".equals(bm.getOpenDiseaseType()) ? DateUtil.addDay(bm.getBuildDate(), 33) : DateUtil.addMonth(bm.getBuildDate(), Integer.parseInt(b.getOpenDiseaseType()));
         }
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 6ae4def..3c0d2b6 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
@@ -5578,7 +5578,6 @@ public class ViewFacade {
         /** 优惠券编号 */
         result.setCouponCode(couponService.findByUsedId(id));
 
-
         BaseObjectResponse objectResponse = new BaseObjectResponse();
         objectResponse.setData(result);
         objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
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 7244d25..de278b5 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
@@ -404,6 +404,22 @@ public class BabyBookbuildingAddRequest {
 	//儿童疾病
 	private List<String> diseases;
 
+	/**
+	 * 围场-儿童建档和儿童体检 添加字段
+	 */
+	//儿童高危-其它高危
+	private String wcOtherHighRisk;
+
+	public String getWcOtherHighRisk() {
+		return wcOtherHighRisk;
+	}
+
+	public void setWcOtherHighRisk(String wcOtherHighRisk) {
+		this.wcOtherHighRisk = wcOtherHighRisk;
+	}
+
+	/********************************************/
+
 	public List<String> getDiseases() {
 		return diseases;
 	}
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 36a637a..9e1712c 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
@@ -339,6 +339,22 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
 
     private String diseases;
 
+    /**
+     * 围场-儿童建档和儿童体检 添加字段
+     */
+    //儿童高危-其它高危
+    private String wcOtherHighRisk;
+
+    public String getWcOtherHighRisk() {
+        return wcOtherHighRisk;
+    }
+
+    public void setWcOtherHighRisk(String wcOtherHighRisk) {
+        this.wcOtherHighRisk = wcOtherHighRisk;
+    }
+
+    /********************************************/
+
     public String getDiseases() {
         return diseases;
     }
@@ -1474,6 +1490,12 @@ public class BabyPageResult  implements IBasicResultConvert<BabyPageResult,BabyM
         setOpenDisease((StringUtils.isEmpty(destModel.getOpenDisease()) || "1".equals(destModel.getOpenDisease())) ? "未开通" : "已开通");
         setOpenDiseaseType(StringUtils.isEmpty(destModel.getOpenDiseaseType()) ? "" : "1".equals(destModel.getOpenDiseaseType()) ? "一个月" : "一年");
         setOpenDiseaseEndTime(destModel.getOpenDiseaseEndTime() == null ? "" : DateUtil.getyyyy_MM_dd(destModel.getOpenDiseaseEndTime()) );
+        //围场-儿童建档和儿童体检 添加字段
+        if (StringUtils.isNotEmpty(destModel.getWcOtherHighRisk()))
+        {
+            setWcOtherHighRisk(destModel.getWcOtherHighRisk());
+        }
+
         return this;
     }
 
-- 
1.8.3.1