jiangjiazhi / regional-platform

Commit 2b4e41f5889ecb5ae97100fba147ebcd6a06e065

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

产筛

Showing 3 changed files with 35 additions and 32 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/SieveResultModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveAddRequest.java

...	...	@@ -43,14 +43,14 @@
43	43	private Map<String,String> sjgjxValue;// 神经管畸形 NTD
44	44
45	45	//hCg
46		- private String hCg;
	46	+ private String hcg;
47	47
48	48	//hafp
49	49	private String hafp;
50	50
51	51
52	52	//hCgMom
53		- private String hCgMom;
	53	+ private String hcgMom;
54	54
55	55	//hafpMom
56	56	private String hafpMom;
57	57
...	...	@@ -109,14 +109,7 @@
109	109	this.sjgjxValue = sjgjxValue;
110	110	}
111	111
112		- public String gethCg() {
113		- return hCg;
114		- }
115	112
116		- public void sethCg(String hCg) {
117		- this.hCg = hCg;
118		- }
119		-
120	113	public String getHafp() {
121	114	return hafp;
122	115	}
123	116
...	...	@@ -125,12 +118,20 @@
125	118	this.hafp = hafp;
126	119	}
127	120
128		- public String gethCgMom() {
129		- return hCgMom;
	121	+ public String getHcg() {
	122	+ return hcg;
130	123	}
131	124
132		- public void sethCgMom(String hCgMom) {
133		- this.hCgMom = hCgMom;
	125	+ public void setHcg(String hcg) {
	126	+ this.hcg = hcg;
	127	+ }
	128	+
	129	+ public String getHcgMom() {
	130	+ return hcgMom;
	131	+ }
	132	+
	133	+ public void setHcgMom(String hcgMom) {
	134	+ this.hcgMom = hcgMom;
134	135	}
135	136
136	137	public String getHafpMom() {

...	...	@@ -660,8 +660,8 @@
660	660	if (CollectionUtils.isNotEmpty(list))
661	661	{
662	662	SieveResultModel model = list.get(0);
663		- sieveResultEditInfo.put("hcg",model.gethCg() != null ? model.gethCg() : "");
664		- sieveResultEditInfo.put("hcgMom",model.gethCgMom() != null ? model.gethCgMom() : "");
	663	+ sieveResultEditInfo.put("hcg",model.getHcg() != null ? model.getHcg() : "");
	664	+ sieveResultEditInfo.put("hcgMom",model.getHcgMom() != null ? model.getHcgMom() : "");
665	665	sieveResultEditInfo.put("hafp",model.getHafp() != null ? model.getHafp() : "");
666	666	sieveResultEditInfo.put("hafpMom",model.getHafpMom() != null ? model.getHafpMom() : "");
667	667	sieveResultEditInfo.put("examineId", model.getExamineId());
...	...	@@ -678,6 +678,7 @@
678	678	sieveResultEditInfo.put("sbstValue",model.getSbstValue());
679	679	sieveResultEditInfo.put("stzhz13Value",model.getStzhz13Value());
680	680	sieveResultEditInfo.put("sjgjxValue",model.getSjgjxValue());
	681	+ sieveResultEditInfo.put("sjgjxValue",model.getPublishName());
681	682	}
682	683	map.put("sieveResultEditInfo",sieveResultEditInfo);
683	684	}
...	...	@@ -768,8 +769,8 @@
768	769	if (CollectionUtils.isNotEmpty(list))
769	770	{
770	771	SieveResultModel sieveResultModel = list.get(0);
771		- sieveResultInfo.put("hcg",sieveResultModel.gethCg() != null ? sieveResultModel.gethCg()+"ng/ml" : "");
772		- sieveResultInfo.put("hcgMom",sieveResultModel.gethCgMom() != null ? sieveResultModel.gethCgMom() : "");
	772	+ sieveResultInfo.put("hcg",sieveResultModel.getHcg() != null ? sieveResultModel.getHcg()+"ng/ml" : "");
	773	+ sieveResultInfo.put("hcgMom",sieveResultModel.getHcgMom() != null ? sieveResultModel.getHcgMom() : "");
773	774	sieveResultInfo.put("hafp",sieveResultModel.getHafp() != null ? sieveResultModel.getHafp()+"U/ml" : "");
774	775	sieveResultInfo.put("hafpMom",sieveResultModel.getHafpMom() != null ? sieveResultModel.getHafpMom() : "");
775	776	sieveResultInfo.put("examineName", CommonsHelper.getUserName(sieveResultModel.getExamineId(), usersService));

...	...	@@ -39,13 +39,13 @@
39	39	private Map<String,String> sjgjxValue;// 神经管畸形 NTD
40	40
41	41	//hCg
42		- private String hCg;
	42	+ private String hcg;
43	43
44	44	//hafp
45	45	private String hafp;
46	46
47	47	//hCgMom
48		- private String hCgMom;
	48	+ private String hcgMom;
49	49
50	50	//hafpMom
51	51	private String hafpMom;
52	52
53	53
...	...	@@ -104,14 +104,22 @@
104	104	this.sjgjxValue = sjgjxValue;
105	105	}
106	106
107		- public String gethCg() {
108		- return hCg;
	107	+ public String getHcg() {
	108	+ return hcg;
109	109	}
110	110
111		- public void sethCg(String hCg) {
112		- this.hCg = hCg;
	111	+ public void setHcg(String hcg) {
	112	+ this.hcg = hcg;
113	113	}
114	114
	115	+ public String getHcgMom() {
	116	+ return hcgMom;
	117	+ }
	118	+
	119	+ public void setHcgMom(String hcgMom) {
	120	+ this.hcgMom = hcgMom;
	121	+ }
	122	+
115	123	public String getHafp() {
116	124	return hafp;
117	125	}
118	126
...	...	@@ -120,14 +128,7 @@
120	128	this.hafp = hafp;
121	129	}
122	130
123		- public String gethCgMom() {
124		- return hCgMom;
125		- }
126	131
127		- public void sethCgMom(String hCgMom) {
128		- this.hCgMom = hCgMom;
129		- }
130		-
131	132	public String getHafpMom() {
132	133	return hafpMom;
133	134	}
...	...	@@ -241,8 +242,8 @@
241	242	sieveModel.setSbstValue(sbstValue);
242	243	sieveModel.setStzhz13Value(stzhz13Value);
243	244	sieveModel.setSjgjxValue(sjgjxValue);
244		- sieveModel.sethCg(hCg);
245		- sieveModel.sethCgMom(hCgMom);
	245	+ sieveModel.setHcg(hcg);
	246	+ sieveModel.setHcgMom(hcgMom);
246	247	sieveModel.setHafp(hafp);
247	248	sieveModel.setHafpMom(hafpMom);
248	249	sieveModel.setExamineId(examineId);