diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITrackDownRecordDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITrackDownRecordDao.java index c4af5d4..c6b9e94 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITrackDownRecordDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITrackDownRecordDao.java @@ -22,19 +22,21 @@ import java.util.List; */ public interface ITrackDownRecordDao { - TrackDownRecord addTrackDown(TrackDownRecord downRecord); + TrackDownRecord addTrackDown(TrackDownRecord downRecord); - void updateTrackDown(TrackDownRecord obj, String id); + void updateTrackDown(TrackDownRecord obj, String id); - void deleteTrackDown(String id); + void updateTrackDownPaparent(TrackDownRecord obj, String patientId); - TrackDownRecord getTrackDown(String id); + void deleteTrackDown(String id); - int queryTrackDownCount(MongoQuery query); + TrackDownRecord getTrackDown(String id); - List queryTrackDown(MongoQuery query); + int queryTrackDownCount(MongoQuery query); - Page findPage(MongoQuery query); + List queryTrackDown(MongoQuery query); - void findAndModify(MongoQuery query, TrackDownRecord obj); + Page findPage(MongoQuery query); + + void findAndModify(MongoQuery query, TrackDownRecord obj); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TrackDownRecordDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TrackDownRecordDaoImpl.java index c626bab..d79508e 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TrackDownRecordDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TrackDownRecordDaoImpl.java @@ -38,6 +38,7 @@ public class TrackDownRecordDaoImpl extends BaseMongoDAOImpl im public void findAndModify(MongoQuery query, TrackDownRecord obj) { updateMulti(query.convertToMongoQuery(), obj); } + @Override public TrackDownRecord addTrackDown(TrackDownRecord downRecord) { return save(downRecord); @@ -49,6 +50,11 @@ public class TrackDownRecordDaoImpl extends BaseMongoDAOImpl im } @Override + public void updateTrackDownPaparent(TrackDownRecord obj, String patientId) { + update(new MongoQuery(new MongoCondition("parentId", patientId, MongoOper.IS)).convertToMongoQuery(), obj); + } + + @Override public void deleteTrackDown(String id) { delete(new MongoQuery(new MongoCondition("id", new ObjectId(id), MongoOper.IS)).convertToMongoQuery()); } diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java index d0d876e..feba9c8 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/TrackDownRecordService.java @@ -82,6 +82,10 @@ public class TrackDownRecordService { iTrackDownRecordDao.updateTrackDown(obj, id); } + public void updateTrackDownParent(TrackDownRecord obj, String parentId) { + iTrackDownRecordDao.updateTrackDownPaparent(obj, parentId); + } + public void deleteTrackDown(String id) { iTrackDownRecordDao.deleteTrackDown(id); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java index 0c0a732..abe9800 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TrackDownController.java @@ -135,7 +135,6 @@ public class TrackDownController extends BaseController { /** * 孕妇追访管理历史数据处理 */ - @RequestMapping(value = "/historyData", method = RequestMethod.GET) public void historyData(Date startTime, Date endTime) { downFacade.historyData(startTime, endTime); 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 d3a0866..3b8c600 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,12 @@ 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())); + trackDownRecordService.updateTrackDownParent(trackDownRecord, antExAddRequest.getParentId()); + } antenatalExaminationService.addOneBabyAnt(model); /** 验证产检券是否可用 可用就改为已使用状态 */ @@ -650,6 +655,14 @@ public class AntenatalExaminationFacade { antExChuModel.setYn(YnEnums.YES.getId()); antExChuModel.setHospitalId(hospitalId); stopWatch.start("queryAntExChu"); + + + /**孕妇追访功能下次预约时间修改*/ + if (StringUtils.isNotEmpty(excAddRequest.getNextCheckTime()) && StringUtils.isNotEmpty(excAddRequest.getParentId())) { + TrackDownRecord trackDownRecord = new TrackDownRecord(); + trackDownRecord.setAppointmentDate(DateUtil.parseYMD(excAddRequest.getNextCheckTime())); + trackDownRecordService.updateTrackDownParent(trackDownRecord, excAddRequest.getParentId()); + } antenatalExaminationService.addOneAntEx(antExChuModel); excAddRequest.setId(antExChuModel.getId());