diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostReviewService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostReviewService.java index d5b1916..0767371 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostReviewService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostReviewService.java @@ -63,6 +63,14 @@ public class PostReviewService { return postReviewDao.findWithList(query.addOrder(Sort.Direction.DESC, "id")); } + public List findWithList(MongoQuery mongoQuery) { + return postReviewDao.findWithList(mongoQuery); + } + + public Integer count(PostReviewQuery mongoQuery){ + return postReviewDao.queryCount(mongoQuery.convertToQuery()); + } + /** * 修改一条数据 * 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 4645ed0..11cd336 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 @@ -15,10 +15,7 @@ import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; -import com.lyms.platform.query.AntExChuQuery; -import com.lyms.platform.query.AntExQuery; -import com.lyms.platform.query.BabyModelQuery; -import com.lyms.platform.query.PatientsQuery; +import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; @@ -54,6 +51,8 @@ public class PatientFacade { private AntenatalExaminationFacade antenatalExaminationFacade; @Autowired private UsersService usersService; + @Autowired + private PostReviewService postReviewService; /** @@ -296,23 +295,16 @@ public class PatientFacade { chanResult.setCheckDoctor(patients.getLastCheckEmployeeId()); } } - //复诊次数 - int i = antExService.queryAntenatalExaminationCount(antExQuery.convertToQuery()); - chanResult.setcTimes(i); - antExChuQuery.setParentId(patients.getId()); - antExChuQuery.setYn(YnEnums.YES.getId()); - List ant = antExService.queryAntenatalExamination(antExChuQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); - + //复查次数 + PostReviewQuery postReviewQuery=new PostReviewQuery(); + postReviewQuery.setParentId(patients.getId()); + postReviewQuery.setYn(YnEnums.YES.getId()); + List withList = postReviewService.findWithList(postReviewQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); String nextCheckTime = ""; -// List examinationModels = antExService.queryAntenatalExamination(antExQuery.convertToQuery()); - if (CollectionUtils.isNotEmpty(ant)) { - nextCheckTime = DateUtil.getyyyy_MM_dd(ant.get(0).getNextCheckTime()); - } else { - List list = antExService.queryAntExChu(antExChuQuery); - if (CollectionUtils.isNotEmpty(list)) { - nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime()); - } + if (CollectionUtils.isNotEmpty(withList)) { + chanResult.setcTimes(withList.size()); + nextCheckTime = withList.get(0).getNextCheckTime(); } chanResult.setNextCheckTime(nextCheckTime); data.add(chanResult); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java index e33d1e8..ced0bfc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java @@ -22,7 +22,7 @@ public class QuanChanResult implements IBasicResultConvert