From 44e23138ecb8ea5b411ff07a61a136c8d4eecd95 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 16 May 2017 18:55:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=AC=A1=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9C=AC=E4=BA=A7=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java  | 5 ++++-
 .../java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
index bc4bc96..70a4b6f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
@@ -118,6 +118,8 @@ public class QuanChanPatientWorker implements Callable<List<QuanChanResult>> {
             PostReviewQuery postReviewQuery = new PostReviewQuery();
             postReviewQuery.setPid(patients.getPid());
             postReviewQuery.setYn(YnEnums.YES.getId());
+            //增加查询本次产程条数
+            postReviewQuery.setStart(patients.getLastMenses());
             stopWatch.start("query postreview list");
             List<PostReviewModel> withList = postReviewService.findWithList(postReviewQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
             if (CollectionUtils.isNotEmpty(withList)) {
@@ -129,7 +131,8 @@ public class QuanChanPatientWorker implements Callable<List<QuanChanResult>> {
                 }
             }
             String nextCheckTime = "";
-            if (CollectionUtils.isNotEmpty(withList)) {
+            if (CollectionUtils.isNotEmpty(withList))
+            {
                 chanResult.setcTimes(withList.size());
                 if (null != withList.get(0).getNextCheckTime()) {
                     nextCheckTime = DateUtil.getyyyy_MM_dd(withList.get(0).getNextCheckTime());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
index 2376ede..48318d1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
@@ -79,7 +79,8 @@ public class QuanPatientWorker implements Callable<List<QuanPatientsResult>> {
             QuanPatientsResult quanPatientsResult = new QuanPatientsResult();
             quanPatientsResult.convertToResult(patients);
             antExQuery.setPid(patients.getPid());
-
+            //增加查询本次产程条数
+            antExQuery.setStart(patients.getLastMenses());
             if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) {
                 if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor()));
@@ -95,6 +96,8 @@ public class QuanPatientWorker implements Callable<List<QuanPatientsResult>> {
             quanPatientsResult.setbTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
             stopWatch.start("query ant count");
             antExChuQuery1.setPid(patients.getPid());
+            //增加查询本次产程条数
+            antExChuQuery1.setStart(patients.getLastMenses());
             List<AntExChuModel> chu = antExService.queryAntExChu(antExChuQuery1.convertToQuery());
             //复诊次数
             List<AntenatalExaminationModel> ant = null;
-- 
1.8.3.1