jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 16 additions and 1 deletions

...	...	@@ -57,7 +57,14 @@
57	57	this.dueStatus = dueStatus;
58	58	}
59	59
	60	+ public boolean isGtePostTimes() {
	61	+ return gtePostTimes;
	62	+ }
60	63
	64	+ public void setGtePostTimes(boolean gtePostTimes) {
	65	+ this.gtePostTimes = gtePostTimes;
	66	+ }
	67	+
61	68	/**
62	69	* 访视状态
63	70	*/
...	...	@@ -84,6 +91,7 @@
84	91	private Date lastCTimeStart;
85	92	private Date lastCTimeEnd;
86	93	private Integer postViewTimes;
	94	+ private boolean gtePostTimes=false;
87	95
88	96	public Integer getPostViewTimes() {
89	97	return postViewTimes;
...	...	@@ -680,7 +688,11 @@
680	688	condition = condition.and("type", type, MongoOper.IS);
681	689	}
682	690	if(null!=postViewTimes){
683		- condition = condition.and("postViewTimes", postViewTimes, MongoOper.IS);
	691	+ if(gtePostTimes){
	692	+ condition = condition.and("postViewTimes", postViewTimes, MongoOper.GTE);
	693	+ }else{
	694	+ condition = condition.and("postViewTimes", postViewTimes, MongoOper.IS);
	695	+ }
684	696	}
685	697
686	698	if (null != lastRhTimeStart) {

...	...	@@ -213,6 +213,9 @@
213	213	Date currentDate = DateUtil.formatDate(new Date());
214	214
215	215	patientsQuery.setPostViewTimes(riskPatientsQueryRequest.getPostViewTimes());
	216	+ if(null!=riskPatientsQueryRequest.getPostViewTimes() &&riskPatientsQueryRequest.getPostViewTimes()>=4){
	217	+ patientsQuery.setGtePostTimes(true);
	218	+ }
216	219
217	220	//服务类型
218	221	if (null != riskPatientsQueryRequest.getServiceType() && ServiceTypeEnums.ALL_SERVICE.getId() != Integer.valueOf(riskPatientsQueryRequest.getServiceType())) {