Commit 44e23138ecb8ea5b411ff07a61a136c8d4eecd95
1 parent
ad385c4b8a
Exists in
master
and in
6 other branches
修改产次查询本产程
Showing 2 changed files with 8 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanChanPatientWorker.java
View file @
44e2313
... | ... | @@ -118,6 +118,8 @@ |
118 | 118 | PostReviewQuery postReviewQuery = new PostReviewQuery(); |
119 | 119 | postReviewQuery.setPid(patients.getPid()); |
120 | 120 | postReviewQuery.setYn(YnEnums.YES.getId()); |
121 | + //增加查询本次产程条数 | |
122 | + postReviewQuery.setStart(patients.getLastMenses()); | |
121 | 123 | stopWatch.start("query postreview list"); |
122 | 124 | List<PostReviewModel> withList = postReviewService.findWithList(postReviewQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); |
123 | 125 | if (CollectionUtils.isNotEmpty(withList)) { |
... | ... | @@ -129,7 +131,8 @@ |
129 | 131 | } |
130 | 132 | } |
131 | 133 | String nextCheckTime = ""; |
132 | - if (CollectionUtils.isNotEmpty(withList)) { | |
134 | + if (CollectionUtils.isNotEmpty(withList)) | |
135 | + { | |
133 | 136 | chanResult.setcTimes(withList.size()); |
134 | 137 | if (null != withList.get(0).getNextCheckTime()) { |
135 | 138 | nextCheckTime = DateUtil.getyyyy_MM_dd(withList.get(0).getNextCheckTime()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java
View file @
44e2313
... | ... | @@ -79,7 +79,8 @@ |
79 | 79 | QuanPatientsResult quanPatientsResult = new QuanPatientsResult(); |
80 | 80 | quanPatientsResult.convertToResult(patients); |
81 | 81 | antExQuery.setPid(patients.getPid()); |
82 | - | |
82 | + //增加查询本次产程条数 | |
83 | + antExQuery.setStart(patients.getLastMenses()); | |
83 | 84 | if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { |
84 | 85 | if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) { |
85 | 86 | Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor())); |
... | ... | @@ -95,6 +96,8 @@ |
95 | 96 | quanPatientsResult.setbTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); |
96 | 97 | stopWatch.start("query ant count"); |
97 | 98 | antExChuQuery1.setPid(patients.getPid()); |
99 | + //增加查询本次产程条数 | |
100 | + antExChuQuery1.setStart(patients.getLastMenses()); | |
98 | 101 | List<AntExChuModel> chu = antExService.queryAntExChu(antExChuQuery1.convertToQuery()); |
99 | 102 | //复诊次数 |
100 | 103 | List<AntenatalExaminationModel> ant = null; |