From f9b2d853c021f24be2968f34740441f9921896b6 Mon Sep 17 00:00:00 2001
From: dongqin <123456>
Date: Sun, 2 Jun 2019 20:56:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/AntenatalExaminationFacade.java     | 33 ++++++++
 .../platform/operate/web/facade/ViewFacade.java    | 22 ++++++
 .../web/result/AntenatalExaminationResult.java     | 91 +++++++++++++++++++++
 .../operate/web/result/AntexChuResult.java         | 92 ++++++++++++++++++++++
 4 files changed, 238 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
index 8f9856a..a3f3a41 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
@@ -3091,6 +3091,21 @@ public class AntenatalExaminationFacade {
 
             antenatalExaminationResult.setIsSieve(cap(data, examinationModel.getParentId()));
             antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery)) ? 0 : 1);
+
+            //  丰润字段的添加
+            antenatalExaminationResult.setGongGaoSelect(examinationModel.getGongGaoSelect());
+            antenatalExaminationResult.setFuweiSelect(examinationModel.getFuweiSelect());
+            antenatalExaminationResult.setEdemaSelect(examinationModel.getEdemaSelect());
+            antenatalExaminationResult.setTireNumberSelect(examinationModel.getTireNumberSelect());
+            antenatalExaminationResult.setQuickenSelect(examinationModel.getQuickenSelect());
+            antenatalExaminationResult.setXhdbSelect(examinationModel.getXhdbSelect());
+            antenatalExaminationResult.setXhdbSelectOtherVal(examinationModel.getXhdbSelectOtherVal());
+            antenatalExaminationResult.setNdbSelect(examinationModel.getNdbSelect());
+            antenatalExaminationResult.setNdbSelectOtherVal(examinationModel.getNdbSelectOtherVal());
+            antenatalExaminationResult.setTireData(examinationModel.getTireData());
+
+
+
             object = antenatalExaminationResult;
         } else {
             //查询初诊数据
@@ -3205,6 +3220,24 @@ public class AntenatalExaminationFacade {
                 antexChuResult.setGenRemark(antExChuModel.getGenRemark());
                 antexChuResult.setGynRemark(antExChuModel.getGynRemark());
 
+                //  丰润字段的添加
+
+
+                antexChuResult.setGongGaoSelect(antExChuModel.getGonggaoSelect());
+
+                //  丰润字段的添加
+                antexChuResult.setGongGaoSelect(antExChuModel.getGonggaoSelect());
+                antexChuResult.setFuweiSelect(antExChuModel.getFuweiSelect());
+                antexChuResult.setEdemaSelect(antExChuModel.getEdemaSelect());
+                antexChuResult.setTireNumberSelect(antExChuModel.getTireNumberSelect());
+                antexChuResult.setQuickenSelect(antExChuModel.getQuickenSelect());
+                antexChuResult.setXhdbSelect(antExChuModel.getXhdbSelect());
+                antexChuResult.setXhdbSelectOtherVal(antExChuModel.getXhdbSelectOtherVal());
+                antexChuResult.setNdbSelect(antExChuModel.getNdbSelect());
+                antexChuResult.setNdbSelectOtherVal(antExChuModel.getNdbSelectOtherVal());
+                antexChuResult.setPlacentas(antExChuModel.getPlacentas());
+
+
 
                 object = antexChuResult;
             }
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 de45eb1..4b6f98b 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
@@ -1820,6 +1820,17 @@ public class ViewFacade {
                         if (placenta.getYszs() != null) {
                             placetaMap.put("yszs", UnitUtils.unitSplice(placenta.getYszs(), UnitConstants.CM));
                         }
+
+                        //  丰润字段添加
+                        if (StringUtils.isNotEmpty(placenta.getHeartRateSelect())){
+                            placetaMap.put("heartRateSelect", placenta.getHeartRateSelect());
+                        }
+                        if (StringUtils.isNotEmpty(placenta.getFetalPositionSelect())){
+                            placetaMap.put("fetalPositionSelect", placenta.getFetalPositionSelect());
+                        }
+                        if (StringUtils.isNotEmpty(placenta.getJoinSelect())) {
+                            placetaMap.put("joinSelect", placenta.getJoinSelect());
+                        }
                     }
 
                     if ("java.util.LinkedHashMap".equals(obj.getClass().getName())) {
@@ -1880,6 +1891,17 @@ public class ViewFacade {
                             if (placenta.get("yszs") != null) {
                                 placetaMap.put("yszs", UnitUtils.unitSplice(placenta.get("yszs"), UnitConstants.CM));
                             }
+
+                            //  丰润字段添加
+                            if (placenta.get("heartRateSelect") != null) {
+                                placetaMap.put("heartRateSelect", placenta.get("heartRateSelect"));
+                            }
+                            if (placenta.get("fetalPositionSelect") != null) {
+                                placetaMap.put("fetalPositionSelect", placenta.get("fetalPositionSelect"));
+                            }
+                            if (placenta.get("joinSelect") != null) {
+                                placetaMap.put("joinSelect", placenta.get("joinSelect"));
+                            }
                         }
                     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
index 2c83889..1a0b529 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
@@ -65,6 +65,97 @@ public class AntenatalExaminationResult implements IBasicResultConvert<Antenatal
     //结果补充
     private String resultSupple;
 
+    //腹围 1-未测 2-拒测
+    private String fuweiSelect;
+    //  浮肿 1-未测 2-拒测
+    private String edemaSelect;
+    //  胎数 1-未测 2-拒测
+    private String tireNumberSelect;
+    /**
+     * 胎动选项 1-未测 2-拒测
+     */
+    private String quickenSelect;
+    /**
+     * 血红蛋白选项 1-可选 2-未测  3-拒测  9-其他
+     **/
+    private String xhdbSelect;
+    /**
+     * 血红蛋白选项 其他 - 对应的值
+     **/
+    private String xhdbSelectOtherVal;
+    /**
+     * 尿蛋白选项 1-未测  2-拒测  9-其他
+     */
+    private String ndbSelect;
+    /**
+     * 尿蛋白选项 其他 - 对应的值
+     */
+    private String ndbSelectOtherVal;
+
+    public String getFuweiSelect() {
+        return fuweiSelect;
+    }
+
+    public void setFuweiSelect(String fuweiSelect) {
+        this.fuweiSelect = fuweiSelect;
+    }
+
+    public String getEdemaSelect() {
+        return edemaSelect;
+    }
+
+    public void setEdemaSelect(String edemaSelect) {
+        this.edemaSelect = edemaSelect;
+    }
+
+    public String getTireNumberSelect() {
+        return tireNumberSelect;
+    }
+
+    public void setTireNumberSelect(String tireNumberSelect) {
+        this.tireNumberSelect = tireNumberSelect;
+    }
+
+    public String getQuickenSelect() {
+        return quickenSelect;
+    }
+
+    public void setQuickenSelect(String quickenSelect) {
+        this.quickenSelect = quickenSelect;
+    }
+
+    public String getXhdbSelect() {
+        return xhdbSelect;
+    }
+
+    public void setXhdbSelect(String xhdbSelect) {
+        this.xhdbSelect = xhdbSelect;
+    }
+
+    public String getXhdbSelectOtherVal() {
+        return xhdbSelectOtherVal;
+    }
+
+    public void setXhdbSelectOtherVal(String xhdbSelectOtherVal) {
+        this.xhdbSelectOtherVal = xhdbSelectOtherVal;
+    }
+
+    public String getNdbSelect() {
+        return ndbSelect;
+    }
+
+    public void setNdbSelect(String ndbSelect) {
+        this.ndbSelect = ndbSelect;
+    }
+
+    public String getNdbSelectOtherVal() {
+        return ndbSelectOtherVal;
+    }
+
+    public void setNdbSelectOtherVal(String ndbSelectOtherVal) {
+        this.ndbSelectOtherVal = ndbSelectOtherVal;
+    }
+
     public String getVcCardNo() {
         return vcCardNo;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
index 5279877..89dd4af 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
@@ -530,6 +530,98 @@ public class AntexChuResult {
     //实验结果
     private String syjgValue;
 
+
+    //腹围 1-未测 2-拒测
+    private String fuweiSelect;
+    //  浮肿 1-未测 2-拒测
+    private String edemaSelect;
+    //  胎数 1-未测 2-拒测
+    private String tireNumberSelect;
+    /**
+     * 胎动选项 1-未测 2-拒测
+     */
+    private String quickenSelect;
+    /**
+     * 血红蛋白选项 1-可选 2-未测  3-拒测  9-其他
+     **/
+    private String xhdbSelect;
+    /**
+     * 血红蛋白选项 其他 - 对应的值
+     **/
+    private String xhdbSelectOtherVal;
+    /**
+     * 尿蛋白选项 1-未测  2-拒测  9-其他
+     */
+    private String ndbSelect;
+    /**
+     * 尿蛋白选项 其他 - 对应的值
+     */
+    private String ndbSelectOtherVal;
+
+    public String getFuweiSelect() {
+        return fuweiSelect;
+    }
+
+    public void setFuweiSelect(String fuweiSelect) {
+        this.fuweiSelect = fuweiSelect;
+    }
+
+    public String getEdemaSelect() {
+        return edemaSelect;
+    }
+
+    public void setEdemaSelect(String edemaSelect) {
+        this.edemaSelect = edemaSelect;
+    }
+
+    public String getTireNumberSelect() {
+        return tireNumberSelect;
+    }
+
+    public void setTireNumberSelect(String tireNumberSelect) {
+        this.tireNumberSelect = tireNumberSelect;
+    }
+
+    public String getQuickenSelect() {
+        return quickenSelect;
+    }
+
+    public void setQuickenSelect(String quickenSelect) {
+        this.quickenSelect = quickenSelect;
+    }
+
+    public String getXhdbSelect() {
+        return xhdbSelect;
+    }
+
+    public void setXhdbSelect(String xhdbSelect) {
+        this.xhdbSelect = xhdbSelect;
+    }
+
+    public String getXhdbSelectOtherVal() {
+        return xhdbSelectOtherVal;
+    }
+
+    public void setXhdbSelectOtherVal(String xhdbSelectOtherVal) {
+        this.xhdbSelectOtherVal = xhdbSelectOtherVal;
+    }
+
+    public String getNdbSelect() {
+        return ndbSelect;
+    }
+
+    public void setNdbSelect(String ndbSelect) {
+        this.ndbSelect = ndbSelect;
+    }
+
+    public String getNdbSelectOtherVal() {
+        return ndbSelectOtherVal;
+    }
+
+    public void setNdbSelectOtherVal(String ndbSelectOtherVal) {
+        this.ndbSelectOtherVal = ndbSelectOtherVal;
+    }
+
     public String getYgbmkyValue() {
         return ygbmkyValue;
     }
-- 
1.8.3.1