diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthInfoServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthInfoServiceImpl.java
index 4f84d2d..c59d0dc 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthInfoServiceImpl.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/childbirth/impl/ChildbirthInfoServiceImpl.java
@@ -102,15 +102,15 @@ public class ChildbirthInfoServiceImpl extends ServiceImpl taiWrapper = new EntityWrapper<>();
- taiWrapper.eq("CID", info.getId());
+ taiWrapper.where("CID={0}", info.getId());
taiMapper.delete(taiWrapper);
EntityWrapper taipanWrapper = new EntityWrapper<>();
- taipanWrapper.eq("CID", info.getId());
+ taipanWrapper.where("CID={0}", info.getId());
taipanMapper.delete(taipanWrapper);
EntityWrapper newbornWrapper = new EntityWrapper<>();
- newbornWrapper.eq("CID", info.getId());
+ newbornWrapper.where("CID={0}", info.getId());
newbornMapper.delete(newbornWrapper);
//【新增分娩信息的3个子列表】新增胎儿信息、新增胎盘信息、新增新生儿信息
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java
index dfe1a81..b506c86 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java
@@ -66,7 +66,7 @@ public interface DiagnoseInfoService extends BaseService {
* 修改人:
* 修改时间:
*/
- public String saveLaterExam(DiagnoseInfo info, List taiList,List highriskList,List diagnoseList);
+ public String saveLaterExam(DiagnoseInfo info,DiagnoseAssit assist, List taiList,List highriskList,List diagnoseList);
/**
* @Description:根据居民ID获取末次高危
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java
index 0e723af..2c0cc0c 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java
@@ -137,14 +137,14 @@ public class DiagnoseInfoServiceImpl extends ServiceImpl taiList,List highriskList,List diagnoseList) {
+ public String saveLaterExam(DiagnoseInfo info,DiagnoseAssit assist, List taiList,List highriskList,List diagnoseList) {
/*
* 基础验证
*/
if (info == null || taiList == null || highriskList== null || diagnoseList==null) {
return "参数缺失";
}
- return this.saveExam(info, null, null, taiList, highriskList, diagnoseList,DiagnoseInfo.TYPE_SECOND);
+ return this.saveExam(info, assist, null, taiList, highriskList, diagnoseList,DiagnoseInfo.TYPE_SECOND);
}
/**
diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/childbirth/ChildbirthController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/childbirth/ChildbirthController.java
index ccf3446..4077c60 100644
--- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/childbirth/ChildbirthController.java
+++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/childbirth/ChildbirthController.java
@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.lyms.base.common.entity.user.Users;
import com.lyms.base.common.service.organ.OrganizationsService;
import com.lyms.hospital.entity.childbirth.ChildbirthInfo;
+import com.lyms.hospital.entity.childbirth.ChildbirthInfoVo;
import com.lyms.hospital.entity.woman.WomanFetationRecord;
import com.lyms.hospital.enums.business.CfEnums;
import com.lyms.hospital.enums.business.CosEnums;
@@ -30,6 +31,7 @@ import com.lyms.hospital.enums.business.SXCauseEnums;
import com.lyms.hospital.enums.business.TaiShuEnums;
import com.lyms.hospital.enums.business.TpmcTypeEnums;
import com.lyms.hospital.request.exam.ChildbirthAddRequest;
+import com.lyms.hospital.request.exam.ChildbirthAddRequestWrapper;
import com.lyms.hospital.service.childbirth.ChildbirthInfoService;
import com.lyms.hospital.service.woman.WomanFetationRecordService;
import com.lyms.shiro.ShiroWebUtils;
@@ -43,8 +45,11 @@ import com.lyms.web.controller.BaseController;
*
*
* []获取分娩页面的字典数据
- * 保存分娩记录
+ * [--]保存分娩记录
* []依据cardNo或vcCardNo查询孕妇分娩记录
+ * 查看表单
+ * 查看页面
+ * 删除分娩信息
*
* @author xujiahong
* @since 2017-03-31
@@ -140,8 +145,22 @@ public class ChildbirthController extends BaseController {
@RequestMapping(value = "/matdel", method = RequestMethod.POST)
@ResponseBody
public AjaxResult saveChildbirthVo(ChildbirthAddRequest request) {
-
-
+ /*
+ * 验证
+ */
+ //验证-一个产程只能分娩一次 TODO
+ //验证-孕妇需要满?孕周才可以分娩 TODO
+
+ /*
+ * 保存分娩(包括分娩信息、胎儿、胎盘、新生儿)
+ */
+ ChildbirthAddRequestWrapper wrapper = new ChildbirthAddRequestWrapper(request);
+ ChildbirthInfoVo vo = wrapper.getVo();
+ if(request.getId()==null){//新增
+ birthService.createChildbirthVo(vo);
+ }else{//修改
+ birthService.updateChildbirthVo(vo);
+ }
return AjaxResult.returnFail();
}
diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java
index c740e56..138d10e 100644
--- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java
+++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java
@@ -252,10 +252,10 @@ public class WomanExamController extends BaseController {
* 阴道
*/
String ydfmw = "";
- if (assist.getVaginaDc() == 1) {
+ if (assist.getVaginaDc()!=null && assist.getVaginaDc() == 1) {
ydfmw += "滴虫、";
}
- if (assist.getVaginaJsjmj() == 1) {
+ if (assist.getVaginaJsjmj()!=null && assist.getVaginaJsjmj() == 1) {
ydfmw += "假丝酵母菌、";
}
if (assist.getVaginaOtherTxt() != null) {
@@ -279,32 +279,6 @@ public class WomanExamController extends BaseController {
}
/**
- * @Description:保存复诊数据
- * @param request
- * @return
- * 创建人:xujiahong
- * 创建时间:2017年5月5日
- * 修改人:
- * 修改时间:
- */
- @RequestMapping(value = "/antexmanage", method = RequestMethod.POST)
- @ResponseBody
- public AjaxResult saveLaterExam(@RequestBody ExamAddRequest request) {
- /*
- * (1)保存产检基本信息 (2)多个胎儿信息(3) 多个诊断信息 TODO
- */
- // 对象转换
- ExamAddRequestWrapper wrapper = new ExamAddRequestWrapper(request);
- DiagnoseInfo info = wrapper.getDiagnoseInfo();
- List taiList = wrapper.getDiagnoseTaiList(); // 胎儿信息
- List highriskList = wrapper.getHighriskList();// 高危列表
- List diagnoseList = wrapper.getDiagnoseList();// 诊断列表
- // 保存复诊信息
- String result = infoService.saveLaterExam(info, taiList, highriskList, diagnoseList);
- return "success".equals(result) ? AjaxResult.returnSuccess() : AjaxResult.returnFail(result);
- }
-
- /**
* @Description:产检获取字典数据
* @return
* 创建人:xujiahong
@@ -533,16 +507,11 @@ public class WomanExamController extends BaseController {
/*
* 高危和诊断
*/
- List highriskMapsList = highriskMapsService.selectByDiagnoseId(info.getId());
- List highrisk = new ArrayList();
- if (highriskMapsList != null && !highriskMapsList.isEmpty()) {
- for (HighriskMaps hm : highriskMapsList) {
- Map map = new HashMap<>();
- map.put("id", hm.getConfId());//真正的高危配置ID
- map.put("name", hm.getName());
- map.put("color", hm.getColortext());
- map.put("code", hm.getColorcode());
- highrisk.add(map);
+ List highrisk = highriskMapsService.selectByDiagnoseId(info.getId());
+ if (highrisk != null && !highrisk.isEmpty()) {
+ for (int i=0;i diagnoseMapsList = diagnoseMapsService.selectByDiagnoseId(info.getId());
@@ -550,7 +519,7 @@ public class WomanExamController extends BaseController {
if (diagnoseMapsList != null && !diagnoseMapsList.isEmpty()) {
for (DiagnoseMaps dm : diagnoseMapsList) {
Map map = new HashMap<>();
- map.put("id", dm.getId());
+ map.put("id", dm.getConfId());
map.put("name", dm.getName());
map.put("color", dm.getGroupname());
map.put("code", dm.getSimpleCode());
@@ -574,6 +543,37 @@ public class WomanExamController extends BaseController {
return AjaxResult.returnSuccess(examAddRequest);
}
+
+ /**
+ * @Description:保存复诊数据
+ * @param request
+ * @return
+ * 创建人:xujiahong
+ * 创建时间:2017年5月5日
+ * 修改人:
+ * 修改时间:
+ */
+ @RequestMapping(value = "/antexmanage", method = RequestMethod.POST)
+ @ResponseBody
+ public AjaxResult saveLaterExam(@RequestBody ExamAddRequest request) {
+ /*
+ * (1)保存产检基本信息 (2)多个胎儿信息(3) 多个诊断信息 TODO
+ */
+ // 对象转换
+ ExamAddRequestWrapper wrapper = new ExamAddRequestWrapper(request);
+ DiagnoseInfo info = wrapper.getDiagnoseInfo();
+
+ Users users = ShiroWebUtils.getCurrentUser();
+ info.setOrgId(users.getOrgId());// 医院ID
+
+ DiagnoseAssit assist = wrapper.getDiagnoseAssit();//辅助检查
+ List taiList = wrapper.getDiagnoseTaiList(); // 胎儿信息
+ List highriskList = wrapper.getHighriskList();// 高危列表
+ List diagnoseList = wrapper.getDiagnoseList();// 诊断列表
+ // 保存复诊信息
+ String result = infoService.saveLaterExam(info,assist, taiList, highriskList, diagnoseList);
+ return "success".equals(result) ? AjaxResult.returnSuccess() : AjaxResult.returnFail(result);
+ }
/**
* @Description:保存初诊数据
diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/request/OldNewWrapper.java b/parent/hospital.web/src/main/java/com/lyms/hospital/request/OldNewWrapper.java
index 73a7183..ad88880 100644
--- a/parent/hospital.web/src/main/java/com/lyms/hospital/request/OldNewWrapper.java
+++ b/parent/hospital.web/src/main/java/com/lyms/hospital/request/OldNewWrapper.java
@@ -2,11 +2,26 @@ package com.lyms.hospital.request;
public class OldNewWrapper {
- public static String obj2Str(Object obj){
- return obj==null?null:obj.toString();
+ public static String obj2Str(Object obj) {
+ return obj == null ? null : obj.toString();
}
- public static Integer obj2Int(Object obj){
- return obj==null?null:Integer.parseInt(obj.toString());
+
+ public static Integer obj2Int(Object obj) {
+ return obj == null ? null : Integer.parseInt(obj.toString());
+ }
+
+ public static Boolean obj2Bool(Object obj) {
+ return obj == null ? null : Boolean.parseBoolean(obj.toString());
+ }
+
+ public static Integer bool2Int(Boolean bool) {
+ if (bool == null) {
+ return null;
+ } else if (bool.equals(Boolean.TRUE)) {
+ return 1;
+ } else if (bool.equals(Boolean.FALSE)) {
+ return 0;
+ }
+ return null;
}
-
}
diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequest.java b/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequest.java
index e457626..04fe3da 100644
--- a/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequest.java
+++ b/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequest.java
@@ -70,7 +70,7 @@ public class ChildbirthAddRequest{
private java.util.Map ocs;
- private List babies;
+ private List babies;
//分娩医院
private String fmHospital;
//接生医生
@@ -132,11 +132,11 @@ public class ChildbirthAddRequest{
this.tHloseBloodL = tHloseBloodL;
}
- public List getBabies() {
+ public List getBabies() {
return babies;
}
- public void setBabies(List babies) {
+ public void setBabies(List babies) {
this.babies = babies;
}
diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequestWrapper.java b/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequestWrapper.java
index ffdacaf..99a9e4d 100644
--- a/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequestWrapper.java
+++ b/parent/hospital.web/src/main/java/com/lyms/hospital/request/exam/ChildbirthAddRequestWrapper.java
@@ -1,7 +1,6 @@
package com.lyms.hospital.request.exam;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,7 +30,9 @@ public class ChildbirthAddRequestWrapper extends OldNewWrapper {
public ChildbirthAddRequestWrapper(ChildbirthAddRequest req) {
this.request = req;
if (req != null) {
- // 快速映射普通字段
+ /*
+ * 快速映射普通字段
+ */
// { 分娩ID、居民ID、孕妇ID、分娩孕周、胎儿数、胎盘数 }
// { (剖宫产)手术原因、 会阴撕裂、缝线针数、产妇情况、造成死亡的原因 }
// { 呼吸、脉搏、产后1小时失血量、产后2小时失血量、产后24小时失血量、第三产程+产后2小时失血量 }
@@ -45,7 +46,9 @@ public class ChildbirthAddRequestWrapper extends OldNewWrapper {
"doctorId" };
Map reqMap = XjhMapUtil.transBean2AliasMap(req, XjhMapUtil.getKeyMap(req_map, info_map));
info = (ChildbirthInfo) XjhMapUtil.transMap2Bean(reqMap, new ChildbirthInfo());
- // 特殊字段设置
+ /*
+ * 特殊字段设置
+ */
info.setChildbirthTime(DateUtil.parseYMD(req.getDueDate()));// 分娩日期
// 分娩方式
Map deliveryMode = (Map) req.getDeliveryMode();
@@ -95,8 +98,24 @@ public class ChildbirthAddRequestWrapper extends OldNewWrapper {
info.setLoseBloodReason(OldNewWrapper.obj2Int(loseBloodCause.get("select")));
info.setLoseBloodOtherText(OldNewWrapper.obj2Str(loseBloodCause.get("other")));
}
- // 产科并发症 TODO 需要前端调整结构
+ // 产科并发症
Map ocs = (Map) req.getOcs();
+ if(ocs!=null && !ocs.isEmpty()){
+ if("yes".equals(ocs.get("yesOrNo"))){//有产科并发症(12个字段)
+ info.setComplicationQztp(obj2Bool2Int(ocs.get("qztp")));//前置胎盘
+ info.setComplicationTpzb(obj2Bool2Int(ocs.get("tpzb")));//胎盘早剥
+ info.setComplicationTpzl(obj2Bool2Int(ocs.get("tpzl")));//胎盘滞留
+ info.setComplicationTmzp(obj2Bool2Int(ocs.get("tmzp")));//胎膜早破
+ info.setComplicationChcx(obj2Bool2Int(ocs.get("chcx")));//产后出血
+ info.setComplicationRsqgxy(obj2Bool2Int(ocs.get("rsqgxy")));//妊娠期高血压
+ info.setComplicationZxa(obj2Bool2Int(ocs.get("zxqqq")));//子痫前期(轻)
+ info.setComplicationZxb(obj2Bool2Int(ocs.get("zxqqz")));//子痫前期(重)
+ info.setComplicationZxc(obj2Bool2Int(ocs.get("zxmxgxybfzxqq")));//子痫慢性高血压并发子痫前期
+ info.setComplicationRshbmxgxy(obj2Bool2Int(ocs.get("rshbmxgxy")));//妊娠合并慢性高血压
+ info.setComplicationOther(obj2Bool2Int(ocs.get("qt")));//其他(产科并发症)
+ info.setComplicationOtherText(OldNewWrapper.obj2Str(ocs.get("qtText")));//其他并发症文本
+ }
+ }
// 胎儿列表
List