From 219039853e4be8e0652ce0bc54a77bedbbf39763 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 10 Aug 2016 11:08:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/ApplyOrderFacade.java | 182 +++++++++++---------- .../platform/operate/web/facade/PatientFacade.java | 3 + .../web/request/ApplyOrderQueryRequest.java | 21 +-- .../web/request/RiskPatientsQueryRequest.java | 66 +++++++- 4 files changed, 171 insertions(+), 101 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 0d913b1..ea3c2a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -13,10 +13,10 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.ApplyOrderQueryRequest; +import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest; import com.lyms.platform.operate.web.request.ReferralApplyOrderAddRequest; import com.lyms.platform.operate.web.request.SieveApplyOrderAddRequest; import com.lyms.platform.operate.web.result.ApplyOrderOutResult; -import com.lyms.platform.operate.web.request.BabyApplyOrderQueryRequest; import com.lyms.platform.operate.web.result.BabyApplyOrderResult; import com.lyms.platform.operate.web.result.ReferralApplyOrderResult; import com.lyms.platform.operate.web.result.SieveApplyOrderResult; @@ -38,6 +38,9 @@ import org.springframework.stereotype.Component; import java.util.*; /** + * + * 申请单门面 + * * Created by Administrator on 2016/6/15 0015. */ @Component @@ -68,13 +71,13 @@ public class ApplyOrderFacade { * @param type 2 孕妇 1 儿童 * @return */ - public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest, Integer userId,Integer type) { + public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest, Integer userId, Integer type) { ReferralApplyOrderModel referralApplyOrderModel = referralApplyOrderAddRequest.convertToDataModel(); referralApplyOrderModel.setCreated(new Date()); referralApplyOrderModel.setStatus(0); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(referralApplyOrderModel.getParentId()); - if(2==type){ + if (2 == type) { //查询产妇信息 List patientses = patientsService.queryPatient(patientsQuery); Patients patients = null; @@ -90,11 +93,11 @@ public class ApplyOrderFacade { referralApplyOrderModel.setPhone(patients.getPhone()); referralApplyOrderModel.setSex(SexEnum.WOMAN.getId()); } - }else{ - BabyModel babyModel= babyService.getOneBabyById(referralApplyOrderModel.getParentId()); - if(null!=babyModel){ + } else { + BabyModel babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId()); + if (null != babyModel) { referralApplyOrderModel.setCardNo(babyModel.getCardNo()); - if(null!=babyModel.getBirth()){ + if (null != babyModel.getBirth()) { referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); } Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); @@ -122,54 +125,60 @@ public class ApplyOrderFacade { * @param sieveApplyOrderAddRequest * @return */ - public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest,Integer userId) { + public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest, Integer userId) { SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel(); sieveApplyOrderModel.setCreated(new Date()); - String hospitalId= autoMatchFacade.getHospitalId(userId); + String hospitalId = autoMatchFacade.getHospitalId(userId); sieveApplyOrderModel.setHospitalId(hospitalId); - //增加产筛 - applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel); - - SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); - sieveApplyOrderQuery.setStatus(0); - sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); - //查询转诊申请单 - List list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); - if (CollectionUtils.isNotEmpty(list)) { - List idList = new ArrayList<>(); - for (SieveApplyOrderModel orderModel : list) { - if (null != orderModel.getParentId()) { - Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); - if (null != patients) { - SieveModel sieveModel = patientsService.convertToModel(patients); - sieveModel.setFrom("2"); - sieveModel.setHospitalId(orderModel.getHospitalId()); - sieveService.addChanQianSieve(sieveModel); + SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); + sieveApplyOrderQuery1.setParentId(sieveApplyOrderAddRequest.getParentId()); + sieveApplyOrderQuery1.setHospitalId(hospitalId); + sieveApplyOrderQuery1.setYn(YnEnums.YES.getId()); + //先查询本院是否已申请 + List list1 = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery1); + if (CollectionUtils.isEmpty(list1)) { + //增加产筛 + applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel); + SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery(); + sieveApplyOrderQuery.setStatus(0); + sieveApplyOrderQuery.setYn(YnEnums.YES.getId()); + //查询转诊申请单 + List list = applyOrderService.querySieveApplyOrderWithQuery(sieveApplyOrderQuery); + if (CollectionUtils.isNotEmpty(list)) { + List idList = new ArrayList<>(); + for (SieveApplyOrderModel orderModel : list) { + if (null != orderModel.getParentId()) { + Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); + if (null != patients) { + SieveModel sieveModel = patientsService.convertToModel(patients); + sieveModel.setFrom("2"); + sieveModel.setHospitalId(orderModel.getHospitalId()); + sieveService.addChanQianSieve(sieveModel); + } + idList.add(orderModel.getId()); } - idList.add(orderModel.getId()); } - } - SieveApplyOrderModel sieveApplyOrderModel1 = new SieveApplyOrderModel(); - sieveApplyOrderModel1.setStatus(1); - for (String str : idList) { - sieveApplyOrderModel1.setId(str); - sieveApplyOrderModel1.setModified(new Date()); + SieveApplyOrderModel sieveApplyOrderModel1 = new SieveApplyOrderModel(); sieveApplyOrderModel1.setStatus(1); - applyOrderService.updateSieve(sieveApplyOrderModel1); + for (String str : idList) { + sieveApplyOrderModel1.setId(str); + sieveApplyOrderModel1.setModified(new Date()); + sieveApplyOrderModel1.setStatus(1); + applyOrderService.updateSieve(sieveApplyOrderModel1); + } + } + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); + List sieveModels = sieveService.queryList(sieveQuery); + if (CollectionUtils.isNotEmpty(sieveModels)) { + SieveModel sieveModel = sieveModels.get(0); + sieveModel.setStatus(2); + int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date()); + sieveModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days)); + sieveService.updateOneChanQianDiaSieve(sieveModel); } - } - - SieveQuery sieveQuery=new SieveQuery(); - sieveQuery.setYn(YnEnums.YES.getId()); - sieveQuery.setParentId(sieveApplyOrderAddRequest.getParentId()); - List sieveModels= sieveService.queryList(sieveQuery); - if(CollectionUtils.isNotEmpty(sieveModels)){ - SieveModel sieveModel = sieveModels.get(0); - sieveModel.setStatus(2); - int days = DateUtil.daysBetween(sieveModel.getLastMenses(), new Date()); - sieveModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days)); - sieveService.updateOneChanQianDiaSieve(sieveModel); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -187,15 +196,16 @@ public class ApplyOrderFacade { ReferralApplyOrderResult referralApplyOrderResult = new ReferralApplyOrderResult(); if (CollectionUtils.isNotEmpty(list)) { Patients patients = patientsService.findOnePatientById(list.get(0).getParentId()); - String zhuanchu =list.get(0).getOutHospitalId(); - Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu)); - String zhuanCName=""; String zhuanRname=""; - if(null!=zhuanc){ - zhuanCName= zhuanc.getName(); + String zhuanchu = list.get(0).getOutHospitalId(); + Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); + String zhuanCName = ""; + String zhuanRname = ""; + if (null != zhuanc) { + zhuanCName = zhuanc.getName(); } - Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu)); - if(null!=zhuanc1){ - zhuanRname =zhuanc1.getName(); + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanchu)); + if (null != zhuanc1) { + zhuanRname = zhuanc1.getName(); } referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname); } @@ -222,14 +232,14 @@ public class ApplyOrderFacade { } return new BaseObjectResponse().setData(sieveApplyOrderResult).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + /** * 查询儿童的转诊申请 - * */ - public BaseListResponse queryBabyApplyOrder(BabyApplyOrderQueryRequest applyOrderQueryRequest, Integer userId){ - ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); + public BaseListResponse queryBabyApplyOrder(BabyApplyOrderQueryRequest applyOrderQueryRequest, Integer userId) { + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setType(1); - List babyApplyOrderResults=new ArrayList<>(); + List babyApplyOrderResults = new ArrayList<>(); referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo()); //1 转入 0转出 @@ -246,27 +256,29 @@ public class ApplyOrderFacade { } List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); - if(CollectionUtils.isNotEmpty(orderModels)){ - for(ReferralApplyOrderModel applyOrderModel:orderModels){ - BabyApplyOrderResult babyApplyOrderResult=new BabyApplyOrderResult(); + if (CollectionUtils.isNotEmpty(orderModels)) { + for (ReferralApplyOrderModel applyOrderModel : orderModels) { + BabyApplyOrderResult babyApplyOrderResult = new BabyApplyOrderResult(); - String zhuanchu =applyOrderModel.getOutHospitalId(); - Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu)); - String zhuanCName=""; String zhuanRname=""; - if(null!=zhuanc){ - zhuanCName= zhuanc.getName(); + String zhuanchu = applyOrderModel.getOutHospitalId(); + Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); + String zhuanCName = ""; + String zhuanRname = ""; + if (null != zhuanc) { + zhuanCName = zhuanc.getName(); } - Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu)); - if(null!=zhuanc1){ - zhuanRname =zhuanc1.getName(); + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanchu)); + if (null != zhuanc1) { + zhuanRname = zhuanc1.getName(); } - babyApplyOrderResult.convert(applyOrderModel,zhuanCName,zhuanRname); + babyApplyOrderResult.convert(applyOrderModel, zhuanCName, zhuanRname); babyApplyOrderResults.add(babyApplyOrderResult); } } return new BaseListResponse().setData(babyApplyOrderResults).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + /** * 高危转诊列表 * @@ -277,8 +289,11 @@ public class ApplyOrderFacade { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); referralApplyOrderQuery.setAge(applyOrderQueryRequest.getAge()); - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getDueWeekStart())){ - referralApplyOrderQuery.setDueDateStart(DateUtil.parseYMD(applyOrderQueryRequest.getDueWeekStart())); + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getStartDueWeek())) { + referralApplyOrderQuery.setDueDateStart(DateUtil.parseYMD(applyOrderQueryRequest.getStartDueWeek())); + } + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getEndDueWeek())) { + referralApplyOrderQuery.setDueDateEnd(DateUtil.parseYMD(applyOrderQueryRequest.getEndDueWeek())); } referralApplyOrderQuery.setRiskFactor(applyOrderQueryRequest.getRiskFactor()); referralApplyOrderQuery.setrLevel(applyOrderQueryRequest.getrLevel()); @@ -307,20 +322,21 @@ public class ApplyOrderFacade { if (CollectionUtils.isNotEmpty(orderModels)) { for (ReferralApplyOrderModel orderModel : orderModels) { ApplyOrderOutResult applyOrderResult = new ApplyOrderOutResult(); - String zhuanchu =orderModel.getOutHospitalId(); - Organization zhuanc =organizationService.getOrganization(Integer.valueOf(zhuanchu)); - String zhuanCName=""; String zhuanRname=""; - if(null!=zhuanc){ - zhuanCName= zhuanc.getName(); + String zhuanchu = orderModel.getOutHospitalId(); + Organization zhuanc = organizationService.getOrganization(Integer.valueOf(zhuanchu)); + String zhuanCName = ""; + String zhuanRname = ""; + if (null != zhuanc) { + zhuanCName = zhuanc.getName(); } - Organization zhuanc1 =organizationService.getOrganization(Integer.valueOf(zhuanchu)); - if(null!=zhuanc1){ - zhuanRname =zhuanc1.getName(); + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(zhuanchu)); + if (null != zhuanc1) { + zhuanRname = zhuanc1.getName(); } applyOrderResult.convertToResult(orderModel, zhuanCName, zhuanRname); - if(NumberUtils.isNumber(orderModel.getApplyDoctor())){ + if (NumberUtils.isNumber(orderModel.getApplyDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(orderModel.getApplyDoctor())); - if(null!=users){ + if (null != users) { applyOrderResult.setApplyDoctor(users.getName()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 5ce45a0..854317f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -205,6 +205,8 @@ public class PatientFacade { if (null != riskPatientsQueryRequest.getServiceType()) { patientsQuery.setServiceType(Integer.valueOf(riskPatientsQueryRequest.getServiceType())); } + patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capStart()); + patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capEnd()); patientsQuery.setAge(riskPatientsQueryRequest.getAge()); patientsQuery.setLimit(riskPatientsQueryRequest.getLimit()); patientsQuery.setPage(riskPatientsQueryRequest.getPage()); @@ -213,6 +215,7 @@ public class PatientFacade { patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setBuildType(1); patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId)); + patientsQuery.setNeed("1"); //查询符合条件的孕妇 List patientses = patientsService.queryPatient(patientsQuery); List data = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java index d94bae2..e26f1b8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java @@ -31,9 +31,9 @@ public class ApplyOrderQueryRequest extends BasePageQueryRequest { //年龄 private String age; //孕周 - private String dueWeekStart; + private String startDueWeek; - private String getDueWeekEnd; + private String endDueWeek; //风险等级 private String rLevel; @@ -88,20 +88,21 @@ public class ApplyOrderQueryRequest extends BasePageQueryRequest { this.age = age; } - public String getDueWeekStart() { - return dueWeekStart; + + public String getEndDueWeek() { + return endDueWeek; } - public void setDueWeekStart(String dueWeekStart) { - this.dueWeekStart = dueWeekStart; + public void setEndDueWeek(String endDueWeek) { + this.endDueWeek = endDueWeek; } - public String getGetDueWeekEnd() { - return getDueWeekEnd; + public String getStartDueWeek() { + return startDueWeek; } - public void setGetDueWeekEnd(String getDueWeekEnd) { - this.getDueWeekEnd = getDueWeekEnd; + public void setStartDueWeek(String startDueWeek) { + this.startDueWeek = startDueWeek; } public String getRiskFactor() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index 9f50926..89cbf9c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -1,7 +1,12 @@ package com.lyms.platform.operate.web.request; -import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.core.annotation.form.FormParam; +import com.lyms.platform.common.utils.DateUtil; +import org.apache.commons.lang.math.NumberUtils; + +import java.util.Date; + /** * 高危孕妇管理查询 *

@@ -20,7 +25,12 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { private String serviceType; //孕周 @FormParam - private String dueWeek; + private String startDueWeek; + + private int start; + private int end; + @FormParam + private String endDueWeek; //年龄 @FormParam private Integer age; @@ -46,6 +56,48 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { @FormParam private Integer expVip; + public Date capStart() { + if (null != startDueWeek) { + start = NumberUtils.toInt(startDueWeek, 0); + Date endDate = DateUtil.addDay(new Date(), -(start*7)); + return endDate; + } + return null; + } + + public Date capEnd() { + if (null != endDueWeek) { + end = NumberUtils.toInt(endDueWeek, 0); + Date endDate = DateUtil.addDay(new Date(), -(end*7)); + return endDate; + } + return null; + } + + public String getEndDueWeek() { + return endDueWeek; + } + + public int getEnd() { + return end; + } + + public void setEnd(int end) { + this.end = end; + } + + public int getStart() { + return start; + } + + public void setStart(int start) { + this.start = start; + } + + public void setEndDueWeek(String endDueWeek) { + this.endDueWeek = endDueWeek; + } + public Integer getExpVip() { return expVip; } @@ -94,16 +146,14 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { this.cTime = cTime; } - public String getDueWeek() { - return dueWeek; + public String getStartDueWeek() { + return startDueWeek; } - public void setDueWeek(String dueWeek) { - this.dueWeek = dueWeek; + public void setStartDueWeek(String startDueWeek) { + this.startDueWeek = startDueWeek; } - - public String getName() { return name; } -- 1.8.3.1