jiangjiazhi / regional-platform

Commit f2745af7dc3cd910935cb6438af90f49b3a4b1e6

Authored by wangbo over 6 years ago

Exists in master and in 6 other branches

诸城人民初诊复诊字段添加

Showing 5 changed files with 110 additions and 42 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AnnualReportController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java

...	...	@@ -369,8 +369,17 @@
369	369
370	370	private String tpaAb;
371	371
	372	+ private String tgAb;
	373	+
372	374	private String aTSHR;
373	375
	376	+ public String getTgAb() {
	377	+ return tgAb;
	378	+ }
	379	+
	380	+ public void setTgAb(String tgAb) {
	381	+ this.tgAb = tgAb;
	382	+ }
374	383
375	384	//妊娠方法
376	385	private Integer pregnancyMethod;

...	...	@@ -297,6 +297,8 @@
297	297
298	298	private String tpaAb;
299	299
	300	+ private String tgAb;
	301	+
300	302	private String aTSHR;
301	303
302	304	public String getfTthree() {
...	...	@@ -329,6 +331,14 @@
329	331
330	332	public void setTpaAb(String tpaAb) {
331	333	this.tpaAb = tpaAb;
	334	+ }
	335	+
	336	+ public String getTgAb() {
	337	+ return tgAb;
	338	+ }
	339	+
	340	+ public void setTgAb(String tgAb) {
	341	+ this.tgAb = tgAb;
332	342	}
333	343
334	344	public String getaTSHR() {

...	...	@@ -15,6 +15,7 @@
15	15
16	16	import javax.servlet.http.HttpServletRequest;
17	17	import javax.servlet.http.HttpServletResponse;
	18	+import java.math.BigDecimal;
18	19
19	20	@Controller
20	21	public class AnnualReportController extends BaseController {
...	...	@@ -42,5 +43,8 @@
42	43	Assert.notNull(loginState, "未登录");
43	44	return loginState.getId();
44	45	}
	46	+
	47	+
	48	+
45	49	}

...	...	@@ -265,54 +265,63 @@
265	265	private String configItemId;
266	266
267	267	//甲状腺功能添加
268		- private String fTthree;
	268	+ private Double fTthree;
269	269
270		- private String fTFour;
	270	+ private Double fTFour;
271	271
272		- private String tSH;
	272	+ private Double tSH;
273	273
274		- private String tpaAb;
	274	+ private Double tpaAb;
275	275
276		- private String aTSHR;
	276	+ private Double tgAb;
277	277
	278	+ private Double aTSHR;
278	279
279		- public String getfTthree() {
	280	+ public double getfTthree() {
280	281	return fTthree;
281	282	}
282	283
283		- public void setfTthree(String fTthree) {
	284	+ public void setfTthree(double fTthree) {
284	285	this.fTthree = fTthree;
285	286	}
286	287
287		- public String getfTFour() {
	288	+ public double getfTFour() {
288	289	return fTFour;
289	290	}
290	291
291		- public void setfTFour(String fTFour) {
	292	+ public void setfTFour(double fTFour) {
292	293	this.fTFour = fTFour;
293	294	}
294	295
295		- public String gettSH() {
	296	+ public double gettSH() {
296	297	return tSH;
297	298	}
298	299
299		- public void settSH(String tSH) {
	300	+ public void settSH(double tSH) {
300	301	this.tSH = tSH;
301	302	}
302	303
303		- public String getTpaAb() {
	304	+ public double getTpaAb() {
304	305	return tpaAb;
305	306	}
306	307
307		- public void setTpaAb(String tpaAb) {
	308	+ public void setTpaAb(double tpaAb) {
308	309	this.tpaAb = tpaAb;
309	310	}
310	311
311		- public String getaTSHR() {
	312	+ public double getTgAb() {
	313	+ return tgAb;
	314	+ }
	315	+
	316	+ public void setTgAb(double tgAb) {
	317	+ this.tgAb = tgAb;
	318	+ }
	319	+
	320	+ public double getaTSHR() {
312	321	return aTSHR;
313	322	}
314	323
315		- public void setaTSHR(String aTSHR) {
	324	+ public void setaTSHR(double aTSHR) {
316	325	this.aTSHR = aTSHR;
317	326	}
318	327
...	...	@@ -1082,11 +1091,26 @@
1082	1091	examinationModel.setHivkt(hivkt);
1083	1092	examinationModel.setSupplement(supplement);
1084	1093	examinationModel.setConfigItemId(configItemId);
1085		- examinationModel.setfTFour(fTFour);
1086		- examinationModel.setfTthree(fTthree);
1087		- examinationModel.settSH(tSH);
1088		- examinationModel.setTpaAb(tpaAb);
1089		- examinationModel.setaTSHR(aTSHR);
	1094	+ java.text.DecimalFormat df = new java.text.DecimalFormat("#.##");
	1095	+ if (null != fTFour) {
	1096	+ examinationModel.setfTFour(df.format(fTFour));
	1097	+ }
	1098	+ if (null != fTthree) {
	1099	+ examinationModel.setfTthree(df.format(fTthree));
	1100	+ }
	1101	+ if (null != tSH) {
	1102	+ examinationModel.settSH(df.format(tSH));
	1103	+ }
	1104	+ if (null != tpaAb) {
	1105	+ examinationModel.setTgAb(df.format(tgAb));
	1106	+ }
	1107	+ if (null != aTSHR) {
	1108	+ examinationModel.setaTSHR(df.format(aTSHR));
	1109	+ }
	1110	+ if (null != tgAb) {
	1111	+ examinationModel.setTgAb(df.format(tgAb));
	1112	+ }
	1113	+
1090	1114	return examinationModel;
1091	1115	}
1092	1116

...	...	@@ -354,16 +354,17 @@
354	354
355	355
356	356	//甲状腺功能添加
357		- private String fTthree;
	357	+ private Double fTthree;
358	358
359		- private String fTFour;
	359	+ private Double fTFour;
360	360
361		- private String tSH;
	361	+ private Double tSH;
362	362
363		- private String tpaAb;
	363	+ private Double tpaAb;
364	364
365		- private String aTSHR;
	365	+ private Double tgAb;
366	366
	367	+ private Double aTSHR;
367	368
368	369	//妊娠方法
369	370	private Integer pregnancyMethod;
370	371
371	372
372	373
373	374
374	375
375	376
376	377
377	378
378	379
...	...	@@ -374,43 +375,51 @@
374	375	private String pregnancyExcpetion;
375	376
376	377
377		- public String getfTthree() {
	378	+ public Double getfTthree() {
378	379	return fTthree;
379	380	}
380	381
381		- public void setfTthree(String fTthree) {
	382	+ public void setfTthree(Double fTthree) {
382	383	this.fTthree = fTthree;
383	384	}
384	385
385		- public String getfTFour() {
	386	+ public Double getfTFour() {
386	387	return fTFour;
387	388	}
388	389
389		- public void setfTFour(String fTFour) {
	390	+ public void setfTFour(Double fTFour) {
390	391	this.fTFour = fTFour;
391	392	}
392	393
393		- public String gettSH() {
	394	+ public Double gettSH() {
394	395	return tSH;
395	396	}
396	397
397		- public void settSH(String tSH) {
	398	+ public void settSH(Double tSH) {
398	399	this.tSH = tSH;
399	400	}
400	401
401		- public String getTpaAb() {
	402	+ public Double getTpaAb() {
402	403	return tpaAb;
403	404	}
404	405
405		- public void setTpaAb(String tpaAb) {
	406	+ public void setTpaAb(Double tpaAb) {
406	407	this.tpaAb = tpaAb;
407	408	}
408	409
409		- public String getaTSHR() {
	410	+ public Double getTgAb() {
	411	+ return tgAb;
	412	+ }
	413	+
	414	+ public void setTgAb(Double tgAb) {
	415	+ this.tgAb = tgAb;
	416	+ }
	417	+
	418	+ public Double getaTSHR() {
410	419	return aTSHR;
411	420	}
412	421
413		- public void setaTSHR(String aTSHR) {
	422	+ public void setaTSHR(Double aTSHR) {
414	423	this.aTSHR = aTSHR;
415	424	}
416	425
...	...	@@ -1896,13 +1905,25 @@
1896	1905	/**
1897	1906	* 产检项
1898	1907	* */
1899		- antExChuModel.setConfigItemId(configItemId);
1900		- antExChuModel.setfTFour(fTFour);
1901		- antExChuModel.setfTthree(fTthree);
1902		- antExChuModel.setaTSHR(aTSHR);
1903		- antExChuModel.setTpaAb(tpaAb);
1904		- antExChuModel.settSH(tSH);
1905		-
	1908	+ java.text.DecimalFormat df = new java.text.DecimalFormat("#.##");
	1909	+ if (null != fTFour) {
	1910	+ antExChuModel.setfTFour(df.format(fTFour));
	1911	+ }
	1912	+ if (null != fTthree) {
	1913	+ antExChuModel.setfTthree(df.format(fTthree));
	1914	+ }
	1915	+ if (null != tSH) {
	1916	+ antExChuModel.settSH(df.format(tSH));
	1917	+ }
	1918	+ if (null != tpaAb) {
	1919	+ antExChuModel.setTgAb(df.format(tgAb));
	1920	+ }
	1921	+ if (null != aTSHR) {
	1922	+ antExChuModel.setaTSHR(df.format(aTSHR));
	1923	+ }
	1924	+ if (null != tgAb) {
	1925	+ antExChuModel.setTgAb(df.format(tgAb));
	1926	+ }
1906	1927
1907	1928	if (null != bp) {
1908	1929	antExChuModel.setBp(JsonUtil.obj2JsonString(bp));