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 649163f..4127591 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 @@ -383,15 +383,19 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ if (null != pids) { condition = condition.and("pid", pids, MongoOper.IN); } - if (null != followupStatus) { - if (followupStatus == 0) { - Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00"); - condition = condition.and("appointmentDate", newDate, MongoOper.GTE); - } else if (followupStatus == 1) { - Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00"); - condition = condition.and("appointmentDate", newDate, MongoOper.LT); - } else if (followupStatus == 2) { - condition = condition.and("stop", "1", MongoOper.IS); + + //排除 产筛跟分娩住院 + if (queryTrackType != null && queryTrackType != 4 && queryTrackType != 5) { + if (null != followupStatus) { + if (followupStatus == 0) { + Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00"); + condition = condition.and("appointmentDate", newDate, MongoOper.GTE); + } else if (followupStatus == 1) { + Date newDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00"); + condition = condition.and("appointmentDate", newDate, MongoOper.LT); + } else if (followupStatus == 2) { + condition = condition.and("stop", "1", MongoOper.IS); + } } } @@ -456,49 +460,52 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ } } - if (null != appointmentDateStart) { - if (null != c1) { - c1 = c1.and("appointmentDate").gte(appointmentDateStart); - } else { - c1 = Criteria.where("appointmentDate").gte(appointmentDateStart); + //排除 产筛 跟分娩住院 + if (queryTrackType != null && queryTrackType != 4 && queryTrackType != 5) { + if (null != appointmentDateStart) { + if (null != c1) { + c1 = c1.and("appointmentDate").gte(appointmentDateStart); + } else { + c1 = Criteria.where("appointmentDate").gte(appointmentDateStart); + } } - } - if (null != appointmentDateEnd) { - if (c1 != null) { - c1 = c1.lte(appointmentDateEnd); - } else { - c1 = Criteria.where("appointmentDate").lte(appointmentDateEnd); + if (null != appointmentDateEnd) { + if (c1 != null) { + c1 = c1.lte(appointmentDateEnd); + } else { + c1 = Criteria.where("appointmentDate").lte(appointmentDateEnd); + } } - } - if (null != trackDownDateStart) { - if (null != c1) { - c1 = c1.and("trackDownDate").gte(trackDownDateStart); - } else { - c1 = Criteria.where("trackDownDate").gte(trackDownDateStart); + if (null != trackDownDateStart) { + if (null != c1) { + c1 = c1.and("trackDownDate").gte(trackDownDateStart); + } else { + c1 = Criteria.where("trackDownDate").gte(trackDownDateStart); + } } - } - if (null != trackDownDateEnd) { - if (c1 != null) { - c1 = c1.lte(trackDownDateEnd); - } else { - c1 = Criteria.where("trackDownDate").lte(trackDownDateEnd); + if (null != trackDownDateEnd) { + if (c1 != null) { + c1 = c1.lte(trackDownDateEnd); + } else { + c1 = Criteria.where("trackDownDate").lte(trackDownDateEnd); + } } - } - if (null != startBeOverdueDays) { - if (null != c1) { - c1 = c1.and("appointmentDate").gte(startBeOverdueDays); - } else { - c1 = Criteria.where("appointmentDate").gte(startBeOverdueDays); + if (null != startBeOverdueDays) { + if (null != c1) { + c1 = c1.and("appointmentDate").gte(startBeOverdueDays); + } else { + c1 = Criteria.where("appointmentDate").gte(startBeOverdueDays); + } } - } - if (null != endBeOverdueDays) { - if (c1 != null) { - c1 = c1.lte(endBeOverdueDays); - } else { - c1 = Criteria.where("appointmentDate").lte(endBeOverdueDays); + if (null != endBeOverdueDays) { + if (c1 != null) { + c1 = c1.lte(endBeOverdueDays); + } else { + c1 = Criteria.where("appointmentDate").lte(endBeOverdueDays); + } } } /******产筛特殊处理*******/ @@ -546,11 +553,8 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ c1 = Criteria.where("sieveAppointmentDate").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 a9affe5..277b8bf 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 @@ -330,6 +330,8 @@ public class TrackDownFacade { patientsQuery.setFmMode(downQueryRequest.getFmType()); isPatient = true; } + + if (null != downQueryRequest.getPostpartumDays()) {//产后天数 Calendar instance = Calendar.getInstance(); instance.setTime(new Date()); @@ -434,6 +436,9 @@ public class TrackDownFacade { downRecordQuery.setParentIds(pids); } } + //设置查询queryTrackType 如果是4 执行产筛的查询条件 + downRecordQuery.setQueryTrackType(downQueryRequest.getTrackType()); + downRecordQuery.setAreaId(downQueryRequest.getAreaId()); downRecordQuery.setProvinceId(downQueryRequest.getProvinceId()); @@ -455,9 +460,6 @@ public class TrackDownFacade { downRecordQuery.setTrackDownDateStart(DateUtil.parseYMD(downQueryRequest.getTrackDownDateStart())); downRecordQuery.setTrackDownDateEnd(DateUtil.parseYMD(downQueryRequest.getTrackDownDateEnd())); - //设置查询queryTrackType 如果是4 执行产筛的查询条件 - downRecordQuery.setQueryTrackType(downQueryRequest.getTrackType()); - //逾期天数 if (null != downQueryRequest.getBeOverdueDays()) { @@ -504,6 +506,8 @@ public class TrackDownFacade { // downRecordQuery.setSort("modified desc"); downRecordQuery.setHospitalId(hospitalId); + System.out.println("====>" + downRecordQuery.convertToQuery().convertToMongoQuery()); + return downRecordQuery; } @@ -933,7 +937,6 @@ public class TrackDownFacade { } } - //产检次数 temp.put("checkCount", getChuzhenCount(parentId)); Criteria criteria = Criteria.where("yn").is(1).and("parentId").is(downRecord.getParentId()); @@ -948,7 +951,6 @@ public class TrackDownFacade { if (trackDown != null) { temp.put("result", StringUtils.isEmpty(trackDown.getResult()) ? "--" : trackDown.getResult()); // 追访结果 - //获取产筛的预约时间 跟追访时间 if (downRecord.getTrackType() != null && downRecord.getTrackType() == 4) { temp.put("yyzfTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getSieveAppointmentDate())); // 产筛预约时间 @@ -961,7 +963,12 @@ public class TrackDownFacade { } else { temp.put("result", "--"); // 婚检追访结果 temp.put("trackDownTime", "--"); // 追访时间 - temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); // 预约预约时间 + if (downRecord.getTrackType() != null && downRecord.getTrackType() == 4) { + temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getSieveAppointmentDate())); // 产筛预约时间 + } else { + temp.put("yyzfTime", downRecord == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); // 预约预约时间 + } + } //如果是产前检查取预约结果 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 dcdeb5d..4211117 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 @@ -833,80 +833,80 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS */ public BaseResponse add(Integer userId, TrackDown trackDown) { String hospitalId = autoMatchFacade.getHospitalId(userId); - if (trackDown.getTrackDownDateType() != TrackDownDateEnums.D.getId()) {//&& trackDown.getTrackDownDateType() != TrackDownDateEnums.G.getId()) {//不等于产检追访和产后访视时进行数据验证状态 - //追访列表ID - if (trackDown.getTrackDownRecId() != null) { - TrackDownRecord trackDownRecord = trackDownRecordService.getTrackDown(trackDown.getTrackDownRecId()); - if (trackDownRecord != null) { - //当传入的状态和数据库一致时才能进行有效操作 + // if (trackDown.getTrackDownDateType() != TrackDownDateEnums.D.getId()) {//&& trackDown.getTrackDownDateType() != TrackDownDateEnums.G.getId()) {//不等于产检追访和产后访视时进行数据验证状态 + //追访列表ID + if (trackDown.getTrackDownRecId() != null) { + TrackDownRecord trackDownRecord = trackDownRecordService.getTrackDown(trackDown.getTrackDownRecId()); + if (trackDownRecord != null) { + //当传入的状态和数据库一致时才能进行有效操作 /*if (trackDownRecord.getTrackType().intValue() != trackDown.getTrackDownDateType()) { return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "数据已经被修改请回到列表刷新后再操作！"); }*/ - if (TrackDownDateEnums.A.getId() == trackDown.getTrackDownDateType() - && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(trackDownRecord.getSex()) - && TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer()) {//性别男：特殊处理，流转到下一流程时结束流程 - trackDown.setTrackDownTransfer(TrackDownTransferEnums.C.getId()); + if (TrackDownDateEnums.A.getId() == trackDown.getTrackDownDateType() + && "5d0b782f-b61b-441b-b8c5-4bf55eece273".equals(trackDownRecord.getSex()) + && TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer()) {//性别男：特殊处理，流转到下一流程时结束流程 + trackDown.setTrackDownTransfer(TrackDownTransferEnums.C.getId()); + } + /** 孕妇追访功能冗余字段**/ + //获取孕妇建档id + if (StringUtils.isNotEmpty(trackDownRecord.getParentId())) { + Patients patients = new Patients(); + if (null != trackDown.getReservatDate()) { + patients.setFollowupTime(trackDown.getReservatDate()); + } else { + patients.setFollowupTime(new Date()); } - /** 孕妇追访功能冗余字段**/ - //获取孕妇建档id - if (StringUtils.isNotEmpty(trackDownRecord.getParentId())) { - Patients patients = new Patients(); - if (null != trackDown.getReservatDate()) { - patients.setFollowupTime(trackDown.getReservatDate()); - } else { - patients.setFollowupTime(new Date()); - } - if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) { - patients.setStop("0"); - } else if (3 == trackDown.getTrackDownTransfer()) { - patients.setStop("1"); - } - patientsService.updatePatientOne(patients, trackDownRecord.getParentId()); + if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) { + patients.setStop("0"); + } else if (3 == trackDown.getTrackDownTransfer()) { + patients.setStop("1"); } - //获取妇女建党id - ResidentsArchiveModel residentsArchiveModel1 = new ResidentsArchiveModel(); - if (StringUtils.isNotEmpty(trackDownRecord.getResidentsArchiveId())) { - if (trackDown.getReservatDate() != null) { - residentsArchiveModel1.setFollowupTime(trackDown.getReservatDate()); - } else { - residentsArchiveModel1.setFollowupTime(new Date()); - } - /**冗余 现在处于哪一个流程*/ - if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) { - residentsArchiveModel1.setStop("0"); - } else if (3 == trackDown.getTrackDownTransfer()) { - residentsArchiveModel1.setStop("1"); - } - residentsArchiveService.updateResident(residentsArchiveModel1, trackDown.getParentId()); + patientsService.updatePatientOne(patients, trackDownRecord.getParentId()); + } + //获取妇女建党id + ResidentsArchiveModel residentsArchiveModel1 = new ResidentsArchiveModel(); + if (StringUtils.isNotEmpty(trackDownRecord.getResidentsArchiveId())) { + if (trackDown.getReservatDate() != null) { + residentsArchiveModel1.setFollowupTime(trackDown.getReservatDate()); + } else { + residentsArchiveModel1.setFollowupTime(new Date()); } - /**冗余到追访记录表*/ - TrackDownRecord trackDownRecord1 = new TrackDownRecord(); - if (trackDown.getReservatDate() != null || trackDown.getTrackDownDateType() != 4 || trackDown.getTrackDownDateType() != 5) { - trackDownRecord1.setAppointmentDate(trackDown.getReservatDate()); + /**冗余 现在处于哪一个流程*/ + if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) { + residentsArchiveModel1.setStop("0"); + } else if (3 == trackDown.getTrackDownTransfer()) { + residentsArchiveModel1.setStop("1"); } - if (null != trackDown.getTrackDownDate() || trackDown.getTrackDownDateType() != 4 || trackDown.getTrackDownDateType() != 5) { - trackDownRecord1.setTrackDownDate(trackDown.getTrackDownDate()); + residentsArchiveService.updateResident(residentsArchiveModel1, trackDown.getParentId()); + } + /**冗余到追访记录表*/ + TrackDownRecord trackDownRecord1 = new TrackDownRecord(); + if (trackDown.getTrackDownDateType() != 4 && trackDown.getTrackDownDateType() != 5) { + trackDownRecord1.setAppointmentDate(trackDown.getReservatDate()); + } + if (trackDown.getTrackDownDateType() != 4 && trackDown.getTrackDownDateType() != 5) { + trackDownRecord1.setTrackDownDate(trackDown.getTrackDownDate()); + } + if (null != trackDown.getTrackDownTransfer()) { + if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) { + trackDownRecord1.setStop("0"); + } else if (3 == trackDown.getTrackDownTransfer()) { + trackDownRecord1.setStop("1"); } - if (null != trackDown.getTrackDownTransfer()) { - if (1 == trackDown.getTrackDownTransfer() || 2 == trackDown.getTrackDownTransfer()) { - trackDownRecord1.setStop("0"); - } else if (3 == trackDown.getTrackDownTransfer()) { - trackDownRecord1.setStop("1"); - } + } + //冗余产筛 预约追访时间 + if (trackDown.getTrackDownDateType() == 4) { + if (trackDown.getReservatDate() != null) { + trackDownRecord1.setSieveAppointmentDate(trackDown.getReservatDate()); } - //冗余产筛 预约追访时间 - if (trackDown.getTrackDownDateType() == 4) { - if (trackDown.getReservatDate() != null) { - trackDownRecord1.setSieveAppointmentDate(trackDown.getReservatDate()); - } - if (null != trackDown.getTrackDownDate()) { - trackDownRecord1.setSieveTrackDownDate(trackDown.getTrackDownDate()); - } + if (null != trackDown.getTrackDownDate()) { + trackDownRecord1.setSieveTrackDownDate(trackDown.getTrackDownDate()); } - trackDownRecordService.updateTrackDown(trackDownRecord1, trackDownRecord.getId()); } + trackDownRecordService.updateTrackDown(trackDownRecord1, trackDownRecord.getId()); } } + trackDown.setId(null); trackDown.setYn(YnEnums.YES.getId()); trackDown.setCreated(new Date());