jiangjiazhi / regional-platform

Commit 94833149f21bdfc7f80ff63bf2ab12d2f3844a47

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

增加字段

Showing 3 changed files with 168 additions and 4 deletions

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

...	...	@@ -70,8 +70,77 @@
70	70	private String tireNumber1;
71	71	private String syjg;
72	72	private List placentas;
73		-
	73	+ //心脏
	74	+ private String heart;
	75	+ //肺部
	76	+ private String lungs;
	77	+ //外阴
	78	+ private String vulva;
	79	+ //阴道
	80	+ private String vagina;
	81	+ // 宫颈
	82	+ private String cervical;
	83	+ //子宫
	84	+ private String uterus;
	85	+ //附件
	86	+ private String fujian;
74	87	private Date created;
	88	+
	89	+ public String getCervical() {
	90	+ return cervical;
	91	+ }
	92	+
	93	+ public void setCervical(String cervical) {
	94	+ this.cervical = cervical;
	95	+ }
	96	+
	97	+ public String getFujian() {
	98	+ return fujian;
	99	+ }
	100	+
	101	+ public void setFujian(String fujian) {
	102	+ this.fujian = fujian;
	103	+ }
	104	+
	105	+ public String getHeart() {
	106	+ return heart;
	107	+ }
	108	+
	109	+ public void setHeart(String heart) {
	110	+ this.heart = heart;
	111	+ }
	112	+
	113	+ public String getLungs() {
	114	+ return lungs;
	115	+ }
	116	+
	117	+ public void setLungs(String lungs) {
	118	+ this.lungs = lungs;
	119	+ }
	120	+
	121	+ public String getUterus() {
	122	+ return uterus;
	123	+ }
	124	+
	125	+ public void setUterus(String uterus) {
	126	+ this.uterus = uterus;
	127	+ }
	128	+
	129	+ public String getVagina() {
	130	+ return vagina;
	131	+ }
	132	+
	133	+ public void setVagina(String vagina) {
	134	+ this.vagina = vagina;
	135	+ }
	136	+
	137	+ public String getVulva() {
	138	+ return vulva;
	139	+ }
	140	+
	141	+ public void setVulva(String vulva) {
	142	+ this.vulva = vulva;
	143	+ }
75	144
76	145	public Date getCreated() {
77	146	return created;

...	...	@@ -44,6 +44,9 @@
44	44	private Map fksxHistory ;
45	45	// 叶酸服用
46	46	private Map ysfyHistory ;
	47	+ //本次妊娠情况
	48	+ private Map cestationInfo;
	49	+
47	50	//孕次
48	51	private Integer pregnancyTimes;
49	52	// 产次
...	...	@@ -70,8 +73,20 @@
70	73	private String yqWeight ;
71	74	//体重指数
72	75	private String baricIndex;
73		- //本次妊娠情况
74		- private Map cestationInfo;
	76	+ //心脏
	77	+ private String heart;
	78	+ //肺部
	79	+ private String lungs;
	80	+ //外阴
	81	+ private String vulva;
	82	+ //阴道
	83	+ private String vagina;
	84	+ // 宫颈
	85	+ private String cervical;
	86	+ //子宫
	87	+ private String uterus;
	88	+ //附件
	89	+ private String fujian;
75	90	// 宫高
76	91	private String gonggao;
77	92	//腹围
...	...	@@ -766,6 +781,13 @@
766	781	antExChuModel.setYghxkt(yghxkt);
767	782	antExChuModel.setXqjq(xqjq);
768	783	antExChuModel.setXnsd(xnsd);
	784	+ antExChuModel.setHeart(heart);
	785	+ antExChuModel.setLungs(lungs);
	786	+ antExChuModel.setVulva(vulva);
	787	+ antExChuModel.setVagina(vagina);
	788	+ antExChuModel.setCervical(cervical);
	789	+ antExChuModel.setUterus(uterus);
	790	+ antExChuModel.setFujian(fujian);
769	791	// antExChuModel.setMdxqsy(mdxqsy);
770	792	antExChuModel.setHivkt(hivkt);
771	793	antExChuModel.setYdfmw(JsonUtil.obj2JsonString(ydfmw));

...	...	@@ -92,8 +92,21 @@
92	92	private String fuwei;
93	93	// 胎数
94	94	private String tireNumber1;
	95	+ //心脏
	96	+ private String heart;
	97	+ //肺部
	98	+ private String lungs;
	99	+ //外阴
	100	+ private String vulva;
	101	+ //阴道
	102	+ private String vagina;
	103	+ // 宫颈
	104	+ private String cervical;
	105	+ //子宫
	106	+ private String uterus;
	107	+ //附件
	108	+ private String fujian;
95	109
96		-
97	110	private List<MatDeliverAddRequest.Placenta> placentas;
98	111	/* //心率
99	112	private double heartRate;
100	113
101	114
102	115
...	...	@@ -203,9 +216,62 @@
203	216	this.abo = abo;
204	217	}
205	218
	219	+ public String getCervical() {
	220	+ return cervical;
	221	+ }
206	222
	223	+ public void setCervical(String cervical) {
	224	+ this.cervical = cervical;
	225	+ }
207	226
	227	+ public String getFujian() {
	228	+ return fujian;
	229	+ }
208	230
	231	+ public void setFujian(String fujian) {
	232	+ this.fujian = fujian;
	233	+ }
	234	+
	235	+ public String getHeart() {
	236	+ return heart;
	237	+ }
	238	+
	239	+ public void setHeart(String heart) {
	240	+ this.heart = heart;
	241	+ }
	242	+
	243	+ public String getLungs() {
	244	+ return lungs;
	245	+ }
	246	+
	247	+ public void setLungs(String lungs) {
	248	+ this.lungs = lungs;
	249	+ }
	250	+
	251	+ public String getUterus() {
	252	+ return uterus;
	253	+ }
	254	+
	255	+ public void setUterus(String uterus) {
	256	+ this.uterus = uterus;
	257	+ }
	258	+
	259	+ public String getVagina() {
	260	+ return vagina;
	261	+ }
	262	+
	263	+ public void setVagina(String vagina) {
	264	+ this.vagina = vagina;
	265	+ }
	266	+
	267	+ public String getVulva() {
	268	+ return vulva;
	269	+ }
	270	+
	271	+ public void setVulva(String vulva) {
	272	+ this.vulva = vulva;
	273	+ }
	274	+
209	275	public String getAlbumin() {
210	276	return albumin;
211	277	}
...	...	@@ -771,6 +837,13 @@
771	837	setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(), Map.class));
772	838	} catch (Exception e) {
773	839	}
	840	+ setHeart(antExChuModel.getHeart());
	841	+ setLungs(antExChuModel.getLungs());
	842	+ setVulva(antExChuModel.getVulva());
	843	+ setVagina(antExChuModel.getVagina());
	844	+ setCervical(antExChuModel.getCervical());
	845	+ setUterus(antExChuModel.getUterus());
	846	+ setFujian(antExChuModel.getFujian());
774	847	setYghxkt(antExChuModel.getYghxkt());
775	848	setPregnancyTimes(antExChuModel.getPregnancyTimes());
776	849	setProdTime(antExChuModel.getProdTime());