jiangjiazhi / regional-platform

Authored by shiyang over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 18 additions and 0 deletions

...	...	@@ -101,8 +101,20 @@
101	101
102	102	//1 未同步 2已经同步
103	103	private Integer isSync;
	104	+ /**
	105	+ * 隆化-乳腺癌检查异常
	106	+ */
	107	+ //乳腺癌异常
	108	+ private Integer breastAbnormity;
104	109
	110	+ public Integer getBreastAbnormity() {
	111	+ return breastAbnormity;
	112	+ }
105	113
	114	+ public void setBreastAbnormity(Integer breastAbnormity) {
	115	+ this.breastAbnormity = breastAbnormity;
	116	+ }
	117	+
106	118	/**
107	119	* @return
108	120	*/
...	...	@@ -180,6 +192,9 @@
180	192	}
181	193	if(StringUtils.isNotEmpty(sfZhzd) ){
182	194	condition=condition.and("sfZhzd.select",sfZhzd , MongoOper.IS);
	195	+ }
	196	+ if(null!=breastAbnormity){
	197	+ condition=condition.and("breastAbnormity", breastAbnormity, MongoOper.IS);
183	198	}
184	199
185	200	Criteria c = null;

...	...	@@ -98,6 +98,8 @@
98	98	query.setRxlJy(queryRequest.getRxlJy());
99	99	query.setRxJy(queryRequest.getRxJy());
100	100	query.setSfZhzd(queryRequest.getSfZhzd());
	101	+ //隆化-乳腺癌检查异常
	102	+ query.setBreastAbnormity(queryRequest.getBreastAbnormity());
101	103
102	104	List list = new ArrayList();
103	105	//System.out.println(query.convertToQuery().convertToMongoQuery());
...	...	@@ -119,6 +121,7 @@
119	121	map.put("sfZzjg", model.getSfZzjg());//检査机构
120	122
121	123	map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期
	124	+ map.put("breastAbnormity",RxaZdycEnums.getName(model.getBreastAbnormity().toString()));//检査日期
122	125
123	126	list.add(map);
124	127	}