jiangjiazhi / regional-platform

Commit 43c9aa6a21adfb4d1ef28bbaf4380290a0600d6a

Authored by liquanyu almost 9 years ago

Exists in master and in 8 other branches

儿童建档

Showing 9 changed files with 321 additions and 46 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/ServiceTypeEnums.java
platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+import java.util.ArrayList;
	4	+import java.util.HashMap;
	5	+import java.util.List;
	6	+import java.util.Map;
	7	+
	8	+/**
	9	+ * Created by Administrator on 2016/3/29 0029.
	10	+ */
	11	+public enum ServiceTypeEnums {
	12	+
	13	+
	14	+ OPEN(0,"开通"),SUSPEND(1,"暂停"),UNSUBSCRIBE(2,"退订"),NO_OPEN(3,"未开通"),STOP(4,"终止");
	15	+
	16	+ private ServiceTypeEnums(int id, String title){
	17	+ this.title=title;
	18	+ this.id =id;
	19	+ }
	20	+ private String title;
	21	+ private int id;
	22	+
	23	+ public int getId() {
	24	+ return id;
	25	+ }
	26	+
	27	+ public String getTitle() {
	28	+ return title;
	29	+ }
	30	+
	31	+ public static List<Map<String,String>> getServiceTypeList()
	32	+ {
	33	+ List<Map<String,String>> list = new ArrayList<>();
	34	+ for(ServiceTypeEnums s : ServiceTypeEnums.values()) {
	35	+ Map<String,String> map = new HashMap<>();
	36	+ map.put("id", s.getId()+"");
	37	+ map.put("title", s.getTitle());
	38	+ list.add(map);
	39	+ }
	40	+ return list;
	41	+ }
	42	+}

...	...	@@ -25,6 +25,9 @@
25	25	//居住类型
26	26	public static final String LIVE_TYPE_ID = "57624c330cf23d4631523ea0";
27	27
	28	+ //文化程度
	29	+ public static final String LEVEL_TYPE_ID = "8046934b-ebe8-4037-98b6-a9ec47996700";
	30	+
28	31
29	32	}

...	...	@@ -102,6 +102,12 @@
102	102
103	103	private int yn = -1;
104	104
	105	+ //母亲证件号
	106	+ private String mcertNo;
	107	+
	108	+ //就诊卡号
	109	+ private String vcCardNo;
	110	+
105	111	public int getYn() {
106	112	return yn;
107	113	}
...	...	@@ -189,6 +195,15 @@
189	195	if(null!=isNull){
190	196	condition=condition.and("communityId", null, MongoOper.IS);
191	197	}
	198	+
	199	+ if(null!=mcertNo){
	200	+ condition=condition.and("mcertNo", null, MongoOper.IS);
	201	+ }
	202	+
	203	+ if(null!=vcCardNo){
	204	+ condition=condition.and("vcCardNo", null, MongoOper.IS);
	205	+ }
	206	+
192	207	if (null != keyword) {
193	208	if (null != keyword) {
194	209	MongoCondition con1 = MongoCondition.newInstance("mphone", "^"+keyword, MongoOper.LIKE);
...	...	@@ -226,6 +241,22 @@
226	241	return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
227	242	}
228	243	return condition.toMongoQuery();
	244	+ }
	245	+
	246	+ public String getMcertNo() {
	247	+ return mcertNo;
	248	+ }
	249	+
	250	+ public void setMcertNo(String mcertNo) {
	251	+ this.mcertNo = mcertNo;
	252	+ }
	253	+
	254	+ public String getVcCardNo() {
	255	+ return vcCardNo;
	256	+ }
	257	+
	258	+ public void setVcCardNo(String vcCardNo) {
	259	+ this.vcCardNo = vcCardNo;
229	260	}
230	261	}

...	...	@@ -9,17 +9,20 @@
9	9	import com.lyms.platform.common.result.BaseObjectResponse;
10	10	import com.lyms.platform.common.result.BaseResponse;
11	11	import com.lyms.platform.common.utils.StringUtils;
	12	+import com.lyms.platform.common.utils.SystemConfig;
12	13	import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade;
13	14	import com.lyms.platform.operate.web.facade.BookbuildingFacade;
14	15	import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
15	16	import com.lyms.platform.operate.web.request.BookbuildingQueryRequest;
16	17	import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest;
	18	+import com.lyms.platform.operate.web.result.BasicConfigResult;
17	19	import com.lyms.platform.pojo.BabyModel;
18	20	import org.springframework.beans.factory.annotation.Autowired;
19	21	import org.springframework.stereotype.Controller;
20	22	import org.springframework.web.bind.annotation.*;
21	23
22	24	import javax.validation.Valid;
	25	+import java.util.List;
23	26
24	27
25	28	/*
26	29
...	...	@@ -73,12 +76,37 @@
73	76	* @param id
74	77	* @return
75	78	*/
76		- @RequestMapping(value = "/queryBabyBuildById/{id}", method = RequestMethod.DELETE)
	79	+ @RequestMapping(value = "/queryBabyBuildById/{id}", method = RequestMethod.GET)
77	80	@ResponseBody
78	81	public BaseObjectResponse queryBabyBuildById(@PathVariable("id")String id){
79	82	return babyBookbuildingFacade.queryBabyBuildById(id);
80	83	}
81	84
	85	+ /**
	86	+ * 查询儿童建档就诊卡号，母亲身份证
	87	+ * @param idCard
	88	+ * @param vcCardNo
	89	+ * @return
	90	+ */
	91	+ @RequestMapping(value = "/queryBabyBuild", method = RequestMethod.GET)
	92	+ @ResponseBody
	93	+ public BaseObjectResponse queryBabyBuild(@RequestParam("idCard")String idCard,@RequestParam("vcCardNo")String vcCardNo){
	94	+ BookbuildingQueryRequest param = new BookbuildingQueryRequest();
	95	+ param.setIdCard(idCard);
	96	+ param.setVcCardNo(vcCardNo);
	97	+ return babyBookbuildingFacade.queryBabyBuild(param);
	98	+ }
	99	+
	100	+
	101	+ /**
	102	+ * 查询儿童建档页面基础数据
	103	+ * @return
	104	+ */
	105	+ @RequestMapping(value = "/getBabyBuildBaseConfig", method = RequestMethod.GET)
	106	+ @ResponseBody
	107	+ public BaseObjectResponse getBabyBuildBaseConfig(){
	108	+ return babyBookbuildingFacade.getBabyBuildBaseConfig();
	109	+ }
82	110
83	111	}

...	...	@@ -4,11 +4,14 @@
4	4	import com.lyms.platform.biz.service.BasicConfigService;
5	5	import com.lyms.platform.biz.service.YunBookbuildingService;
6	6	import com.lyms.platform.common.constants.ErrorCodeConstants;
	7	+import com.lyms.platform.common.enums.ServiceTypeEnums;
7	8	import com.lyms.platform.common.enums.YnEnums;
8	9	import com.lyms.platform.common.result.BaseListResponse;
9	10	import com.lyms.platform.common.result.BaseObjectResponse;
10	11	import com.lyms.platform.common.result.BaseResponse;
11	12	import com.lyms.platform.common.utils.DateUtil;
	13	+import com.lyms.platform.common.utils.JsonUtil;
	14	+import com.lyms.platform.common.utils.StringUtils;
12	15	import com.lyms.platform.common.utils.SystemConfig;
13	16	import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest;
14	17	import com.lyms.platform.operate.web.request.BookbuildingQueryRequest;
15	18
...	...	@@ -41,7 +44,11 @@
41	44	private BabyBookbuildingService babyBookbuildingService;
42	45
43	46	@Autowired
	47	+ private BasicConfigFacade basicConfigFacade;
	48	+
	49	+ @Autowired
44	50	private BasicConfigService basicConfigService;
	51	+ private BaseObjectResponse babyBuildBaseConfig;
45	52
46	53	/**
47	54	* 修改儿童建档
...	...	@@ -111,6 +118,13 @@
111	118	bm.setAreaId(b.getHomeAreaId());
112	119	bm.setStreetId(b.getHomeStreetId());
113	120
	121	+ bm.setFetusCount(b.getFetusCount());
	122	+ bm.setDueCount(b.getDueCount());
	123	+ bm.setBabyHead(b.getBabyHead());
	124	+ bm.setBabyHeight(b.getBabyHeight());
	125	+ bm.setBabyWeight(b.getBabyWeight());
	126	+ bm.setHospitalId(b.getHospitalId());
	127	+
114	128	bm.setDueDate(DateUtil.parseYMD(b.getDueDate()));
115	129	bm.setDueType(b.getDueType());
116	130	bm.setIsMalformation(b.getIsMalformation());
...	...	@@ -120,6 +134,7 @@
120	134	bm.setServiceType(b.getServiceType());
121	135	bm.setVcCardNo(b.getVcCardNo());
122	136	bm.setHospitalId(b.getHospitalId());
	137	+ bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar()));
123	138	return bm;
124	139	}
125	140
126	141
127	142
...	...	@@ -131,21 +146,144 @@
131	146	babyBookbuildingService.deleteBabyById(id);
132	147	}
133	148
	149	+ /**
	150	+ * 儿童建档查询详情，根据ID、
	151	+ * @param id
	152	+ * @return
	153	+ */
134	154	public BaseObjectResponse queryBabyBuildById(String id) {
135	155
136	156	BabyModelQuery babyQuery = new BabyModelQuery();
137	157	babyQuery.setId(id);
138	158	babyQuery.setYn(YnEnums.YES.getId());
139	159	BabyBuildResult result = new BabyBuildResult();
140		- babyBookbuildingService.queryBabyBuildById(babyQuery);
141		-//
142		-// BaseObjectResponse objectResponse = new BaseObjectResponse();
143		-// objectResponse.setData(result);
144		-// objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
145		-// objectResponse.setErrormsg("成功");
146		-// return objectResponse;
	160	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildById(babyQuery);
	161	+ if (models != null && models.size() > 0)
	162	+ {
	163	+ BabyModel model = models.get(0);
	164	+ result = getBabyBuildResult(model);
147	165
148		- return null;
	166	+ }
	167	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	168	+ objectResponse.setData(result);
	169	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	170	+ objectResponse.setErrormsg("成功");
	171	+ return objectResponse;
	172	+ }
	173	+
	174	+ /**
	175	+ * 构建返回数据
	176	+ * @param model
	177	+ * @return
	178	+ */
	179	+ private BabyBuildResult getBabyBuildResult(BabyModel model)
	180	+ {
	181	+ BabyBuildResult result = new BabyBuildResult();
	182	+ result.setId(model.getId());
	183	+ //母亲信息
	184	+ result.setMommyName(model.getMname());
	185	+ result.setMommyCertificateTypeId(model.getMcertTypeId());
	186	+ result.setMommyCertificateNum(model.getMcertNo());
	187	+ result.setMommyBirthday(DateUtil.getyyyy_MM_dd(model.getMbirth()));
	188	+ result.setMommyLevelId(model.getmLevelId());
	189	+ result.setMommyProfessionTypeId(model.getMproTypeId());
	190	+ result.setMommyPhone(model.getMphone());
	191	+
	192	+ //父亲信息
	193	+ result.setFatherName(model.getFname());
	194	+ result.setFatherPhone(model.getFphone());
	195	+ result.setFatherBirthday(DateUtil.getyyyy_MM_dd(model.getFbirth()));
	196	+ result.setFatherLevelId(model.getfLevelId());
	197	+ result.setFatherProfessionTypeId(model.getFproTypeId());
	198	+
	199	+ //儿童信息
	200	+ result.setBabyName(model.getName());
	201	+ result.setGender(model.getSex());
	202	+ result.setBabyCardNo(model.getCardNo());
	203	+ result.setBabyBirthday(DateUtil.getyyyy_MM_dd(model.getBirth()));
	204	+ result.setHomeAddress(model.getAddress());
	205	+ result.setHomeProvinceId(model.getProvinceId());
	206	+ result.setHomeCityId(model.getCityId());
	207	+ result.setHomeAreaId(model.getAreaId());
	208	+ result.setHomeStreetId(model.getStreetId());
	209	+
	210	+ //出生信息
	211	+ result.setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
	212	+ result.setDueType(model.getDueType());
	213	+ result.setFetusCount(model.getFetusCount());
	214	+ result.setDueCount(model.getDueCount());
	215	+ result.setBabyHeight(model.getBabyHeight());
	216	+ result.setBabyWeight(model.getBabyWeight());
	217	+ result.setBabyHead(model.getBabyHead());
	218	+ result.setDeliverOrg(model.getOrg());
	219	+ result.setIsMalformation(model.getIsMalformation());
	220	+ result.setApgar(JsonUtil.str2Obj(model.getApgarScore(), Map.class));
	221	+
	222	+ result.setBuildDoctor(model.getBuildDoctor());
	223	+ result.setBuildDate(DateUtil.getyyyy_MM_dd(model.getBuildDate()));
	224	+ result.setServiceType(model.getServiceType());
	225	+ result.setVcCardNo(model.getVcCardNo());
	226	+ result.setHospitalId(model.getHospitalId());
	227	+ return result;
	228	+ }
	229	+
	230	+
	231	+ /**
	232	+ * 根据母亲身份证或者就诊卡号
	233	+ * @param param
	234	+ * @return
	235	+ */
	236	+ public BaseObjectResponse queryBabyBuild(BookbuildingQueryRequest param) {
	237	+
	238	+ BabyBuildResult result = new BabyBuildResult();
	239	+ if (!StringUtils.isEmpty(param.getVcCardNo()) \|\| !StringUtils.isEmpty(param.getIdCard()))
	240	+ {
	241	+ BabyModelQuery babyQuery = new BabyModelQuery();
	242	+ babyQuery.setMcertNo(param.getIdCard());
	243	+ babyQuery.setVcCardNo(param.getVcCardNo());
	244	+ babyQuery.setYn(YnEnums.YES.getId());
	245	+
	246	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildById(babyQuery);
	247	+ if (models != null && models.size() > 0)
	248	+ {
	249	+ BabyModel model = models.get(0);
	250	+ result = getBabyBuildResult(model);
	251	+ }
	252	+ }
	253	+
	254	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	255	+ objectResponse.setData(result);
	256	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	257	+ objectResponse.setErrormsg("成功");
	258	+ return objectResponse;
	259	+
	260	+ }
	261	+
	262	+ /**
	263	+ * 查询儿童建档页面基础数据
	264	+ * @return
	265	+ */
	266	+ public BaseObjectResponse getBabyBuildBaseConfig() {
	267	+ Map<String,List> map = new HashMap();
	268	+
	269	+ //证件类型
	270	+ List<BasicConfigResult> pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
	271	+ map.put("certeType",pcerteTypeResult);
	272	+
	273	+ //文化程度
	274	+ List<BasicConfigResult> levelType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LEVEL_TYPE_ID);
	275	+ map.put("levelType",levelType);
	276	+
	277	+ // 职业类别
	278	+ List<BasicConfigResult> professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID);
	279	+ map.put("professionType",professionTypeResults);
	280	+
	281	+ BaseObjectResponse objectResponse = new BaseObjectResponse();
	282	+ objectResponse.setData(map);
	283	+ objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
	284	+ objectResponse.setErrormsg("成功");
	285	+
	286	+ return objectResponse;
149	287	}
150	288	}

...	...	@@ -140,5 +140,36 @@
140	140	}
141	141	return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
142	142	}
	143	+
	144	+
	145	+ /**
	146	+ * 查询基础数据通过parentId
	147	+ * @param parentId
	148	+ * @return
	149	+ */
	150	+ public List<BasicConfigResult> getBaseicConfigByParentId(String parentId)
	151	+ {
	152	+ BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
	153	+ basicConfigQuery.setNeed("1");
	154	+ basicConfigQuery.setYn(YnEnums.YES.getId());
	155	+ basicConfigQuery.setParentId(parentId);
	156	+ List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
	157	+ List<BasicConfigResult> provincesResults = new ArrayList<>();
	158	+ if (datas != null)
	159	+ {
	160	+ for(BasicConfig data : datas)
	161	+ {
	162	+ BasicConfigResult br = new BasicConfigResult();
	163	+ br.setId(data.getId());
	164	+ br.setCode(data.getCode());
	165	+ br.setEnable(data.getEnable());
	166	+ br.setName(data.getName());
	167	+ br.setParentId(data.getParentId());
	168	+ provincesResults.add(br);
	169	+ }
	170	+
	171	+ }
	172	+ return provincesResults;
	173	+ }
143	174	}

1	1	package com.lyms.platform.operate.web.facade;
2	2
3	3	import com.lyms.platform.biz.service.BasicConfigService;
	4	+import com.lyms.platform.common.enums.ServiceTypeEnums;
4	5	import com.lyms.platform.common.enums.YnEnums;
5	6	import com.lyms.platform.common.result.BaseListResponse;
6	7	import com.lyms.platform.common.utils.StringUtils;
7	8
...	...	@@ -37,9 +38,8 @@
37	38	private YunBookbuildingService yunBookbuildingService;
38	39
39	40	@Autowired
40		- private BasicConfigService basicConfigService;
	41	+ private BasicConfigFacade basicConfigFacade;
41	42
42		-
43	43	/**
44	44	* 添加孕妇建档
45	45	* @param yunRequest
46	46
47	47
48	48
49	49
50	50
51	51
...	...	@@ -112,29 +112,33 @@
112	112	Map<String,List> mapProvince = new HashMap<>();
113	113
114	114	//证件类型
115		- List<BasicConfigResult> pcerteTypeResult = getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
	115	+ List<BasicConfigResult> pcerteTypeResult = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CERTE_TYPE_ID);
116	116	mapProvince.put("certeType",pcerteTypeResult);
117	117
118	118	//国籍
119		- List<BasicConfigResult> countiryResults = getBaseicConfigByParentId(SystemConfig.COUNTRY_TYPE_ID);
	119	+ List<BasicConfigResult> countiryResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.COUNTRY_TYPE_ID);
120	120	mapProvince.put("country",countiryResults);
121	121
122	122	// 民族
123		- List<BasicConfigResult> nationResults = getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
	123	+ List<BasicConfigResult> nationResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.NATION_TYPE_ID);
124	124	mapProvince.put("nation",nationResults);
125	125
126	126	// 职业类别
127		- List<BasicConfigResult> professionTypeResults = getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID);
	127	+ List<BasicConfigResult> professionTypeResults = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.PROFESSION_TYPE_ID);
128	128	mapProvince.put("professionType",professionTypeResults);
129	129
130	130	// 户籍类别
131		- List<BasicConfigResult> censusType = getBaseicConfigByParentId(SystemConfig.CENSUS_TYPE_ID);
	131	+ List<BasicConfigResult> censusType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.CENSUS_TYPE_ID);
132	132	mapProvince.put("censusType",censusType);
133	133
134	134	// 户籍类别
135		- List<BasicConfigResult> liveType = getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID);
	135	+ List<BasicConfigResult> liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID);
136	136	mapProvince.put("liveType",liveType);
137	137
	138	+ //服务类型
	139	+ List servictType = ServiceTypeEnums.getServiceTypeList();
	140	+ mapProvince.put("servictType",servictType);
	141	+
138	142	list.add(mapProvince);
139	143
140	144
141	145
...	...	@@ -149,35 +153,7 @@
149	153	return listResponse;
150	154	}
151	155
152		- /**
153		- * 查询基础数据通过parentId
154		- * @param parentId
155		- * @return
156		- */
157		- private List<BasicConfigResult> getBaseicConfigByParentId(String parentId)
158		- {
159		- BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
160		- basicConfigQuery.setNeed("1");
161		- basicConfigQuery.setYn(YnEnums.YES.getId());
162		- basicConfigQuery.setParentId(parentId);
163		- List<BasicConfig> datas = basicConfigService.queryBasicConfig(basicConfigQuery);
164		- List<BasicConfigResult> provincesResults = new ArrayList<>();
165		- if (datas != null)
166		- {
167		- for(BasicConfig data : datas)
168		- {
169		- BasicConfigResult br = new BasicConfigResult();
170		- br.setId(data.getId());
171		- br.setCode(data.getCode());
172		- br.setEnable(data.getEnable());
173		- br.setName(data.getName());
174		- br.setParentId(data.getParentId());
175		- provincesResults.add(br);
176		- }
177	156
178		- }
179		- return provincesResults;
180		- }
181	157
182	158
183	159	/**

...	...	@@ -2,6 +2,8 @@
2	2
3	3	import com.lyms.platform.common.core.annotation.form.Form;
4	4
	5	+import java.util.Map;
	6	+
5	7	/**
6	8	* Created by lqy on 2016/6/15.
7	9	*/
...	...	@@ -88,6 +90,9 @@
88	90	//助产机构
89	91	private String deliverOrg;
90	92
	93	+ //apgar评分
	94	+ private Map<String,String> apgar;
	95	+
91	96	//是否畸形 0非畸形 1畸形
92	97	private Integer isMalformation;
93	98
...	...	@@ -388,6 +393,14 @@
388	393
389	394	public void setVcCardNo(String vcCardNo) {
390	395	this.vcCardNo = vcCardNo;
	396	+ }
	397	+
	398	+ public Map<String, String> getApgar() {
	399	+ return apgar;
	400	+ }
	401	+
	402	+ public void setApgar(Map<String, String> apgar) {
	403	+ this.apgar = apgar;
391	404	}
392	405	}

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import java.util.Map;
	4	+
3	5	/**
4	6	* Created by lqy on 2016/6/17.
5	7	*/
...	...	@@ -88,6 +90,9 @@
88	90	//是否畸形 0非畸形 1畸形
89	91	private Integer isMalformation;
90	92
	93	+ //apgar评分
	94	+ private Map<String,String> apgar;
	95	+
91	96	//建档医生
92	97	private String buildDoctor;
93	98	//建档日期
...	...	@@ -385,6 +390,14 @@
385	390
386	391	public void setVcCardNo(String vcCardNo) {
387	392	this.vcCardNo = vcCardNo;
	393	+ }
	394	+
	395	+ public Map<String, String> getApgar() {
	396	+ return apgar;
	397	+ }
	398	+
	399	+ public void setApgar(Map<String, String> apgar) {
	400	+ this.apgar = apgar;
388	401	}
389	402	}