diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index eab5fc5..95673f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -6481,6 +6481,7 @@ public class AntenatalExaminationFacade { public BaseResponse getAutoRiskRecord(AntExManagerQueryRequest antExManagerQueryRequest, Integer id) { List riskList = new ArrayList(); BaseQuery baseQuery = new BaseQuery(); + String hospitalId = autoMatchFacade.getHospitalId(id); PatientsQuery patientsQuery = new PatientsQuery(); List patientses = null; @@ -6498,6 +6499,7 @@ public class AntenatalExaminationFacade { } } Query query = new Query(); + query.addCriteria(Criteria.where("hospitalId").is(hospitalId)); if (CollectionUtils.isNotEmpty(patientIds)) { query.addCriteria(Criteria.where("patientId").in(patientIds)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 010f4e4..99d68c2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -1566,16 +1566,18 @@ public class PatientServiceFacade { service.setSynStatus(1); service.setUpdateDate(new Date()); patientServiceService.updatePatientService(service); - - Patients patients = patientsService.findOnePatientById(service.getParentid()); - if (patients != null) { - if (patients.getType()==3){ - patients.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); - }else { - // patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); - patients.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + //只有孕期精准医疗、产后康复才更新 + if (service.getSerType()==1 ||service.getSerType()==20){ + Patients patients = patientsService.findOnePatientById(service.getParentid()); + if (patients != null) { + if (patients.getType()==3){ + patients.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId()); + }else { + // patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + patients.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + } + patientsService.updatePatient(patients); } - patientsService.updatePatient(patients); } } }