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> { PostReviewQuery postReviewQuery = new PostReviewQuery(); postReviewQuery.setPid(patients.getPid()); postReviewQuery.setYn(YnEnums.YES.getId()); + //增加查询本次产程条数 + postReviewQuery.setStart(patients.getLastMenses()); stopWatch.start("query postreview list"); List withList = postReviewService.findWithList(postReviewQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); if (CollectionUtils.isNotEmpty(withList)) { @@ -129,7 +131,8 @@ public class QuanChanPatientWorker implements Callable> { } } 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> { 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> { quanPatientsResult.setbTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); stopWatch.start("query ant count"); antExChuQuery1.setPid(patients.getPid()); + //增加查询本次产程条数 + antExChuQuery1.setStart(patients.getLastMenses()); List chu = antExService.queryAntExChu(antExChuQuery1.convertToQuery()); //复诊次数 List ant = null;