From e689a98070f863b81ac539d8f74bb7b527fa8248 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Fri, 21 Jun 2019 15:29:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DischargeAbstractController.java | 10 ++-- .../web/facade/AntenatalExaminationFacade.java | 16 +++++- .../operate/web/facade/BabyCheckFacade.java | 4 +- .../web/facade/DischargeAbstractFacade.java | 28 +++++++--- .../web/request/DischargeSummaryRequest.java | 63 ++++++++++++++++++++++ 5 files changed, 107 insertions(+), 14 deletions(-) create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeSummaryRequest.java 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 9345384..ee574e0 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 @@ -11,6 +11,7 @@ import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.DischargeAbstractFacade; import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest; import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest; +import com.lyms.platform.operate.web.request.DischargeSummaryRequest; import com.lyms.platform.operate.web.result.DischargeAbstractQueryResult; import com.lyms.platform.operate.web.result.DischargeAbstractSaveResult; import com.lyms.platform.permission.service.CouponService; @@ -109,14 +110,13 @@ public class DischargeAbstractController extends BaseController { return dischargeAbstractFacade.correctDisCharge(); } - @RequestMapping(value = "list", method = RequestMethod.GET) + @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody @TokenRequired public BaseResponse list(HttpServletRequest request, - @RequestParam(value = "page") Integer page, - @RequestParam(value = "limit") Integer limit) { - - return dischargeAbstractFacade.list(page, limit, getUserId(request)); + @RequestParam(value = "limit") Integer limit, + DischargeSummaryRequest dischargeSummaryRequest) { + return dischargeAbstractFacade.list(page, limit, getUserId(request), dischargeSummaryRequest); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 0d3b5b7..183512c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -556,6 +556,7 @@ public class AntenatalExaminationFacade { antExChuModel.setParentId(parentId); excAddRequest.setParentId(parentId); Patients p = patientsService.findOnePatientById(parentId); + System.out.println("===============>" + p); //加入产筛 patientsService.validata(p); } @@ -592,6 +593,19 @@ public class AntenatalExaminationFacade { antExChuQuery.setId(antExChuModel.getId()); List list = antenatalExaminationService.queryAntExChu(antExChuQuery); operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list.get(0), antExChuModel, OptActionEnums.UPDATE.getId(), "修改初诊"); + /** + * 承德区域 产筛状态修改 + * */ + if (null != excAddRequest.getScreeningState() && StringUtils.isNotEmpty(excAddRequest.getParentId())) { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(excAddRequest.getParentId()); + List sieveModels = sieveDao.queryList(sieveQuery.convertToQuery()); + for (SieveModel sieveModel : sieveModels) { + sieveModel.setStatus(excAddRequest.getScreeningState()); + sieveDao.updateChanQianSieve(sieveModel); + } + } } else { AntExChuQuery antExChuQuery1 = new AntExChuQuery(); antExChuQuery1.setParentId(excAddRequest.getParentId()); @@ -712,7 +726,7 @@ public class AntenatalExaminationFacade { sieveDao.updateChanQianSieve(sieveModel); } } - + //初诊是添加追访记录 addTrackDownInfo(userId, patients); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index ea8042a..8a957f4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -797,10 +797,12 @@ public class BabyCheckFacade extends BaseServiceImpl { if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) { /*** *儿保列表展示暂未开放 - * */ + + + } list.add(map); } 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 e6f5cb7..d81c0ef 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,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.hospitalapi.dzfy.DzfyHisService; -import com.lyms.platform.biz.service.BabyService; -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.OptActionEnums; import com.lyms.platform.common.enums.RenShenJieJuEnums; @@ -14,6 +11,7 @@ import com.lyms.platform.common.utils.BeanUtils; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest; import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest; +import com.lyms.platform.operate.web.request.DischargeSummaryRequest; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; import com.lyms.platform.permission.service.CouponService; @@ -60,7 +58,8 @@ public class DischargeAbstractFacade extends BaseServiceImpl { @Autowired private DzfyHisService dzfyHisService; - + @Autowired + private CommonService commonService; @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; @@ -397,12 +396,14 @@ public class DischargeAbstractFacade extends BaseServiceImpl { return new BaseResponse().setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setErrorcode(ErrorCodeConstants.SUCCESS); } - public BaseResponse list(Integer page, Integer limit, Integer userId) { + public BaseResponse list(Integer page, Integer limit, Integer userId, DischargeSummaryRequest dischargeSummaryRequest) { List hospital = groupsFacade.findGroupHospital(userId, false); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); - boolean flag = true; + boolean flag = false; + if (StringUtils.isNotEmpty(dischargeSummaryRequest.getStartLeaveHospital()) && StringUtils.isNotEmpty(dischargeSummaryRequest.getEndLeaveHospiital())) { + } if (flag) { List discharge = mongoTemplate.find(Query.query(pCriteria), DischargeAbstractMotherModel.class); @@ -425,10 +426,23 @@ public class DischargeAbstractFacade extends BaseServiceImpl { map.put("name", patients.getUsername()); map.put("phoen", patients.getPhone()); map.put("age", patients.getAge() + "岁"); + map.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate())); + String rFactor = commonService.resloveFactor(patients.getRiskFactorId()); + if (patients.getoRiskFactor() != null && !"null".equals(patients.getoRiskFactor())) { + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(rFactor)) { + rFactor += "," + patients.getoRiskFactor(); + } else { + rFactor = patients.getoRiskFactor(); + } + } + map.put("highRisk", rFactor); } map.put("leaveHospitalDate", DateUtil.getyyyy_MM_dd(dischargeAbstract.getLeaveHospitalDate())); map.put("description", dischargeAbstract.getDescription()); map.put("afterMakeBabyDays", dischargeAbstract.getAfterMakeBabyDays()); + map.put("litterIndex", ""); + map.put("inputPerson", dischargeAbstract.getInputMan()); + map.put("inputdate", DateUtil.getyyyy_MM_dd(dischargeAbstract.getCreateDate())); data.add(map); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeSummaryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeSummaryRequest.java new file mode 100644 index 0000000..84d9254 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeSummaryRequest.java @@ -0,0 +1,63 @@ +package com.lyms.platform.operate.web.request; + +public class DischargeSummaryRequest { + + private String startLeaveHospital; + private String endLeaveHospiital; + + private String queryNo;//查询号 + + private Integer postpartumDays; + + private String startFmDate; + + private String endFmDate; + + public String getStartLeaveHospital() { + return startLeaveHospital; + } + + public void setStartLeaveHospital(String startLeaveHospital) { + this.startLeaveHospital = startLeaveHospital; + } + + public String getEndLeaveHospiital() { + return endLeaveHospiital; + } + + public void setEndLeaveHospiital(String endLeaveHospiital) { + this.endLeaveHospiital = endLeaveHospiital; + } + + public String getQueryNo() { + return queryNo; + } + + public void setQueryNo(String queryNo) { + this.queryNo = queryNo; + } + + public Integer getPostpartumDays() { + return postpartumDays; + } + + public void setPostpartumDays(Integer postpartumDays) { + this.postpartumDays = postpartumDays; + } + + public String getStartFmDate() { + return startFmDate; + } + + public void setStartFmDate(String startFmDate) { + this.startFmDate = startFmDate; + } + + public String getEndFmDate() { + return endFmDate; + } + + public void setEndFmDate(String endFmDate) { + this.endFmDate = endFmDate; + } +} -- 1.8.3.1