From d38661b9f4f4803c0263d21cc1f6d8adf2401029 Mon Sep 17 00:00:00 2001 From: xujiahong Date: Tue, 25 Apr 2017 17:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=A4=B4=E9=83=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/woman/WomanFetationRecordMapper.xml | 1 + .../service/woman/WomanFetationRecordService.java | 14 +++- .../woman/impl/WomanFetationRecordServiceImpl.java | 20 ++++-- .../controller/woman/WomanExamController.java | 83 ++++++++++++++++++++++ .../controller/woman/WomanPregnantController.java | 15 ++-- .../response/keymap/WomanFetationRecordKeymap.java | 4 +- .../java/com/lyms/hospital/util/HospitalUtil.java | 2 +- 7 files changed, 125 insertions(+), 14 deletions(-) create mode 100644 parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanExamController.java diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.xml index 8401e81..3cdcd3b 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.xml +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.xml @@ -78,6 +78,7 @@ FROM WOMAN_FETATION_RECORD wf INNER JOIN SYS_ORGANIZATIONS org ON wf.`HOSTPITAL_ID`=org.`ID` + AND wf.IFDEL=0 AND wf.BASE_PAPERS_TYPE=#{cardType} diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanFetationRecordService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanFetationRecordService.java index 19ba8cd..bfbfb9c 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanFetationRecordService.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/WomanFetationRecordService.java @@ -21,6 +21,18 @@ import com.lyms.web.service.BaseService; */ public interface WomanFetationRecordService extends BaseService { + + /** + *
  • @Description:条件查询有效的（未被删除的，启用的，未终止妊娠的，未分娩的&其他指定条件）孕妇建档 + *
  • @param obj + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月25日 + *
  • 修改人： + *
  • 修改时间： + */ + public WomanFetationRecord queryEffectiveOne(WomanFetationRecord obj); + /** *
  • @Description:条件查询对象（未删除的）（主要用于验证条件下的存在性） *
  • @param obj @@ -47,7 +59,7 @@ public interface WomanFetationRecordService extends BaseService@Description:查询-根据孕妇建档ID查询表单详情 - *
  • @return + *
  • @return （null if 没有建档信息 或 已删除） *
  • 创建人：xujiahong *
  • 创建时间：2017年4月19日 *
  • 修改人： diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFetationRecordServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFetationRecordServiceImpl.java index b446429..967d0bb 100644 --- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFetationRecordServiceImpl.java +++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/woman/impl/WomanFetationRecordServiceImpl.java @@ -129,13 +129,14 @@ public class WomanFetationRecordServiceImpl extends ServiceImpl map = new HashMap<>(); WomanFetationRecord fetationRecord = this.selectDetailById(id); - if(fetationRecord!=null){ - WomanHusband womanHusband = womanHusbandService.selectByTarget(WomanHusband.TARGET_TYPE_ARCHIVE, fetationRecord.getId()); - map.put("fetationRecord", fetationRecord); - map.put("womanHusband", womanHusband); + if(fetationRecord==null || fetationRecord.getIfdel()==IfdelEnum.YES.getStatus()){ + return null;//没有建档信息 或 已删除 } + WomanHusband womanHusband = womanHusbandService.selectByTarget(WomanHusband.TARGET_TYPE_ARCHIVE, fetationRecord.getId()); + Map map = new HashMap<>(); + map.put("fetationRecord", fetationRecord); + map.put("womanHusband", womanHusband); return map; } @@ -175,4 +176,13 @@ public class WomanFetationRecordServiceImpl extends ServiceImpl + * + * 依据cardNo或vcCardNo查询孕妇产检记录 + * + * @author xujiahong + * + */ +@Controller +@RequestMapping("/womanExam") +public class WomanExamController extends BaseController { + + @Autowired + private WomanFetationRecordService fetationService; + + /** + *
  • @Description:依据cardNo或vcCardNo查询孕妇产检记录 + *
  • @param cardNo 证件号 + *
  • @param vcCardNo 就诊卡号 + *
  • @return + *
  • 创建人：xujiahong + *
  • 创建时间：2017年4月25日 + *
  • 修改人： + *
  • 修改时间： + */ + @RequestMapping(value = "/antexmanage", method = RequestMethod.POST) + @ResponseBody + public AjaxResult deletePregnant(String cardNo,String vcCardNo,String orgId){//orgId或来自token + /* + * （1）孕妇档案信息（通过证件号或就诊卡号查询） + * （2）高危因素列表 TODO + * （3）产检记录列表 + */ + //基本验证 + if(StringUtils.isEmpty(orgId)){ + return AjaxResult.returnFail("入参错误：医院ID为空"); + } + if(StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo)){ + return AjaxResult.returnFail("入参错误：查询条件为空"); + } + //（1）孕妇档案信息（通过证件号或就诊卡号查询） + WomanFetationRecord query = new WomanFetationRecord(); + query.setHostpitalId(orgId);//医院ID + WomanFetationRecord dbFetationRecord = null; + + //证件号不为空，则通过证件号查询 + if(!StringUtils.isEmpty(cardNo)){ + query.setBasePapersNumber(cardNo); + dbFetationRecord = fetationService.queryEffectiveOne(query); + } + //上述查询未执行或没结果，且就诊卡号不为空，则通过就诊卡号查询 + if(dbFetationRecord==null && !StringUtils.isEmpty(vcCardNo)){ + query.setBasePapersNumber(null); + query.setContactWomanWay(vcCardNo); + dbFetationRecord = fetationService.queryEffectiveOne(query); + } + //未查询到孕妇建档信息 + if(dbFetationRecord==null){ + return AjaxResult.returnFail("未查询到孕妇建档信息"); + } + //（2）高危因素列表 TODO + //（3）产检记录列表 TODO （此处需要查询当前产程中本院和外院的所有产检记录） + + + + return AjaxResult.returnFail(); + } + +} diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanPregnantController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanPregnantController.java index cd6d447..b0f0e90 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanPregnantController.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/woman/WomanPregnantController.java @@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.lyms.base.common.service.sys.SysDictService; import com.lyms.hospital.entity.woman.WomanFetationRecord; import com.lyms.hospital.entity.woman.WomanHusband; @@ -51,15 +50,15 @@ import com.lyms.web.controller.BaseController; public class WomanPregnantController extends BaseController { @Autowired - private WomanFetationRecordService fetationService; - @Autowired private TokenService tokenService; @Autowired + private WomanFetationRecordService fetationService; + @Autowired private SysDictService dictService; - @RequestMapping(value = "/deletePregnant/{id}", method = RequestMethod.POST) + @RequestMapping(value = "/deletePregnant/{id}", method = RequestMethod.DELETE) @ResponseBody - public AjaxResult deletePregnant(@PathVariable String id){ + public AjaxResult deletePregnant(@PathVariable("id")String id){ Integer count = fetationService.deleteLogicById(id); if(count>0){ return AjaxResult.returnSuccess(); @@ -82,6 +81,9 @@ public class WomanPregnantController extends BaseController { public AjaxResult findPatientData(String id){ //查询详情相关对象 Map serviceMap = fetationService.selectWomanFetationMapById(id); + if(serviceMap==null){ + return AjaxResult.returnFail("档案不存在或已删除"); + } WomanFetationRecord f = (WomanFetationRecord)serviceMap.get("fetationRecord"); WomanHusband w = (WomanHusband)serviceMap.get("womanHusband"); /* @@ -176,6 +178,9 @@ public class WomanPregnantController extends BaseController { public AjaxResult queryPregnantBuildById(@PathVariable String id){ //查询详情相关对象 Map map = fetationService.selectWomanFetationMapById(id); + if(map==null){ + return AjaxResult.returnFail("档案不存在或已删除"); + } WomanFetationRecord fetationRecord = (WomanFetationRecord)map.get("fetationRecord"); WomanHusband womanHusband = (WomanHusband)map.get("womanHusband"); //转换为与前端对接的response对象 diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanFetationRecordKeymap.java b/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanFetationRecordKeymap.java index c67dcd4..bfff48e 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanFetationRecordKeymap.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/response/keymap/WomanFetationRecordKeymap.java @@ -123,7 +123,7 @@ public class WomanFetationRecordKeymap { "hospitalServiceType",//服务类型 "hospitalServiceStatus",//服务状态 - "hospitalRecordDoctor",//建档医生 +// "hospitalRecordDoctor",//建档医生 "hostpitalId",//建档医院 "hospitalRecordDateStr",//建档日期 "hospitalRecordRemark",//档案备注 @@ -200,7 +200,7 @@ public class WomanFetationRecordKeymap { "serviceType",//服务类型 "serviceStatus",//服务状态 - "bookbuildingDoctor",//建档医生ID +// "bookbuildingDoctor",//建档医生ID "hospitalId",//建档医院ID "bookbuildingDate",//建档日期 "mremark",//备注 diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/util/HospitalUtil.java b/parent/hospital.web/src/main/java/com/lyms/hospital/util/HospitalUtil.java index 83bd174..f4579f6 100644 --- a/parent/hospital.web/src/main/java/com/lyms/hospital/util/HospitalUtil.java +++ b/parent/hospital.web/src/main/java/com/lyms/hospital/util/HospitalUtil.java @@ -33,7 +33,7 @@ public class HospitalUtil { } int week = (days / 7); int day = (days % 7); - return "孕" + week + "周" + day + "天"; + return "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); } } -- 1.8.3.1