jiangjiazhi / regional-platform

Commit 624cad3655ec6d731b9a004a8f0033e70d762ac7

Authored by yangfei over 8 years ago

Exists in master and in 6 other branches

产检增加字段

Showing 2 changed files with 74 additions and 50 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -25,6 +25,10 @@
25	25	private String neoDeathTodo;
26	26	//出生缺陷儿备注
27	27	private String birthDefectTodo;
	28	+ //新生儿死亡备注
	29	+ private Integer neoDeath;
	30	+ //出生缺陷儿备注
	31	+ private Integer birthDefect;
28	32	//预产期
29	33	private Date dueDate;
30	34	//末次月经
...	...	@@ -59,10 +63,6 @@
59	63	private Integer stillbirth;
60	64	//死产
61	65	private Integer stillChan ;
62		- //新生儿死亡
63		- private Integer neoDeath;
64		- //出生缺陷
65		- private Integer birthDefect;
66	66	// 身高
67	67	private String height;
68	68	//体重
69	69
...	...	@@ -110,22 +110,7 @@
110	110	*/
111	111	private String diagnosisOther;
112	112
113		- public String getNeoDeathTodo() {
114		- return neoDeathTodo;
115		- }
116	113
117		- public void setNeoDeathTodo(String neoDeathTodo) {
118		- this.neoDeathTodo = neoDeathTodo;
119		- }
120		-
121		- public String getBirthDefectTodo() {
122		- return birthDefectTodo;
123		- }
124		-
125		- public void setBirthDefectTodo(String birthDefectTodo) {
126		- this.birthDefectTodo = birthDefectTodo;
127		- }
128		-
129	114	public String getDiagnosisOther() {
130	115	return diagnosisOther;
131	116	}
...	...	@@ -218,6 +203,38 @@
218	203	return heart;
219	204	}
220	205
	206	+ public String getNeoDeathTodo() {
	207	+ return neoDeathTodo;
	208	+ }
	209	+
	210	+ public void setNeoDeathTodo(String neoDeathTodo) {
	211	+ this.neoDeathTodo = neoDeathTodo;
	212	+ }
	213	+
	214	+ public Integer getNeoDeath() {
	215	+ return neoDeath;
	216	+ }
	217	+
	218	+ public void setNeoDeath(Integer neoDeath) {
	219	+ this.neoDeath = neoDeath;
	220	+ }
	221	+
	222	+ public Integer getBirthDefect() {
	223	+ return birthDefect;
	224	+ }
	225	+
	226	+ public void setBirthDefect(Integer birthDefect) {
	227	+ this.birthDefect = birthDefect;
	228	+ }
	229	+
	230	+ public String getBirthDefectTodo() {
	231	+ return birthDefectTodo;
	232	+ }
	233	+
	234	+ public void setBirthDefectTodo(String birthDefectTodo) {
	235	+ this.birthDefectTodo = birthDefectTodo;
	236	+ }
	237	+
221	238	public void setHeart(String heart) {
222	239	this.heart = heart;
223	240	}
224	241
225	242
...	...	@@ -696,28 +713,13 @@
696	713	this.baricIndex = baricIndex;
697	714	}
698	715
699		- public Integer getBirthDefect() {
700		- return birthDefect;
701		- }
702	716
703		- public void setBirthDefect(Integer birthDefect) {
704		- this.birthDefect = birthDefect;
705		- }
706		-
707	717	public Integer getDelivery() {
708	718	return delivery;
709	719	}
710	720
711	721	public void setDelivery(Integer delivery) {
712	722	this.delivery = delivery;
713		- }
714		-
715		- public Integer getNeoDeath() {
716		- return neoDeath;
717		- }
718		-
719		- public void setNeoDeath(Integer neoDeath) {
720		- this.neoDeath = neoDeath;
721	723	}
722	724
723	725	public Integer getPlanedProd() {

...	...	@@ -87,6 +87,10 @@
87	87	private Integer stillbirth;
88	88	//死产
89	89	private Integer stillChan;
	90	+ //新生儿死亡备注
	91	+ private String neoDeathTodo;
	92	+ //出生缺陷备注
	93	+ private String birthDefectTodo;
90	94	//新生儿死亡
91	95	private Integer neoDeath;
92	96	//出生缺陷
...	...	@@ -230,6 +234,22 @@
230	234	return abortionZR;
231	235	}
232	236
	237	+ public Integer getNeoDeath() {
	238	+ return neoDeath;
	239	+ }
	240	+
	241	+ public void setNeoDeath(Integer neoDeath) {
	242	+ this.neoDeath = neoDeath;
	243	+ }
	244	+
	245	+ public Integer getBirthDefect() {
	246	+ return birthDefect;
	247	+ }
	248	+
	249	+ public void setBirthDefect(Integer birthDefect) {
	250	+ this.birthDefect = birthDefect;
	251	+ }
	252	+
233	253	public void setAbortionZR(Integer abortionZR) {
234	254	this.abortionZR = abortionZR;
235	255	}
236	256
...	...	@@ -602,14 +622,7 @@
602	622	this.abortion = abortion;
603	623	}
604	624
605		- public Integer getBirthDefect() {
606		- return birthDefect;
607		- }
608	625
609		- public void setBirthDefect(Integer birthDefect) {
610		- this.birthDefect = birthDefect;
611		- }
612		-
613	626	public Integer getDelivery() {
614	627	return delivery;
615	628	}
616	629
...	...	@@ -618,14 +631,7 @@
618	631	this.delivery = delivery;
619	632	}
620	633
621		- public Integer getNeoDeath() {
622		- return neoDeath;
623		- }
624	634
625		- public void setNeoDeath(Integer neoDeath) {
626		- this.neoDeath = neoDeath;
627		- }
628		-
629	635	public Integer getPlanedProd() {
630	636	return planedProd;
631	637	}
...	...	@@ -899,6 +905,22 @@
899	905	this.hHealthInfo = hHealthInfo;
900	906	}
901	907
	908	+ public String getNeoDeathTodo() {
	909	+ return neoDeathTodo;
	910	+ }
	911	+
	912	+ public void setNeoDeathTodo(String neoDeathTodo) {
	913	+ this.neoDeathTodo = neoDeathTodo;
	914	+ }
	915	+
	916	+ public String getBirthDefectTodo() {
	917	+ return birthDefectTodo;
	918	+ }
	919	+
	920	+ public void setBirthDefectTodo(String birthDefectTodo) {
	921	+ this.birthDefectTodo = birthDefectTodo;
	922	+ }
	923	+
902	924	public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
903	925	if (null != antExChuModel) {
904	926	setBarCode(antExChuModel.getBarCode());
...	...	@@ -939,8 +961,8 @@
939	961	if(null!=antExChuModel.getBp()){
940	962	setBp(JsonUtil.str2Obj(antExChuModel.getBp(),Map.class));
941	963	}
942		- setNeoDeath(antExChuModel.getNeoDeath());
943		- setBirthDefect(antExChuModel.getBirthDefect());
	964	+ setNeoDeathTodo(antExChuModel.getNeoDeathTodo());
	965	+ setBirthDefectTodo(antExChuModel.getBirthDefectTodo());
944	966	setHeart(antExChuModel.getHeart());
945	967	setLungs(antExChuModel.getLungs());
946	968	setVulva(antExChuModel.getVulva());