From e7c70d89874a0b23663ac64b80ef31cc662e48df Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 12 Aug 2016 16:33:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/PostReviewFacade.java  | 13 ++++++++++++-
 .../platform/operate/web/request/PostReviewRequest.java     |  8 ++++++++
 .../platform/operate/web/result/PostReviewListResult.java   | 13 +++++++++++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
index 3fcba3f..c81e8fa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java
@@ -8,6 +8,7 @@ import com.lyms.platform.common.enums.YnEnums;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.Assert;
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.operate.web.request.PostReviewQueryRequest;
 import com.lyms.platform.operate.web.request.PostReviewRequest;
@@ -60,9 +61,19 @@ public class PostReviewFacade {
             if(CollectionUtils.isNotEmpty(list1)){
                 postReviewModel.setHospitalId(list1.get(0)+"");
             }
-            postReviewModel.setPid(patientsService.findOnePatientById(postReviewRequest.getParentId()).getPid());
+            Patients patients = patientsService.findOnePatientById(postReviewRequest.getParentId());
+            if(StringUtils.isNotEmpty(postReviewRequest.getDueDate())){
+                patients.setFmDate(DateUtil.parseYMD(postReviewRequest.getDueDate()));
+                patientsService.updatePatient(patients);
+            }
+            postReviewModel.setPid(patients.getPid());
             postReviewService.addPostReview(postReviewModel);
         } else {
+            Patients patients = patientsService.findOnePatientById(postReviewRequest.getParentId());
+            if(StringUtils.isNotEmpty(postReviewRequest.getDueDate())){
+                patients.setFmDate(DateUtil.parseYMD(postReviewRequest.getDueDate()));
+                patientsService.updatePatient(patients);
+            }
             postReviewService.updatePostById(postReviewRequest.convertToDataModel(), postReviewRequest.getId());
         }
         return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
index bf07427..757692c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
@@ -24,6 +24,8 @@ public class PostReviewRequest   implements IBasicRequestConvert<PostReviewModel
     @FormParam
     @NotEmpty(message = "产妇id不能为空")
     private String parentId;
+    //分娩时间，自动分娩补录情况
+    private String dueDate;
 
     //分娩天数
     private String day;
@@ -92,7 +94,13 @@ public class PostReviewRequest   implements IBasicRequestConvert<PostReviewModel
     private Map nextCheckTime;
 
 
+    public String getDueDate() {
+        return dueDate;
+    }
 
+    public void setDueDate(String dueDate) {
+        this.dueDate = dueDate;
+    }
 
     public String getBasin() {
         return basin;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
index acdbadb..0675a2b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java
@@ -36,10 +36,20 @@ public class PostReviewListResult {
     private String lastMenses;
     //分娩时间
     private String dueDate;
+
+    private String addDueDate="0";
     //<!---------基本信息----------->
     private List data = new ArrayList();
     private String cTime;
 
+    public String getAddDueDate() {
+        return addDueDate;
+    }
+
+    public void setAddDueDate(String addDueDate) {
+        this.addDueDate = addDueDate;
+    }
+
     public String getcTime() {
         return cTime;
     }
@@ -153,10 +163,10 @@ public class PostReviewListResult {
             }
         } catch (Exception e) {
         }
+        setAddDueDate(patients.getBuildType()==2?"1":"0");
         setName(patients.getUsername());
         setPhone(patients.getPhone());
         setRemarks(patients.getMremark());
-        setRiskScore("60");
         if (null != patients.getDueDate()) {
             setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
         }
@@ -166,7 +176,6 @@ public class PostReviewListResult {
             setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
         }
 
-
         setcTime(DateUtil.getyyyy_MM_dd(new Date()));
         return this;
     }
-- 
1.8.3.1