diff --git a/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java b/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java index 00d7bb2..d514493 100644 --- a/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java +++ b/platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java @@ -746,8 +746,8 @@ public class SyncDataService { } if (map.get("FE_LBLOODPRESSURE") != null || map.get("FE_HBLOODPRESSURE") != null) { Map bpmap = new HashMap<>(); - bpmap.put("szy", map.get("FE_LBLOODPRESSURE") == null ? "" : DataUtil.getString(map.get("FE_LBLOODPRESSURE"))); - bpmap.put("ssy", map.get("FE_HBLOODPRESSURE") == null ? "" : DataUtil.getString(map.get("FE_HBLOODPRESSURE"))); + bpmap.put("szy", map.get("FE_LBLOODPRESSURE") == null ? "" : DataUtil.getString(map.get("FE_LBLOODPRESSURE"))); + bpmap.put("ssy", map.get("FE_HBLOODPRESSURE") == null ? "" : DataUtil.getString(map.get("FE_HBLOODPRESSURE"))); chuModel.setBp(JsonUtil.obj2Str(bpmap)); } @@ -831,7 +831,15 @@ public class SyncDataService { antxModel.setCheckDate(DataUtil.getDate(map.get("CHECKDATE"))); antxModel.setNextCheckTime(DataUtil.getDate(map.get("NEXTCHECKTIME"))); antxModel.setYn(DataUtil.getInteger(map.get("YN"))); - antxModel.setCreated(DataUtil.getDate(map.get("CREATED"))); + if (map.get("CREATED") == null) + { + antxModel.setCreated(DataUtil.getDate(map.get("CHECKDATE"))); + } + else + { + antxModel.setCreated(DataUtil.getDate(map.get("CREATED"))); + } + antxModel.setModified(DataUtil.getDate(map.get("MODIFIED"))); String hid = DataUtil.getString(map.get("HOSPITALID")); 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 f5e32a6..4481974 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 @@ -248,6 +248,7 @@ public class AntenatalExaminationFacade { Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); patients.setLastCheckEmployeeId(antExAddRequest.getCheckDoctor()); + patientsService.updateNextCheckTime(antExAddRequest.getNextCheckTime(), patients.getId()); patientsService.updatePatient(patients); patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime())? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime())); //修改孕妇高危等级 @@ -257,7 +258,7 @@ public class AntenatalExaminationFacade { updateLastRhTime(patients.getId(), hospitalId); //修改最后一次检查时间 setLashCTimes(antExAddRequest.getParentId()); - patientsService.updateNextCheckTime(antExAddRequest.getNextCheckTime(), patients.getId()); + //修改数据 syncMaster(antExAddRequest.getParentId(),antExAddRequest.getNextCheckTime()); @@ -301,9 +302,10 @@ public class AntenatalExaminationFacade { if (StringUtils.isNotEmpty(patients.getEnable()) && "0".equals(patients.getEnable())) { patients.setEnable("1"); } + patientsService.updateNextCheckTime(antExAddRequest.getNextCheckTime(), patients.getId()); patientsService.updatePatient(patients); // patientsService.updatePatientOneCol(patients.getId(), com.lyms.platform.common.utils.StringUtils.isEmpty(antExAddRequest.getNextCheckTime()) == true ? null : DateUtil.parseYMD(antExAddRequest.getNextCheckTime())); - patientsService.updateNextCheckTime(antExAddRequest.getNextCheckTime(), patients.getId()); + antenatalExaminationService.addOneBabyAnt(model); /** 验证产检券是否可用 可用就改为已使用状态 */ @@ -437,8 +439,9 @@ public class AntenatalExaminationFacade { } //修改患者风险等级 // updatePatientRiskLevel(antExChuModel, patients); - patientsService.updatePatient(patients); patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(),patients.getId()); + patientsService.updatePatient(patients); + //修改本系统最后的高危 updateLastRisk(patients.getId()); @@ -509,9 +512,9 @@ public class AntenatalExaminationFacade { //修改患者风险等级 patients.setLastCheckEmployeeId(excAddRequest.getProdDoctor()); - - patientsService.updatePatient(patients); patientsService.updateNextCheckTime(excAddRequest.getNextCheckTime(), patients.getId()); + patientsService.updatePatient(patients); + updateLastRisk(patients.getId()); //修改本院最后一次定义高危