jiangjiazhi / regional-platform

Authored by jiangjiazhi over 7 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 18 additions and 2 deletions

...	...	@@ -89,7 +89,16 @@
89	89	private String cityId;
90	90	private String areaId;
91	91	private String streetId;
	92	+ private Integer type;
92	93
	94	+ public Integer getType() {
	95	+ return type;
	96	+ }
	97	+
	98	+ public void setType(Integer type) {
	99	+ this.type = type;
	100	+ }
	101	+
93	102	public String getStreetRegisterId() {
94	103	return streetRegisterId;
95	104	}
...	...	@@ -436,7 +445,9 @@
436	445	if (StringUtils.isNotEmpty(name)) {
437	446	condition = condition.and("name", name, MongoOper.IS);
438	447	}
439		-
	448	+ if (null != type) {
	449	+ condition = condition.and("type", type, MongoOper.IS);
	450	+ }
440	451	if (isFirst != null) {
441	452	condition = condition.and("isFirst", isFirst, MongoOper.IS);
442	453	}

...	...	@@ -125,10 +125,15 @@
125	125
126	126	//本院低次
127	127	int dichi = recordService.count(antExRecordQuery1);
	128	+
	129	+ antExRecordQuery1.setType(1);
	130	+ //初诊的次数
	131	+ int cdichi = recordService.count(antExRecordQuery1);
	132	+
128	133	antExRecordQuery1.setHospitalId(null);
129	134
130	135	antExManagerResult.settTimes(recordService.count(antExRecordQuery1));
131		- antExManagerResult.setChTimes(dichi);
	136	+ antExManagerResult.setChTimes(dichi-cdichi);
132	137	handleRisk(e, antExManagerResult);
133	138
134	139	data.add(antExManagerResult);