diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml index 89d493e..9a94f4a 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml @@ -315,15 +315,21 @@ - and serEndTime = #{serEndTime,jdbcType=TIMESTAMP} + AND + =0 + ]]> + and docStartTime = #{docStartTime,jdbcType=TIMESTAMP} - - and docEndTime = #{docEndTime,jdbcType=TIMESTAMP} + AND + =0 + ]]> 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 aa7178e..8b185c4 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 @@ -1184,6 +1184,29 @@ public class PatientServiceFacade { public void doServiceEndExcute() { + + PatientServiceQuery patientQuery = new PatientServiceQuery(); + patientQuery.setSerEndTime(new Date()); + patientQuery.setStatus(1); + List patientServices = patientServiceService.queryPatientService(patientQuery); + if (CollectionUtils.isNotEmpty(patientServices)) + { + for (PatientService service : patientServices) + { + service.setSerType(1); + service.setSerStatus(3); + patientServiceService.updatePatientService(service); + + Patients patients = patientsService.findOnePatientById(service.getParentid()); + patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + patients.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + patientsService.updatePatient(patients); + + } + } + + + // TServiceTimeRecordQuery stquery = new TServiceTimeRecordQuery(); // stquery.setEndTime(new Date()); // List tsList = serviceTimeRecordService.queryServiceTimeRecordsEnd(stquery); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index 6a3f8bc..9242950 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -628,6 +628,11 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP { for (PatientService ps : list) { + if (ps.getDocEndTime() == null || ps.getDocEndTime().getTime() < new Date().getTime()) + { + continue; + } + Patients pat = patientsService.findOnePatientById(ps.getParentid()); if (pat != null && pat.getType() == 1) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index b378562..bef237f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -1421,6 +1421,11 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga { for (PatientService ps : list) { + if (ps.getDocEndTime() == null || ps.getDocEndTime().getTime() < new Date().getTime()) + { + continue; + } + Patients pat = patientsService.findOnePatientById(ps.getParentid()); if (pat != null && pat.getType() == 1) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 37efd56..4d8298a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1927,6 +1927,10 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient { for (PatientService ps : list) { + if (ps.getDocEndTime() == null || ps.getDocEndTime().getTime() < new Date().getTime()) + { + continue; + } Patients pat = patientsService.findOnePatientById(ps.getParentid()); if (pat != null && pat.getType() == 1) {