diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index aaa6f04..ce73a9d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -371,7 +371,7 @@ public class PatientMarkHospServiceFacade { * 同步查询乐陵住院数据 */ public void synLlHisData(int offset, int page) { - + System.out.println("同步查询乐陵住院数据"); PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery(); patientMarkHospQuery.setSort("hospit_date"); patientMarkHospQuery.setNeed("y"); @@ -381,7 +381,7 @@ public class PatientMarkHospServiceFacade { List patientMarkHospitals = patientMarkHospitalService.queryPatientMarkHospital(patientMarkHospQuery); for (PatientMarkHospital ps : patientMarkHospitals) { - if (ps.getHospitType() == 1) {//分娩住院跳过 + if (ps.getHospitType()!=null && ps.getHospitType() == 1) {//分娩住院跳过 continue; } synUpdateHisData(ps); 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 d9185e8..66cc088 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 @@ -143,6 +143,10 @@ public class PatientServiceFacade { return baseResponse; } + Patients patients = patientsService.findOnePatientById(ps.getParentid()); + if(patients!=null){ + ps.setPid(patients.getPid()); + } ps.setId(UUID.randomUUID().toString().replace("-", "")); ps.setHospitalId(hospitalId); // ps.setCreateDate(new Date()); 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 96c19ee..1b92a28 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -9,6 +9,29 @@ http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-3.1.xsd http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd"> + + + + + + + + + + + 0 + 1 + + + + + + + + + + + @@ -149,6 +172,8 @@ + +