From 0bef0e376d2404d50e63f31f19dcebf7082624dc Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 2 Nov 2022 15:19:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=99=8C=E6=A3=80=E6=9F=A5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=9C=BA=E6=9E=84=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/CancerScreeningFacade.java | 14 ++++++++++++++ .../operate/web/request/CancerScreeningRequest.java | 10 ++++++++++ .../operate/web/request/CervicalCancerListRequest.java | 8 ++++++++ .../web/service/impl/CervicalCancerServiceImpl.java | 8 ++++++++ 4 files changed, 40 insertions(+) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index 592582a..d508fe3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -91,6 +91,11 @@ public class CancerScreeningFacade { Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); //查询条件 CancerScreeningQuery query = new CancerScreeningQuery(); + + if (StringUtils.isNotEmpty(queryRequest.getHospitalId())) + { + query.setHospitalId(queryRequest.getHospitalId()); + } query.setLimit(queryRequest.getLimit()); query.setPage(queryRequest.getPage()); query.setNeed("need"); @@ -1089,8 +1094,11 @@ public class CancerScreeningFacade { String hospitalId = autoMatchFacade.getHospitalId(userId); Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); Query query = new Query(); + + boolean isCurrent = false; if (request.getPosition() == 1) { + isCurrent = true; Criteria c = Criteria.where("hospitalId").is(hospitalId); query.addCriteria(c); } @@ -1143,6 +1151,12 @@ public class CancerScreeningFacade { } } + if (StringUtils.isNotEmpty(request.getHospitalId()) && !isCurrent) + { + Criteria c = Criteria.where("hospitalId").is(request.getHospitalId()); + query.addCriteria(c); + } + if (StringUtils.isNotEmpty(request.getOptDate())) { String[] arrs = request.getOptDate().split(" - "); Date start = DateUtil.parseYMD(arrs[0]); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java index 871af15..4d569d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerScreeningRequest.java @@ -95,6 +95,16 @@ public class CancerScreeningRequest extends BasePageQueryRequest { private Integer position;// 审核级别 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 private Integer status; // 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 + private String hospitalId; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + public Integer getStatus() { return status; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java index d34eaae..ccae14d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CervicalCancerListRequest.java @@ -62,7 +62,15 @@ public class CervicalCancerListRequest extends BaseQuery { private String examineDate;//审核时间/驳回时间 private Integer position;// 审核级别 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 private Integer status; // 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 + private String hospitalId; + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } public Integer getStatus() { return status; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 895fdb4..ff765f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -163,6 +163,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { String hospitalId = autoMatchFacade.getHospitalId(userId); Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); Query query = new Query(); + boolean isCurrent = false; if (param.getStatus() != null) { Criteria c = Criteria.where("position").is(param.getStatus()); @@ -170,6 +171,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { } if (param.getPosition() == 1) { + isCurrent = true; Criteria c = Criteria.where("hospitalId").is(hospitalId); query.addCriteria(c); } @@ -222,6 +224,12 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { } } + if (StringUtils.isNotEmpty(param.getHospitalId()) && !isCurrent) + { + Criteria c = Criteria.where("hospitalId").is(param.getHospitalId()); + query.addCriteria(c); + } + String keyword = param.getKeyword(); if (StringUtils.isNotEmpty(keyword)) { Criteria c = new Criteria().orOperator(Criteria.where("name").is(keyword), Criteria.where("phone").is(keyword)); -- 1.8.3.1