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 4425fc7..835a858 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 @@ -1337,6 +1337,8 @@ public class Patients extends BaseModel { downRecord.setTrackType(TrackDownDateEnums.C.getId()); //特殊处理 产筛预约追访时间 downRecord.setSieveAppointmentDate(new Date()); + //特殊处理 分娩住院预约追访时间 + downRecord.setFmzyAppointmentDate(new Date()); return downRecord; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java index a976375..95e5852 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDownRecord.java @@ -60,18 +60,41 @@ public class TrackDownRecord extends BaseModel { //预约追访日期 private Date appointmentDate; + //追访日期 + private Date trackDownDate; + //是否终止流程 + private String stop; + + /*********孕妇追访 产筛、 分娩住院字段特殊处理***********/ //特殊 产筛预约追访时间 private Date sieveAppointmentDate; //特殊 产筛追访日期 private Date sieveTrackDownDate; - //追访日期 - private Date trackDownDate; + //特殊 分娩住院预约追访时间 + private Date fmzyAppointmentDate; - //是否终止流程 - private String stop; + //特殊 产筛追访日期 + private Date fmzyTrackDownDate; + + + public Date getFmzyAppointmentDate() { + return fmzyAppointmentDate; + } + + public void setFmzyAppointmentDate(Date fmzyAppointmentDate) { + this.fmzyAppointmentDate = fmzyAppointmentDate; + } + + public Date getFmzyTrackDownDate() { + return fmzyTrackDownDate; + } + + public void setFmzyTrackDownDate(Date fmzyTrackDownDate) { + this.fmzyTrackDownDate = fmzyTrackDownDate; + } public Date getSieveAppointmentDate() { return sieveAppointmentDate; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java index 4127591..1d02e79 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java @@ -415,6 +415,21 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ } + /*****分娩住院特殊处理*********/ + if (queryTrackType != null && queryTrackType == 5) { + if (null != followupStatus) { + if (followupStatus == 0) { + Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00"); + condition = condition.and("fmzyAppointmentDate", newDate, MongoOper.GTE); + } else if (followupStatus == 1) { + Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00"); + condition = condition.and("fmzyAppointmentDate", newDate, MongoOper.LT); + } else if (followupStatus == 2) { + condition = condition.and("stop", "1", MongoOper.IS); + } + } + + } Criteria c1 = null; @@ -555,6 +570,52 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ } } + /**********分娩住院特殊处理**************/ + if (null != queryTrackType && queryTrackType == 5) { + if (null != trackDownDateStart) { + if (null != c1) { + c1 = c1.and("fmzyTrackDownDate").gte(trackDownDateStart); + } else { + c1 = Criteria.where("fmzyTrackDownDate").gte(trackDownDateStart); + } + } + if (null != trackDownDateEnd) { + if (c1 != null) { + c1 = c1.lte(trackDownDateEnd); + } else { + c1 = Criteria.where("fmzyTrackDownDate").lte(trackDownDateEnd); + } + } + + if (null != startBeOverdueDays) { + if (null != c1) { + c1 = c1.and("fmzyAppointmentDate").gte(startBeOverdueDays); + } else { + c1 = Criteria.where("fmzyAppointmentDate").gte(startBeOverdueDays); + } + } + if (null != endBeOverdueDays) { + if (c1 != null) { + c1 = c1.lte(endBeOverdueDays); + } else { + c1 = Criteria.where("fmzyAppointmentDate").lte(endBeOverdueDays); + } + } + if (null != appointmentDateStart) { + if (null != c1) { + c1 = c1.and("fmzyAppointmentDate").gte(appointmentDateStart); + } else { + c1 = Criteria.where("fmzyAppointmentDate").gte(appointmentDateStart); + } + } + if (null != appointmentDateEnd) { + if (c1 != null) { + c1 = c1.lte(appointmentDateEnd); + } else { + c1 = Criteria.where("fmzyAppointmentDate").lte(appointmentDateEnd); + } + } + } if (null != c1) { condition = condition.andCondition(new MongoCondition(c1)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 277b8bf..2081433 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -955,6 +955,9 @@ public class TrackDownFacade { if (downRecord.getTrackType() != null && downRecord.getTrackType() == 4) { temp.put("yyzfTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getSieveAppointmentDate())); // 产筛预约时间 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getSieveTrackDownDate())); // 产筛追访时间 + } else if (downRecord.getTrackType() != null && downRecord.getTrackType() == 5) { + temp.put("yyzfTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getFmzyAppointmentDate())); // 分娩住院预约时间 + temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getFmzyTrackDownDate())); // 分娩住院追访时间 } else { temp.put("yyzfTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); // 预约时间 temp.put("trackDownTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(trackDown.getTrackDownDate())); // 追访时间 @@ -965,12 +968,12 @@ public class TrackDownFacade { temp.put("trackDownTime", "--"); // 追访时间 if (downRecord.getTrackType() != null && downRecord.getTrackType() == 4) { temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getSieveAppointmentDate())); // 产筛预约时间 + } else if (downRecord.getTrackType() != null && downRecord.getTrackType() == 5) { + temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getSieveAppointmentDate())); // 分娩住院预约时间 } else { temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); // 预约预约时间 } - } - //如果是产前检查取预约结果 //复诊 AntenatalExaminationModel examinationModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId())).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class); 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 4211117..3d47979 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 @@ -903,6 +903,15 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS trackDownRecord1.setSieveTrackDownDate(trackDown.getTrackDownDate()); } } + //冗余分娩住院 预约追访时间 + if (trackDown.getTrackDownDateType() == 5) { + if (trackDown.getReservatDate() != null) { + trackDownRecord1.setFmzyAppointmentDate(trackDown.getReservatDate()); + } + if (null != trackDown.getTrackDownDate()) { + trackDownRecord1.setFmzyTrackDownDate(trackDown.getTrackDownDate()); + } + } trackDownRecordService.updateTrackDown(trackDownRecord1, trackDownRecord.getId()); } }