diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 835a858..4be2c90 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -1332,13 +1332,13 @@ public class Patients extends BaseModel { downRecord.setHospitalId(getHospitalId()); downRecord.setSource(getId()); downRecord.setStatus(1); - downRecord.setAppointmentDate(new Date()); + // downRecord.setAppointmentDate(new Date()); downRecord.setStop("0"); downRecord.setTrackType(TrackDownDateEnums.C.getId()); //特殊处理 产筛预约追访时间 - downRecord.setSieveAppointmentDate(new Date()); + //downRecord.setSieveAppointmentDate(new Date()); //特殊处理 分娩住院预约追访时间 - downRecord.setFmzyAppointmentDate(new Date()); + //downRecord.setFmzyAppointmentDate(new Date()); return downRecord; } 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 f8807a1..306a2b5 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 @@ -366,7 +366,7 @@ public class AntenatalExaminationFacade { sieveDao.updateChanQianSieve(sieveModel); } } - /* *//**修改孕妇追访管理修改*//* + /* *//**修改孕妇追访管理修改*//* if (StringUtils.isNotEmpty(antExAddRequest.getNextCheckTime()) && StringUtils.isNotEmpty(antExAddRequest.getParentId())) { TrackDownRecord trackDownRecord = new TrackDownRecord(); trackDownRecord.setAppointmentDate(DateUtil.parseYMD(antExAddRequest.getNextCheckTime())); @@ -657,7 +657,7 @@ public class AntenatalExaminationFacade { stopWatch.start("queryAntExChu"); - /* *//**孕妇追访功能下次预约时间修改*//* + /* *//**孕妇追访功能下次预约时间修改*//* if (StringUtils.isNotEmpty(excAddRequest.getNextCheckTime()) && StringUtils.isNotEmpty(excAddRequest.getParentId())) { TrackDownRecord trackDownRecord = new TrackDownRecord(); trackDownRecord.setAppointmentDate(DateUtil.parseYMD(excAddRequest.getNextCheckTime())); @@ -1131,6 +1131,10 @@ public class AntenatalExaminationFacade { if (CollectionUtils.isNotEmpty(records)) {//存在则进行修改,只修改基本信息,不修改显示状态和追访类型 TrackDownRecord trackDownRecord1 = records.get(0); trackDownRecord.setId(trackDownRecord1.getId()); + + } + if (null != patient.getNextCheckTime()) { + trackDownRecord.setAppointmentDate(patient.getNextCheckTime()); } trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 309ce42..cc2c596 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -545,7 +545,12 @@ public class BookbuildingFacade { if (week > 20) {//不能做产前筛查追访,产前检查追访 trackDownRecord.setTrackType(TrackDownDateEnums.I.getId()); } - + //孕妇追访默认时间 + trackDownRecord.setAppointmentDate(new Date()); + //产筛默认时间 + trackDownRecord.setSieveAppointmentDate(new Date()); + //设置默认分娩住院时间 + trackDownRecord.setFmzyAppointmentDate(new Date()); trackDownService.addOrupdateTrackDownRecord(userId, trackDownRecord); } }); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java index 3d47979..85c2617 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java @@ -170,7 +170,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS Integer userId, Integer type, Integer check, String checkup, String pregnantBuild, Integer followupStatus, Boolean isDeliver, HttpServletResponse response, Integer encryption) { String hospitalId = autoMatchFacade.getHospitalId(userId); - List> restList = new ArrayList<>(); + List> restList; Integer archiveModelCount = 0; if (type == 1) {//查询妇女建档为主数据 //查询条件 @@ -306,6 +306,8 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("chfc", 3);//产后复查空白 temp.put("resident", 1); // 妇女建档 temp.put("check", 3); // 婚检 + temp.put("cqzd", 3);//产前诊断默认 + temp.put("id", archiveModel.getId()); temp.put("cardNo", encryption == 0 ? StringUtils.encryCardNo(archiveModel.getCertificateNum()) : archiveModel.getCertificateNum());