diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java index 53b90be..3207acb 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java @@ -8,11 +8,11 @@ import com.lyms.platform.common.utils.StringUtils; public enum TrackDownDateEnums { A(1, "婚前检查"), B(2, "怀孕建档"), - C(3, "孕期检查"), + C(3, "产前检查"), D(4, "产前筛查"), - E(3, "分娩住院"), - F(3, "产后访视"), - G(3, "产后复查"); + E(5, "分娩住院"), + F(6, "产后访视"), + G(7, "产后复查"); TrackDownDateEnums(Integer id, String name) { this.id = id; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java index 70ab650..3cc15bd 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java @@ -18,6 +18,8 @@ public class TrackDown extends BaseModel { private String parentId; + private String residentsArchiveId; + private String pid; private Date created; @@ -60,6 +62,19 @@ public class TrackDown extends BaseModel { */ private Integer trackDownTransfer; + /** + * 追访数据保存的类型 + */ + private Integer trackDownDateType; + + public String getResidentsArchiveId() { + return residentsArchiveId; + } + + public void setResidentsArchiveId(String residentsArchiveId) { + this.residentsArchiveId = residentsArchiveId; + } + public String getId() { return id; } @@ -163,4 +178,20 @@ public class TrackDown extends BaseModel { public void setReservatDate(Date reservatDate) { this.reservatDate = reservatDate; } + + public Integer getTrackDownTransfer() { + return trackDownTransfer; + } + + public void setTrackDownTransfer(Integer trackDownTransfer) { + this.trackDownTransfer = trackDownTransfer; + } + + public Integer getTrackDownDateType() { + return trackDownDateType; + } + + public void setTrackDownDateType(Integer trackDownDateType) { + this.trackDownDateType = trackDownDateType; + } } 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 fbbca30..544b95a 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 @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.service.TrackDownService; import com.lyms.platform.common.enums.FmTypeEnums; +import com.lyms.platform.common.enums.TrackDownDateEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.PageResult; @@ -73,22 +74,43 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("username", patient.getUsername()); temp.put("phone", patient.getPhone()); temp.put("age", DateUtil.getAge(patient.getBirth())); - temp.put("bookbuild", 2); // 孕期建档 1=勾勾 2=叉叉 3=-- + // 孕期建档 1=勾勾 2=叉叉 3=空白 patient有数据>>勾勾 没有>有怀孕建档追访并且（流转至下一流程 or 结束所有流程）xx 没有就是空 + temp.put("bookbuild", 1); temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patient.getBookbuildingDate())); - temp.put("yjcount", getChuzhenCount(patient.getId())); // 孕检次数 = 初诊 + 复诊 - temp.put("cqsc", 1); // 产前筛查 1=勾勾 2=叉叉 3=-- - temp.put("fm", 3); // 分娩 1=勾勾 2=叉叉 3=-- - temp.put("fmType", FmTypeEnums.getFmNameById(patient.getFmType())); // 分娩方式 - temp.put("chfc", 3); // 产后复查 1=勾勾 2=叉叉 3=-- - temp.put("chfcCount", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("yn").is(1)), PostReviewModel.class)); // 复查次数 + + // 产检记录 > 0 勾勾 没有：有产前检查追访并且（流转至下一流程 or 结束所有流程）叉叉 + long yjCount = getChuzhenCount(patient.getId()); + temp.put("yj", yjCount > 0 ? 1 : isExitTrackDown(patient.getId(), TrackDownDateEnums.C)); + temp.put("yjcount", yjCount); // 孕检次数 = 初诊 + 复诊 + + + // 产前筛查 有产晒记录>勾勾 没有: 有产前筛查追访并且流转至下一流程 勾勾 反之xx + temp.put("cqsc", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("yn").is(1)), AntExChuModel.class) > 0L ? 1 : isExitTrackDown(patient.getId(), TrackDownDateEnums.D)); + + // type=3 且（isAutoFm不为1，或者不存在）且dueStatus为0 没有: 有分娩住院追访并且流转至下一流程 勾勾 反之xx + temp.put("fm", patient.getType() == 3 && (patient.getIsAutoFm() != 1 || patient.getIsAutoFm() == null) && patient.getDueStatus() == 0 ? 1 : isExitTrackDown(patient.getId(), TrackDownDateEnums.E)); // 分娩 1=勾勾 2=叉叉 + temp.put("fmType", FmTypeEnums.getFmNameById(patient.getFmType()) == null ? "--" : FmTypeEnums.getFmNameById(patient.getFmType())); // 分娩方式 + + // 产后复查 1=勾勾 2=叉叉 有产后复查记录>勾勾 没有: 有产后复查追访并且流转至下一流程 勾勾 反之xx + long chfcCount = mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("yn").is(1)), PostReviewModel.class); + temp.put("chfc", chfcCount > 0L ? 1 : isExitTrackDown(patient.getId(), TrackDownDateEnums.G)); + temp.put("chfcCount", chfcCount); // 复查次数 + + + temp.put("resident", 2); // 妇女建档（产品说是直接来的 没有追访的判断） patient有数据 lyms_resident没数据 直接XX 如果有 后面的流程会设置为勾勾的 map.put("resident", 1); // 妇女建档 + + // 婚检 有婚检 勾勾 没有： 有婚前检查并且流转至下一流程 叉叉 没有就是空白 + temp.put("check", mongoTemplate.count(Query.query(Criteria.where("parentId").is(patient.getId()).and("yn").is(1)), PremaritalCheckup.class) > 0L ? 1 : isExitTrackDown(patient.getId(), TrackDownDateEnums.A)); + restList.add(temp); } + + Integer archiveModelCount = 0; for (ResidentsArchiveModel archiveModel : residentsArchiveModels) { for (Map map : restList) { if(StringUtils.isNotEmpty((String) map.get("cardNo")) && map.get("cardNo").toString().equals(archiveModel.getCertificateNum())) { - map.put("resident", 2); // 妇女建档 + map.put("resident", 1); // 妇女建档 map.put("residentDate", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); - map.put("check", 3); // 婚检 continue; } } @@ -98,20 +120,33 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS temp.put("username", archiveModel.getUsername()); temp.put("phone", archiveModel.getPhone()); temp.put("age", DateUtil.getAge(archiveModel.getBirthday())); - temp.put("resident", 3); // 妇女建档 + temp.put("resident", 1); // 妇女建档 temp.put("residentDate", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); // 妇女建档日期 - temp.put("check", 2); // 婚检 - temp.put("bookbuild", 2); // 孕期建档 1=勾勾 2=叉叉 + temp.put("check", mongoTemplate.count(Query.query(Criteria.where("certificateNum").is(archiveModel.getCertificateNum()).and("yn").is(1)), PremaritalCheckup.class) > 0L ? 1 : isResidentsArchive(archiveModel.getId())); // 婚检 + temp.put("bookbuild", 3); // 孕期建档 1=勾勾 2=叉叉 temp.put("bookbuildDate", "--"); + temp.put("yj", 3); temp.put("yjcount", 0); // 孕检次数 = 初诊 + 复诊 - temp.put("cqsc", 2); // 产前筛查 1=勾勾 2=叉叉 - temp.put("fm", 2); // 分娩 1=勾勾 2=叉叉 + temp.put("cqsc", 3); // 产前筛查 1=勾勾 2=叉叉 + temp.put("fm", 3); // 分娩 1=勾勾 2=叉叉 temp.put("fmType", "--"); // 分娩方式 - temp.put("chfc", 2); // 产后复查 1=勾勾 2=叉叉 + temp.put("chfc", 3); // 产后复查 1=勾勾 2=叉叉 temp.put("chfcCount", 0); // 复查次数 + archiveModelCount++; restList.add(temp); } - return RespBuilder.buildSuccess("tabList", new PageResult(restList.size(), page, limit, CollectionUtils.getPageIds(restList, page, limit))); + return RespBuilder.buildSuccess("tabList", new PageResult(restList.size() + archiveModelCount, page, limit, CollectionUtils.getPageIds(restList, page, limit))); + } + + private int isExitTrackDown(String parentId, TrackDownDateEnums trackDownDateEnums) { + return mongoTemplate.exists(Query.query(Criteria.where("parentId").is(parentId).and("yn").is(1) + .and("trackDownDateType").is(trackDownDateEnums.getId()).and("trackDownTransfer").in(Arrays.asList(2, 3))), TrackDown.class) ? 2 : 3; + } + + + private int isResidentsArchive(String residentsArchiveId) { + return mongoTemplate.exists(Query.query(Criteria.where("residentsArchiveId").is(residentsArchiveId).and("yn").is(1) + .and("trackDownDateType").is(TrackDownDateEnums.A).and("trackDownTransfer").in(Arrays.asList(2, 3))), TrackDown.class) ? 2 : 3; } /**