diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/TServiceTimeRecordMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/TServiceTimeRecordMapper.java index 78e22d9..494cfd7 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/TServiceTimeRecordMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/TServiceTimeRecordMapper.java @@ -8,7 +8,9 @@ import com.lyms.platform.query.TServiceTimeRecordQuery; import java.util.List; public interface TServiceTimeRecordMapper { - + void updateServiceTimeRecord(TServiceTimeRecord record); void addServiceTimeRecord(TServiceTimeRecord record); List selectServiceTimeRecords(TServiceTimeRecordQuery query); + + List queryServiceTimeRecordsEnd(TServiceTimeRecordQuery query); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/TServiceTimeRecordService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/TServiceTimeRecordService.java index de53b6a..a7063e7 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/TServiceTimeRecordService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/TServiceTimeRecordService.java @@ -9,4 +9,7 @@ import java.util.List; public interface TServiceTimeRecordService { void addServiceTimeRecord(TServiceTimeRecord record); List selectServiceTimeRecords(TServiceTimeRecordQuery query); + public void updateServiceTimeRecord(TServiceTimeRecord record); + List queryServiceTimeRecordsEnd(TServiceTimeRecordQuery query); + } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/TServiceTimeRecordServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/TServiceTimeRecordServiceImpl.java index ff2cf78..ed03daa 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/TServiceTimeRecordServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/TServiceTimeRecordServiceImpl.java @@ -26,4 +26,14 @@ public class TServiceTimeRecordServiceImpl implements TServiceTimeRecordService public List selectServiceTimeRecords(TServiceTimeRecordQuery query) { return tserviceTimeRecordMapper.selectServiceTimeRecords(query); } + + @Override + public void updateServiceTimeRecord(TServiceTimeRecord record) { + tserviceTimeRecordMapper.updateServiceTimeRecord(record); + } + + @Override + public List queryServiceTimeRecordsEnd(TServiceTimeRecordQuery query) { + return tserviceTimeRecordMapper.queryServiceTimeRecordsEnd(query); + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml b/platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml index 403d965..146fda4 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/TServiceTimeRecord.xml @@ -18,6 +18,15 @@ + 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 c6de669..08ce9fb 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 @@ -995,5 +995,37 @@ public class PatientServiceFacade { return map; } + public void doServiceEndExcute() + { + TServiceTimeRecordQuery stquery = new TServiceTimeRecordQuery(); + stquery.setEndTime(new Date()); + List tsList = serviceTimeRecordService.queryServiceTimeRecordsEnd(stquery); + if (CollectionUtils.isNotEmpty(tsList)) { + for (TServiceTimeRecord st : tsList) + { + st.setEndType(1); + serviceTimeRecordService.updateServiceTimeRecord(st); + + PatientServiceQuery patientQuery = new PatientServiceQuery(); + patientQuery.setSerType(1); + patientQuery.setParentid(st.getForeignId()); + 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(st.getForeignId()); + patients.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId()); + patients.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId()); + patientsService.updatePatient(patients); + } + } + } } diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml index 0836d52..94e4861 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -315,6 +315,23 @@ + + + + + + + + + + + + + + + + + @@ -346,6 +363,7 @@ +