From 48740375f84870c305c0f493235d31fa476a3770 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 14 May 2018 11:21:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=91=E6=94=BE=E6=AF=8D?=
 =?UTF-8?q?=E5=AD=90=E4=BF=9D=E5=81=A5=E6=89=8B=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/BookbuildingFacade.java   |  1 +
 .../lyms/platform/operate/web/facade/PatientServiceFacade.java |  1 -
 .../com/lyms/platform/operate/web/result/PatientSerResult.java | 10 ----------
 .../lyms/platform/operate/web/result/PregnantInfoResult.java   | 10 ++++++++++
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index d06df69..f74bc3b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -1298,6 +1298,7 @@ public class BookbuildingFacade {
                 result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getLastMenses()));
                 result.setLastMenstrualPeriod(DateUtil.getyyyy_MM_dd(p.getFuckLastMens()));
             }
+            result.setSendCareMan(p.getSendCareMan());
             result.setLastMenstrualPeriodBasis(p.getLastMenstrualPeriodBasis());
             result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther());
             result.setLastMenstrualPeriodBasisDoctorId(p.getLastMenstrualPeriodBasisDoctorId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
index 59759f9..86c6be8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
@@ -436,7 +436,6 @@ public class PatientServiceFacade {
                 else if (patients.getType() == 3) {
                     result.setcDueWeek("已分娩");
                 }
-                result.setSendCareMan(patients.getSendCareMan());
                 result.setAge(DateUtil.getAge(patients.getBirth()) + "岁");
                 result.setName(patients.getUsername());
                 result.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java
index 9585a34..d094955 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java
@@ -109,8 +109,6 @@ public class PatientSerResult {
      */
     private Integer status;
     private String statusStr;
-    //是否发放母子保健手册
-    private String sendCareMan;
     /**
      * 退款时间
      */
@@ -120,14 +118,6 @@ public class PatientSerResult {
      */
     private String backUser;
 
-    public String getSendCareMan() {
-        return sendCareMan;
-    }
-
-    public void setSendCareMan(String sendCareMan) {
-        this.sendCareMan = sendCareMan;
-    }
-
     public String getSex() {
         return sex;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
index 0dda2d4..36f1ee3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java
@@ -20,6 +20,8 @@ public class PregnantInfoResult {
     private String lastMenstrualPeriodBasisDoctorName;
     //是否提供丈夫信息
     private Boolean reqHusband;
+    //是否发放母子保健手册
+    private String sendCareMan;
     /**
      * 编辑时服务信息
      */
@@ -27,6 +29,14 @@ public class PregnantInfoResult {
     //显示服务信息
     private List<PatientSerResult> patientSerResults;
 
+    public String getSendCareMan() {
+        return sendCareMan;
+    }
+
+    public void setSendCareMan(String sendCareMan) {
+        this.sendCareMan = sendCareMan;
+    }
+
     public Boolean getReqHusband() {
         return reqHusband;
     }
-- 
1.8.3.1