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 bdff111..1ce0df3 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 @@ -6,11 +6,16 @@ package com.lyms.platform.common.enums; public enum TrackDownDateEnums { A(1, "婚前检查",2), B(2, "怀孕建档",3), - C(3, "产前检查",5), - D(4, "产前筛查",5), + C(3, "产前检查",8), + D(4, "产前筛查",9), E(5, "分娩住院",6), - F(6, "产后访视",7), - G(7, "产后复查",-1); + F(6, "产后访视",10), + G(7, "产后复查",11), + H(8, "产前检查转出",5), + I(9, "产前筛查转出",5), + J(10, "产后访视转出",-1), + K(11, "产后复查转出",-1), + ; TrackDownDateEnums(Integer id, String name,Integer nextid) { this.id = id; 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 b53d2ff..efd0e57 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 @@ -6,9 +6,6 @@ import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.utils.StringUtils; -import org.apache.commons.collections.CollectionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; @@ -35,6 +32,7 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ private String streetId; private String key; private Integer trackType; + private List trackTypes; private String parentId; private List pids; private String hospitalId; @@ -49,6 +47,14 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ */ private Date lastMensesEnd; + public List getTrackTypes() { + return trackTypes; + } + + public void setTrackTypes(List trackTypes) { + this.trackTypes = trackTypes; + } + public Date getLastMensesStart() { return lastMensesStart; } @@ -168,12 +174,16 @@ public class TrackDownRecordQuery extends BaseQuery implements IConvertToNativeQ if(null!=trackType){ condition = condition.and("trackType", trackType, MongoOper.IS); } + if (null != trackTypes) { + condition = condition.and("trackType", trackTypes, MongoOper.IN); + } if(StringUtils.isNotEmpty(parentId)){ condition = condition.and("parentId", parentId, MongoOper.IS); } if (null != pids) { condition = condition.and("pid", pids, MongoOper.IN); } + Criteria c1 = null; if (null != lastMensesStart) { if (null != 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 a8c21cf..f117343 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 @@ -1,12 +1,9 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; -import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.FmTypeEnums; import com.lyms.platform.common.enums.TrackDownDateEnums; -import com.lyms.platform.common.enums.TrackDownTransferEnums; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.result.RespBuilder; @@ -116,8 +113,15 @@ public class TrackDownFacade { //如果是产筛请求 if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) { downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140)); - downRecordQuery.setTrackType(3); - }/*else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.E.getId() == downQueryRequest.getTrackType()){ + downRecordQuery.setTrackTypes(Arrays.asList(4,8)); + }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.C.getId() == downQueryRequest.getTrackType()){ + downRecordQuery.setTrackTypes(Arrays.asList(3,9)); + }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.F.getId() == downQueryRequest.getTrackType()){ + downRecordQuery.setTrackTypes(Arrays.asList(6,11)); + }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.G.getId() == downQueryRequest.getTrackType()){ + downRecordQuery.setTrackTypes(Arrays.asList(7,10)); + } + /*else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.E.getId() == downQueryRequest.getTrackType()){ downRecordQuery.setLastMensesStart(); }*/ downRecordQuery.setPage(downQueryRequest.getPage()); 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 cb3e136..7a556fa 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 @@ -187,7 +187,7 @@ public class TrackDownServiceImpl extends BaseServiceImpl implements ITrackDownS trackDown.setPid(mongoUtil.getPid(parentId)); trackDown.setParentId(parentId); } - //怀孕建档扭转直孕期检查的时候需要有孕妇的档案才可以扭转 + //怀孕建档:怀孕建档流转至孕期检查的时候需要有孕妇的档案才可以扭转 if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer() && TrackDownDateEnums.B.getId() == trackDown.getTrackDownDateType() &&StringUtils.isNotEmpty(trackDown.getParentId())) {