From 54e7174e270ab34cafb07e245cbd3fd19a75b913 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Fri, 12 Jan 2018 11:11:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=90=E5=80=A9=E8=AF=B4=E7=9A=84=20?=
 =?UTF-8?q?=E6=94=B9=E5=BB=BA=E6=A1=A3=E7=AE=A1=E7=90=86=E7=9A=84=E5=BB=BA?=
 =?UTF-8?q?=E6=A1=A3=E5=AD=95=E5=91=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/operate/web/facade/PatientFacade.java    | 6 +++---
 .../platform/operate/web/service/impl/TrackDownServiceImpl.java     | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 785701c..22361b2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -1,6 +1,5 @@
 package com.lyms.platform.operate.web.facade;
 
-import com.lyms.platform.beans.MsgListRequest;
 import com.lyms.platform.beans.MsgRequest;
 import com.lyms.platform.biz.service.*;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
@@ -14,7 +13,6 @@ import com.lyms.platform.common.utils.*;
 import com.lyms.platform.operate.web.request.*;
 import com.lyms.platform.operate.web.result.*;
 import com.lyms.platform.operate.web.utils.CommonsHelper;
-import com.lyms.platform.operate.web.utils.MessageCenterService;
 import com.lyms.platform.operate.web.worker.QuanChanPatientWorker;
 import com.lyms.platform.operate.web.worker.QuanPatientWorker;
 import com.lyms.platform.operate.web.worker.WorkHR;
@@ -1051,7 +1049,9 @@ public class PatientFacade {
                 patientManagerQueryModel.setpId(patients.getPid());
                 String dueWeek = "";
                 try {
-                    if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) {
+                    // 徐倩说改的
+                    //                    if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) {
+                    if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) {
                         dueWeek = "已分娩";
                     } else {
                         int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
index 5fb8ba2..f1c1114 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java
@@ -322,6 +322,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS
                 temp.put("trackDownType", TrackDownTypeEnums.getName(trackDown.getTrackDownDateType()));
                 temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult());
                 temp.put("reservatDate", DateUtil.getyyyy_MM_dd(trackDown.getReservatDate()));
+                temp.put("trackDownTransfer", trackDown.getTrackDownTransfer());
                 if(TrackDownDateEnums.A.getId().equals(trackDown.getTrackDownDateType())) {
                     hqjcList.add(temp);
                 } else if(TrackDownDateEnums.B.getId().equals(trackDown.getTrackDownDateType())) {
-- 
1.8.3.1