From 87f6738276ffb5366b61c4f764b783921f70e270 Mon Sep 17 00:00:00 2001
From: wtt <1872109740@qq.com>
Date: Thu, 4 Feb 2021 15:10:56 +0800
Subject: [PATCH] update

---
 .../lyms/platform/pojo/BabyHighRiskBabyModel.java  | 75 +++++++++++++++++++
 .../operate/web/facade/BabyHighRiskBabyFacade.java | 19 +++++
 .../web/request/BabyBookbuildingAddRequest.java    | 10 +++
 .../web/request/BabyHighRiskBabyRequest.java       | 73 ++++++++++++++++++
 .../operate/web/result/BabyBuildResult.java        | 27 ++++++-
 .../operate/web/result/BabyHighRiskBabyResult.java | 87 ++++++++++++++++++++++
 6 files changed, 289 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java
index 2f21df2..60cfb3f 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyHighRiskBabyModel.java
@@ -19,6 +19,21 @@ public class BabyHighRiskBabyModel extends BaseModel {
     private static final long serialVersionUID = SerialIdEnum.BabyHighRiskBabyModel.getCid();
 
     /*新增字段*/
+    // 纠正月龄||纠正胎龄
+    private String correctAge;
+    //体重评价
+    private String weightEvaluate;
+    //身长评价
+    private String heightEvaluate;
+    //头围评价
+    private String headEvaluate;
+    //身长评价标准值
+    private String heightEvaluateStandard;
+    //头围评价标准值
+    private String headEvaluateStandard;
+    //体重评价标准值
+    private String weightEvaluateStandard;
+
     //身长别体重
     private String heightWeight;
     //前囟{闭合、未闭合、未闭合尺寸x-y}
@@ -788,6 +803,66 @@ public class BabyHighRiskBabyModel extends BaseModel {
     public void setYhipJoint(String yhipJoint) {
         this.yhipJoint = yhipJoint;
     }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getCorrectAge() {
+        return correctAge;
+    }
+
+    public void setCorrectAge(String correctAge) {
+        this.correctAge = correctAge;
+    }
+
+    public String getWeightEvaluate() {
+        return weightEvaluate;
+    }
+
+    public void setWeightEvaluate(String weightEvaluate) {
+        this.weightEvaluate = weightEvaluate;
+    }
+
+    public String getHeightEvaluate() {
+        return heightEvaluate;
+    }
+
+    public void setHeightEvaluate(String heightEvaluate) {
+        this.heightEvaluate = heightEvaluate;
+    }
+
+    public String getHeadEvaluate() {
+        return headEvaluate;
+    }
+
+    public void setHeadEvaluate(String headEvaluate) {
+        this.headEvaluate = headEvaluate;
+    }
+
+    public String getHeightEvaluateStandard() {
+        return heightEvaluateStandard;
+    }
+
+    public void setHeightEvaluateStandard(String heightEvaluateStandard) {
+        this.heightEvaluateStandard = heightEvaluateStandard;
+    }
+
+    public String getHeadEvaluateStandard() {
+        return headEvaluateStandard;
+    }
+
+    public void setHeadEvaluateStandard(String headEvaluateStandard) {
+        this.headEvaluateStandard = headEvaluateStandard;
+    }
+
+    public String getWeightEvaluateStandard() {
+        return weightEvaluateStandard;
+    }
+
+    public void setWeightEvaluateStandard(String weightEvaluateStandard) {
+        this.weightEvaluateStandard = weightEvaluateStandard;
+    }
 }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
index a4dd005..816f7ce 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
@@ -92,6 +92,14 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl {
         if(StringUtils.isEmpty(babyModel.getMname())){
             model.setMname(request.getMname());
         }
+        model.setCorrectAge(request.getCorrectAge());
+        model.setWeightEvaluate(request.getWeightEvaluate());
+        model.setHeightEvaluate(request.getHeightEvaluate());
+        model.setHeadEvaluate(request.getHeadEvaluate());
+        model.setHeightEvaluateStandard(request.getHeightEvaluateStandard());
+        model.setHeadEvaluateStandard(request.getHeadEvaluateStandard());
+        model.setWeightEvaluateStandard(request.getWeightEvaluateStandard());
+
         model.setHeightWeight(request.getHeightWeight());
         model.setBregma(request.getBregma());
         model.setMs(request.getMs());
@@ -242,6 +250,17 @@ public class BabyHighRiskBabyFacade extends BaseServiceImpl {
             BabyHighRiskBabyModel babyHighRiskBabyModel = babyHighRiskBabyService.queryById(id);
             BabyHighRiskBabyResult highRiskBabyResult = new BabyHighRiskBabyResult();
             highRiskBabyResult.convertToResult(babyHighRiskBabyModel);
+            if(StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz())
+                    && StringUtils.isEmpty(babyHighRiskBabyModel.getGmdz())
+                    && StringUtils.isEmpty(babyHighRiskBabyModel.getXhdb())
+                    && StringUtils.isEmpty(babyHighRiskBabyModel.getXzcc())
+                    && StringUtils.isEmpty(babyHighRiskBabyModel.getTlcc())
+                    && StringUtils.isEmpty(babyHighRiskBabyModel.getTlhc())
+                    && StringUtils.isEmpty(babyHighRiskBabyModel.getZhipJoint())
+                    && StringUtils.isEmpty(babyHighRiskBabyModel.getYhipJoint())
+                    && babyHighRiskBabyModel.getNdt()==null ){
+                highRiskBabyResult.setFzjcState("1");
+            }
 
             String bregma = "";
             String bregmaValue = "";
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 1c18257..5b5c0d4 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
@@ -15,6 +15,8 @@ public class BabyBookbuildingAddRequest {
 
 	//预产期避免前端误传报错
 	private String yChanQi;
+	//分娩方式  shun 顺产   pao剖宫产 高危儿回显使用
+	private String fmfs;
 
 	//幼儿园名称,使用基础配置
 	private String yeymcId;
@@ -1434,4 +1436,12 @@ public class BabyBookbuildingAddRequest {
 	public void setVipEndTime(String vipEndTime) {
 		this.vipEndTime = vipEndTime;
 	}
+
+	public String getFmfs() {
+		return fmfs;
+	}
+
+	public void setFmfs(String fmfs) {
+		this.fmfs = fmfs;
+	}
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java
index 2977267..b137d06 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyHighRiskBabyRequest.java
@@ -15,6 +15,23 @@ import java.util.Map;
  */
 public class BabyHighRiskBabyRequest {
     /*新增字段*/
+
+    // 纠正月龄||纠正胎龄
+    private String correctAge;
+    //体重评价
+    private String weightEvaluate;
+    //身长评价
+    private String heightEvaluate;
+    //头围评价
+    private String headEvaluate;
+    //身长评价标准值
+    private String heightEvaluateStandard;
+    //头围评价标准值
+    private String headEvaluateStandard;
+    //体重评价标准值
+    private String weightEvaluateStandard;
+
+
     //身长别体重
     private String heightWeight;
     /*
@@ -815,4 +832,60 @@ public class BabyHighRiskBabyRequest {
     public void setYhipJoint(String yhipJoint) {
         this.yhipJoint = yhipJoint;
     }
+
+    public String getCorrectAge() {
+        return correctAge;
+    }
+
+    public void setCorrectAge(String correctAge) {
+        this.correctAge = correctAge;
+    }
+
+    public String getWeightEvaluate() {
+        return weightEvaluate;
+    }
+
+    public void setWeightEvaluate(String weightEvaluate) {
+        this.weightEvaluate = weightEvaluate;
+    }
+
+    public String getHeightEvaluate() {
+        return heightEvaluate;
+    }
+
+    public void setHeightEvaluate(String heightEvaluate) {
+        this.heightEvaluate = heightEvaluate;
+    }
+
+    public String getHeadEvaluate() {
+        return headEvaluate;
+    }
+
+    public void setHeadEvaluate(String headEvaluate) {
+        this.headEvaluate = headEvaluate;
+    }
+
+    public String getHeightEvaluateStandard() {
+        return heightEvaluateStandard;
+    }
+
+    public void setHeightEvaluateStandard(String heightEvaluateStandard) {
+        this.heightEvaluateStandard = heightEvaluateStandard;
+    }
+
+    public String getHeadEvaluateStandard() {
+        return headEvaluateStandard;
+    }
+
+    public void setHeadEvaluateStandard(String headEvaluateStandard) {
+        this.headEvaluateStandard = headEvaluateStandard;
+    }
+
+    public String getWeightEvaluateStandard() {
+        return weightEvaluateStandard;
+    }
+
+    public void setWeightEvaluateStandard(String weightEvaluateStandard) {
+        this.weightEvaluateStandard = weightEvaluateStandard;
+    }
 }
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 9fa2f40..bcf47b1 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
@@ -11,6 +11,9 @@ public class BabyBuildResult {
 
     //预产期
     private String yChanQi;
+    //分娩方式
+    private String dueType;
+
 
     private String yeymcId;//幼儿园名称,使用基础配置
     private Map yeymcIdMap;//幼儿园名称,使用基础配置
@@ -164,8 +167,8 @@ public class BabyBuildResult {
 
     //预产期
     private String  dueDate;
-    //分娩方式
-    private String dueType;
+    //分娩方式  shun 顺产   pao剖宫产 高危儿回显使用
+    private String fmfs;
     //胎数
     private String fetusCount;
     //产次
@@ -1387,4 +1390,24 @@ public class BabyBuildResult {
     public void setmHighRiskReason2(List mHighRiskReason2) {
         this.mHighRiskReason2 = mHighRiskReason2;
     }
+
+    /*
+    <select ng-model="formData.dueType" ng-options="item.id as item.name for item in FMFS"
+     class="fgl_five_Input100 ng-pristine ng-untouched ng-valid"><option value="" class="">--请选择--</option>
+     <option value="0" label="顺产">顺产</option>
+     <option value="1" label="剖宫产">剖宫产</option>
+     <option value="2" label="流产">流产</option>
+     <option value="3" label="引产">引产</option></select>
+     shun 顺产   pao剖宫产
+     */
+    public String getFmfs() {
+        if ("0".equals(dueType)){
+            fmfs = "shun";
+        }else if("1".equals(dueType)){
+            fmfs = "pao";
+        }
+        return fmfs;
+    }
+
+
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java
index 62cf86c..b541d36 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyHighRiskBabyResult.java
@@ -12,6 +12,23 @@ import java.util.Map;
 public class BabyHighRiskBabyResult implements IBasicResultConvert <BabyHighRiskBabyResult, BabyHighRiskBabyModel> {
 
     /*新增字段*/
+    // 纠正月龄||纠正胎龄
+    private String correctAge;
+    //体重评价
+    private String weightEvaluate;
+    //身长评价
+    private String heightEvaluate;
+    //头围评价
+    private String headEvaluate;
+    //身长评价标准值
+    private String heightEvaluateStandard;
+    //头围评价标准值
+    private String headEvaluateStandard;
+    //体重评价标准值
+    private String weightEvaluateStandard;
+    //辅助检查状态 1 没有辅助检查
+    private String fzjcState;
+
     //身长别体重
     private String heightWeight;
     //前囟{闭合、未闭合、未闭合尺寸x-y}
@@ -247,7 +264,69 @@ public class BabyHighRiskBabyResult implements IBasicResultConvert <BabyHighRisk
         this.hospitalName = hospitalName;
     }
 
+    public String getCorrectAge() {
+        return correctAge;
+    }
+
+    public void setCorrectAge(String correctAge) {
+        this.correctAge = correctAge;
+    }
+
+    public String getWeightEvaluate() {
+        return weightEvaluate;
+    }
+
+    public void setWeightEvaluate(String weightEvaluate) {
+        this.weightEvaluate = weightEvaluate;
+    }
+
+    public String getHeightEvaluate() {
+        return heightEvaluate;
+    }
+
+    public void setHeightEvaluate(String heightEvaluate) {
+        this.heightEvaluate = heightEvaluate;
+    }
+
+    public String getHeadEvaluate() {
+        return headEvaluate;
+    }
+
+    public void setHeadEvaluate(String headEvaluate) {
+        this.headEvaluate = headEvaluate;
+    }
+
+    public String getHeightEvaluateStandard() {
+        return heightEvaluateStandard;
+    }
+
+    public void setHeightEvaluateStandard(String heightEvaluateStandard) {
+        this.heightEvaluateStandard = heightEvaluateStandard;
+    }
+
+    public String getHeadEvaluateStandard() {
+        return headEvaluateStandard;
+    }
+
+    public void setHeadEvaluateStandard(String headEvaluateStandard) {
+        this.headEvaluateStandard = headEvaluateStandard;
+    }
+
+    public String getWeightEvaluateStandard() {
+        return weightEvaluateStandard;
+    }
+
+    public void setWeightEvaluateStandard(String weightEvaluateStandard) {
+        this.weightEvaluateStandard = weightEvaluateStandard;
+    }
+
+    public String getFzjcState() {
+        return fzjcState;
+    }
 
+    public void setFzjcState(String fzjcState) {
+        this.fzjcState = fzjcState;
+    }
 
     public String getMname() {
         return mname;
@@ -847,6 +926,14 @@ public class BabyHighRiskBabyResult implements IBasicResultConvert <BabyHighRisk
     public BabyHighRiskBabyResult convertToResult(BabyHighRiskBabyModel destModel) {
 
         try {
+            setCorrectAge(destModel.getCorrectAge());
+            setWeightEvaluate(destModel.getWeightEvaluate());
+            setHeightEvaluate(destModel.getHeightEvaluate());
+            setHeadEvaluate(destModel.getHeadEvaluate());
+            setHeightEvaluateStandard(destModel.getHeightEvaluateStandard());
+            setHeadEvaluateStandard(destModel.getHeadEvaluateStandard());
+            setWeightEvaluateStandard(destModel.getWeightEvaluateStandard());
+
             setHeightWeight(destModel.getHeightWeight());
             setMs(destModel.getMs());
             setPf(destModel.getPf());
-- 
1.8.3.1