jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 95 additions and 0 deletions

...	...	@@ -485,6 +485,27 @@
485	485	// 是否自动分娩
486	486	private Integer isAutoFm = -1;
487	487
	488	+
	489	+ //复查次数
	490	+ private Integer postViewTimesStart;
	491	+ private Integer postViewTimesEnd;
	492	+
	493	+ public Integer getPostViewTimesStart() {
	494	+ return postViewTimesStart;
	495	+ }
	496	+
	497	+ public void setPostViewTimesStart(Integer postViewTimesStart) {
	498	+ this.postViewTimesStart = postViewTimesStart;
	499	+ }
	500	+
	501	+ public Integer getPostViewTimesEnd() {
	502	+ return postViewTimesEnd;
	503	+ }
	504	+
	505	+ public void setPostViewTimesEnd(Integer postViewTimesEnd) {
	506	+ this.postViewTimesEnd = postViewTimesEnd;
	507	+ }
	508	+
488	509	public List<String> getVcCardNos() {
489	510	return vcCardNos;
490	511	}
...	...	@@ -1274,6 +1295,22 @@
1274	1295	condition = condition.and("postViewTimes", postViewTimes, MongoOper.GTE);
1275	1296	}else{
1276	1297	condition = condition.and("postViewTimes", postViewTimes, MongoOper.IS);
	1298	+ }
	1299	+ }
	1300	+
	1301	+ if (null != postViewTimesStart) {
	1302	+ if (null != c1) {
	1303	+ c1 = c1.and("postViewTimes").gte(postViewTimesStart);
	1304	+ } else {
	1305	+ c1 = Criteria.where("postViewTimes").gte(postViewTimesStart);
	1306	+ }
	1307	+ }
	1308	+
	1309	+ if (null != postViewTimesEnd) {
	1310	+ if (null != c1) {
	1311	+ c1 = c1.lte(postViewTimesEnd);
	1312	+ } else {
	1313	+ c1 = Criteria.where("postViewTimes").lte(postViewTimesEnd);
1277	1314	}
1278	1315	}
1279	1316

...	...	@@ -451,6 +451,23 @@
451	451
452	452	patientsQuery.setQueryNo(riskPatientsQueryRequest.getQueryNo());
453	453
	454	+
	455	+ patientsQuery.setPostViewTimesStart(riskPatientsQueryRequest.getPostViewTimesStart());
	456	+ patientsQuery.setPostViewTimesEnd(riskPatientsQueryRequest.getPostViewTimesEnd());
	457	+
	458	+ if (riskPatientsQueryRequest.getPostViewDaysStart() != null)
	459	+ {
	460	+ Date start = DateUtil.addDay(new Date(),-riskPatientsQueryRequest.getPostViewDaysStart());
	461	+ patientsQuery.setFmDateEnd(start);
	462	+ }
	463	+
	464	+ if (riskPatientsQueryRequest.getPostViewDaysEnd() != null)
	465	+ {
	466	+ Date end = DateUtil.addDay(new Date(),-riskPatientsQueryRequest.getPostViewDaysEnd());
	467	+ patientsQuery.setFmDateStart(end);
	468	+ }
	469	+
	470	+
454	471	return patientsQuery;
455	472	}
456	473

...	...	@@ -71,6 +71,15 @@
71	71	//复查次数
72	72	private Integer postViewTimes;
73	73
	74	+ //复查次数
	75	+ private Integer postViewTimesStart;
	76	+ private Integer postViewTimesEnd;
	77	+
	78	+
	79	+ //产后天数
	80	+ private Integer postViewDaysStart;
	81	+ private Integer postViewDaysEnd;
	82	+
74	83	// 0 高危孕妇 1 全部孕妇 2全部产妇
75	84	private Integer queryType;
76	85
...	...	@@ -114,6 +123,38 @@
114	123
115	124	//分娩医院
116	125	private String fmHospital;
	126	+
	127	+ public Integer getPostViewDaysStart() {
	128	+ return postViewDaysStart;
	129	+ }
	130	+
	131	+ public void setPostViewDaysStart(Integer postViewDaysStart) {
	132	+ this.postViewDaysStart = postViewDaysStart;
	133	+ }
	134	+
	135	+ public Integer getPostViewDaysEnd() {
	136	+ return postViewDaysEnd;
	137	+ }
	138	+
	139	+ public void setPostViewDaysEnd(Integer postViewDaysEnd) {
	140	+ this.postViewDaysEnd = postViewDaysEnd;
	141	+ }
	142	+
	143	+ public Integer getPostViewTimesStart() {
	144	+ return postViewTimesStart;
	145	+ }
	146	+
	147	+ public void setPostViewTimesStart(Integer postViewTimesStart) {
	148	+ this.postViewTimesStart = postViewTimesStart;
	149	+ }
	150	+
	151	+ public Integer getPostViewTimesEnd() {
	152	+ return postViewTimesEnd;
	153	+ }
	154	+
	155	+ public void setPostViewTimesEnd(Integer postViewTimesEnd) {
	156	+ this.postViewTimesEnd = postViewTimesEnd;
	157	+ }
117	158
118	159	public String getFmHospital() {
119	160	return fmHospital;