diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAfterVisitStatisticsModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAfterVisitStatisticsModel.java index 6ea08b0..b1d8d6b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAfterVisitStatisticsModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAfterVisitStatisticsModel.java @@ -98,6 +98,19 @@ public class BabyAfterVisitStatisticsModel extends BaseModel { */ private Date updateTime; + /** + * 访视流程 1-正常 2-作废 + */ + private String afterVisitWorkflowStatus; + + public String getAfterVisitWorkflowStatus() { + return afterVisitWorkflowStatus; + } + + public void setAfterVisitWorkflowStatus(String afterVisitWorkflowStatus) { + this.afterVisitWorkflowStatus = afterVisitWorkflowStatus; + } + public Date getCreated() { return created; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java index 0ee6bca..2f0828a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyAfterVisitServiceImpl.java @@ -71,7 +71,7 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { String querNo = request.getQueryNo(); Query query = new Query(); String hospitalId = autoMatchFacade.getHospitalId(userId); - query.addCriteria(Criteria.where("hospitalId").is(hospitalId).and("yn").is(1)); + query.addCriteria(Criteria.where("hospitalId").is(hospitalId).and("yn").is(1).and("afterVisitWorkflowStatus").is("1")); // 查询号 姓名、证件号、手机号 if (StringUtils.isNotEmpty(querNo)) { @@ -111,6 +111,7 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { query.addCriteria(Criteria.where("hearCheckSize").gte(startEyeCheckSize).lte(endEyeCheckSize)); } + query.addCriteria(Criteria.where("afterVisitWorkflowStatus").is("1")); // 组装分页query long count = mongoTemplate.count(query, BabyAfterVisitStatisticsModel.class); request.mysqlBuild((int) count); @@ -343,17 +344,13 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { query.addCriteria(Criteria.where("birth").gte(end).lte(start)); } - // FIXME: 2019/7/3 原型添加时为输入框，查询时为下拉框，如何写程序？ - // 追访结果 - String afterVisitResult = request.getAfterVisitResult(); - if (Objects.nonNull(afterVisitResult)) { - query.addCriteria(Criteria.where("afterVisitResult").is(afterVisitResult)); - } - // 流程状态 String workflowStatus = request.getWorkflowStatus(); if (Objects.nonNull(workflowStatus)) { query.addCriteria(Criteria.where("afterVisitWorkflow").is(workflowStatus)); + } else { + query.addCriteria(Criteria.where("afterVisitWorkflow").is("1")); + } // 追访方式 String afterVisitWay = request.getAfterVisitWay(); @@ -441,8 +438,23 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { } query.addCriteria(Criteria.where("appointmentTime").gte(start).lte(date)); } - if (!appointmentTimeBoolean && !nonNull) { - query.addCriteria(Criteria.where("appointmentTime").lte(new Date())); + + + // 追访结果 1-显示 当前时间 > 预约时间（默认） + // 2-显示 当前时间 < 预约时间 + String afterVisitResult = request.getAfterVisitResult(); + if (Objects.isNull(afterVisitResult)) { + afterVisitResult = "1"; + } + + if ("1".equals(afterVisitResult)) { + if (!appointmentTimeBoolean && !nonNull) { + query.addCriteria(Criteria.where("appointmentTime").lte(new Date())); + } + } else { + if (!appointmentTimeBoolean && !nonNull) { + query.addCriteria(Criteria.where("appointmentTime").gt(new Date())); + } } @@ -864,20 +876,11 @@ public class BabyAfterVisitServiceImpl implements BabyAfterVisitService { Update update = MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(visitInfoModel)); mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(visitInfoModel.getId())), update, BabyAfterVisitInfoModel.class); - if (afterVisitWorkflow.equals(TrackDownTransferEnums.B.getId().toString())) { - // 停止当前流程 - mongoTemplate.updateFirst(Query.query(Criteria.where(BABY_ID).is(babyId).and("type").is(type)), Update.update("yn", 2), BabyAfterVisitInfoModel.class); - } - if (afterVisitWorkflow.equals(TrackDownTransferEnums.C.getId().toString())) { // 终止所有流程 - int parseInt = Integer.parseInt(type); - if (parseInt == TYPE_CHECK) { - mongoTemplate.updateFirst(Query.query(Criteria.where(BABY_ID).is(babyId).and("type").is("3")), Update.update("yn", 2), BabyAfterVisitInfoModel.class); - } - if (parseInt == TYPE_EYE_CHECK) { - mongoTemplate.updateFirst(Query.query(Criteria.where(BABY_ID).is(babyId).and("type").is("2")), Update.update("yn", 2), BabyAfterVisitInfoModel.class); - } + mongoTemplate.updateFirst(Query.query(Criteria.where(BABY_ID).is(babyId).and("type").is("3")), Update.update("afterVisitWorkflow", "3"), BabyAfterVisitInfoModel.class); + mongoTemplate.updateFirst(Query.query(Criteria.where(BABY_ID).is(babyId).and("type").is("2")), Update.update("afterVisitWorkflow", "3"), BabyAfterVisitInfoModel.class); + mongoTemplate.updateFirst(Query.query(Criteria.where(BABY_ID).is(babyId)), Update.update("afterVisitWorkflowStatus", "2"), BabyAfterVisitStatisticsModel.class); } return new BaseResponse(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java index e541b2e..e7ad5b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/BabyAfterVisitInfoModelWork.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.worker; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.pojo.BabyAfterVisitInfoModel; +import com.lyms.platform.pojo.BabyAfterVisitStatisticsModel; import com.lyms.platform.pojo.BabyEyeCheck; import com.lyms.platform.pojo.BabyModel; import org.springframework.beans.BeanUtils; @@ -50,7 +51,8 @@ public class BabyAfterVisitInfoModelWork implements Callable