From d4e4332de6793273b4d8d031b8d712e72d827076 Mon Sep 17 00:00:00 2001 From: wangbo <184677810@qq.com> Date: Fri, 21 Jun 2019 16:57:05 +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 | 7 ++-- .../web/facade/AntenatalExaminationFacade.java | 14 ++++++++ .../web/facade/DischargeAbstractFacade.java | 20 ++++++++---- .../web/request/DischargeSummaryRequest.java | 37 ++-------------------- 4 files changed, 35 insertions(+), 43 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 ee574e0..16d9e46 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 @@ -116,7 +116,10 @@ public class DischargeAbstractController extends BaseController { public BaseResponse list(HttpServletRequest request, @RequestParam(value = "page") Integer page, @RequestParam(value = "limit") Integer limit, - DischargeSummaryRequest dischargeSummaryRequest) { - return dischargeAbstractFacade.list(page, limit, getUserId(request), dischargeSummaryRequest); + @RequestParam(value = "LeaveHospitalDate") String leaveHospitalDate, + @RequestParam(value = "queryNo") String queryNo, + @RequestParam(value = "postpartumDays") Integer postpartumDays, + @RequestParam(value = "FmDate") String fmDate) { + return dischargeAbstractFacade.list(page, limit, getUserId(request), leaveHospitalDate, postpartumDays, fmDate, queryNo); } } 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 183512c..e0d1ef2 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 @@ -319,6 +319,20 @@ public class AntenatalExaminationFacade { antExQuery.setId(antExAddRequest.getId()); List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), list.get(0), model, OptActionEnums.UPDATE.getId(), "修改复诊"); + /** + * 承德区域 产筛状态修改 + * */ + if (null != antExAddRequest.getScreeningState() && StringUtils.isNotEmpty(antExAddRequest.getParentId())) { + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(antExAddRequest.getParentId()); + List sieveModels = sieveDao.queryList(sieveQuery.convertToQuery()); + for (SieveModel sieveModel : sieveModels) { + sieveModel.setStatus(antExAddRequest.getScreeningState()); + sieveDao.updateChanQianSieve(sieveModel); + } + } + } else { model.setOperator(userId); model.setYn(YnEnums.YES.getId()); 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 d81c0ef..569d4de 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 @@ -396,21 +396,27 @@ public class DischargeAbstractFacade extends BaseServiceImpl { return new BaseResponse().setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setErrorcode(ErrorCodeConstants.SUCCESS); } - public BaseResponse list(Integer page, Integer limit, Integer userId, DischargeSummaryRequest dischargeSummaryRequest) { + public BaseResponse list(Integer page, Integer limit, Integer userId, String leaveHospitalDate, Integer postpartumDays, String fmDate, String queryNo) { 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 = false; - if (StringUtils.isNotEmpty(dischargeSummaryRequest.getStartLeaveHospital()) && StringUtils.isNotEmpty(dischargeSummaryRequest.getEndLeaveHospiital())) { - + if (StringUtils.isNotEmpty(queryNo)) { + pCriteria.orOperator(Criteria.where("cardNo").is(queryNo), + Criteria.where("username").is(queryNo), Criteria.where("phone").is(queryNo) + , Criteria.where("vcCardNo").is(queryNo)); + flag = true; } + if (StringUtils.isNotEmpty(fmDate) && StringUtils.isNotEmpty(fmDate)) { + + } if (flag) { - List discharge = mongoTemplate.find(Query.query(pCriteria), DischargeAbstractMotherModel.class); + List patients = mongoTemplate.find(Query.query(pCriteria), Patients.class); List ids = new ArrayList<>(); - if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(discharge)) { - for (DischargeAbstractMotherModel dischargeAbstract : discharge) { - ids.add(dischargeAbstract.getId()); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patients)) { + for (Patients patients1 : patients) { + ids.add(patients1.getId()); } } criteria.and("_id").in(ids); 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 index 84d9254..7e5f3ba 100644 --- 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 @@ -2,32 +2,15 @@ package com.lyms.platform.operate.web.request; public class DischargeSummaryRequest { - private String startLeaveHospital; - private String endLeaveHospiital; + private String LeaveHospitalDate; + 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; - } + private String FmDate; - public String getEndLeaveHospiital() { - return endLeaveHospiital; - } - - public void setEndLeaveHospiital(String endLeaveHospiital) { - this.endLeaveHospiital = endLeaveHospiital; - } public String getQueryNo() { return queryNo; @@ -45,19 +28,5 @@ public class DischargeSummaryRequest { 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