From 49b1f2eb99ae60529f8ae12c899cfce4ee35e900 Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Fri, 14 Dec 2018 16:10:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/pojo/MaternalDeliverModel.java   | 55 ++++++++++++----------
 .../platform/operate/web/facade/ViewFacade.java    |  6 +--
 .../operate/web/request/MatDeliverAddRequest.java  | 30 +-----------
 .../operate/web/result/MaternalDeliverResult.java  | 29 ------------
 4 files changed, 35 insertions(+), 85 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
index 4bbfc7d..9dc4d6f 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
@@ -1363,6 +1363,34 @@ public class MaternalDeliverModel extends BaseModel {
         private Integer twining ;//缠绕
         private String tightness;//松紧程度
 
+        private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
+        private String placentalQs;//胎盘缺损g
+        private String ccm;//粗糙面
+
+        public String getPlacentalComplete() {
+            return placentalComplete;
+        }
+
+        public void setPlacentalComplete(String placentalComplete) {
+            this.placentalComplete = placentalComplete;
+        }
+
+        public String getPlacentalQs() {
+            return placentalQs;
+        }
+
+        public void setPlacentalQs(String placentalQs) {
+            this.placentalQs = placentalQs;
+        }
+
+        public String getCcm() {
+            return ccm;
+        }
+
+        public void setCcm(String ccm) {
+            this.ccm = ccm;
+        }
+
         public String getTightness() {
             return tightness;
         }
@@ -1760,37 +1788,14 @@ public class MaternalDeliverModel extends BaseModel {
 
     private String bedNum;//床号
     private String bhNum;//住院号
-    private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
+    /*private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
     private String placentalQs;//胎盘缺损g
-    private String ccm;//粗糙面
+    private String ccm;//粗糙面*/
     private String fhqk;//缝合情况（1：皮内缝合；2：外缝针）
     private String szxz;//水肿血肿
     private String jmkz;//静脉扩张
     private String zyDiagnosis;//主要诊断
 
-    public String getPlacentalComplete() {
-        return placentalComplete;
-    }
-
-    public void setPlacentalComplete(String placentalComplete) {
-        this.placentalComplete = placentalComplete;
-    }
-
-    public String getPlacentalQs() {
-        return placentalQs;
-    }
-
-    public void setPlacentalQs(String placentalQs) {
-        this.placentalQs = placentalQs;
-    }
-
-    public String getCcm() {
-        return ccm;
-    }
-
-    public void setCcm(String ccm) {
-        this.ccm = ccm;
-    }
 
     public String getFhqk() {
         return fhqk;
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 9b49c55..64ae528 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
@@ -2781,9 +2781,6 @@ public class ViewFacade {
         map.put("gjOther",data.getGjOther());
         map.put("bedNum",data.getBedNum());
         map.put("bhNum",data.getBhNum());
-        map.put("placentalComplete",data.getPlacentalComplete());
-        map.put("placentalQs",data.getPlacentalQs());
-        map.put("ccm",data.getCcm());
         map.put("fhqk",data.getFhqk());
         map.put("szxz",data.getSzxz());
         map.put("jmkz",data.getJmkz());
@@ -2929,6 +2926,9 @@ public class ViewFacade {
                 extMap.put("qdfz",temp.getQdfz());
                 extMap.put("twining",temp.getTwining());
                 extMap.put("tightness",temp.getTightness());
+                extMap.put("placentalComplete",temp.getPlacentalComplete());
+                extMap.put("placentalQs",temp.getPlacentalQs());
+                extMap.put("ccm",temp.getCcm());
                 /****************************/
 
                 ExtPlacentaList.add(extMap);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
index c712bb9..ec18487 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
@@ -342,9 +342,9 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
 
     private String bedNum;//床号
     private String bhNum;//住院号
-    private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
+    /*private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
     private String placentalQs;//胎盘缺损g
-    private String ccm;//粗糙面
+    private String ccm;//粗糙面*/
     private String fhqk;//缝合情况（1：皮内缝合；2：外缝针）
     private String szxz;//水肿血肿
     private String jmkz;//静脉扩张
@@ -429,9 +429,6 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
 
         maternalDeliverModel.setBedNum(bedNum);
         maternalDeliverModel.setBhNum(bhNum);
-        maternalDeliverModel.setPlacentalComplete(placentalComplete);
-        maternalDeliverModel.setPlacentalQs(placentalQs);
-        maternalDeliverModel.setCcm(ccm);
         maternalDeliverModel.setFhqk(fhqk);
         maternalDeliverModel.setSzxz(szxz);
         maternalDeliverModel.setJmkz(jmkz);
@@ -440,29 +437,6 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
         return maternalDeliverModel;
     }
 
-    public String getPlacentalComplete() {
-        return placentalComplete;
-    }
-
-    public void setPlacentalComplete(String placentalComplete) {
-        this.placentalComplete = placentalComplete;
-    }
-
-    public String getPlacentalQs() {
-        return placentalQs;
-    }
-
-    public void setPlacentalQs(String placentalQs) {
-        this.placentalQs = placentalQs;
-    }
-
-    public String getCcm() {
-        return ccm;
-    }
-
-    public void setCcm(String ccm) {
-        this.ccm = ccm;
-    }
 
     public String getFhqk() {
         return fhqk;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
index a2f724f..db0245b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
@@ -141,37 +141,11 @@ public class MaternalDeliverResult  {
 
     private String bedNum;//床号
     private String bhNum;//住院号
-    private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
-    private String placentalQs;//胎盘缺损g
-    private String ccm;//粗糙面
     private String fhqk;//缝合情况（1：皮内缝合；2：外缝针）
     private String szxz;//水肿血肿
     private String jmkz;//静脉扩张
     private String zyDiagnosis;//主要诊断
 
-    public String getPlacentalComplete() {
-        return placentalComplete;
-    }
-
-    public void setPlacentalComplete(String placentalComplete) {
-        this.placentalComplete = placentalComplete;
-    }
-
-    public String getPlacentalQs() {
-        return placentalQs;
-    }
-
-    public void setPlacentalQs(String placentalQs) {
-        this.placentalQs = placentalQs;
-    }
-
-    public String getCcm() {
-        return ccm;
-    }
-
-    public void setCcm(String ccm) {
-        this.ccm = ccm;
-    }
 
     public String getFhqk() {
         return fhqk;
@@ -494,9 +468,6 @@ public class MaternalDeliverResult  {
 
         setBedNum(destModel.getBedNum());
         setBhNum(destModel.getBhNum());
-        setPlacentalComplete(destModel.getPlacentalComplete());
-        setPlacentalQs(destModel.getPlacentalQs());
-        setCcm(destModel.getCcm());
         setFhqk(destModel.getFhqk());
         setSzxz(destModel.getSzxz());
         setJmkz(destModel.getJmkz());
-- 
1.8.3.1