From 6b7fe9054ee7ad6bc55c438971d803d338dcc0c6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 9 Jan 2025 19:22:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=84=BF=E7=AB=A5?= =?UTF-8?q?=E3=80=81=E4=BA=A7=E5=A6=87=E8=BD=AC=E8=AF=8A=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/pojo/ReferralApplyScreeningModel.java | 10 ++++ .../query/ReferralApplyScreeningQuery.java | 43 ++++++++++++++ .../web/controller/ApplyScreeningController.java | 2 +- .../operate/web/facade/ApplyScreeningFacade.java | 67 ++++++++++++---------- .../web/request/ApplyScreeningQueryRequest.java | 18 ++++++ .../request/ReferralApplyScreeningAddRequest.java | 22 +++++++ 6 files changed, 131 insertions(+), 31 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyScreeningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyScreeningModel.java index 6653ad1..b360c1e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyScreeningModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyScreeningModel.java @@ -63,6 +63,8 @@ public class ReferralApplyScreeningModel extends BaseModel { private Integer expVip; //转入科室 private String transferredDepartment; + //转出科室 + private String outDepartment; //病情描述 private String diseaseDesc; //转院必要性 @@ -431,6 +433,14 @@ public class ReferralApplyScreeningModel extends BaseModel { this.transferredHospital = transferredHospital; } + public String getOutDepartment() { + return outDepartment; + } + + public void setOutDepartment(String outDepartment) { + this.outDepartment = outDepartment; + } + @Override public String toString() { return "ReferralApplyOrderModel{" + diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java index 2ef5fc3..c43e73c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyScreeningQuery.java @@ -1,6 +1,7 @@ package com.lyms.platform.query; import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.dao.operator.MongoCondition; import com.lyms.platform.common.dao.operator.MongoOper; @@ -51,7 +52,9 @@ public class ReferralApplyScreeningQuery extends BaseQuery implements IConvertTo private String hospitalName; //转入医院 private String transferredHospital; + private String transferredDepartment; private String outHospitalId; + private String outDepartment; private String hospitalId; private String phone; @@ -94,7 +97,32 @@ public class ReferralApplyScreeningQuery extends BaseQuery implements IConvertTo //查询号 private String queryNo; + //1 转入 0转出 + private String action; + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String getTransferredDepartment() { + return transferredDepartment; + } + + public void setTransferredDepartment(String transferredDepartment) { + this.transferredDepartment = transferredDepartment; + } + + public String getOutDepartment() { + return outDepartment; + } + + public void setOutDepartment(String outDepartment) { + this.outDepartment = outDepartment; + } public Date getLastMenses() { return lastMenses; @@ -398,6 +426,21 @@ public class ReferralApplyScreeningQuery extends BaseQuery implements IConvertTo condition = condition.and("outHospitalId", outHospitalId, MongoOper.IN); } + if (StringUtils.isNotEmpty(action)){ + //1 转入 0转出 + if ("1".equals(action)){ + condition = condition.and("transferredDepartment", true, MongoOper.EXISTS); + }else { + condition = condition.and("outDepartment", true, MongoOper.EXISTS); + } + } + + if (null != outDepartment) { + condition = condition.and("outDepartment", outDepartment, MongoOper.IS); + } + if (null != transferredDepartment) { + condition = condition.and("transferredDepartment", transferredDepartment, MongoOper.IS); + } if (null != transferredHospital) { List list = new ArrayList<>(); list.add(transferredHospital); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java index 794961f..0a200fc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyScreeningController.java @@ -37,7 +37,7 @@ public class ApplyScreeningController extends BaseController { @TokenRequired public BaseResponse addReferralApplyOrder(@Valid @RequestBody ReferralApplyScreeningAddRequest applyScreeningAddRequest, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return applyScreeningFacade.addOneReferralApplyScreening(applyScreeningAddRequest, loginState.getId(), 2); + return applyScreeningFacade.addOneReferralApplyScreening(applyScreeningAddRequest, loginState.getId(), applyScreeningAddRequest.getType()); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java index 2d67165..78352e6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyScreeningFacade.java @@ -343,44 +343,49 @@ public class ApplyScreeningFacade { if (StringUtils.isNotEmpty(applyScreeningQueryRequest.getHandleType())) { referralApplyScreeningQuery.setStatus(Integer.valueOf(applyScreeningQueryRequest.getHandleType())); } - //1 转入 0转出 - if ("1".equals(applyScreeningQueryRequest.getAction())) { - if (StringUtils.isNotEmpty(applyScreeningQueryRequest.getTransferredHospital())) { - if (NumberUtils.isNumber(applyScreeningQueryRequest.getTransferredHospital())) { - referralApplyScreeningQuery.setOutHospitalId(applyScreeningQueryRequest.getTransferredHospital()); - } else { - OrganizationQuery organizationQuery = new OrganizationQuery(); - organizationQuery.setYn(YnEnums.YES.getId()); - organizationQuery.setName(applyScreeningQueryRequest.getTransferredHospital()); - List organization = organizationService.queryOrganization(organizationQuery); - if (CollectionUtils.isNotEmpty(organization)) { - referralApplyScreeningQuery.setOutHospitalId(organization.get(0).getId() + ""); - } else { + if (applyScreeningQueryRequest.getType()==2){ + //1 转入 0转出 + if ("1".equals(applyScreeningQueryRequest.getAction())) { + if (StringUtils.isNotEmpty(applyScreeningQueryRequest.getTransferredHospital())) { + if (NumberUtils.isNumber(applyScreeningQueryRequest.getTransferredHospital())) { referralApplyScreeningQuery.setOutHospitalId(applyScreeningQueryRequest.getTransferredHospital()); + } else { + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setName(applyScreeningQueryRequest.getTransferredHospital()); + List organization = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isNotEmpty(organization)) { + referralApplyScreeningQuery.setOutHospitalId(organization.get(0).getId() + ""); + } else { + referralApplyScreeningQuery.setOutHospitalId(applyScreeningQueryRequest.getTransferredHospital()); + } } } - } - referralApplyScreeningQuery.setTransferredHospital(hospital); - } else if ("0".equals(applyScreeningQueryRequest.getAction())) { - if (StringUtils.isNotEmpty(applyScreeningQueryRequest.getTransferredHospital())) { - if (NumberUtils.isNumber(applyScreeningQueryRequest.getTransferredHospital())) { - referralApplyScreeningQuery.setTransferredHospital(applyScreeningQueryRequest.getTransferredHospital()); - } else { - OrganizationQuery organizationQuery = new OrganizationQuery(); - organizationQuery.setYn(YnEnums.YES.getId()); - organizationQuery.setName(applyScreeningQueryRequest.getTransferredHospital()); - List organization = organizationService.queryOrganization(organizationQuery); - if (CollectionUtils.isNotEmpty(organization)) { - referralApplyScreeningQuery.setTransferredHospital(organization.get(0).getId() + ""); - } else { + referralApplyScreeningQuery.setTransferredHospital(hospital); + } else if ("0".equals(applyScreeningQueryRequest.getAction())) { + if (StringUtils.isNotEmpty(applyScreeningQueryRequest.getTransferredHospital())) { + if (NumberUtils.isNumber(applyScreeningQueryRequest.getTransferredHospital())) { referralApplyScreeningQuery.setTransferredHospital(applyScreeningQueryRequest.getTransferredHospital()); + } else { + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setName(applyScreeningQueryRequest.getTransferredHospital()); + List organization = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isNotEmpty(organization)) { + referralApplyScreeningQuery.setTransferredHospital(organization.get(0).getId() + ""); + } else { + referralApplyScreeningQuery.setTransferredHospital(applyScreeningQueryRequest.getTransferredHospital()); + } } } + referralApplyScreeningQuery.setOutHospitalId(hospital); } - referralApplyScreeningQuery.setOutHospitalId(hospital); + }else { + referralApplyScreeningQuery.setAction(applyScreeningQueryRequest.getAction()); } + List screeningModels = applyScreeningService.queryReferralApplyScreeningWithQuery(referralApplyScreeningQuery); @@ -646,8 +651,10 @@ public class ApplyScreeningFacade { //查询转入申请单 ReferralApplyScreeningQuery referralApplyScreeningQuery1 = new ReferralApplyScreeningQuery(); - referralApplyScreeningQuery1.setOutHospitalId(outHospitalId); - referralApplyScreeningQuery1.setTransferredHospital(patients.getHospitalId()); + if (!outHospitalId.equals("2100002419")){ + referralApplyScreeningQuery1.setOutHospitalId(outHospitalId); + referralApplyScreeningQuery1.setTransferredHospital(patients.getHospitalId()); + } referralApplyScreeningQuery1.setPid(patients.getPid()); referralApplyModel.setReceived(new Date());//接诊日期 applyScreeningService.updateByParentId(referralApplyScreeningQuery1, referralApplyModel); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyScreeningQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyScreeningQueryRequest.java index d358094..05eac5a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyScreeningQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyScreeningQueryRequest.java @@ -56,6 +56,24 @@ public class ApplyScreeningQueryRequest extends BasePageQueryRequest { //状态 private String handleType; + private String outDepartment; + private String transferredDepartment; + + public String getTransferredDepartment() { + return transferredDepartment; + } + + public void setTransferredDepartment(String transferredDepartment) { + this.transferredDepartment = transferredDepartment; + } + + public String getOutDepartment() { + return outDepartment; + } + + public void setOutDepartment(String outDepartment) { + this.outDepartment = outDepartment; + } public String getHandleType() { return handleType; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyScreeningAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyScreeningAddRequest.java index dab48d5..60ca2d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyScreeningAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralApplyScreeningAddRequest.java @@ -23,6 +23,8 @@ public class ReferralApplyScreeningAddRequest implements IBasicRequestConvert