diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index e300524..ae2f9f4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -76,6 +76,8 @@ public class TestController { @Autowired private BabyCheckService babyCheckService; + @Autowired + private PostReviewService postReviewService; @Autowired private BabyCheckFacade babyCheckFacade; @@ -338,6 +340,52 @@ public class TestController { return "update finish"; } + + /** + * 修正产后复查次数 + * @param hospitalId + * @return + */ + @RequestMapping(value = "/updatePostViewTimes", method = RequestMethod.GET) + @ResponseBody + public String updatePostViewTimes(@RequestParam(required = true) String hospitalId,@RequestParam(required = false) String patientId) { + PatientsQuery patientsQuery1 = new PatientsQuery(); + patientsQuery1.setYn(YnEnums.YES.getId()); + patientsQuery1.setHospitalId(hospitalId); + patientsQuery1.setType(3); //查询产妇 + patientsQuery1.setExtEnable(false); + patientsQuery1.setId(patientId); + List pats = patientsService.queryPatient(patientsQuery1); + System.out.println("main="+pats.size()); + if (CollectionUtils.isNotEmpty(pats)) { + for (Patients pat : pats) { + if (StringUtils.isNotEmpty(pat.getPid())) + { + PostReviewQuery postReviewQuery = new PostReviewQuery(); + postReviewQuery.setPid(pat.getPid()); + postReviewQuery.setYn(YnEnums.YES.getId()); + List postReviewModels = postReviewService.findWithList(postReviewQuery); + if (CollectionUtils.isNotEmpty(postReviewModels)) + { + System.out.println("postReviewModels="+postReviewModels.size()+";patientid="+pat.getId()); + for(PostReviewModel postReviewModel : postReviewModels) + { + Patients patients = patientsService.findOnePatientById(postReviewModel.getParentId()); + patients.setPostViewTimes(postReviewModels.size()); + patientsService.updatePatient(patients); + } + } + + } + + } + } + return "updatePostViewTimes finish"; + } + + + + @RequestMapping(value = "/rebuildDefaultRoles", method = RequestMethod.GET) @ResponseBody public String rebuildDefaultRoles() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 738adbb..e7f3e47 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -129,35 +129,49 @@ public class PostReviewFacade { //修改非主档案 同时修改主档案的产后复查次数增加 - if (StringUtils.isNotEmpty(patients1.getSource())) + if (StringUtils.isNotEmpty(patients1.getPid())) { - Patients mainPatients = patientsService.findOnePatientById(patients1.getSource()); + PatientsQuery patientsQuery1 = new PatientsQuery(); + patientsQuery1.setYn(YnEnums.YES.getId()); + patientsQuery1.setPid(patients1.getPid()); + + List pats = patientsService.queryPatient(patientsQuery1); - if (null != patients1.getPostViewTimes()) { + if (null != patients1.getPostViewTimes()) + { Patients patients2 = new Patients(); patients2.setPostViewTimes(patients1.getPostViewTimes() + 1); - patients2.setId(mainPatients.getId()); - patientsService.updatePatient(patients2); - } else { + for (Patients pat : pats) + { + patients2.setId(pat.getId()); + patientsService.updatePatient(patients2); + } + + } + else + { Patients patients2 = new Patients(); patients2.setPostViewTimes(1); - patients2.setId(mainPatients.getId()); - patientsService.updatePatient(patients2); - } + for (Patients pat : pats) + { + patients2.setId(pat.getId()); + patientsService.updatePatient(patients2); + } + } } - if (null != patients1.getPostViewTimes()) { - Patients patients2 = new Patients(); - patients2.setPostViewTimes(patients1.getPostViewTimes() + 1); - patients2.setId(patients1.getId()); - patientsService.updatePatient(patients2); - } else { - Patients patients2 = new Patients(); - patients2.setPostViewTimes(1); - patients2.setId(patients1.getId()); - patientsService.updatePatient(patients2); - } +// if (null != patients1.getPostViewTimes()) { +// Patients patients2 = new Patients(); +// patients2.setPostViewTimes(patients1.getPostViewTimes() + 1); +// patients2.setId(patients1.getId()); +// patientsService.updatePatient(patients2); +// } else { +// Patients patients2 = new Patients(); +// patients2.setPostViewTimes(1); +// patients2.setId(patients1.getId()); +// patientsService.updatePatient(patients2); +// } patientsService.updateNextCheckTime(postReviewRequest.getNextCheckTime(),patients.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java index 68178f5..116dfbd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java @@ -397,7 +397,6 @@ public class SieveRecordFacade { SieveRecordQuery query = new SieveRecordQuery(); query.setYn(YnEnums.YES.getId()); query.setId(id); - query.setStatus(0); PregnantInfoResult result = new PregnantInfoResult(); List list = sieveRecordService.query(query); if (list != null && list.size() > 0) {