fangcheng / regional-platform

Authored by jiangjiazhi almost 9 years ago

Showing 3 changed files with 21 additions and 2 deletions

...	...	@@ -9,6 +9,7 @@
9	9	import org.springframework.data.mongodb.core.query.Criteria;
10	10
11	11	import java.util.Date;
	12	+import java.util.List;
12	13
13	14	/**
14	15	* 产妇模型定义
15	16
...	...	@@ -178,11 +179,21 @@
178	179
179	180	private Integer buildType = -1;
180	181
	182	+ private List<Integer> buildTypeList;
	183	+
181	184	private Integer buildTypeEq;
182	185
183	186	private Date fmDateStart;
184	187	private Date fmDateEnd;
185	188
	189	+ public List<Integer> getBuildTypeList() {
	190	+ return buildTypeList;
	191	+ }
	192	+
	193	+ public void setBuildTypeList(List<Integer> buildTypeList) {
	194	+ this.buildTypeList = buildTypeList;
	195	+ }
	196	+
186	197	public Date getFmDateEnd() {
187	198	return fmDateEnd;
188	199	}
...	...	@@ -489,6 +500,8 @@
489	500	}
490	501	if (buildType != -1) {
491	502	condition = condition.and("buildType", buildType, MongoOper.NE);
	503	+ }else if(null!=buildTypeList){
	504	+ condition = condition.and("buildType", buildTypeList, MongoOper.IN);
492	505	}
493	506
494	507	if (buildTypeEq != null) {
...	...	@@ -573,6 +586,7 @@
573	586	if (null != birth) {
574	587	condition = condition.and("birth", birth, MongoOper.IS);
575	588	}
	589	+
576	590
577	591	if (null != orServiceStatus && orServiceStatus.length > 1) {
578	592	Criteria c = Criteria.where("serviceStatus").in(orServiceStatus[0], orServiceStatus[1]);

...	...	@@ -460,7 +460,9 @@
460	460	if (days < 168 && patients.getFmDate() == null) {
461	461	return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR1).setErrormsg("当前孕妇的孕周小于24孕周，不能进行分娩");
462	462	}
463		-
	463	+ if(null!=patients.getDueStatus() && 1 == patients.getDueStatus()){
	464	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("您已终止妊娠不能进行分娩");
	465	+ }
464	466
465	467	MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
466	468	matDeliverQuery.setPid(patients.getPid());

...	...	@@ -139,11 +139,14 @@
139	139	}
140	140
141	141
	142	+
142	143	String hospitalId = autoMatchFacade.getHospitalId(userId);
143	144	//取所有医院的建档数据优先取本院，然后取外院
144	145	Patients patientsList = examinationFacade.findOnePatient(postReviewQueryRequest.getCardNo(), postReviewQueryRequest.getVcCardNo(), null, hospitalId, 3,true,null);
145	146	PostReviewListResult postReviewListResult = new PostReviewListResult();
146		-
	147	+ if(null!=patients.getDueStatus() && 1 == patients.getDueStatus()){
	148	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("您已终止妊娠不能进行复查");
	149	+ }
147	150	if (null != patientsList) {
148	151	PostReviewQuery postReviewQuery = new PostReviewQuery();
149	152	postReviewQuery.setPid(patientsList.getPid());