From a7fd103213d47570f16cc07b438d5d5880d49ac3 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 27 Sep 2017 12:07:23 +0800
Subject: [PATCH] update code

---
 .../com/lyms/platform/operate/web/controller/TestController.java  | 4 ++--
 .../com/lyms/platform/operate/web/facade/BookbuildingFacade.java  | 8 +++++++-
 .../com/lyms/platform/operate/web/facade/SieveRecordFacade.java   | 1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
index d20a8b2..e09fbac 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
@@ -356,7 +356,7 @@ public class TestController {
         patientsQuery1.setExtEnable(false);
         patientsQuery1.setId(patientId);
         List<Patients> pats = patientsService.queryPatient(patientsQuery1);
-        System.out.println("main="+pats.size());
+        System.out.println("main=" + pats.size());
         if (CollectionUtils.isNotEmpty(pats)) {
             for (Patients pat : pats) {
                 if (StringUtils.isNotEmpty(pat.getPid()))
@@ -401,7 +401,7 @@ public class TestController {
             for (Patients pat : pats) {
                 if (StringUtils.isNotEmpty(pat.getPid()))
                 {
-                    pat.setBuildDays(DateUtil.getDays(pat.getLastMenses(), new Date()));
+                    pat.setBuildDays(DateUtil.getDays(pat.getLastMenses(), pat.getBookbuildingDate()));
                     patientsService.updatePatient(pat);
                 }
 
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 670f5fb..f6faa63 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
@@ -227,6 +227,9 @@ public class BookbuildingFacade {
         }
 
         Patients patient = getPatientsData(yunRequest);
+
+        patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date()));
+
         patient.setDueStatus(0);
         //1孕妇  3 产妇
         patient.setType(type);
@@ -424,6 +427,8 @@ public class BookbuildingFacade {
         }
 
         Patients patient = getPatientsData(yunRequest);
+
+        patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date()));
         patient.setDueStatus(0);
         //1孕妇  3 产妇
         patient.setType(type);
@@ -812,6 +817,7 @@ public class BookbuildingFacade {
 
         Patients patient = getPatientsData(yunRequest);
         patient.setModified(new Date());
+        patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), DateUtil.parseYMD(yunRequest.getBookbuildingDate())));
 
 //		Integer type =  ServiceObjEnums.YUNOBJ.getId();
 //		if (patient.getLastMenses() != null)
@@ -1074,7 +1080,7 @@ public class BookbuildingFacade {
      */
     public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) {
         Patients patient = new Patients();
-        patient.setBuildDays(DateUtil.getDays(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()), new Date()));
+
         patient.setMensStartDay(yunRequest.getMensStartDay());
 
         patient.setMensEndDay(yunRequest.getMensEndDay());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java
index 57ca440..e8619ea 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java
@@ -370,6 +370,7 @@ public class SieveRecordFacade {
 
         BaseObjectResponse br = new BaseObjectResponse();
         Patients patients = bookbuildingFacade.getPatientsData(model);
+        patients.setBuildDays(DateUtil.getDays(patients.getLastMenses(), patients.getBookbuildingDate()));
         Map<String, Object> map =   viewFacade.getPatientViewData(patients, model.getId());
         br.setData(map);
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
-- 
1.8.3.1