diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index 11d4655..ee843f3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.utils.StringUtils; import org.springframework.data.mongodb.core.query.Criteria; import java.util.Date; +import java.util.List; /** * 产妇模型定义 @@ -178,11 +179,21 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { private Integer buildType = -1; + private List buildTypeList; + private Integer buildTypeEq; private Date fmDateStart; private Date fmDateEnd; + public List getBuildTypeList() { + return buildTypeList; + } + + public void setBuildTypeList(List buildTypeList) { + this.buildTypeList = buildTypeList; + } + public Date getFmDateEnd() { return fmDateEnd; } @@ -489,6 +500,8 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { } if (buildType != -1) { condition = condition.and("buildType", buildType, MongoOper.NE); + }else if(null!=buildTypeList){ + condition = condition.and("buildType", buildTypeList, MongoOper.IN); } if (buildTypeEq != null) { @@ -574,6 +587,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition = condition.and("birth", birth, MongoOper.IS); } + if (null != orServiceStatus && orServiceStatus.length > 1) { Criteria c = Criteria.where("serviceStatus").in(orServiceStatus[0], orServiceStatus[1]); condition.andCondition(new MongoCondition(c)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 94b71fa..fa4cc82 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -460,7 +460,9 @@ public class MatDeliverFacade { if (days < 168 && patients.getFmDate() == null) { return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周,不能进行分娩"); } - + if(null!=patients.getDueStatus() && 1 == patients.getDueStatus()){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("您已终止妊娠不能进行分娩"); + } MatDeliverQuery matDeliverQuery = new MatDeliverQuery(); matDeliverQuery.setPid(patients.getPid()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java index 6f0cb1d..3c47551 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java @@ -139,11 +139,14 @@ public class PostReviewFacade { } + String hospitalId = autoMatchFacade.getHospitalId(userId); //取所有医院的建档数据 优先取本院 ,然后取外院 Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, hospitalId, 3,true,null); PostReviewListResult postReviewListResult = new PostReviewListResult(); - + if(null!=patients.getDueStatus() && 1 == patients.getDueStatus()){ + return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("您已终止妊娠不能进行复查"); + } if (null != patientsList) { PostReviewQuery postReviewQuery = new PostReviewQuery(); postReviewQuery.setPid(patientsList.getPid());