From da1791f6fe5e460736a5f8cc4efe3d57fc9e2dd0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sun, 25 Sep 2022 14:21:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=99=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/CancerScreeningFacade.java | 13 ++++++++++++- .../platform/operate/web/request/CancerExamineRequest.java | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) 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 58dd90d..f7b33a0 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 @@ -1043,6 +1043,11 @@ public class CancerScreeningFacade { Criteria c = Criteria.where("cityId").is(organization.getCityId()); query.addCriteria(c); } + else if (request.getPosition() == 4) + { + Criteria c = Criteria.where("provinceId").is(organization.getProvinceId()); + query.addCriteria(c); + } if (StringUtils.isNotEmpty(request.getOptDate())) { String[] arrs = request.getOptDate().split(" - "); @@ -1076,7 +1081,13 @@ public class CancerScreeningFacade { if (StringUtils.isNotEmpty(request.getOptHospital())) { - Criteria c = Criteria.where("optHospital").is(request.getOptUser()); + Criteria c = Criteria.where("optHospital").is(request.getOptHospital()); + query.addCriteria(c); + } + + if (request.getStatus() != null) + { + Criteria c = Criteria.where("position").is(request.getStatus()); query.addCriteria(c); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerExamineRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerExamineRequest.java index 8c0e428..e13d925 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerExamineRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CancerExamineRequest.java @@ -13,7 +13,7 @@ public class CancerExamineRequest { private Integer type;//1 宫颈癌 2 乳腺癌 - private Integer status; // 0 录入 1 审核中 2 审核通过 3 驳回 + private Integer status; // 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 private String examineDate;//审核时间/驳回时间 private Integer position;//1 机构 2 县 3 市 -- 1.8.3.1