jiangjiazhi / regional-platform

Authored by shiyang over 3 years ago

1 parent a207903fb8

Exists in master and in 6 other branches

Showing 3 changed files with 33 additions and 1 deletions

...	...	@@ -107,6 +107,20 @@
107	107	//乳腺癌异常
108	108	private Integer breastAbnormity;
109	109
	110	+ /**
	111	+ * 乳腺彩超检查
	112	+ * 超声所见
	113	+ */
	114	+ private String newRxCssj;
	115	+
	116	+ public String getNewRxCssj() {
	117	+ return newRxCssj;
	118	+ }
	119	+
	120	+ public void setNewRxCssj(String newRxCssj) {
	121	+ this.newRxCssj = newRxCssj;
	122	+ }
	123	+
110	124	public Integer getBreastAbnormity() {
111	125	return breastAbnormity;
112	126	}
...	...	@@ -195,6 +209,9 @@
195	209	}
196	210	if(null!=breastAbnormity){
197	211	condition=condition.and("breastAbnormity", breastAbnormity, MongoOper.IS);
	212	+ }
	213	+ if(null!=newRxCssj){
	214	+ condition=condition.and("newRxCssj", newRxCssj, MongoOper.IS);
198	215	}
199	216
200	217	Criteria c = null;

...	...	@@ -102,7 +102,8 @@
102	102	query.setSfZhzd(queryRequest.getSfZhzd());
103	103	//隆化-乳腺癌检查异常
104	104	query.setBreastAbnormity(queryRequest.getBreastAbnormity());
105		-
	105	+ //超声所见
	106	+ query.setNewRxCssj(queryRequest.getNewRxCssj());
106	107	List list = new ArrayList();
107	108	//System.out.println(query.convertToQuery().convertToMongoQuery());
108	109	List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
...	...	@@ -124,6 +125,7 @@
124	125
125	126	map.put("sfJcsj", DateUtil.getyyyy_MM_dd(model.getSfJcsj()));//检査日期
126	127	map.put("breastAbnormity",RxaZdycEnums.getName(null!=model.getBreastAbnormity()?model.getBreastAbnormity().toString():null));
	128	+ map.put("newRxCssj",LhUltrasoundContent.getName(null!=model.getNewRxCssj()?model.getNewRxCssj():null));//超声所见
127	129
128	130	list.add(map);
129	131	}

...	...	@@ -56,6 +56,19 @@
56	56	//乳腺癌异常
57	57	private Integer breastAbnormity;
58	58
	59	+ /**
	60	+ * 乳腺彩超检查
	61	+ * 超声所见
	62	+ */
	63	+ private String newRxCssj;
	64	+
	65	+ public String getNewRxCssj() {
	66	+ return newRxCssj;
	67	+ }
	68	+
	69	+ public void setNewRxCssj(String newRxCssj) {
	70	+ this.newRxCssj = newRxCssj;
	71	+ }
59	72
60	73	public Integer getBreastAbnormity() {
61	74	return breastAbnormity;