jiangjiazhi / regional-platform

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

Showing 3 changed files

...	...	@@ -24,6 +24,7 @@
24	24	private String sbst;// 18-三体
25	25	private String dzhpx;// 地中海贫血
26	26	private String cspj;// 产筛评价
	27	+ private String stzhz13; //13-三体
27	28	//录入人员
28	29	private String publishName;
29	30
...	...	@@ -31,6 +32,14 @@
31	32	private Integer yn;
32	33	private Date created;
33	34	private Date modified;
	35	+
	36	+ public String getStzhz13() {
	37	+ return stzhz13;
	38	+ }
	39	+
	40	+ public void setStzhz13(String stzhz13) {
	41	+ this.stzhz13 = stzhz13;
	42	+ }
34	43
35	44	public Integer getYn() {
36	45	return yn;

...	...	@@ -24,6 +24,7 @@
24	24	private String sbst;// 18-三体
25	25	private String dzhpx;// 地中海贫血
26	26	private String cspj;// 产筛评价
	27	+ private String stzhz13; //13-三体
27	28	//录入人员
28	29	private String publishName;
29	30
...	...	@@ -91,6 +92,14 @@
91	92	this.tszhz = tszhz;
92	93	}
93	94
	95	+ public String getStzhz13() {
	96	+ return stzhz13;
	97	+ }
	98	+
	99	+ public void setStzhz13(String stzhz13) {
	100	+ this.stzhz13 = stzhz13;
	101	+ }
	102	+
94	103	@Override
95	104	public SieveResultModel convertToDataModel() {
96	105	/* private String tszhz;// 唐氏综合症
...	...	@@ -108,6 +117,7 @@
108	117	sieveModel.setSbst(sbst);
109	118	sieveModel.setDzhpx(dzhpx);
110	119	sieveModel.setCspj(cspj);
	120	+ sieveModel.setStzhz13(stzhz13);
111	121	sieveModel.setPublishName(publishName);
112	122	return sieveModel;
113	123	}
...	...	@@ -125,6 +135,9 @@
125	135	}
126	136	if(StringUtils.isNotEmpty(dzhpx)){
127	137	list.add(Integer.valueOf(dzhpx));
	138	+ }
	139	+ if(StringUtils.isNotEmpty(stzhz13)){
	140	+ list.add(Integer.valueOf(stzhz13));
128	141	}
129	142	return Collections.max(list);
130	143	}

...	...	@@ -44,6 +44,7 @@
44	44	private String sbst;// 18-三体
45	45	private String dzhpx;// 地中海贫血
46	46	private String cspj;// 产筛评价
	47	+ private String stzhz13; //13-三体
47	48	//录入人员
48	49	private String publishName;
49	50
50	51
...	...	@@ -111,7 +112,13 @@
111	112	this.tszhz = tszhz;
112	113	}
113	114
	115	+ public String getStzhz13() {
	116	+ return stzhz13;
	117	+ }
114	118
	119	+ public void setStzhz13(String stzhz13) {
	120	+ this.stzhz13 = stzhz13;
	121	+ }
115	122
116	123	public SieveResult convert(SieveResultModel sieveResultModel,Patients patients){
117	124	/* try {
...	...	@@ -141,6 +148,7 @@
141	148	setSbst(sieveResultModel.getSbst());
142	149	setSjgjx(sieveResultModel.getSjgjx());
143	150	setTszhz(sieveResultModel.getTszhz());
	151	+ setStzhz13(sieveResultModel.getStzhz13());
144	152	return this;
145	153	}
146	154	}