jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 76 additions and 2 deletions

...	...	@@ -852,6 +852,18 @@
852	852	condition = condition.and("breastType", breastType, MongoOper.IS);
853	853	}
854	854	}
	855	+ //滦平20211227-筛选分娩状态
	856	+ Criteria c3=MongoCondition.newInstance().getCriteria();
	857	+ if(null!=dueStatus){
	858	+ if(0==dueStatus){
	859	+ MongoCondition con =MongoCondition.newInstance();
	860	+ MongoCondition con1 = MongoCondition.newInstance("dueStatus", "0", MongoOper.IS);
	861	+ MongoCondition con2 = MongoCondition.newInstance("dueStatus", false, MongoOper.EXISTS);
	862	+ c3 = con.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
	863	+ }else {
	864	+ condition = condition.and("dueStatus", dueStatus, MongoOper.IS);
	865	+ }
	866	+ }
855	867
856	868	Criteria c1 = null;
857	869
858	870
...	...	@@ -1393,10 +1405,10 @@
1393	1405	}
1394	1406
1395	1407	if (null != c1) {
1396		- return new MongoCondition(c1.andOperator(condition.getCriteria(),c2)).toMongoQuery();
	1408	+ return new MongoCondition(c1.andOperator(condition.getCriteria(),c2,c3)).toMongoQuery();
1397	1409	// return new MongoCondition(c1.andOperator(condition.getCriteria())).toMongoQuery();
1398	1410	}
1399		- return new MongoCondition(c2.andOperator(condition.getCriteria())).toMongoQuery();
	1411	+ return new MongoCondition(c2.andOperator(condition.getCriteria(),c3)).toMongoQuery();
1400	1412	// return condition.toMongoQuery();
1401	1413	}
1402	1414

...	...	@@ -2565,6 +2565,17 @@
2565	2565	}
2566	2566	}
2567	2567	patientsQuery.setQueryNo(StringUtils.isEmpty(patientManagerRequest.getQueryNo()) ? null : patientManagerRequest.getQueryNo());
	2568	+ //滦平20211227-月下下次检查时间、分娩状态
	2569	+ if (StringUtils.isNotEmpty(patientManagerRequest.getNextCheckTime())&&"2100001377".equals(hospitalId)) {
	2570	+ try {
	2571	+ patientsQuery.setNextCheckTimeStart(DateUtil.getSNDate(patientManagerRequest.getNextCheckTime())[0]);
	2572	+ patientsQuery.setNextCheckTimeEnd(DateUtil.getSNDate(patientManagerRequest.getNextCheckTime())[1]);
	2573	+ } catch (Exception e) {
	2574	+ // 什么都不做，这里是数据传入错误了
	2575	+ }
	2576	+ }
	2577	+ //分娩状态
	2578	+ patientsQuery.setDueStatus(null==patientManagerRequest.getDueStatus() ? null : patientManagerRequest.getDueStatus());
2568	2579
2569	2580	List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
2570	2581	List <PatientManagerQueryModel> patientManagerQueryModelList = new ArrayList <>();
...	...	@@ -2655,6 +2666,8 @@
2655	2666	}
2656	2667	}
2657	2668
	2669	+ //滦平20211227
	2670	+ patientManagerQueryModel.setNextCheckTime(DateUtil.getyyyy_MM_dd(patients.getNextCheckTime()));
2658	2671	patientManagerQueryModelList.add(patientManagerQueryModel);
2659	2672	}
2660	2673	}

1	1	package com.lyms.platform.operate.web.request;
2	2
	3	+import java.util.Date;
	4	+
3	5	/**
4	6	* @auther HuJiaqi
5	7	* @createTime 2016年12月20日 14时33分
...	...	@@ -128,6 +130,30 @@
128	130	this.prodDoctor = prodDoctor;
129	131	}
130	132	/**********************************************/
	133	+
	134	+ /**
	135	+ * 滦平
	136	+ */
	137	+ //分娩状态 0未终止妊娠 1终止妊娠
	138	+ private Integer dueStatus;
	139	+ //预约下次检查时间
	140	+ private String nextCheckTime;
	141	+
	142	+ public Integer getDueStatus() {
	143	+ return dueStatus;
	144	+ }
	145	+
	146	+ public void setDueStatus(Integer dueStatus) {
	147	+ this.dueStatus = dueStatus;
	148	+ }
	149	+
	150	+ public String getNextCheckTime() {
	151	+ return nextCheckTime;
	152	+ }
	153	+
	154	+ public void setNextCheckTime(String nextCheckTime) {
	155	+ this.nextCheckTime = nextCheckTime;
	156	+ }
131	157
132	158	public String getNormal() {
133	159	return normal;

...	...	@@ -92,6 +92,29 @@
92	92
93	93	private String id;
94	94
	95	+ /**
	96	+ * 滦平
	97	+ */
	98	+ //分娩状态 0未终止妊娠 1终止妊娠
	99	+ private Integer dueStatus;
	100	+ //预约下次检查时间
	101	+ private String nextCheckTime;
	102	+
	103	+ public Integer getDueStatus() {
	104	+ return dueStatus;
	105	+ }
	106	+
	107	+ public void setDueStatus(Integer dueStatus) {
	108	+ this.dueStatus = dueStatus;
	109	+ }
	110	+
	111	+ public String getNextCheckTime() {
	112	+ return nextCheckTime;
	113	+ }
	114	+
	115	+ public void setNextCheckTime(String nextCheckTime) {
	116	+ this.nextCheckTime = nextCheckTime;
	117	+ }
95	118
96	119	public String getLowerHairOgrId() {
97	120	return lowerHairOgrId;