jiangjiazhi / regional-platform

Commit 6d21897c9e363664085dbaae18c5244cad44abfa

Authored by yangfei about 8 years ago

Exists in master and in 6 other branches

Merge remote-tracking branch 'origin/master'

Showing 8 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarMother.java
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarMother.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPatientExtendEarMotherRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/InitDataUtils.java

1	1	package com.lyms.platform.permission.model;
2	2
3	3	import java.util.Date;
	4	+import java.util.Map;
4	5
5	6	/**
6	7	* 儿童建档的母亲壬辰详情
7	8
8	9
9	10
10	11
11	12
12	13
13	14
14	15
15	16
16	17
17	18
18	19
19	20
20	21
21	22
22	23
23	24
24	25
25	26
26	27
27	28
28	29
29	30
30	31
31	32
32	33
33	34
34	35
35	36
36	37
37	38
38	39
39	40
40	41
41	42
42	43
43	44
44	45
45	46
46	47
47	48
48	49
49	50
50	51
51	52
52	53
53	54
54	55
55	56
56	57
57	58
58	59
59	60
60	61
61	62
...	...	@@ -16,351 +17,140 @@
16	17	/**
17	18	* 是否有流产史 1=有 -1=无
18	19	*/
19		- private Integer abortionHistoryType;
	20	+ private String abortionHistoryType;
20	21
	22	+
21	23	/**
22		- * 流产时间
23		- */
24		- private Date abortionDate;
25		-
26		- /**
27		- * 流产原因
28		- */
29		- private String abortionCause;
30		-
31		- /**
32		- * 流产方式 1=药物流产
33		- */
34		- private Integer abortionType;
35		-
36		- /**
37	24	* 妊娠期病毒感染史
38	25	*/
39		- private Integer viralInfectionHistoryType;
40		-
	26	+ private String viralInfectionHistoryType;
	27	+
	28	+
41	29	/**
42		- * 妊娠期病毒感染史类型：风疹巨细胞病毒疱疹弓形虫其他产考字典表
43		- */
44		- private String viralInfectionTypeId;
45		-
46		- /**
47		- * 妊娠期病毒感染史其他类型的描述信息
48		- */
49		- private String viralInfectionOtherDesc;
50		-
51		- /**
52		- * 妊娠期病毒感染史的孕周数
53		- */
54		- private Integer viralInfectionDate;
55		-
56		- /**
57	30	* 妊娠期外生殖器感染史 1=有 -1=无
58	31	*/
59		- private Integer genitalInfectionHistoryType;
	32	+ private String genitalInfectionHistoryType;
60	33
	34	+
61	35	/**
62		- * 妊娠期外生殖器感染史类型 1=淋病 2=梅毒 3=尖锐湿疹 4=其他
63		- */
64		- private String genitalInfectionTypeId;
65		-
66		- /**
67		- * 妊娠期外生殖器感染史其他类型的描述信息
68		- */
69		- private String genitalInfectionOtherDesc;
70		-
71		- /**
72		- * 妊娠期外生殖器感染史孕周数
73		- */
74		- private Integer genitalInfectionDate;
75		-
76		- /**
77	36	* 妊娠期放射性物质接触史
78	37	*/
79		- private Integer radiationType;
	38	+ private String radiationHistoryType;
80	39
	40	+
81	41	/**
82		- * 妊娠期放射性物质接触孕周
83		- */
84		- private Date radiationDate;
85		-
86		- /**
87	42	* 妊娠期药物应用史
88	43	*/
89		- private Integer drugAppType;
	44	+ private String drugAppType;
90	45
91	46	/**
92		- * 药物名称
93		- */
94		- private String drugAppName;
95		-
96		- /**
97		- * 用药时间
98		- */
99		- private Date drugAppUseDate;
100		-
101		- /**
102	47	* 有害物接触史
103	48	*/
104		- private Integer harmfulSubstanceType;
	49	+ private String harmfulSubstanceType;
105	50
106		- /**
107		- * 有害物的名称
108		- */
109		- private String harmfulSubstanceName;
	51	+
110	52
111	53	/**
112		- * 接触有害物的时间
113		- */
114		- private Date harmfulSubstanceDate;
115		-
116		- /**
117	54	* 妊娠期不良生活习惯史
118	55	*/
119		- private Integer badLifeHistoryType;
120		-
	56	+ private String badLifeHistoryType;
	57	+
	58	+
121	59	/**
122		- * 妊娠期不良生活的类型 1=吸烟 2=饮酒 3=吸毒
	60	+ * 是否有异常妊娠
123	61	*/
124		- private String badLifeTypeId;
125		-
	62	+ private String bnormalPregnancyHistoryType;
	63	+
126	64	/**
127	65	* 是否有妊娠期病史
128	66	*/
129		- private Integer medicalHistoryType;
130		-
	67	+ private String medicalHistoryType;
	68	+
131	69	/**
132		- * 妊娠期病史病史类型 1=糖尿病 2=肾炎 3=甲状腺功能减退 4=败血症 5=其他
133		- */
134		- private Integer medicalTypeId;
135		-
136		- /**
137		- * 妊娠期病史其他病史类型的描述
138		- */
139		- private String medicalOtherTypeDesc;
140		-
141		- /**
142		- * 是否有异常妊娠
143		- */
144		- private Integer bnormalPregnancyHistoryType;
145		-
146		- /**
147		- * 异常类型总和 1=妊高症 2=胎儿宫发育迟缓 3=母婴血型不和 4=其他
148		- */
149		- private String bnormalPregnancyTypeId;
150		-
151		- /**
152		- * 其他类型的描述
153		- */
154		- private String bnormalPregnancyOtherDesc;
155		-
156		- /**
157	70	* 儿童建档的主键
158	71	*/
159	72	private String babyPatientId;
160	73
161		- public Integer getGestationAge() {
162		- return gestationAge;
	74	+ public String getBnormalPregnancyHistoryType() {
	75	+ return bnormalPregnancyHistoryType;
163	76	}
164	77
165		- public void setGestationAge(Integer gestationAge) {
166		- this.gestationAge = gestationAge;
	78	+ public void setBnormalPregnancyHistoryType(String bnormalPregnancyHistoryType) {
	79	+ this.bnormalPregnancyHistoryType = bnormalPregnancyHistoryType;
167	80	}
168		- public Integer getAbortionHistoryType() {
169		- return abortionHistoryType;
170		- }
171	81
172		- public void setAbortionHistoryType(Integer abortionHistoryType) {
173		- this.abortionHistoryType = abortionHistoryType;
	82	+ public String getMedicalHistoryType() {
	83	+ return medicalHistoryType;
174	84	}
175		- public Date getAbortionDate() {
176		- return abortionDate;
177		- }
178	85
179		- public void setAbortionDate(Date abortionDate) {
180		- this.abortionDate = abortionDate;
	86	+ public void setMedicalHistoryType(String medicalHistoryType) {
	87	+ this.medicalHistoryType = medicalHistoryType;
181	88	}
182		- public String getAbortionCause() {
183		- return abortionCause;
184		- }
185	89
186		- public void setAbortionCause(String abortionCause) {
187		- this.abortionCause = abortionCause;
	90	+ public Integer getGestationAge() {
	91	+ return gestationAge;
188	92	}
189		- public Integer getAbortionType() {
190		- return abortionType;
191		- }
192	93
193		- public void setAbortionType(Integer abortionType) {
194		- this.abortionType = abortionType;
	94	+ public void setGestationAge(Integer gestationAge) {
	95	+ this.gestationAge = gestationAge;
195	96	}
196		- public Integer getViralInfectionHistoryType() {
197		- return viralInfectionHistoryType;
198		- }
199	97
200		- public void setViralInfectionHistoryType(Integer viralInfectionHistoryType) {
201		- this.viralInfectionHistoryType = viralInfectionHistoryType;
	98	+ public String getAbortionHistoryType() {
	99	+ return abortionHistoryType;
202	100	}
203		- public String getViralInfectionTypeId() {
204		- return viralInfectionTypeId;
205		- }
206	101
207		- public void setViralInfectionTypeId(String viralInfectionTypeId) {
208		- this.viralInfectionTypeId = viralInfectionTypeId;
	102	+ public void setAbortionHistoryType(String abortionHistoryType) {
	103	+ this.abortionHistoryType = abortionHistoryType;
209	104	}
210		- public String getViralInfectionOtherDesc() {
211		- return viralInfectionOtherDesc;
212		- }
213	105
214		- public void setViralInfectionOtherDesc(String viralInfectionOtherDesc) {
215		- this.viralInfectionOtherDesc = viralInfectionOtherDesc;
	106	+ public String getViralInfectionHistoryType() {
	107	+ return viralInfectionHistoryType;
216	108	}
217		- public Integer getViralInfectionDate() {
218		- return viralInfectionDate;
219		- }
220	109
221		- public void setViralInfectionDate(Integer viralInfectionDate) {
222		- this.viralInfectionDate = viralInfectionDate;
	110	+ public void setViralInfectionHistoryType(String viralInfectionHistoryType) {
	111	+ this.viralInfectionHistoryType = viralInfectionHistoryType;
223	112	}
224		- public Integer getGenitalInfectionHistoryType() {
	113	+
	114	+ public String getGenitalInfectionHistoryType() {
225	115	return genitalInfectionHistoryType;
226	116	}
227	117
228		- public void setGenitalInfectionHistoryType(Integer genitalInfectionHistoryType) {
	118	+ public void setGenitalInfectionHistoryType(String genitalInfectionHistoryType) {
229	119	this.genitalInfectionHistoryType = genitalInfectionHistoryType;
230	120	}
231		- public String getGenitalInfectionTypeId() {
232		- return genitalInfectionTypeId;
233		- }
234	121
235		- public void setGenitalInfectionTypeId(String genitalInfectionTypeId) {
236		- this.genitalInfectionTypeId = genitalInfectionTypeId;
	122	+ public String getRadiationHistoryType() {
	123	+ return radiationHistoryType;
237	124	}
238		- public String getGenitalInfectionOtherDesc() {
239		- return genitalInfectionOtherDesc;
240		- }
241	125
242		- public void setGenitalInfectionOtherDesc(String genitalInfectionOtherDesc) {
243		- this.genitalInfectionOtherDesc = genitalInfectionOtherDesc;
	126	+ public void setRadiationHistoryType(String radiationHistoryType) {
	127	+ this.radiationHistoryType = radiationHistoryType;
244	128	}
245		- public Integer getGenitalInfectionDate() {
246		- return genitalInfectionDate;
247		- }
248	129
249		- public void setGenitalInfectionDate(Integer genitalInfectionDate) {
250		- this.genitalInfectionDate = genitalInfectionDate;
251		- }
252		- public Integer getRadiationType() {
253		- return radiationType;
254		- }
255		-
256		- public void setRadiationType(Integer radiationType) {
257		- this.radiationType = radiationType;
258		- }
259		- public Date getRadiationDate() {
260		- return radiationDate;
261		- }
262		-
263		- public void setRadiationDate(Date radiationDate) {
264		- this.radiationDate = radiationDate;
265		- }
266		- public Integer getDrugAppType() {
	130	+ public String getDrugAppType() {
267	131	return drugAppType;
268	132	}
269	133
270		- public void setDrugAppType(Integer drugAppType) {
	134	+ public void setDrugAppType(String drugAppType) {
271	135	this.drugAppType = drugAppType;
272	136	}
273		- public String getDrugAppName() {
274		- return drugAppName;
275		- }
276	137
277		- public void setDrugAppName(String drugAppName) {
278		- this.drugAppName = drugAppName;
279		- }
280		- public Date getDrugAppUseDate() {
281		- return drugAppUseDate;
282		- }
283		-
284		- public void setDrugAppUseDate(Date drugAppUseDate) {
285		- this.drugAppUseDate = drugAppUseDate;
286		- }
287		- public Integer getHarmfulSubstanceType() {
	138	+ public String getHarmfulSubstanceType() {
288	139	return harmfulSubstanceType;
289	140	}
290	141
291		- public void setHarmfulSubstanceType(Integer harmfulSubstanceType) {
	142	+ public void setHarmfulSubstanceType(String harmfulSubstanceType) {
292	143	this.harmfulSubstanceType = harmfulSubstanceType;
293	144	}
294		- public String getHarmfulSubstanceName() {
295		- return harmfulSubstanceName;
296		- }
297	145
298		- public void setHarmfulSubstanceName(String harmfulSubstanceName) {
299		- this.harmfulSubstanceName = harmfulSubstanceName;
300		- }
301		- public Date getHarmfulSubstanceDate() {
302		- return harmfulSubstanceDate;
303		- }
304		-
305		- public void setHarmfulSubstanceDate(Date harmfulSubstanceDate) {
306		- this.harmfulSubstanceDate = harmfulSubstanceDate;
307		- }
308		- public Integer getBadLifeHistoryType() {
	146	+ public String getBadLifeHistoryType() {
309	147	return badLifeHistoryType;
310	148	}
311	149
312		- public void setBadLifeHistoryType(Integer badLifeHistoryType) {
	150	+ public void setBadLifeHistoryType(String badLifeHistoryType) {
313	151	this.badLifeHistoryType = badLifeHistoryType;
314	152	}
315		- public String getBadLifeTypeId() {
316		- return badLifeTypeId;
317		- }
318	153
319		- public void setBadLifeTypeId(String badLifeTypeId) {
320		- this.badLifeTypeId = badLifeTypeId;
321		- }
322		- public Integer getMedicalHistoryType() {
323		- return medicalHistoryType;
324		- }
325		-
326		- public void setMedicalHistoryType(Integer medicalHistoryType) {
327		- this.medicalHistoryType = medicalHistoryType;
328		- }
329		- public Integer getMedicalTypeId() {
330		- return medicalTypeId;
331		- }
332		-
333		- public void setMedicalTypeId(Integer medicalTypeId) {
334		- this.medicalTypeId = medicalTypeId;
335		- }
336		- public String getMedicalOtherTypeDesc() {
337		- return medicalOtherTypeDesc;
338		- }
339		-
340		- public void setMedicalOtherTypeDesc(String medicalOtherTypeDesc) {
341		- this.medicalOtherTypeDesc = medicalOtherTypeDesc;
342		- }
343		- public Integer getBnormalPregnancyHistoryType() {
344		- return bnormalPregnancyHistoryType;
345		- }
346		-
347		- public void setBnormalPregnancyHistoryType(Integer bnormalPregnancyHistoryType) {
348		- this.bnormalPregnancyHistoryType = bnormalPregnancyHistoryType;
349		- }
350		- public String getBnormalPregnancyTypeId() {
351		- return bnormalPregnancyTypeId;
352		- }
353		-
354		- public void setBnormalPregnancyTypeId(String bnormalPregnancyTypeId) {
355		- this.bnormalPregnancyTypeId = bnormalPregnancyTypeId;
356		- }
357		- public String getBnormalPregnancyOtherDesc() {
358		- return bnormalPregnancyOtherDesc;
359		- }
360		-
361		- public void setBnormalPregnancyOtherDesc(String bnormalPregnancyOtherDesc) {
362		- this.bnormalPregnancyOtherDesc = bnormalPregnancyOtherDesc;
363		- }
364	154	public String getBabyPatientId() {
365	155	return babyPatientId;
366	156	}
...	...	@@ -368,46 +158,5 @@
368	158	public void setBabyPatientId(String babyPatientId) {
369	159	this.babyPatientId = babyPatientId;
370	160	}
371		-
372		- @Override
373		- public String toString() {
374		- StringBuilder sb = new StringBuilder();
375		- sb.append("BabyPatientExtendEarMother [ ");
376		- sb.append("id=" + id + ",");
377		- sb.append("gestationAge=" + gestationAge + ",");
378		- sb.append("abortionHistoryType=" + abortionHistoryType + ",");
379		- sb.append("abortionDate=" + abortionDate + ",");
380		- sb.append("abortionCause=" + abortionCause + ",");
381		- sb.append("abortionType=" + abortionType + ",");
382		- sb.append("viralInfectionHistoryType=" + viralInfectionHistoryType + ",");
383		- sb.append("viralInfectionTypeId=" + viralInfectionTypeId + ",");
384		- sb.append("viralInfectionOtherDesc=" + viralInfectionOtherDesc + ",");
385		- sb.append("viralInfectionDate=" + viralInfectionDate + ",");
386		- sb.append("genitalInfectionHistoryType=" + genitalInfectionHistoryType + ",");
387		- sb.append("genitalInfectionTypeId=" + genitalInfectionTypeId + ",");
388		- sb.append("genitalInfectionOtherDesc=" + genitalInfectionOtherDesc + ",");
389		- sb.append("genitalInfectionDate=" + genitalInfectionDate + ",");
390		- sb.append("radiationType=" + radiationType + ",");
391		- sb.append("radiationDate=" + radiationDate + ",");
392		- sb.append("drugAppType=" + drugAppType + ",");
393		- sb.append("drugAppName=" + drugAppName + ",");
394		- sb.append("drugAppUseDate=" + drugAppUseDate + ",");
395		- sb.append("harmfulSubstanceType=" + harmfulSubstanceType + ",");
396		- sb.append("harmfulSubstanceName=" + harmfulSubstanceName + ",");
397		- sb.append("harmfulSubstanceDate=" + harmfulSubstanceDate + ",");
398		- sb.append("badLifeHistoryType=" + badLifeHistoryType + ",");
399		- sb.append("badLifeTypeId=" + badLifeTypeId + ",");
400		- sb.append("medicalHistoryType=" + medicalHistoryType + ",");
401		- sb.append("medicalTypeId=" + medicalTypeId + ",");
402		- sb.append("medicalOtherTypeDesc=" + medicalOtherTypeDesc + ",");
403		- sb.append("bnormalPregnancyHistoryType=" + bnormalPregnancyHistoryType + ",");
404		- sb.append("bnormalPregnancyTypeId=" + bnormalPregnancyTypeId + ",");
405		- sb.append("bnormalPregnancyOtherDesc=" + bnormalPregnancyOtherDesc + ",");
406		- sb.append("babyPatientId=" + babyPatientId + ",");
407		- sb.replace(sb.length()-1, sb.length(), " ]");
408		- return sb.toString();
409		- }
410		-
411		-
412	161	}

1	1	<?xml version="1.0" encoding="UTF-8" ?>
2	2	<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
3		-<mapper namespace="com.lyms.platform.permission.dao.BabyPatientExtendEarMotherMapper">
	3	+<mapper namespace="com.lyms.platform.permission.dao.master.BabyPatientExtendEarMotherMapper">
4	4
5	5	<resultMap id="BabyPatientExtendEarMotherResultMap" type="com.lyms.platform.permission.model.BabyPatientExtendEarMother">
6	6	<id column="id" property="id" jdbcType="VARCHAR" />
7	7	<result column="gestation_age" property="gestationAge" jdbcType="INTEGER" />
8		-<result column="abortion_history_type" property="abortionHistoryType" jdbcType="INTEGER" />
9		-<result column="abortion_date" property="abortionDate" jdbcType="TIMESTAMP" />
10		-<result column="abortion_cause" property="abortionCause" jdbcType="VARCHAR" />
11		-<result column="abortion_type" property="abortionType" jdbcType="INTEGER" />
12		-<result column="viral_infection_history_type" property="viralInfectionHistoryType" jdbcType="INTEGER" />
13		-<result column="viral_infection_type_id" property="viralInfectionTypeId" jdbcType="VARCHAR" />
14		-<result column="viral_infection_other_desc" property="viralInfectionOtherDesc" jdbcType="VARCHAR" />
15		-<result column="viral_infection_date" property="viralInfectionDate" jdbcType="INTEGER" />
16		-<result column="genital_infection_history_type" property="genitalInfectionHistoryType" jdbcType="INTEGER" />
17		-<result column="genital_infection_type_id" property="genitalInfectionTypeId" jdbcType="VARCHAR" />
18		-<result column="genital_infection_other_desc" property="genitalInfectionOtherDesc" jdbcType="VARCHAR" />
19		-<result column="genital_infection_date" property="genitalInfectionDate" jdbcType="INTEGER" />
20		-<result column="radiation_type" property="radiationType" jdbcType="INTEGER" />
21		-<result column="radiation_date" property="radiationDate" jdbcType="TIMESTAMP" />
22		-<result column="drug_app_type" property="drugAppType" jdbcType="INTEGER" />
	8	+<result column="abortion_history_type" property="abortionHistoryType" jdbcType="VARCHAR" />
	9	+<result column="viral_infection_history_type" property="viralInfectionHistoryType" jdbcType="VARCHAR" />
	10	+<result column="genital_infection_history_type" property="genitalInfectionHistoryType" jdbcType="VARCHAR" />
	11	+<result column="radiation_history_type" property="radiationHistoryType" jdbcType="INTEGER" />
23	12	<result column="drug_app_name" property="drugAppName" jdbcType="VARCHAR" />
24		-<result column="drug_app_use_date" property="drugAppUseDate" jdbcType="TIMESTAMP" />
25	13	<result column="harmful_substance_type" property="harmfulSubstanceType" jdbcType="INTEGER" />
26		-<result column="harmful_substance_name" property="harmfulSubstanceName" jdbcType="VARCHAR" />
27		-<result column="harmful_substance_date" property="harmfulSubstanceDate" jdbcType="TIMESTAMP" />
28	14	<result column="bad_life_history_type" property="badLifeHistoryType" jdbcType="INTEGER" />
29		-<result column="bad_life_type_id" property="badLifeTypeId" jdbcType="VARCHAR" />
30	15	<result column="medical_history_type" property="medicalHistoryType" jdbcType="INTEGER" />
31		-<result column="medical_type_id" property="medicalTypeId" jdbcType="INTEGER" />
32		-<result column="medical_other_type_desc" property="medicalOtherTypeDesc" jdbcType="VARCHAR" />
33	16	<result column="bnormal_pregnancy_history_type" property="bnormalPregnancyHistoryType" jdbcType="INTEGER" />
34		-<result column="bnormal_pregnancy_type_id" property="bnormalPregnancyTypeId" jdbcType="VARCHAR" />
35		-<result column="bnormal_pregnancy_other_desc" property="bnormalPregnancyOtherDesc" jdbcType="VARCHAR" />
36	17	<result column="baby_patient_id" property="babyPatientId" jdbcType="VARCHAR" />
	18	+<result column="baby_ear_id" property="babyEarId" jdbcType="VARCHAR" />
37	19	</resultMap>
38	20
39	21
40	22
41	23	<insert id="addBabyPatientExtendEarMother" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarMother">
42		-insert into baby_patient_extend_ear_mother (id,gestation_age,abortion_history_type,abortion_date,abortion_cause,abortion_type,viral_infection_history_type,viral_infection_type_id,viral_infection_other_desc,viral_infection_date,genital_infection_history_type,genital_infection_type_id,genital_infection_other_desc,genital_infection_date,radiation_type,radiation_date,drug_app_type,drug_app_name,drug_app_use_date,harmful_substance_type,harmful_substance_name,harmful_substance_date,bad_life_history_type,bad_life_type_id,medical_history_type,medical_type_id,medical_other_type_desc,bnormal_pregnancy_history_type,bnormal_pregnancy_type_id,bnormal_pregnancy_other_desc,baby_patient_id) values (#{id},#{gestationAge},#{abortionHistoryType},#{abortionDate},#{abortionCause},#{abortionType},#{viralInfectionHistoryType},#{viralInfectionTypeId},#{viralInfectionOtherDesc},#{viralInfectionDate},#{genitalInfectionHistoryType},#{genitalInfectionTypeId},#{genitalInfectionOtherDesc},#{genitalInfectionDate},#{radiationType},#{radiationDate},#{drugAppType},#{drugAppName},#{drugAppUseDate},#{harmfulSubstanceType},#{harmfulSubstanceName},#{harmfulSubstanceDate},#{badLifeHistoryType},#{badLifeTypeId},#{medicalHistoryType},#{medicalTypeId},#{medicalOtherTypeDesc},#{bnormalPregnancyHistoryType},#{bnormalPregnancyTypeId},#{bnormalPregnancyOtherDesc},#{babyPatientId})
	24	+insert into baby_patient_extend_ear_mother (id,gestation_age,abortion_history_type,viral_infection_history_type,genital_infection_history_type,radiation_history_type,drug_app_name,harmful_substance_type,bad_life_history_type,medical_history_type,bnormal_pregnancy_history_type,baby_patient_id,baby_ear_id) values (#{id},#{gestationAge},#{abortionHistoryType},#{viralInfectionHistoryType},#{genitalInfectionHistoryType},#{radiationHistoryType},#{drugAppName},#{harmfulSubstanceType},#{badLifeHistoryType},#{medicalHistoryType},#{bnormalPregnancyHistoryType},#{babyPatientId},#{babyEarId})
43	25	</insert>
44	26
45	27
46	28
47	29	<update id="updateBabyPatientExtendEarMother" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarMother">
48		-update baby_patient_extend_ear_mother <set>
49		- <if test="gestationAge != null and gestationAge >= 0">
	30	+update baby_patient_extend_ear_mother <set><if test="gestationAge != null and gestationAge >= 0">
50	31	gestation_age = #{gestationAge,jdbcType=INTEGER},
51	32	</if>
52		-<if test="abortionHistoryType != null and abortionHistoryType >= 0">
53		-abortion_history_type = #{abortionHistoryType,jdbcType=INTEGER},
	33	+<if test="abortionHistoryType != null and abortionHistoryType != ''">
	34	+abortion_history_type = #{abortionHistoryType,jdbcType=VARCHAR},
54	35	</if>
55		-<if test="abortionDate != null">
56		-abortion_date = #{abortionDate,jdbcType=TIMESTAMP},
	36	+<if test="viralInfectionHistoryType != null and viralInfectionHistoryType != ''">
	37	+viral_infection_history_type = #{viralInfectionHistoryType,jdbcType=VARCHAR},
57	38	</if>
58		-<if test="abortionCause != null and abortionCause != ''">
59		-abortion_cause = #{abortionCause,jdbcType=VARCHAR},
	39	+<if test="genitalInfectionHistoryType != null and genitalInfectionHistoryType != ''">
	40	+genital_infection_history_type = #{genitalInfectionHistoryType,jdbcType=VARCHAR},
60	41	</if>
61		-<if test="abortionType != null and abortionType >= 0">
62		-abortion_type = #{abortionType,jdbcType=INTEGER},
	42	+<if test="radiationHistoryType != null and radiationHistoryType >= 0">
	43	+radiation_history_type = #{radiationHistoryType,jdbcType=INTEGER},
63	44	</if>
64		-<if test="viralInfectionHistoryType != null and viralInfectionHistoryType >= 0">
65		-viral_infection_history_type = #{viralInfectionHistoryType,jdbcType=INTEGER},
66		-</if>
67		-<if test="viralInfectionTypeId != null and viralInfectionTypeId != ''">
68		-viral_infection_type_id = #{viralInfectionTypeId,jdbcType=VARCHAR},
69		-</if>
70		-<if test="viralInfectionOtherDesc != null and viralInfectionOtherDesc != ''">
71		-viral_infection_other_desc = #{viralInfectionOtherDesc,jdbcType=VARCHAR},
72		-</if>
73		-<if test="viralInfectionDate != null and viralInfectionDate >= 0">
74		-viral_infection_date = #{viralInfectionDate,jdbcType=INTEGER},
75		-</if>
76		-<if test="genitalInfectionHistoryType != null and genitalInfectionHistoryType >= 0">
77		-genital_infection_history_type = #{genitalInfectionHistoryType,jdbcType=INTEGER},
78		-</if>
79		-<if test="genitalInfectionTypeId != null and genitalInfectionTypeId != ''">
80		-genital_infection_type_id = #{genitalInfectionTypeId,jdbcType=VARCHAR},
81		-</if>
82		-<if test="genitalInfectionOtherDesc != null and genitalInfectionOtherDesc != ''">
83		-genital_infection_other_desc = #{genitalInfectionOtherDesc,jdbcType=VARCHAR},
84		-</if>
85		-<if test="genitalInfectionDate != null and genitalInfectionDate >= 0">
86		-genital_infection_date = #{genitalInfectionDate,jdbcType=INTEGER},
87		-</if>
88		-<if test="radiationType != null and radiationType >= 0">
89		-radiation_type = #{radiationType,jdbcType=INTEGER},
90		-</if>
91		- <if test="radiationDate != null">
92		-radiation_date = #{radiationDate,jdbcType=TIMESTAMP},
93		-</if>
94		-<if test="drugAppType != null and drugAppType >= 0">
95		-drug_app_type = #{drugAppType,jdbcType=INTEGER},
96		-</if>
97	45	<if test="drugAppName != null and drugAppName != ''">
98	46	drug_app_name = #{drugAppName,jdbcType=VARCHAR},
99	47	</if>
100		- <if test="drugAppUseDate != null">
101		-drug_app_use_date = #{drugAppUseDate,jdbcType=TIMESTAMP},
102		-</if>
103	48	<if test="harmfulSubstanceType != null and harmfulSubstanceType >= 0">
104	49	harmful_substance_type = #{harmfulSubstanceType,jdbcType=INTEGER},
105	50	</if>
106		-<if test="harmfulSubstanceName != null and harmfulSubstanceName != ''">
107		-harmful_substance_name = #{harmfulSubstanceName,jdbcType=VARCHAR},
108		-</if>
109		- <if test="harmfulSubstanceDate != null">
110		-harmful_substance_date = #{harmfulSubstanceDate,jdbcType=TIMESTAMP},
111		-</if>
112	51	<if test="badLifeHistoryType != null and badLifeHistoryType >= 0">
113	52	bad_life_history_type = #{badLifeHistoryType,jdbcType=INTEGER},
114	53	</if>
115		-<if test="badLifeTypeId != null and badLifeTypeId != ''">
116		-bad_life_type_id = #{badLifeTypeId,jdbcType=VARCHAR},
117		-</if>
118	54	<if test="medicalHistoryType != null and medicalHistoryType >= 0">
119	55	medical_history_type = #{medicalHistoryType,jdbcType=INTEGER},
120	56	</if>
121		-<if test="medicalTypeId != null and medicalTypeId >= 0">
122		-medical_type_id = #{medicalTypeId,jdbcType=INTEGER},
123		-</if>
124		-<if test="medicalOtherTypeDesc != null and medicalOtherTypeDesc != ''">
125		-medical_other_type_desc = #{medicalOtherTypeDesc,jdbcType=VARCHAR},
126		-</if>
127	57	<if test="bnormalPregnancyHistoryType != null and bnormalPregnancyHistoryType >= 0">
128	58	bnormal_pregnancy_history_type = #{bnormalPregnancyHistoryType,jdbcType=INTEGER},
129	59	</if>
130		-<if test="bnormalPregnancyTypeId != null and bnormalPregnancyTypeId != ''">
131		-bnormal_pregnancy_type_id = #{bnormalPregnancyTypeId,jdbcType=VARCHAR},
132		-</if>
133		-<if test="bnormalPregnancyOtherDesc != null and bnormalPregnancyOtherDesc != ''">
134		-bnormal_pregnancy_other_desc = #{bnormalPregnancyOtherDesc,jdbcType=VARCHAR},
135		-</if>
136	60	<if test="babyPatientId != null and babyPatientId != ''">
137	61	baby_patient_id = #{babyPatientId,jdbcType=VARCHAR},
138	62	</if>
	63	+<if test="babyEarId != null and babyEarId != ''">
	64	+baby_ear_id = #{babyEarId,jdbcType=VARCHAR},
	65	+</if>
139	66	</set>
140	67	where id = #{id,jdbcType=VARCHAR}
141	68	</update>
142	69
143	70
144		-<delete id="deleteBabyPatientExtendEarMother" parameterType="java.lang.String">
	71	+<delete id="deleteBabyPatientExtendEarMother" parameterType="java.lang.Integer">
145	72	delete from baby_patient_extend_ear_mother where id = #{id,jdbcType=VARCHAR}
146	73	</delete>
147	74
148	75
149	76
150		-<select id="getBabyPatientExtendEarMother" resultMap="BabyPatientExtendEarMotherResultMap" parameterType="java.lang.String">
151		-select id,gestation_age,abortion_history_type,abortion_date,abortion_cause,abortion_type,viral_infection_history_type,viral_infection_type_id,viral_infection_other_desc,viral_infection_date,genital_infection_history_type,genital_infection_type_id,genital_infection_other_desc,genital_infection_date,radiation_type,radiation_date,drug_app_type,drug_app_name,drug_app_use_date,harmful_substance_type,harmful_substance_name,harmful_substance_date,bad_life_history_type,bad_life_type_id,medical_history_type,medical_type_id,medical_other_type_desc,bnormal_pregnancy_history_type,bnormal_pregnancy_type_id,bnormal_pregnancy_other_desc,baby_patient_id
	77	+<select id="getBabyPatientExtendEarMother" resultMap="BabyPatientExtendEarMotherResultMap" parameterType="java.lang.Integer">
	78	+select id,gestation_age,abortion_history_type,viral_infection_history_type,genital_infection_history_type,radiation_history_type,drug_app_name,harmful_substance_type,bad_life_history_type,medical_history_type,bnormal_pregnancy_history_type,baby_patient_id,baby_ear_id
152	79	from baby_patient_extend_ear_mother where id = #{id,jdbcType=VARCHAR}
153	80	</select>
154	81
155	82
156	83
157	84
158	85
159	86
160	87
161	88
162	89
163	90
164	91
165	92
...	...	@@ -173,100 +100,46 @@
173	100	<if test="gestationAge != null and gestationAge >= 0">
174	101	and gestation_age = #{gestationAge,jdbcType=INTEGER}
175	102	</if>
176		-<if test="abortionHistoryType != null and abortionHistoryType >= 0">
177		-and abortion_history_type = #{abortionHistoryType,jdbcType=INTEGER}
	103	+<if test="abortionHistoryType != null and abortionHistoryType != ''">
	104	+and abortion_history_type = #{abortionHistoryType,jdbcType=VARCHAR}
178	105	</if>
179		-<if test="abortionDate != null">
180		-and abortion_date = #{abortionDate,jdbcType=TIMESTAMP}
	106	+<if test="viralInfectionHistoryType != null and viralInfectionHistoryType != ''">
	107	+and viral_infection_history_type = #{viralInfectionHistoryType,jdbcType=VARCHAR}
181	108	</if>
182		-<if test="abortionCause != null and abortionCause != ''">
183		-and abortion_cause = #{abortionCause,jdbcType=VARCHAR}
	109	+<if test="genitalInfectionHistoryType != null and genitalInfectionHistoryType != ''">
	110	+and genital_infection_history_type = #{genitalInfectionHistoryType,jdbcType=VARCHAR}
184	111	</if>
185		-<if test="abortionType != null and abortionType >= 0">
186		-and abortion_type = #{abortionType,jdbcType=INTEGER}
	112	+<if test="radiationHistoryType != null and radiationHistoryType >= 0">
	113	+and radiation_history_type = #{radiationHistoryType,jdbcType=INTEGER}
187	114	</if>
188		-<if test="viralInfectionHistoryType != null and viralInfectionHistoryType >= 0">
189		-and viral_infection_history_type = #{viralInfectionHistoryType,jdbcType=INTEGER}
190		-</if>
191		-<if test="viralInfectionTypeId != null and viralInfectionTypeId != ''">
192		-and viral_infection_type_id = #{viralInfectionTypeId,jdbcType=VARCHAR}
193		-</if>
194		-<if test="viralInfectionOtherDesc != null and viralInfectionOtherDesc != ''">
195		-and viral_infection_other_desc = #{viralInfectionOtherDesc,jdbcType=VARCHAR}
196		-</if>
197		-<if test="viralInfectionDate != null and viralInfectionDate >= 0">
198		-and viral_infection_date = #{viralInfectionDate,jdbcType=INTEGER}
199		-</if>
200		-<if test="genitalInfectionHistoryType != null and genitalInfectionHistoryType >= 0">
201		-and genital_infection_history_type = #{genitalInfectionHistoryType,jdbcType=INTEGER}
202		-</if>
203		-<if test="genitalInfectionTypeId != null and genitalInfectionTypeId != ''">
204		-and genital_infection_type_id = #{genitalInfectionTypeId,jdbcType=VARCHAR}
205		-</if>
206		-<if test="genitalInfectionOtherDesc != null and genitalInfectionOtherDesc != ''">
207		-and genital_infection_other_desc = #{genitalInfectionOtherDesc,jdbcType=VARCHAR}
208		-</if>
209		-<if test="genitalInfectionDate != null and genitalInfectionDate >= 0">
210		-and genital_infection_date = #{genitalInfectionDate,jdbcType=INTEGER}
211		-</if>
212		-<if test="radiationType != null and radiationType >= 0">
213		-and radiation_type = #{radiationType,jdbcType=INTEGER}
214		-</if>
215		- <if test="radiationDate != null" >
216		-and radiation_date = #{radiationDate,jdbcType=TIMESTAMP}
217		-</if>
218		-<if test="drugAppType != null and drugAppType >= 0">
219		-and drug_app_type = #{drugAppType,jdbcType=INTEGER}
220		-</if>
221	115	<if test="drugAppName != null and drugAppName != ''">
222	116	and drug_app_name = #{drugAppName,jdbcType=VARCHAR}
223	117	</if>
224		- <if test="drugAppUseDate != null">
225		-and drug_app_use_date = #{drugAppUseDate,jdbcType=TIMESTAMP}
226		-</if>
227	118	<if test="harmfulSubstanceType != null and harmfulSubstanceType >= 0">
228	119	and harmful_substance_type = #{harmfulSubstanceType,jdbcType=INTEGER}
229	120	</if>
230		-<if test="harmfulSubstanceName != null and harmfulSubstanceName != ''">
231		-and harmful_substance_name = #{harmfulSubstanceName,jdbcType=VARCHAR}
232		-</if>
233		- <if test="harmfulSubstanceDate != null">
234		-and harmful_substance_date = #{harmfulSubstanceDate,jdbcType=TIMESTAMP}
235		-</if>
236	121	<if test="badLifeHistoryType != null and badLifeHistoryType >= 0">
237	122	and bad_life_history_type = #{badLifeHistoryType,jdbcType=INTEGER}
238	123	</if>
239		-<if test="badLifeTypeId != null and badLifeTypeId != ''">
240		-and bad_life_type_id = #{badLifeTypeId,jdbcType=VARCHAR}
241		-</if>
242	124	<if test="medicalHistoryType != null and medicalHistoryType >= 0">
243	125	and medical_history_type = #{medicalHistoryType,jdbcType=INTEGER}
244	126	</if>
245		-<if test="medicalTypeId != null and medicalTypeId >= 0">
246		-and medical_type_id = #{medicalTypeId,jdbcType=INTEGER}
247		-</if>
248		-<if test="medicalOtherTypeDesc != null and medicalOtherTypeDesc != ''">
249		-and medical_other_type_desc = #{medicalOtherTypeDesc,jdbcType=VARCHAR}
250		-</if>
251	127	<if test="bnormalPregnancyHistoryType != null and bnormalPregnancyHistoryType >= 0">
252	128	and bnormal_pregnancy_history_type = #{bnormalPregnancyHistoryType,jdbcType=INTEGER}
253	129	</if>
254		-<if test="bnormalPregnancyTypeId != null and bnormalPregnancyTypeId != ''">
255		-and bnormal_pregnancy_type_id = #{bnormalPregnancyTypeId,jdbcType=VARCHAR}
256		-</if>
257		-<if test="bnormalPregnancyOtherDesc != null and bnormalPregnancyOtherDesc != ''">
258		-and bnormal_pregnancy_other_desc = #{bnormalPregnancyOtherDesc,jdbcType=VARCHAR}
259		-</if>
260	130	<if test="babyPatientId != null and babyPatientId != ''">
261	131	and baby_patient_id = #{babyPatientId,jdbcType=VARCHAR}
262	132	</if>
	133	+<if test="babyEarId != null and babyEarId != ''">
	134	+and baby_ear_id = #{babyEarId,jdbcType=VARCHAR}
	135	+</if>
263	136	</where>
264	137	</sql>
265	138
266	139
267	140
268	141	<select id="queryBabyPatientExtendEarMother" resultMap="BabyPatientExtendEarMotherResultMap" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEarMotherQuery">
269		-select id,gestation_age,abortion_history_type,abortion_date,abortion_cause,abortion_type,viral_infection_history_type,viral_infection_type_id,viral_infection_other_desc,viral_infection_date,genital_infection_history_type,genital_infection_type_id,genital_infection_other_desc,genital_infection_date,radiation_type,radiation_date,drug_app_type,drug_app_name,drug_app_use_date,harmful_substance_type,harmful_substance_name,harmful_substance_date,bad_life_history_type,bad_life_type_id,medical_history_type,medical_type_id,medical_other_type_desc,bnormal_pregnancy_history_type,bnormal_pregnancy_type_id,bnormal_pregnancy_other_desc,baby_patient_id
	142	+select id,gestation_age,abortion_history_type,viral_infection_history_type,genital_infection_history_type,radiation_history_type,drug_app_name,harmful_substance_type,bad_life_history_type,medical_history_type,bnormal_pregnancy_history_type,baby_patient_id,baby_ear_id
270	143	from baby_patient_extend_ear_mother
271	144	<include refid="BabyPatientExtendEarMotherCondition" />
272	145	<include refid="orderAndLimit" />

...	...	@@ -43,6 +43,12 @@
43	43	@Autowired
44	44	private BabyEarFacade babyEarFacade;
45	45
	46	+ @ResponseBody
	47	+ @RequestMapping(method = RequestMethod.GET,value = "/babyear/init")
	48	+ public BaseResponse babyEarInit(){
	49	+ return babyEarFacade.babyEarInit();
	50	+ }
	51	+
46	52	/**
47	53	* 增加儿童听力筛查
48	54	*

...	...	@@ -4,18 +4,19 @@
4	4	import com.lyms.platform.biz.service.PersonService;
5	5	import com.lyms.platform.common.base.IBasicRequestConvert;
6	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
7		-import com.lyms.platform.common.enums.BabyEarResultEnums;
8		-import com.lyms.platform.common.enums.DeafEnums;
9		-import com.lyms.platform.common.enums.HighRiskEnum;
10		-import com.lyms.platform.common.enums.YnEnums;
	7	+import com.lyms.platform.common.enums.*;
11	8	import com.lyms.platform.common.result.BaseObjectResponse;
12	9	import com.lyms.platform.common.result.BaseResponse;
13	10	import com.lyms.platform.common.result.RespBuilder;
14	11	import com.lyms.platform.common.utils.DateUtil;
	12	+import com.lyms.platform.common.utils.SystemConfig;
15	13	import com.lyms.platform.operate.web.request.BabyEarAddRequest;
16	14	import com.lyms.platform.operate.web.request.BabyEarBase;
	15	+import com.lyms.platform.operate.web.request.BabyPatientExtendEarMotherRequest;
17	16	import com.lyms.platform.operate.web.request.BabyScreenAddRequest;
18	17	import com.lyms.platform.operate.web.result.BabyEarResult;
	18	+import com.lyms.platform.operate.web.result.BasicConfigResult;
	19	+import com.lyms.platform.operate.web.utils.InitDataUtils;
19	20	import com.lyms.platform.permission.model.*;
20	21	import com.lyms.platform.permission.service.*;
21	22	import com.lyms.platform.pojo.BabyModel;
...	...	@@ -28,10 +29,7 @@
28	29	import org.springframework.beans.factory.annotation.Autowired;
29	30	import org.springframework.stereotype.Component;
30	31
31		-import java.util.Date;
32		-import java.util.HashMap;
33		-import java.util.List;
34		-import java.util.Map;
	32	+import java.util.*;
35	33
36	34
37	35	/**
...	...	@@ -176,7 +174,11 @@
176	174	//儿童家庭信息
177	175	BabyPatientExtendEarFamily babyPatientExtendEarFamily = babyEarAddRequest.getPatientExtendEarFamily();
178	176	//母亲信息
179		- BabyPatientExtendEarMother babyPatientExtendEarMother = babyEarAddRequest.getPatientExtendEarMother();
	177	+ BabyPatientExtendEarMotherRequest babyPatientExtendEarMotherRequest = babyEarAddRequest.getPatientExtendEarMother();
	178	+ BabyPatientExtendEarMother babyPatientExtendEarMother=null;
	179	+ if(null!=babyPatientExtendEarMotherRequest){
	180	+ babyPatientExtendEarMother= babyPatientExtendEarMotherRequest.convertToDataModel();
	181	+ }
180	182	String hId = autoMatchFacade.getHospitalId(userId);
181	183
182	184	if (null != baby) {
...	...	@@ -414,5 +416,46 @@
414	416	}
415	417	return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
416	418	}
	419	+
	420	+ public BaseResponse babyEarInit(){
	421	+ Map map = new HashMap();
	422	+ map.put("taishu", InitDataUtils.getTaiShu());
	423	+ map.put("sex", InitDataUtils.getSex());
	424	+ List<BasicConfigResult> pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
	425	+ map.put("certeType", pcerteTypeResult);
	426	+
	427	+ //文化程度
	428	+ List<BasicConfigResult> levelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);
	429	+ map.put("levelType", levelType);
	430	+
	431	+ // 职业类别
	432	+ List<BasicConfigResult> professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID);
	433	+ map.put("professionType", professionTypeResults);
	434	+
	435	+ //服务类型
	436	+ List serviceType = ServiceTypeEnums.getServiceTypeList();
	437	+ map.put("serviceType", serviceType);
	438	+
	439	+ //服务状态
	440	+ List serviceStatus = ServiceStatusEnums.getServiceStatusList();
	441	+ map.put("serviceStatus", serviceStatus);
	442	+
	443	+ //医院
	444	+ List hospitals = InitDataUtils.getAbortionEnums();
	445	+ map.put("liuchan", hospitals);
	446	+
	447	+ //分娩方式
	448	+ List fmType = FmTypeEnums.getFmTypeEnums();
	449	+ map.put("fmType", fmType);
	450	+
	451	+ //体验类型
	452	+ List expType = ExpEnums.getExpEnums();
	453	+ map.put("expType", expType);
	454	+ return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map);
	455	+ }
	456	+ @Autowired
	457	+ private BasicConfigFacade basicConfigFacade;
	458	+ @Autowired
	459	+ private AntenatalExaminationFacade antenatalExaminationFacade;
417	460	}

...	...	@@ -38,7 +38,7 @@
38	38	//儿童出生信息
39	39	private BabyPatientExtendEarBirth babyBirth;
40	40
41		- private BabyPatientExtendEarMother patientExtendEarMother;
	41	+ private BabyPatientExtendEarMotherRequest patientExtendEarMother;
42	42
43	43	private BabyPatientExtendEarFamily patientExtendEarFamily;
44	44
45	45
...	...	@@ -58,11 +58,11 @@
58	58	this.babyBirth = babyBirth;
59	59	}
60	60
61		- public BabyPatientExtendEarMother getPatientExtendEarMother() {
	61	+ public BabyPatientExtendEarMotherRequest getPatientExtendEarMother() {
62	62	return patientExtendEarMother;
63	63	}
64	64
65		- public void setPatientExtendEarMother(BabyPatientExtendEarMother patientExtendEarMother) {
	65	+ public void setPatientExtendEarMother(BabyPatientExtendEarMotherRequest patientExtendEarMother) {
66	66	this.patientExtendEarMother = patientExtendEarMother;
67	67	}
68	68

...	...	@@ -4,8 +4,6 @@
4	4	import com.lyms.platform.common.utils.DateUtil;
5	5	import com.lyms.platform.pojo.BabyModel;
6	6
7		-import java.util.Date;
8		-
9	7	/**
10	8	* 邮政编码和高危因素没有存储在mongodb
11	9	*
12	10
13	11
...	...	@@ -16,11 +14,28 @@
16	14	public BabyEarBase(){
17	15
18	16	}
	17	+ //住院号
	18	+ private String admissNo;
	19	+ //新生儿出院诊断
	20	+ private String dischargeDiagnosis;
	21	+ //建档医生
	22	+ private String createUserId;
	23	+ //建档时间
	24	+ private String createTime;
	25	+ //就诊卡号
	26	+ private String vcCardNo;
	27	+ //条码
	28	+ private String barCode;
	29	+ //备注
	30	+ private String remark;
19	31
	32	+ //服务状态
	33	+ private Integer serviceStatus;
	34	+ //服务状态
	35	+ private Integer serviceType;
20	36	private String id;
21	37	//儿童建档记录id
22	38	private String babyId;
23		- private String pid;
24	39	//儿童名字
25	40	private String name;
26	41	//儿童身份证号
...	...	@@ -81,6 +96,7 @@
81	96	private String postCode;
82	97	//性别
83	98	private Integer sex;
	99	+ private String pid;
84	100
85	101	// 父亲信息
86	102	private String fname;

	1	+package com.lyms.platform.operate.web.request;
	2	+
	3	+import com.lyms.platform.common.base.IBasicRequestConvert;
	4	+import com.lyms.platform.common.utils.JsonUtil;
	5	+import com.lyms.platform.permission.model.BabyPatientExtendEarMother;
	6	+
	7	+import java.util.List;
	8	+import java.util.Map;
	9	+
	10	+
	11	+/**
	12	+ * 添加类的一句话简单描述。
	13	+ * <p/>
	14	+ * 详细描述
	15	+ * <p/>
	16	+ * 示例代码
	17	+ * <pre>
	18	+ * </pre/>
	19	+ *
	20	+ * @author JIAZHI.JIANG
	21	+ * @version BME V100R001 2017-06-29 16:05
	22	+ * @since BME V100R001C40B104
	23	+ */
	24	+public class BabyPatientExtendEarMotherRequest implements IBasicRequestConvert<BabyPatientExtendEarMother> {
	25	+
	26	+ /**
	27	+ * 妊娠年龄
	28	+ */
	29	+ private Integer gestationAge;
	30	+ /**
	31	+ * 母亲高危因素
	32	+ */
	33	+ private List<String> mHighRisk;
	34	+
	35	+ /**
	36	+ * 是否有流产史 1=有 -1=无
	37	+ */
	38	+ private Map abortionHistoryType;
	39	+
	40	+
	41	+ /**
	42	+ * 妊娠期病毒感染史
	43	+ */
	44	+ private Map viralInfectionHistoryType;
	45	+
	46	+
	47	+ /**
	48	+ * 妊娠期外生殖器感染史 1=有 -1=无
	49	+ */
	50	+ private Map genitalInfectionHistoryType;
	51	+
	52	+
	53	+ /**
	54	+ * 妊娠期放射性物质接触史
	55	+ */
	56	+ private Map radiationHistoryType;
	57	+
	58	+
	59	+ /**
	60	+ * 妊娠期药物应用史
	61	+ */
	62	+ private Map drugAppType;
	63	+
	64	+ /**
	65	+ * 有害物接触史
	66	+ */
	67	+ private Map harmfulSubstanceType;
	68	+
	69	+ /**
	70	+ * 妊娠期不良生活习惯史
	71	+ */
	72	+ private Map badLifeHistoryType;
	73	+
	74	+
	75	+ /**
	76	+ * 是否有妊娠期病史
	77	+ */
	78	+ private Map medicalHistoryType;
	79	+
	80	+
	81	+ /**
	82	+ * 是否有异常妊娠
	83	+ */
	84	+ private Map bnormalPregnancyHistoryType;
	85	+ /**
	86	+ * 儿童建档的主键
	87	+ */
	88	+ private String babyPatientId;
	89	+ @Override
	90	+ public BabyPatientExtendEarMother convertToDataModel() {
	91	+ BabyPatientExtendEarMother babyPatientExtendEarMother = new BabyPatientExtendEarMother();
	92	+ babyPatientExtendEarMother.setGestationAge(gestationAge);
	93	+ babyPatientExtendEarMother.setBabyPatientId(babyPatientId);
	94	+ if(null!=badLifeHistoryType){
	95	+ babyPatientExtendEarMother.setBadLifeHistoryType(JsonUtil.obj2JsonString(badLifeHistoryType));
	96	+ }
	97	+
	98	+ if(null!=bnormalPregnancyHistoryType){
	99	+ babyPatientExtendEarMother.setBnormalPregnancyHistoryType(JsonUtil.obj2JsonString(bnormalPregnancyHistoryType));
	100	+ }
	101	+ if(null!=medicalHistoryType){
	102	+ babyPatientExtendEarMother.setMedicalHistoryType(JsonUtil.obj2JsonString(medicalHistoryType));
	103	+ }
	104	+ if(null!=harmfulSubstanceType){
	105	+ babyPatientExtendEarMother.setHarmfulSubstanceType(JsonUtil.obj2JsonString(harmfulSubstanceType));
	106	+ }
	107	+ if(null!=drugAppType){
	108	+ babyPatientExtendEarMother.setDrugAppType(JsonUtil.obj2JsonString(drugAppType));
	109	+ }
	110	+ if(null!=radiationHistoryType){
	111	+ babyPatientExtendEarMother.setRadiationHistoryType(JsonUtil.obj2JsonString(radiationHistoryType));
	112	+ }
	113	+
	114	+ if(null!=genitalInfectionHistoryType){
	115	+ babyPatientExtendEarMother.setGenitalInfectionHistoryType(JsonUtil.obj2JsonString(genitalInfectionHistoryType));
	116	+ }
	117	+ if(null!=viralInfectionHistoryType){
	118	+ babyPatientExtendEarMother.setViralInfectionHistoryType(JsonUtil.obj2JsonString(viralInfectionHistoryType));
	119	+ }
	120	+ if(null!=abortionHistoryType){
	121	+ babyPatientExtendEarMother.setAbortionHistoryType(JsonUtil.obj2JsonString(abortionHistoryType));
	122	+ }
	123	+ return babyPatientExtendEarMother;
	124	+ }
	125	+
	126	+ public Map getRadiationHistoryType() {
	127	+ return radiationHistoryType;
	128	+ }
	129	+
	130	+ public void setRadiationHistoryType(Map radiationHistoryType) {
	131	+ this.radiationHistoryType = radiationHistoryType;
	132	+ }
	133	+
	134	+ public Integer getGestationAge() {
	135	+ return gestationAge;
	136	+ }
	137	+
	138	+ public void setGestationAge(Integer gestationAge) {
	139	+ this.gestationAge = gestationAge;
	140	+ }
	141	+
	142	+ public Map getAbortionHistoryType() {
	143	+ return abortionHistoryType;
	144	+ }
	145	+
	146	+ public void setAbortionHistoryType(Map abortionHistoryType) {
	147	+ this.abortionHistoryType = abortionHistoryType;
	148	+ }
	149	+
	150	+
	151	+ public Map getViralInfectionHistoryType() {
	152	+ return viralInfectionHistoryType;
	153	+ }
	154	+
	155	+ public void setViralInfectionHistoryType(Map viralInfectionHistoryType) {
	156	+ this.viralInfectionHistoryType = viralInfectionHistoryType;
	157	+ }
	158	+
	159	+ public Map getGenitalInfectionHistoryType() {
	160	+ return genitalInfectionHistoryType;
	161	+ }
	162	+
	163	+ public void setGenitalInfectionHistoryType(Map genitalInfectionHistoryType) {
	164	+ this.genitalInfectionHistoryType = genitalInfectionHistoryType;
	165	+ }
	166	+
	167	+
	168	+ public Map getDrugAppType() {
	169	+ return drugAppType;
	170	+ }
	171	+
	172	+ public void setDrugAppType(Map drugAppType) {
	173	+ this.drugAppType = drugAppType;
	174	+ }
	175	+
	176	+ public Map getHarmfulSubstanceType() {
	177	+ return harmfulSubstanceType;
	178	+ }
	179	+
	180	+ public void setHarmfulSubstanceType(Map harmfulSubstanceType) {
	181	+ this.harmfulSubstanceType = harmfulSubstanceType;
	182	+ }
	183	+
	184	+ public Map getBadLifeHistoryType() {
	185	+ return badLifeHistoryType;
	186	+ }
	187	+
	188	+ public void setBadLifeHistoryType(Map badLifeHistoryType) {
	189	+ this.badLifeHistoryType = badLifeHistoryType;
	190	+ }
	191	+
	192	+ public Map getMedicalHistoryType() {
	193	+ return medicalHistoryType;
	194	+ }
	195	+
	196	+ public void setMedicalHistoryType(Map medicalHistoryType) {
	197	+ this.medicalHistoryType = medicalHistoryType;
	198	+ }
	199	+
	200	+ public Map getBnormalPregnancyHistoryType() {
	201	+ return bnormalPregnancyHistoryType;
	202	+ }
	203	+
	204	+ public void setBnormalPregnancyHistoryType(Map bnormalPregnancyHistoryType) {
	205	+ this.bnormalPregnancyHistoryType = bnormalPregnancyHistoryType;
	206	+ }
	207	+
	208	+ public String getBabyPatientId() {
	209	+ return babyPatientId;
	210	+ }
	211	+
	212	+ public void setBabyPatientId(String babyPatientId) {
	213	+ this.babyPatientId = babyPatientId;
	214	+ }
	215	+
	216	+
	217	+}

...	...	@@ -193,6 +193,17 @@
193	193	}
194	194	return list;
195	195	}
	196	+ //流产方式
	197	+ public static List getAbortionEnums() {
	198	+ List<Object> list = new ArrayList<>();
	199	+ for (AbortionEnums enums : AbortionEnums.values()) {
	200	+ Map<String, Object> resultMap = new HashMap<>();
	201	+ resultMap.put("id", enums.getId());
	202	+ resultMap.put("name", enums.getName());
	203	+ list.add(resultMap);
	204	+ }
	205	+ return list;
	206	+ }
196	207
197	208	/**
198	209	* 获取性别