jiangjiazhi / center

Commit f18aa9057317384b4860cb9e2f388b346405f9d6

Authored by xujiahong over 8 years ago

Exists in master

日常提交：保存分娩等

Showing 11 changed files with 195 additions and 65 deletions

parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthInfoServiceImpl.java
parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java
parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java
parent/hospital.web/src/main/java/com/lyms/hospital/controller/childbirth/ChildbirthController.java
parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java
parent/hospital.web/src/main/java/com/lyms/hospital/request/OldNewWrapper.java
parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequest.java
parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequestWrapper.java
parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequest.java
parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ExamAddRequestWrapper.java
parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanExamKeymap.java

...	...	@@ -102,15 +102,15 @@
102	102	*/
103	103	//删除
104	104	EntityWrapper<ChildbirthTai> taiWrapper = new EntityWrapper<>();
105		- taiWrapper.eq("CID", info.getId());
	105	+ taiWrapper.where("CID={0}", info.getId());
106	106	taiMapper.delete(taiWrapper);
107	107
108	108	EntityWrapper<ChildbirthTaipan> taipanWrapper = new EntityWrapper<>();
109		- taipanWrapper.eq("CID", info.getId());
	109	+ taipanWrapper.where("CID={0}", info.getId());
110	110	taipanMapper.delete(taipanWrapper);
111	111
112	112	EntityWrapper<ChildbirthNewborn> newbornWrapper = new EntityWrapper<>();
113		- newbornWrapper.eq("CID", info.getId());
	113	+ newbornWrapper.where("CID={0}", info.getId());
114	114	newbornMapper.delete(newbornWrapper);
115	115
116	116	//【新增分娩信息的3个子列表】新增胎儿信息、新增胎盘信息、新增新生儿信息

...	...	@@ -66,7 +66,7 @@
66	66	* <li>修改人：
67	67	* <li>修改时间：
68	68	*/
69		- public String saveLaterExam(DiagnoseInfo info, List<DiagnoseTai> taiList,List<HighriskMaps> highriskList,List<DiagnoseMaps> diagnoseList);
	69	+ public String saveLaterExam(DiagnoseInfo info,DiagnoseAssit assist, List<DiagnoseTai> taiList,List<HighriskMaps> highriskList,List<DiagnoseMaps> diagnoseList);
70	70
71	71	/**
72	72	* <li>@Description:根据居民ID获取末次高危

...	...	@@ -137,14 +137,14 @@
137	137
138	138	@Override
139	139	@Transactional
140		- public String saveLaterExam(DiagnoseInfo info, List<DiagnoseTai> taiList,List<HighriskMaps> highriskList,List<DiagnoseMaps> diagnoseList) {
	140	+ public String saveLaterExam(DiagnoseInfo info,DiagnoseAssit assist, List<DiagnoseTai> taiList,List<HighriskMaps> highriskList,List<DiagnoseMaps> diagnoseList) {
141	141	/*
142	142	* 基础验证
143	143	*/
144	144	if (info == null \|\| taiList == null \|\| highriskList== null \|\| diagnoseList==null) {
145	145	return "参数缺失";
146	146	}
147		- return this.saveExam(info, null, null, taiList, highriskList, diagnoseList,DiagnoseInfo.TYPE_SECOND);
	147	+ return this.saveExam(info, assist, null, taiList, highriskList, diagnoseList,DiagnoseInfo.TYPE_SECOND);
148	148	}
149	149
150	150	/**

...	...	@@ -16,6 +16,7 @@
16	16	import com.lyms.base.common.entity.user.Users;
17	17	import com.lyms.base.common.service.organ.OrganizationsService;
18	18	import com.lyms.hospital.entity.childbirth.ChildbirthInfo;
	19	+import com.lyms.hospital.entity.childbirth.ChildbirthInfoVo;
19	20	import com.lyms.hospital.entity.woman.WomanFetationRecord;
20	21	import com.lyms.hospital.enums.business.CfEnums;
21	22	import com.lyms.hospital.enums.business.CosEnums;
...	...	@@ -30,6 +31,7 @@
30	31	import com.lyms.hospital.enums.business.TaiShuEnums;
31	32	import com.lyms.hospital.enums.business.TpmcTypeEnums;
32	33	import com.lyms.hospital.request.exam.ChildbirthAddRequest;
	34	+import com.lyms.hospital.request.exam.ChildbirthAddRequestWrapper;
33	35	import com.lyms.hospital.service.childbirth.ChildbirthInfoService;
34	36	import com.lyms.hospital.service.woman.WomanFetationRecordService;
35	37	import com.lyms.shiro.ShiroWebUtils;
36	38
...	...	@@ -43,8 +45,11 @@
43	45	* </p>
44	46	*
45	47	* []获取分娩页面的字典数据<br/>
46		- * 保存分娩记录<br/>
	48	+ * [--]保存分娩记录<br/>
47	49	* []依据cardNo或vcCardNo查询孕妇分娩记录<br/>
	50	+ * 查看表单<br/>
	51	+ * 查看页面<br/>
	52	+ * 删除分娩信息<br/>
48	53	*
49	54	* @author xujiahong
50	55	* @since 2017-03-31
...	...	@@ -140,8 +145,22 @@
140	145	@RequestMapping(value = "/matdel", method = RequestMethod.POST)
141	146	@ResponseBody
142	147	public AjaxResult saveChildbirthVo(ChildbirthAddRequest request) {
143		-
144		-
	148	+ /*
	149	+ * 验证
	150	+ */
	151	+ //验证-一个产程只能分娩一次 TODO
	152	+ //验证-孕妇需要满？孕周才可以分娩 TODO
	153	+
	154	+ /*
	155	+ * 保存分娩（包括分娩信息、胎儿、胎盘、新生儿）
	156	+ */
	157	+ ChildbirthAddRequestWrapper wrapper = new ChildbirthAddRequestWrapper(request);
	158	+ ChildbirthInfoVo vo = wrapper.getVo();
	159	+ if(request.getId()==null){//新增
	160	+ birthService.createChildbirthVo(vo);
	161	+ }else{//修改
	162	+ birthService.updateChildbirthVo(vo);
	163	+ }
145	164	return AjaxResult.returnFail();
146	165	}
147	166

...	...	@@ -252,10 +252,10 @@
252	252	* 阴道
253	253	*/
254	254	String ydfmw = "";
255		- if (assist.getVaginaDc() == 1) {
	255	+ if (assist.getVaginaDc()!=null && assist.getVaginaDc() == 1) {
256	256	ydfmw += "滴虫、";
257	257	}
258		- if (assist.getVaginaJsjmj() == 1) {
	258	+ if (assist.getVaginaJsjmj()!=null && assist.getVaginaJsjmj() == 1) {
259	259	ydfmw += "假丝酵母菌、";
260	260	}
261	261	if (assist.getVaginaOtherTxt() != null) {
...	...	@@ -279,32 +279,6 @@
279	279	}
280	280
281	281	/**
282		- * <li>@Description:保存复诊数据
283		- * <li>@param request
284		- * <li>@return
285		- * <li>创建人：xujiahong
286		- * <li>创建时间：2017年5月5日
287		- * <li>修改人：
288		- * <li>修改时间：
289		- */
290		- @RequestMapping(value = "/antexmanage", method = RequestMethod.POST)
291		- @ResponseBody
292		- public AjaxResult saveLaterExam(@RequestBody ExamAddRequest request) {
293		- /*
294		- * （1）保存产检基本信息（2）多个胎儿信息（3）多个诊断信息 TODO
295		- */
296		- // 对象转换
297		- ExamAddRequestWrapper wrapper = new ExamAddRequestWrapper(request);
298		- DiagnoseInfo info = wrapper.getDiagnoseInfo();
299		- List<DiagnoseTai> taiList = wrapper.getDiagnoseTaiList(); // 胎儿信息
300		- List<HighriskMaps> highriskList = wrapper.getHighriskList();// 高危列表
301		- List<DiagnoseMaps> diagnoseList = wrapper.getDiagnoseList();// 诊断列表
302		- // 保存复诊信息
303		- String result = infoService.saveLaterExam(info, taiList, highriskList, diagnoseList);
304		- return "success".equals(result) ? AjaxResult.returnSuccess() : AjaxResult.returnFail(result);
305		- }
306		-
307		- /**
308	282	* <li>@Description:产检获取字典数据
309	283	* <li>@return
310	284	* <li>创建人：xujiahong
...	...	@@ -533,16 +507,11 @@
533	507	/*
534	508	* 高危和诊断
535	509	*/
536		- List<HighriskMaps> highriskMapsList = highriskMapsService.selectByDiagnoseId(info.getId());
537		- List highrisk = new ArrayList();
538		- if (highriskMapsList != null && !highriskMapsList.isEmpty()) {
539		- for (HighriskMaps hm : highriskMapsList) {
540		- Map<String, Object> map = new HashMap<>();
541		- map.put("id", hm.getConfId());//真正的高危配置ID
542		- map.put("name", hm.getName());
543		- map.put("color", hm.getColortext());
544		- map.put("code", hm.getColorcode());
545		- highrisk.add(map);
	510	+ List<HighriskMaps> highrisk = highriskMapsService.selectByDiagnoseId(info.getId());
	511	+ if (highrisk != null && !highrisk.isEmpty()) {
	512	+ for (int i=0;i<highrisk.size();i++) {
	513	+ HighriskMaps hm = highrisk.get(i);
	514	+ hm.setId(hm.getConfId());//真正的高危配置ID
546	515	}
547	516	}
548	517	List<DiagnoseMaps> diagnoseMapsList = diagnoseMapsService.selectByDiagnoseId(info.getId());
...	...	@@ -550,7 +519,7 @@
550	519	if (diagnoseMapsList != null && !diagnoseMapsList.isEmpty()) {
551	520	for (DiagnoseMaps dm : diagnoseMapsList) {
552	521	Map<String, Object> map = new HashMap<>();
553		- map.put("id", dm.getId());
	522	+ map.put("id", dm.getConfId());
554	523	map.put("name", dm.getName());
555	524	map.put("color", dm.getGroupname());
556	525	map.put("code", dm.getSimpleCode());
...	...	@@ -573,6 +542,37 @@
573	542	examAddRequest.setOtherHighRisk(otherHighRisk);
574	543
575	544	return AjaxResult.returnSuccess(examAddRequest);
	545	+ }
	546	+
	547	+ /**
	548	+ * <li>@Description:保存复诊数据
	549	+ * <li>@param request
	550	+ * <li>@return
	551	+ * <li>创建人：xujiahong
	552	+ * <li>创建时间：2017年5月5日
	553	+ * <li>修改人：
	554	+ * <li>修改时间：
	555	+ */
	556	+ @RequestMapping(value = "/antexmanage", method = RequestMethod.POST)
	557	+ @ResponseBody
	558	+ public AjaxResult saveLaterExam(@RequestBody ExamAddRequest request) {
	559	+ /*
	560	+ * （1）保存产检基本信息（2）多个胎儿信息（3）多个诊断信息 TODO
	561	+ */
	562	+ // 对象转换
	563	+ ExamAddRequestWrapper wrapper = new ExamAddRequestWrapper(request);
	564	+ DiagnoseInfo info = wrapper.getDiagnoseInfo();
	565	+
	566	+ Users users = ShiroWebUtils.getCurrentUser();
	567	+ info.setOrgId(users.getOrgId());// 医院ID
	568	+
	569	+ DiagnoseAssit assist = wrapper.getDiagnoseAssit();//辅助检查
	570	+ List<DiagnoseTai> taiList = wrapper.getDiagnoseTaiList(); // 胎儿信息
	571	+ List<HighriskMaps> highriskList = wrapper.getHighriskList();// 高危列表
	572	+ List<DiagnoseMaps> diagnoseList = wrapper.getDiagnoseList();// 诊断列表
	573	+ // 保存复诊信息
	574	+ String result = infoService.saveLaterExam(info,assist, taiList, highriskList, diagnoseList);
	575	+ return "success".equals(result) ? AjaxResult.returnSuccess() : AjaxResult.returnFail(result);
576	576	}
577	577
578	578	/**

...	...	@@ -2,12 +2,27 @@
2	2
3	3	public class OldNewWrapper {
4	4
5		- public static String obj2Str(Object obj){
6		- return obj==null?null:obj.toString();
	5	+ public static String obj2Str(Object obj) {
	6	+ return obj == null ? null : obj.toString();
7	7	}
8		- public static Integer obj2Int(Object obj){
9		- return obj==null?null:Integer.parseInt(obj.toString());
	8	+
	9	+ public static Integer obj2Int(Object obj) {
	10	+ return obj == null ? null : Integer.parseInt(obj.toString());
10	11	}
11		-
	12	+
	13	+ public static Boolean obj2Bool(Object obj) {
	14	+ return obj == null ? null : Boolean.parseBoolean(obj.toString());
	15	+ }
	16	+
	17	+ public static Integer bool2Int(Boolean bool) {
	18	+ if (bool == null) {
	19	+ return null;
	20	+ } else if (bool.equals(Boolean.TRUE)) {
	21	+ return 1;
	22	+ } else if (bool.equals(Boolean.FALSE)) {
	23	+ return 0;
	24	+ }
	25	+ return null;
	26	+ }
12	27	}

...	...	@@ -70,7 +70,7 @@
70	70	private java.util.Map ocs;
71	71
72	72
73		- private List<Baby> babies;
	73	+ private List babies;
74	74	//分娩医院
75	75	private String fmHospital;
76	76	//接生医生
77	77
...	...	@@ -132,11 +132,11 @@
132	132	this.tHloseBloodL = tHloseBloodL;
133	133	}
134	134
135		- public List<Baby> getBabies() {
	135	+ public List getBabies() {
136	136	return babies;
137	137	}
138	138
139		- public void setBabies(List<Baby> babies) {
	139	+ public void setBabies(List babies) {
140	140	this.babies = babies;
141	141	}
142	142

1	1	package com.lyms.hospital.request.exam;
2	2
3	3	import java.util.ArrayList;
4		-import java.util.HashMap;
5	4	import java.util.List;
6	5	import java.util.Map;
7	6
...	...	@@ -31,7 +30,9 @@
31	30	public ChildbirthAddRequestWrapper(ChildbirthAddRequest req) {
32	31	this.request = req;
33	32	if (req != null) {
34		- // 快速映射普通字段
	33	+ /*
	34	+ * 快速映射普通字段
	35	+ */
35	36	// { 分娩ID、居民ID、孕妇ID、分娩孕周、胎儿数、胎盘数 }
36	37	// { （剖宫产）手术原因、会阴撕裂、缝线针数、产妇情况、造成死亡的原因 }
37	38	// { 呼吸、脉搏、产后1小时失血量、产后2小时失血量、产后24小时失血量、第三产程+产后2小时失血量 }
...	...	@@ -45,7 +46,9 @@
45	46	"doctorId" };
46	47	Map<String, Object> reqMap = XjhMapUtil.transBean2AliasMap(req, XjhMapUtil.getKeyMap(req_map, info_map));
47	48	info = (ChildbirthInfo) XjhMapUtil.transMap2Bean(reqMap, new ChildbirthInfo());
48		- // 特殊字段设置
	49	+ /*
	50	+ * 特殊字段设置
	51	+ */
49	52	info.setChildbirthTime(DateUtil.parseYMD(req.getDueDate()));// 分娩日期
50	53	// 分娩方式
51	54	Map<String, String> deliveryMode = (Map<String, String>) req.getDeliveryMode();
52	55
...	...	@@ -95,8 +98,24 @@
95	98	info.setLoseBloodReason(OldNewWrapper.obj2Int(loseBloodCause.get("select")));
96	99	info.setLoseBloodOtherText(OldNewWrapper.obj2Str(loseBloodCause.get("other")));
97	100	}
98		- // 产科并发症 TODO 需要前端调整结构
	101	+ // 产科并发症
99	102	Map<String, Object> ocs = (Map<String, Object>) req.getOcs();
	103	+ if(ocs!=null && !ocs.isEmpty()){
	104	+ if("yes".equals(ocs.get("yesOrNo"))){//有产科并发症（12个字段）
	105	+ info.setComplicationQztp(obj2Bool2Int(ocs.get("qztp")));//前置胎盘
	106	+ info.setComplicationTpzb(obj2Bool2Int(ocs.get("tpzb")));//胎盘早剥
	107	+ info.setComplicationTpzl(obj2Bool2Int(ocs.get("tpzl")));//胎盘滞留
	108	+ info.setComplicationTmzp(obj2Bool2Int(ocs.get("tmzp")));//胎膜早破
	109	+ info.setComplicationChcx(obj2Bool2Int(ocs.get("chcx")));//产后出血
	110	+ info.setComplicationRsqgxy(obj2Bool2Int(ocs.get("rsqgxy")));//妊娠期高血压
	111	+ info.setComplicationZxa(obj2Bool2Int(ocs.get("zxqqq")));//子痫前期(轻)
	112	+ info.setComplicationZxb(obj2Bool2Int(ocs.get("zxqqz")));//子痫前期(重)
	113	+ info.setComplicationZxc(obj2Bool2Int(ocs.get("zxmxgxybfzxqq")));//子痫慢性高血压并发子痫前期
	114	+ info.setComplicationRshbmxgxy(obj2Bool2Int(ocs.get("rshbmxgxy")));//妊娠合并慢性高血压
	115	+ info.setComplicationOther(obj2Bool2Int(ocs.get("qt")));//其他（产科并发症）
	116	+ info.setComplicationOtherText(OldNewWrapper.obj2Str(ocs.get("qtText")));//其他并发症文本
	117	+ }
	118	+ }
100	119
101	120	// 胎儿列表
102	121	List<Map<String, Object>> placentas = req.getPlacentas();
...	...	@@ -109,6 +128,7 @@
109	128	taiList.add(tai);
110	129	}
111	130	}
	131	+
112	132	// 胎盘娩出方式
113	133	List<Map<String, Object>> extPlacentas = req.getExtPlacentas();
114	134	if(extPlacentas!=null && !extPlacentas.isEmpty()){
115	135
...	...	@@ -120,13 +140,58 @@
120	140	}else{
121	141	taipan.setBirthType(ChildbirthTaipan.BIRTH_TYPE_SON);//子面
122	142	}
123		- Map<String, Object> tpSize = new HashMap<>();
124		-// aaaaaaaa TODO
	143	+ Map<String, Object> tpSize = (Map<String, Object>) placenta.get("tpSize");
	144	+ if(tpSize!=null){
	145	+ taipan.setPlacentaLength(OldNewWrapper.obj2Int(tpSize.get("c")));
	146	+ taipan.setPlacentaWidth(OldNewWrapper.obj2Int(tpSize.get("k")));
	147	+ taipan.setPlacentaThick(OldNewWrapper.obj2Int(tpSize.get("g")));
	148	+ }
	149	+ taipan.setPlacentaWeight(OldNewWrapper.obj2Int(placenta.get("tpWeight")));
	150	+ taipan.setUmbilicalLength(OldNewWrapper.obj2Int(placenta.get("umbilicalCordLength")));
	151	+ if("yes".equals(placenta.get("umbilicalCordEx"))){//脐带有异常
	152	+ taipan.setUmbilicalException(OldNewWrapper.obj2Int(placenta.get("umbilicalCordExType")));
	153	+ }else{
	154	+ taipan.setUmbilicalException(0);
	155	+ }
	156	+ taipanList.add(taipan);
125	157	}
126	158	}
127	159
128	160	// 新生儿
129		-
	161	+ List<Map<String, Object>> babies = req.getBabies();
	162	+ if(babies!=null && !babies.isEmpty()){
	163	+ for(Map<String, Object> baby : babies){
	164	+ ChildbirthNewborn newborn = new ChildbirthNewborn();
	165	+ newborn.setGender(OldNewWrapper.obj2Int(baby.get("babyGender")));//性别
	166	+ newborn.setWeight(OldNewWrapper.obj2Int(baby.get("babyWeight")));//体重
	167	+ newborn.setHeight(OldNewWrapper.obj2Int(baby.get("babyHeight")));//身长
	168	+ newborn.setDeformity(OldNewWrapper.obj2Int(baby.get("deformity")));//是否畸形
	169	+
	170	+ Map<String, Object> apgarScore = (Map<String, Object>)baby.get("apgarScore");
	171	+ if(apgarScore!=null && !apgarScore.isEmpty()){
	172	+ newborn.setApgarScoreOne(OldNewWrapper.obj2Int(baby.get("pf1")));//apgar评分1分钟
	173	+ newborn.setApgarScoreFive(OldNewWrapper.obj2Int(baby.get("pf5")));//apgar评分5分钟
	174	+ newborn.setApgarScoreTen(OldNewWrapper.obj2Int(baby.get("pf10")));//apgar评分10分钟
	175	+ }
	176	+
	177	+ newborn.setAsphyxia(OldNewWrapper.obj2Int(baby.get("asphyxiaM")));//窒息分钟
	178	+ newborn.setGestationEnding(OldNewWrapper.obj2Int(baby.get("pregnancyOut")));//妊娠结局（枚举）
	179	+ newborn.setDisease(OldNewWrapper.obj2Str(baby.get("babyHealthy")));//新生儿疾病
	180	+ newborn.setTouchBegin(OldNewWrapper.obj2Int(baby.get("contactStartM")));//母婴接触开始时间
	181	+ newborn.setTouchStay(OldNewWrapper.obj2Int(baby.get("contactM")));//母婴接触持续时间
	182	+ if("yes".equals(OldNewWrapper.obj2Str(baby.get("earlySuck")))){
	183	+ newborn.setSuck(1);//早吸吮（枚举）1是，0否
	184	+ }else{
	185	+ newborn.setSuck(0);//早吸吮（枚举）1是，0否
	186	+ }
	187	+ newborn.setBirthTime(DateUtil.parseYMDHM(OldNewWrapper.obj2Str(baby.get("dueTime"))));//娩出时间
	188	+ newbornList.add(newborn);
	189	+ }
	190	+ }
	191	+ vo.setInfo(info);
	192	+ vo.setNewbornList(newbornList);
	193	+ vo.setTaiList(taiList);
	194	+ vo.setTaipanList(taipanList);
130	195	}//if (req != null)
131	196
132	197	}
...	...	@@ -139,6 +204,11 @@
139	204	str += map.get("m") == null ? "" : map.get("m").toString();
140	205	}
141	206	return str;
	207	+ }
	208	+
	209	+ private int obj2Bool2Int(Object obj){
	210	+ Boolean bool = OldNewWrapper.obj2Bool(obj);
	211	+ return OldNewWrapper.bool2Int(bool);
142	212	}
143	213
144	214	public ChildbirthAddRequest getRequest() {

...	...	@@ -231,7 +231,24 @@
231	231	* 胎儿列表
232	232	*/
233	233	private List<DiagnoseTai> taiList;
	234	+ /**
	235	+ * 主诉
	236	+ */
	237	+ private String chiefComplaint;
	238	+ /**
	239	+ * 浮肿
	240	+ */
	241	+ private String edema;
	242	+
234	243
	244	+ public String getChiefComplaint() {
	245	+ return chiefComplaint;
	246	+ }
	247	+
	248	+ public void setChiefComplaint(String chiefComplaint) {
	249	+ this.chiefComplaint = chiefComplaint;
	250	+ }
	251	+
235	252	public List<DiagnoseTai> getTaiList() {
236	253	return taiList;
237	254	}
...	...	@@ -862,6 +879,14 @@
862	879
863	880	public void sethHealthInfo(Map<String, String> hHealthInfo) {
864	881	this.hHealthInfo = hHealthInfo;
	882	+ }
	883	+
	884	+ public String getEdema() {
	885	+ return edema;
	886	+ }
	887	+
	888	+ public void setEdema(String edema) {
	889	+ this.edema = edema;
865	890	}
866	891
867	892

...	...	@@ -179,8 +179,8 @@
179	179	assistMap.put(key, DiagnoseAssit.RUOYANG + "");
180	180	}
181	181	}
	182	+ diagnoseAssit = (DiagnoseAssit) XjhMapUtil.transMap2FormatBean(assistMap, new DiagnoseAssit());
182	183	}
183		- diagnoseAssit = (DiagnoseAssit) XjhMapUtil.transMap2FormatBean(assistMap, new DiagnoseAssit());
184	184	// 阴道分泌物
185	185	Map<String, Object> ydfmw = request.getYdfmw();
186	186	if (ydfmw != null) {

...	...	@@ -73,8 +73,8 @@
73	73	//产科检查（3）
74	74	"gonggaoObstetrics",//
75	75	"fuweiObstetrics",//
76		-// "fuzhongObstetrics",//浮肿
77	76	"taishuObstetrics",//
	77	+ "fuzhongObstetrics",//浮肿
78	78
79	79	//高危评分（5）
80	80	// "hasHighrisk",//
...	...	@@ -135,6 +135,7 @@
135	135	"gonggao",//
136	136	"fuwei",//
137	137	"tireNumber",//
	138	+ "edema",//浮肿
138	139
139	140	//高危评分（5）
140	141	// "highriskSocre",//高危评分