jiangjiazhi / regional-platform

Commit e2c14a3879e67bf49518055596c65e4e8690e1ba

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

产妇增加字段

Showing 3 changed files with 235 additions and 213 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

...	...	@@ -35,23 +35,23 @@
35	35	// 叶酸服用
36	36	private String ysfyHistory ;
37	37	//孕次
38		- private String pregnancyTimes;
	38	+ private Integer pregnancyTimes;
39	39	// 产次
40		- private String prodTime;
	40	+ private Integer prodTime;
41	41	// 顺产
42		- private String delivery;
	42	+ private Integer delivery;
43	43	//刨宫产
44		- private String planedProd;
	44	+ private Integer planedProd;
45	45	//流产
46		- private String abortion;
	46	+ private Integer abortion;
47	47	//死胎
48		- private String stillbirth;
	48	+ private Integer stillbirth;
49	49	//死产
50		- private String stillChan ;
	50	+ private Integer stillChan ;
51	51	//新生儿死亡
52		- private String neoDeath;
	52	+ private Integer neoDeath;
53	53	//出生缺陷
54		- private String birthDefect;
	54	+ private Integer birthDefect;
55	55	// 身高
56	56	private String height;
57	57	//体重
58	58
59	59
...	...	@@ -167,30 +167,8 @@
167	167	// 阴道清洁度
168	168	private String ydqjd;
169	169
170		- public String getAbortion() {
171		- return abortion;
172		- }
173	170
174		- public void setAbortion(String abortion) {
175		- this.abortion = abortion;
176		- }
177	171
178		- public String getBaricIndex() {
179		- return baricIndex;
180		- }
181		-
182		- public void setBaricIndex(String baricIndex) {
183		- this.baricIndex = baricIndex;
184		- }
185		-
186		- public String getBirthDefect() {
187		- return birthDefect;
188		- }
189		-
190		- public void setBirthDefect(String birthDefect) {
191		- this.birthDefect = birthDefect;
192		- }
193		-
194	172	public String getCestationInfo() {
195	173	return cestationInfo;
196	174	}
197	175
...	...	@@ -207,13 +185,7 @@
207	185	this.checkTime = checkTime;
208	186	}
209	187
210		- public String getDelivery() {
211		- return delivery;
212		- }
213	188
214		- public void setDelivery(String delivery) {
215		- this.delivery = delivery;
216		- }
217	189
218	190	public String getDiagnosis() {
219	191	return diagnosis;
220	192
...	...	@@ -295,13 +267,7 @@
295	267	this.id = id;
296	268	}
297	269
298		- public String getNeoDeath() {
299		- return neoDeath;
300		- }
301	270
302		- public void setNeoDeath(String neoDeath) {
303		- this.neoDeath = neoDeath;
304		- }
305	271
306	272	public String getNextCheckTime() {
307	273	return nextCheckTime;
308	274
...	...	@@ -351,54 +317,7 @@
351	317	this.placentas = placentas;
352	318	}
353	319
354		- public String getPlanedProd() {
355		- return planedProd;
356		- }
357	320
358		- public void setPlanedProd(String planedProd) {
359		- this.planedProd = planedProd;
360		- }
361		-
362		- public String getPregnancyTimes() {
363		- return pregnancyTimes;
364		- }
365		-
366		- public void setPregnancyTimes(String pregnancyTimes) {
367		- this.pregnancyTimes = pregnancyTimes;
368		- }
369		-
370		- public String getProdDoctor() {
371		- return prodDoctor;
372		- }
373		-
374		- public void setProdDoctor(String prodDoctor) {
375		- this.prodDoctor = prodDoctor;
376		- }
377		-
378		- public String getProdTime() {
379		- return prodTime;
380		- }
381		-
382		- public void setProdTime(String prodTime) {
383		- this.prodTime = prodTime;
384		- }
385		-
386		- public String getStillbirth() {
387		- return stillbirth;
388		- }
389		-
390		- public void setStillbirth(String stillbirth) {
391		- this.stillbirth = stillbirth;
392		- }
393		-
394		- public String getStillChan() {
395		- return stillChan;
396		- }
397		-
398		- public void setStillChan(String stillChan) {
399		- this.stillChan = stillChan;
400		- }
401		-
402	321	public String getTireNumber1() {
403	322	return tireNumber1;
404	323	}
...	...	@@ -542,6 +461,94 @@
542	461	public void setMdxqsy(String mdxqsy) {
543	462	this.mdxqsy = mdxqsy;
544	463	}*/
	464	+
	465	+ public Integer getAbortion() {
	466	+ return abortion;
	467	+ }
	468	+
	469	+ public void setAbortion(Integer abortion) {
	470	+ this.abortion = abortion;
	471	+ }
	472	+
	473	+ public String getBaricIndex() {
	474	+ return baricIndex;
	475	+ }
	476	+
	477	+ public void setBaricIndex(String baricIndex) {
	478	+ this.baricIndex = baricIndex;
	479	+ }
	480	+
	481	+ public Integer getBirthDefect() {
	482	+ return birthDefect;
	483	+ }
	484	+
	485	+ public void setBirthDefect(Integer birthDefect) {
	486	+ this.birthDefect = birthDefect;
	487	+ }
	488	+
	489	+ public Integer getDelivery() {
	490	+ return delivery;
	491	+ }
	492	+
	493	+ public void setDelivery(Integer delivery) {
	494	+ this.delivery = delivery;
	495	+ }
	496	+
	497	+ public Integer getNeoDeath() {
	498	+ return neoDeath;
	499	+ }
	500	+
	501	+ public void setNeoDeath(Integer neoDeath) {
	502	+ this.neoDeath = neoDeath;
	503	+ }
	504	+
	505	+ public Integer getPlanedProd() {
	506	+ return planedProd;
	507	+ }
	508	+
	509	+ public void setPlanedProd(Integer planedProd) {
	510	+ this.planedProd = planedProd;
	511	+ }
	512	+
	513	+ public Integer getPregnancyTimes() {
	514	+ return pregnancyTimes;
	515	+ }
	516	+
	517	+ public void setPregnancyTimes(Integer pregnancyTimes) {
	518	+ this.pregnancyTimes = pregnancyTimes;
	519	+ }
	520	+
	521	+ public String getProdDoctor() {
	522	+ return prodDoctor;
	523	+ }
	524	+
	525	+ public void setProdDoctor(String prodDoctor) {
	526	+ this.prodDoctor = prodDoctor;
	527	+ }
	528	+
	529	+ public Integer getProdTime() {
	530	+ return prodTime;
	531	+ }
	532	+
	533	+ public void setProdTime(Integer prodTime) {
	534	+ this.prodTime = prodTime;
	535	+ }
	536	+
	537	+ public Integer getStillbirth() {
	538	+ return stillbirth;
	539	+ }
	540	+
	541	+ public void setStillbirth(Integer stillbirth) {
	542	+ this.stillbirth = stillbirth;
	543	+ }
	544	+
	545	+ public Integer getStillChan() {
	546	+ return stillChan;
	547	+ }
	548	+
	549	+ public void setStillChan(Integer stillChan) {
	550	+ this.stillChan = stillChan;
	551	+ }
545	552
546	553	public String getNcgOther() {
547	554	return ncgOther;

...	...	@@ -45,23 +45,23 @@
45	45	// 叶酸服用
46	46	private Map ysfyHistory ;
47	47	//孕次
48		- private String pregnancyTimes;
	48	+ private Integer pregnancyTimes;
49	49	// 产次
50		- private String prodTime;
	50	+ private Integer prodTime;
51	51	// 顺产
52		- private String delivery;
	52	+ private Integer delivery;
53	53	//刨宫产
54		- private String planedProd;
	54	+ private Integer planedProd;
55	55	//流产
56		- private String abortion;
	56	+ private Integer abortion;
57	57	//死胎
58		- private String stillbirth;
	58	+ private Integer stillbirth;
59	59	//死产
60		- private String stillChan ;
	60	+ private Integer stillChan ;
61	61	//新生儿死亡
62		- private String neoDeath;
	62	+ private Integer neoDeath;
63	63	//出生缺陷
64		- private String birthDefect;
	64	+ private Integer birthDefect;
65	65	// 身高
66	66	private String height;
67	67	//体重
68	68
...	...	@@ -449,14 +449,10 @@
449	449	this.id = id;
450	450	}
451	451
452		- public String getAbortion() {
	452	+ public Integer getAbortion() {
453	453	return abortion;
454	454	}
455	455
456		- public void setAbortion(String abortion) {
457		- this.abortion = abortion;
458		- }
459		-
460	456	public String getBaricIndex() {
461	457	return baricIndex;
462	458	}
463	459
464	460
...	...	@@ -465,14 +461,74 @@
465	461	this.baricIndex = baricIndex;
466	462	}
467	463
468		- public String getBirthDefect() {
	464	+ public void setAbortion(Integer abortion) {
	465	+ this.abortion = abortion;
	466	+ }
	467	+
	468	+ public Integer getBirthDefect() {
469	469	return birthDefect;
470	470	}
471	471
472		- public void setBirthDefect(String birthDefect) {
	472	+ public void setBirthDefect(Integer birthDefect) {
473	473	this.birthDefect = birthDefect;
474	474	}
475	475
	476	+ public Integer getDelivery() {
	477	+ return delivery;
	478	+ }
	479	+
	480	+ public void setDelivery(Integer delivery) {
	481	+ this.delivery = delivery;
	482	+ }
	483	+
	484	+ public Integer getNeoDeath() {
	485	+ return neoDeath;
	486	+ }
	487	+
	488	+ public void setNeoDeath(Integer neoDeath) {
	489	+ this.neoDeath = neoDeath;
	490	+ }
	491	+
	492	+ public Integer getPlanedProd() {
	493	+ return planedProd;
	494	+ }
	495	+
	496	+ public void setPlanedProd(Integer planedProd) {
	497	+ this.planedProd = planedProd;
	498	+ }
	499	+
	500	+ public Integer getPregnancyTimes() {
	501	+ return pregnancyTimes;
	502	+ }
	503	+
	504	+ public void setPregnancyTimes(Integer pregnancyTimes) {
	505	+ this.pregnancyTimes = pregnancyTimes;
	506	+ }
	507	+
	508	+ public Integer getProdTime() {
	509	+ return prodTime;
	510	+ }
	511	+
	512	+ public void setProdTime(Integer prodTime) {
	513	+ this.prodTime = prodTime;
	514	+ }
	515	+
	516	+ public Integer getStillbirth() {
	517	+ return stillbirth;
	518	+ }
	519	+
	520	+ public void setStillbirth(Integer stillbirth) {
	521	+ this.stillbirth = stillbirth;
	522	+ }
	523	+
	524	+ public Integer getStillChan() {
	525	+ return stillChan;
	526	+ }
	527	+
	528	+ public void setStillChan(Integer stillChan) {
	529	+ this.stillChan = stillChan;
	530	+ }
	531	+
476	532	public Map getCestationInfo() {
477	533	return cestationInfo;
478	534	}
479	535
...	...	@@ -489,14 +545,7 @@
489	545	this.checkTime = checkTime;
490	546	}
491	547
492		- public String getDelivery() {
493		- return delivery;
494		- }
495	548
496		- public void setDelivery(String delivery) {
497		- this.delivery = delivery;
498		- }
499		-
500	549	public String getDiagnosis() {
501	550	return diagnosis;
502	551	}
...	...	@@ -554,14 +603,6 @@
554	603	this.highriskSocre = highriskSocre;
555	604	}
556	605
557		- public String getNeoDeath() {
558		- return neoDeath;
559		- }
560		-
561		- public void setNeoDeath(String neoDeath) {
562		- this.neoDeath = neoDeath;
563		- }
564		-
565	606	public Map getNextCheckTime() {
566	607	return nextCheckTime;
567	608	}
568	609
569	610
...	...	@@ -586,22 +627,8 @@
586	627	this.placentas = placentas;
587	628	}
588	629
589		- public String getPlanedProd() {
590		- return planedProd;
591		- }
592	630
593		- public void setPlanedProd(String planedProd) {
594		- this.planedProd = planedProd;
595		- }
596	631
597		- public String getPregnancyTimes() {
598		- return pregnancyTimes;
599		- }
600		-
601		- public void setPregnancyTimes(String pregnancyTimes) {
602		- this.pregnancyTimes = pregnancyTimes;
603		- }
604		-
605	632	public String getProdDoctor() {
606	633	return prodDoctor;
607	634	}
608	635
...	...	@@ -610,29 +637,7 @@
610	637	this.prodDoctor = prodDoctor;
611	638	}
612	639
613		- public String getProdTime() {
614		- return prodTime;
615		- }
616	640
617		- public void setProdTime(String prodTime) {
618		- this.prodTime = prodTime;
619		- }
620		-
621		- public String getStillbirth() {
622		- return stillbirth;
623		- }
624		-
625		- public void setStillbirth(String stillbirth) {
626		- this.stillbirth = stillbirth;
627		- }
628		-
629		- public String getStillChan() {
630		- return stillChan;
631		- }
632		-
633		- public void setStillChan(String stillChan) {
634		- this.stillChan = stillChan;
635		- }
636	641
637	642	public String getTireNumber1() {
638	643	return tireNumber1;

...	...	@@ -59,23 +59,23 @@
59	59	// 叶酸服用
60	60	private Map ysfyHistory;
61	61	//孕次
62		- private String pregnancyTimes;
	62	+ private Integer pregnancyTimes;
63	63	// 产次
64		- private String prodTime;
	64	+ private Integer prodTime;
65	65	// 顺产
66		- private String delivery;
	66	+ private Integer delivery;
67	67	//刨宫产
68		- private String planedProd;
	68	+ private Integer planedProd;
69	69	//流产
70		- private String abortion;
	70	+ private Integer abortion;
71	71	//死胎
72		- private String stillbirth;
	72	+ private Integer stillbirth;
73	73	//死产
74		- private String stillChan;
	74	+ private Integer stillChan;
75	75	//新生儿死亡
76		- private String neoDeath;
	76	+ private Integer neoDeath;
77	77	//出生缺陷
78		- private String birthDefect;
	78	+ private Integer birthDefect;
79	79	// 身高
80	80	private String height;
81	81	//体重
82	82
...	...	@@ -203,13 +203,7 @@
203	203	this.abo = abo;
204	204	}
205	205
206		- public String getAbortion() {
207		- return abortion;
208		- }
209	206
210		- public void setAbortion(String abortion) {
211		- this.abortion = abortion;
212		- }
213	207
214	208
215	209	public String getAlbumin() {
216	210
...	...	@@ -236,13 +230,7 @@
236	230	this.bChao = bChao;
237	231	}
238	232
239		- public String getBirthDefect() {
240		- return birthDefect;
241		- }
242	233
243		- public void setBirthDefect(String birthDefect) {
244		- this.birthDefect = birthDefect;
245		- }
246	234
247	235	public String getBld() {
248	236	return bld;
249	237
...	...	@@ -292,14 +280,7 @@
292	280	this.chgOther = chgOther;
293	281	}
294	282
295		- public String getDelivery() {
296		- return delivery;
297		- }
298	283
299		- public void setDelivery(String delivery) {
300		- this.delivery = delivery;
301		- }
302		-
303	284	public String getDiagnosis() {
304	285	return diagnosis;
305	286	}
306	287
...	...	@@ -407,14 +388,7 @@
407	388	this.ndb = ndb;
408	389	}
409	390
410		- public String getNeoDeath() {
411		- return neoDeath;
412		- }
413	391
414		- public void setNeoDeath(String neoDeath) {
415		- this.neoDeath = neoDeath;
416		- }
417		-
418	392	public Map getNextCheckTime() {
419	393	return nextCheckTime;
420	394	}
421	395
...	...	@@ -447,13 +421,7 @@
447	421	this.placentas = placentas;
448	422	}
449	423
450		- public String getPlanedProd() {
451		- return planedProd;
452		- }
453	424
454		- public void setPlanedProd(String planedProd) {
455		- this.planedProd = planedProd;
456		- }
457	425
458	426	public String getPlatelet() {
459	427	return platelet;
460	428
...	...	@@ -463,13 +431,7 @@
463	431	this.platelet = platelet;
464	432	}
465	433
466		- public String getPregnancyTimes() {
467		- return pregnancyTimes;
468		- }
469	434
470		- public void setPregnancyTimes(String pregnancyTimes) {
471		- this.pregnancyTimes = pregnancyTimes;
472		- }
473	435
474	436	public String getProdDoctor() {
475	437	return prodDoctor;
476	438
477	439
478	440
479	441
480	442
...	...	@@ -479,28 +441,76 @@
479	441	this.prodDoctor = prodDoctor;
480	442	}
481	443
482		- public String getProdTime() {
	444	+
	445	+ public Integer getAbortion() {
	446	+ return abortion;
	447	+ }
	448	+
	449	+ public void setAbortion(Integer abortion) {
	450	+ this.abortion = abortion;
	451	+ }
	452	+
	453	+ public Integer getBirthDefect() {
	454	+ return birthDefect;
	455	+ }
	456	+
	457	+ public void setBirthDefect(Integer birthDefect) {
	458	+ this.birthDefect = birthDefect;
	459	+ }
	460	+
	461	+ public Integer getDelivery() {
	462	+ return delivery;
	463	+ }
	464	+
	465	+ public void setDelivery(Integer delivery) {
	466	+ this.delivery = delivery;
	467	+ }
	468	+
	469	+ public Integer getNeoDeath() {
	470	+ return neoDeath;
	471	+ }
	472	+
	473	+ public void setNeoDeath(Integer neoDeath) {
	474	+ this.neoDeath = neoDeath;
	475	+ }
	476	+
	477	+ public Integer getPlanedProd() {
	478	+ return planedProd;
	479	+ }
	480	+
	481	+ public void setPlanedProd(Integer planedProd) {
	482	+ this.planedProd = planedProd;
	483	+ }
	484	+
	485	+ public Integer getPregnancyTimes() {
	486	+ return pregnancyTimes;
	487	+ }
	488	+
	489	+ public void setPregnancyTimes(Integer pregnancyTimes) {
	490	+ this.pregnancyTimes = pregnancyTimes;
	491	+ }
	492	+
	493	+ public Integer getProdTime() {
483	494	return prodTime;
484	495	}
485	496
486		- public void setProdTime(String prodTime) {
	497	+ public void setProdTime(Integer prodTime) {
487	498	this.prodTime = prodTime;
488	499	}
489	500
490		-
491		- public String getStillbirth() {
	501	+ public Integer getStillbirth() {
492	502	return stillbirth;
493	503	}
494	504
495		- public void setStillbirth(String stillbirth) {
	505	+ public void setStillbirth(Integer stillbirth) {
496	506	this.stillbirth = stillbirth;
497	507	}
498	508
499		- public String getStillChan() {
	509	+ public Integer getStillChan() {
500	510	return stillChan;
501	511	}
502	512
503		- public void setStillChan(String stillChan) {
	513	+ public void setStillChan(Integer stillChan) {
504	514	this.stillChan = stillChan;
505	515	}
506	516
...	...	@@ -798,8 +808,8 @@
798	808
799	809	}
800	810	setSyjg(antExChuModel.getSyjg());
801		- setAbo(antExChuModel.getAbortion());
802		- setAlbumin(antExChuModel.getAbortion());
	811	+ setAbo(antExChuModel.getAbo());
	812	+ setAlbumin(antExChuModel.getAlbumin());
803	813	setXhdb(antExChuModel.getXhdb());
804	814	setBxbjs(antExChuModel.getBxbjs());
805	815	setPlatelet(antExChuModel.getPlatelet());