From aa50346482a35b3ea9787ebd29864437154a7769 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Mon, 12 Dec 2016 11:38:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=99=A2=E5=B0=8F=E7=BB=93=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=B4=BB=E4=BA=A7=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/DischargeAbstractController.java | 2 +- .../operate/web/facade/DischargeAbstractFacade.java | 21 +++++++++++++++++---- .../web/result/DischargeAbstractQueryResult.java | 17 ++++++++++++++++- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java index 140ef65..615433c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java @@ -65,7 +65,7 @@ public class DischargeAbstractController extends BaseController { */ @TokenRequired @ResponseBody - @RequestMapping(value = "query", method = RequestMethod.POST, consumes = "application/json") + @RequestMapping(value = "query", method = RequestMethod.GET, consumes = "application/json") public BaseObjectResponse query(HttpServletRequest httpServletRequest, @RequestBody DischargeAbstractQueryRequest dischargeAbstractSaveRequest) { BaseObjectResponse baseObjectResponse; try { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index 79d5160..93a0aab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -1,10 +1,8 @@ package com.lyms.platform.operate.web.facade; -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.biz.service.DischargeAbstractBabyService; -import com.lyms.platform.biz.service.DischargeAbstractMotherService; -import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.enums.RenShenJieJuEnums; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.BeanUtils; import com.lyms.platform.common.utils.DateUtil; @@ -17,6 +15,7 @@ import com.lyms.platform.operate.web.result.DischargeAbstractSaveResult; import com.lyms.platform.pojo.DischargeAbstractBabyModel; import com.lyms.platform.pojo.DischargeAbstractMotherModel; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.DischargeAbstractBabyQuery; import com.lyms.platform.query.DischargeAbstractMotherQuery; import com.lyms.platform.query.PatientsQuery; @@ -49,6 +48,9 @@ public class DischargeAbstractFacade { @Autowired private BasicConfigService basicConfigService; + @Autowired + private BabyService babyService; + public DischargeAbstractSaveResult save(DischargeAbstractSaveRequest dischargeAbstractSaveRequest) { DischargeAbstractSaveResult dischargeAbstractSaveResult = new DischargeAbstractSaveResult(); @@ -126,6 +128,17 @@ public class DischargeAbstractFacade { dischargeAbstractMotherQuery.setPatientId(patients.getId()); List dischargeAbstractMotherModelList = dischargeAbstractMotherService.query(dischargeAbstractMotherQuery); + // 查询活产数 + BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setParentId(patients.getId()); + babyModelQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); + try { + dischargeAbstractQueryResult.setLivingNumber(babyService.queryBabyWithQuery(babyModelQuery).size()); + } catch (Exception e) { + // 什么都不干 + } + if (dischargeAbstractMotherModelList == null || dischargeAbstractMotherModelList.size() == 0) { dischargeAbstractQueryResult.setStatus("2"); dischargeAbstractQueryResult.setErrormsg("已分娩还没有做出院小结"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java index c597a3f..12e9a09 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractQueryResult.java @@ -89,11 +89,18 @@ public class DischargeAbstractQueryResult extends BaseResponse { /** * @auther HuJiaqi + * @createTime 2016年12月12日 11时35分 + * @discription 活产数 + */ + private Integer livingNumber; + + /** + * @auther HuJiaqi * @createTime 2016年12月06日 14时17分 * @discription 母亲model */ private DischargeAbstractMotherQueryModel dischargeAbstractMotherQueryModel; - + /** * @auther HuJiaqi * @createTime 2016年12月06日 14时18分 @@ -204,4 +211,12 @@ public class DischargeAbstractQueryResult extends BaseResponse { public void setFmDate(String fmDate) { this.fmDate = fmDate; } + + public Integer getLivingNumber() { + return livingNumber; + } + + public void setLivingNumber(Integer livingNumber) { + this.livingNumber = livingNumber; + } } -- 1.8.3.1