jiangjiazhi / regional-platform

Authored by dongqin almost 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 15 additions and 0 deletions

...	...	@@ -66,6 +66,16 @@
66	66
67	67	private List<String> hospitalIds;
68	68
	69	+ private String remianType;
	70	+
	71	+ public String getRemianType() {
	72	+ return remianType;
	73	+ }
	74	+
	75	+ public void setRemianType(String remianType) {
	76	+ this.remianType = remianType;
	77	+ }
	78	+
69	79	public List<String> getHospitalIds() {
70	80	return hospitalIds;
71	81	}
...	...	@@ -122,6 +132,9 @@
122	132	}
123	133	if (null != chargeRecordId) {
124	134	condition = condition.and("chargeRecordId", chargeRecordId, MongoOper.IS);
	135	+ }
	136	+ if (null != remianType) {
	137	+ condition = condition.and("healthType", remianType, MongoOper.NE);
125	138	}
126	139
127	140	if (null != healthType) {

...	...	@@ -1505,6 +1505,8 @@
1505	1505	healthChargeQuery.setCreatedStart(startTime);
1506	1506	healthChargeQuery.setCreatedEnd(endTime);
1507	1507	healthChargeQuery.setYn(YnEnums.YES.getId());
	1508	+
	1509	+ healthChargeQuery.setRemianType("4");
1508	1510	if (StringUtils.isNotEmpty(reportNameType)) {
1509	1511	healthChargeQuery.setHealthType(Integer.parseInt(reportNameType));
1510	1512	}