diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java index 96f75f9..73cceda 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/rcfy/RcGlxtService.java @@ -1185,7 +1185,7 @@ public class RcGlxtService { "REGISTER_ADDRESS, REGISTER_PROVINCE,REGISTER_CITY,REGISTER_COUNTRY,REGISTER_TOWN,REGISTER_HOURCE_NO," + "BIRTH_DATE,CONTACT_NAME,CONTACT_TEL_NO,HUSBAND_NAME,HUSBAND_ID_CARD,HUSBAND_TEL,HUSBAND_CERTIFICATE_TYPE," + "HUSBAND_CERTIFICATE_NO,HUSBAND_RESIDENCE_ADDRESS,HUSBAND_COMPANY," + - "STATUS,DATA_FROM_HOSPITAL,CREATE_TIME,UPDATE_TIME,OPERATOR,OPERAT_TIME,HEALTH_RECORD,TELPHONE,BELONG_HOSPITAL) " + + "STATUS,DATA_FROM_HOSPITAL,CREATE_TIME,UPDATE_TIME,OPERATOR,OPERAT_TIME,HEALTH_RECORD,TELPHONE,BELONG_HOSPITAL,LAST_MENSES) " + " values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"; ps = conn.prepareStatement(baseInfoSql); ps.setString(1,patients.getId()); @@ -1312,6 +1312,7 @@ public class RcGlxtService { ps.setString(36, patients.getFileCode()); ps.setString(37, patients.getPhone()); ps.setString(38, hospitalsMap.get(patients.getHospitalId())); + ps.setTimestamp(39, new Timestamp(patients.getLastMenses().getTime())); int saveCount = ps.executeUpdate(); System.out.println("saveCount="+saveCount); } 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 fe9b0cb..4ddcfc8 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 @@ -2410,7 +2410,10 @@ public class TestController extends BaseController { } patientsQuery1.setHospitalList(hids); } - + else + { + patientsQuery1.setHospitalList(rcGlxtService.getHids()); + } List patientses = patientsService.queryPatient(patientsQuery1); if (CollectionUtils.isNotEmpty(patientses)) { @@ -2442,6 +2445,10 @@ public class TestController extends BaseController { } matDeliverQuery.setFmHospitalList(hids); } + else + { + matDeliverQuery.setFmHospitalList(rcGlxtService.getHids()); + } List list2 = matDeliverService.query(matDeliverQuery); if (CollectionUtils.isNotEmpty(list2)) @@ -2475,6 +2482,10 @@ public class TestController extends BaseController { } matDeliverQuery.setFmHospitalList(hids); } + else + { + matDeliverQuery.setFmHospitalList(rcGlxtService.getHids()); + } List list2 = matDeliverService.query(matDeliverQuery); if (CollectionUtils.isNotEmpty(list2)) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 8417395..7017e78 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -272,7 +272,8 @@ public class AntExRecordFacade { if (end > antExRecordModelList.size()) { end = antExRecordModelList.size(); } - listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion, organizationService, usersService, recordService, commonService, hospital, basicConfigService, antExService))); + listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion, + organizationService, usersService, recordService, commonService, hospital, basicConfigService, antExService,patientsService))); } for (Future f : listFuture) { try { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java index 0e2b527..6457a37 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java @@ -1,9 +1,6 @@ package com.lyms.platform.operate.web.worker; -import com.lyms.platform.biz.service.AntExRecordService; -import com.lyms.platform.biz.service.AntenatalExaminationService; -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.biz.service.CommonService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.result.AntExManagerResult; @@ -15,6 +12,7 @@ import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.AntExRecordModel; import com.lyms.platform.pojo.AntenatalExaminationModel; +import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.AntExRecordQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.math.NumberUtils; @@ -39,6 +37,7 @@ public class AntExRecordWorker implements Callable> { private AntExRecordService recordService; private CommonService commonService; private String hospital; + private PatientsService patientsService; private BasicConfigService basicConfigService; @@ -54,7 +53,7 @@ public class AntExRecordWorker implements Callable> { CommonService commonService, String hospital, BasicConfigService basicConfigService, - AntenatalExaminationService antenatalExaminationService) { + AntenatalExaminationService antenatalExaminationService,PatientsService patientsService) { this.record = record; this.isRegion = isRegion; this.organizationService = organizationService; @@ -64,6 +63,7 @@ public class AntExRecordWorker implements Callable> { this.hospital = hospital; this.basicConfigService = basicConfigService; this.antenatalExaminationService = antenatalExaminationService; + this.patientsService = patientsService; } @Override @@ -115,6 +115,8 @@ public class AntExRecordWorker implements Callable> { } AntExRecordQuery antExRecordQuery1 = new AntExRecordQuery(); + Patients patients = patientsService.findOnePatientById(e.getParentId()); + antExRecordQuery1.setCheckTimeStart(patients.getLastMenses()); antExRecordQuery1.setCheckTimeEnd(e.getCheckTime()); antExRecordQuery1.setPid(e.getPid()); antExRecordQuery1.setHospitalId(hospital);