jiangjiazhi / regional-platform

Authored by shiyang almost 4 years ago

1 parent 1926b057e5

Exists in master and in 6 other branches

Showing 3 changed files with 12 additions and 9 deletions

...	...	@@ -288,7 +288,7 @@
288	288	private String bLzdRy;
289	289	//诊断时间
290	290	private Date bLzdSj;
291		- //最后诊断内容字段 yn(0未见异常,1异常);yc(异常项1-9)展示用到enum(LhEndDiagnosisContent);qt(其他注明);
	291	+ //最后诊断内容字段 yn(0未见异常,1异常);yc(异常项1-9),前端存成数组[],展示用到enum(LhEndDiagnosisContent);qt(其他注明);
292	292	private Map<String,Object> zhJd;
293	293	//诊断机构
294	294	private String zHzdJg;

...	...	@@ -316,11 +316,11 @@
316	316	//乳腺最后随访结果内容翻译字段（map key:yc）
317	317	if(null!=cancerScreeningModel.getZhJd()){
318	318	if(null!=cancerScreeningModel.getZhJd().get("yc")){
319		- String[] arry = null;
320		- for (int i=0; i<((String[]) cancerScreeningModel.getZhJd().get("yc")).length;i++) {
321		- arry[i]=LhEndDiagnosisContent.getName(((String[]) cancerScreeningModel.getZhJd().get("yc"))[i]);
	319	+ List<String> list=new ArrayList<>();
	320	+ for (String yc : (List<String>) cancerScreeningModel.getZhJd().get("yc")) {
	321	+ list.add(LhEndDiagnosisContent.getName(yc));
322	322	}
323		- result.setMapYcName(arry);
	323	+ result.setMapYcName(list);
324	324	}
325	325	}
326	326	org.springframework.beans.BeanUtils.copyProperties(cancerScreeningModel,result);

...	...	@@ -2,6 +2,8 @@
2	2
3	3	import com.lyms.platform.pojo.CancerScreeningModel;
4	4
	5	+import java.util.List;
	6	+
5	7	/**
6	8	* Created by Administrator on 2021-07-19.
7	9	*/
8	10
9	11
...	...	@@ -16,14 +18,15 @@
16	18	private String newRxCssjName;
17	19	//乳腺X线检查容翻译字段
18	20	private String rxXJcName;
19		- //乳腺最后随访结果内容翻译字段（map key:yc）
20		- private String[] mapYcName;
	21	+ //乳腺最后随访结果内容翻译字段（map key:yc）用到enum(LhEndDiagnosisContent)
	22	+ private List<String> mapYcName;
21	23
22		- public String[] getMapYcName() {
	24	+
	25	+ public List<String> getMapYcName() {
23	26	return mapYcName;
24	27	}
25	28
26		- public void setMapYcName(String[] mapYcName) {
	29	+ public void setMapYcName(List<String> mapYcName) {
27	30	this.mapYcName = mapYcName;
28	31	}
29	32