jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 5 changed files with 25 additions and 23 deletions

...	...	@@ -139,7 +139,7 @@
139	139	//分类右
140	140	private Map<String,String> rxlFly;
141	141	//建议
142		- private String rxlJy;
	142	+ private Map<String,String> rxlJy;
143	143	//检查机构
144	144	private String rxlJcdw;
145	145	//检査人员
...	...	@@ -152,7 +152,7 @@
152	152	//乳腺X线评估右
153	153	private Map<String,String> rxlPgy;
154	154	//建议
155		- private String rxJy;
	155	+ private Map<String,String> rxJy;
156	156	//(五〉最终随访结果
157	157	//随访情况
158	158	private String sfQk;
...	...	@@ -678,14 +678,6 @@
678	678	this.rxlFly = rxlFly;
679	679	}
680	680
681		- public String getRxlJy() {
682		- return rxlJy;
683		- }
684		-
685		- public void setRxlJy(String rxlJy) {
686		- this.rxlJy = rxlJy;
687		- }
688		-
689	681	public String getRxlJcdw() {
690	682	return rxlJcdw;
691	683	}
692	684
...	...	@@ -718,11 +710,19 @@
718	710	this.rxlPgy = rxlPgy;
719	711	}
720	712
721		- public String getRxJy() {
	713	+ public Map<String, String> getRxlJy() {
	714	+ return rxlJy;
	715	+ }
	716	+
	717	+ public void setRxlJy(Map<String, String> rxlJy) {
	718	+ this.rxlJy = rxlJy;
	719	+ }
	720	+
	721	+ public Map<String, String> getRxJy() {
722	722	return rxJy;
723	723	}
724	724
725		- public void setRxJy(String rxJy) {
	725	+ public void setRxJy(Map<String, String> rxJy) {
726	726	this.rxJy = rxJy;
727	727	}
728	728

...	...	@@ -138,7 +138,7 @@
138	138	//分类右
139	139	private Map<String,String> rxlFly;
140	140	//建议
141		- private String rxlJy;
	141	+ private Map<String,String> rxlJy;
142	142	//检查机构
143	143	private String rxlJcdw;
144	144	//检査人员
...	...	@@ -151,7 +151,7 @@
151	151	//乳腺X线评估右
152	152	private Map<String,String> rxlPgy;
153	153	//建议
154		- private String rxJy;
	154	+ private Map<String,String> rxJy;
155	155	//(五〉最终随访结果
156	156	//随访情况
157	157	private String sfQk;
158	158
159	159
...	...	@@ -689,14 +689,18 @@
689	689	this.rxlFly = rxlFly;
690	690	}
691	691
692		- public String getRxlJy() {
	692	+ public Map<String, String> getRxlJy() {
693	693	return rxlJy;
694	694	}
695	695
696		- public void setRxlJy(String rxlJy) {
	696	+ public void setRxlJy(Map<String, String> rxlJy) {
697	697	this.rxlJy = rxlJy;
698	698	}
699	699
	700	+ public void setRxJy(Map<String, String> rxJy) {
	701	+ this.rxJy = rxJy;
	702	+ }
	703	+
700	704	public String getRxlJcdw() {
701	705	return rxlJcdw;
702	706	}
703	707
...	...	@@ -737,12 +741,8 @@
737	741	this.rxlPgy = rxlPgy;
738	742	}
739	743
740		- public String getRxJy() {
	744	+ public Map<String, String> getRxJy() {
741	745	return rxJy;
742		- }
743		-
744		- public void setRxJy(String rxJy) {
745		- this.rxJy = rxJy;
746	746	}
747	747
748	748	public String getSfQk() {

...	...	@@ -51,7 +51,7 @@
51	51	* @return
52	52	*/
53	53	@ResponseBody
54		- @RequestMapping(value="/resCanScrList/{id}",method = RequestMethod.GET)
	54	+ @RequestMapping(value="/resCanScrList/{residentId}",method = RequestMethod.GET)
55	55	@TokenRequired
56	56	public BaseResponse getResIdCancerScreenList(@PathVariable String residentId) {
57	57	return cancerScreenService.getResIdCancerScreenList(residentId);

...	...	@@ -164,6 +164,8 @@
164	164	cancerScr.setHospitalId(hospitalId);
165	165	//操作人的id
166	166	cancerScr.setOperator(id);
	167	+ //有效
	168	+ cancerScr.setYn(YnEnums.YES.getId());
167	169	cancerScreenService.addOneCancerScreen(cancerScr);
168	170	return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
169	171	}else{