From eaae35b4c482088a8e5092923520eda82998d432 Mon Sep 17 00:00:00 2001
From: wtt <wtt@qq.com>
Date: Tue, 6 Apr 2021 12:08:04 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/AntExRecordFacade.java      | 44 +++++++++++++++++++++-
 .../web/request/AntExManagerQueryRequest.java      | 41 ++++++++++++++++++++
 2 files changed, 83 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
index 4c97b8c..0231820 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
@@ -275,12 +275,17 @@ public class AntExRecordFacade {
                     }
                 }
             }
+            //产检医院，省市县医院
+            if (StringUtils.isNotEmpty(antExManagerQueryRequest.gethId()) &&(
+                    StringUtils.isEmpty(antExManagerQueryRequest.getCzhospitalId()) || StringUtils.isEmpty(antExManagerQueryRequest.getCzcityId())
+                            || StringUtils.isEmpty(antExManagerQueryRequest.getCzareaId())|| StringUtils.isEmpty(antExManagerQueryRequest.getCzhospitalId()) ) ) {
 
-            if (org.apache.commons.lang.StringUtils.isNotEmpty(antExManagerQueryRequest.gethId())) {
                 List<String> orgId = new ArrayList<>();
                 orgId.add(antExManagerQueryRequest.gethId());
                 hospitalList.retainAll(orgId);
-            } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExManagerQueryRequest.getCprovinceId())) {
+            } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExManagerQueryRequest.getCprovinceId()) &&(
+                    StringUtils.isEmpty(antExManagerQueryRequest.getCzhospitalId()) || StringUtils.isEmpty(antExManagerQueryRequest.getCzcityId())
+                            || StringUtils.isEmpty(antExManagerQueryRequest.getCzareaId())|| StringUtils.isEmpty(antExManagerQueryRequest.getCzhospitalId())))  {
                 OrganizationQuery organizationQuery = new OrganizationQuery();
                 organizationQuery.setYn(YnEnums.YES.getId());
                 organizationQuery.setProvinceId(antExManagerQueryRequest.getCprovinceId());
@@ -301,7 +306,42 @@ public class AntExRecordFacade {
                 }
                 hospitalList.retainAll(orgId);
             }
+
+            //初诊医院，省市县医院
+            if (StringUtils.isNotEmpty(antExManagerQueryRequest.getCzhospitalId()) && (
+                    StringUtils.isEmpty(antExManagerQueryRequest.gethId()) ||  StringUtils.isEmpty(antExManagerQueryRequest.getCprovinceId())
+                            ||  StringUtils.isEmpty(antExManagerQueryRequest.getCcityId()) ||  StringUtils.isEmpty(antExManagerQueryRequest.getCareaId()) )) {
+
+                List<String> orgId = new ArrayList<>();
+                orgId.add(antExManagerQueryRequest.getCzhospitalId());
+                hospitalList.retainAll(orgId);
+            } else if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExManagerQueryRequest.getCzprovinceId())&& (
+                    StringUtils.isEmpty(antExManagerQueryRequest.gethId()) ||  StringUtils.isEmpty(antExManagerQueryRequest.getCprovinceId())
+                            ||  StringUtils.isEmpty(antExManagerQueryRequest.getCcityId()) ||  StringUtils.isEmpty(antExManagerQueryRequest.getCareaId()) )) {
+                OrganizationQuery organizationQuery = new OrganizationQuery();
+                organizationQuery.setYn(YnEnums.YES.getId());
+                organizationQuery.setProvinceId(antExManagerQueryRequest.getCzprovinceId());
+                if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExManagerQueryRequest.getCzcityId())) {
+                    organizationQuery.setCityId(antExManagerQueryRequest.getCzcityId());
+                    if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(antExManagerQueryRequest.getCzareaId())) {
+                        organizationQuery.setAreaId(antExManagerQueryRequest.getCzareaId());
+                    }
+                }
+                List<String> orgId = new ArrayList<>();
+                List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
+                if (CollectionUtils.isNotEmpty(organizations)) {
+                    for (Organization org : organizations) {
+                        if (null != org.getId()) {
+                            orgId.add(org.getId() + "");
+                        }
+                    }
+                }
+                hospitalList.retainAll(orgId);
+            }
+           // 产检医院,初诊医院只能选择其中一个查询
             antExRecordQuery.setHospitalList(hospitalList);
+
+
         } else {
             String hospital = autoMatchFacade.getHospitalId(userId);
             antExRecordQuery.setHospitalId(hospital);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
index 37bc5f7..7a8c7d9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
@@ -16,6 +16,15 @@ import java.util.Date;
 @Form
 public class AntExManagerQueryRequest extends BasePageQueryRequest {
 
+    //初诊省份
+    private String czprovinceId;
+    //初诊城市
+    private String czcityId;
+    //初诊区域
+    private String czareaId;
+    // 初诊医院id
+    private String czhospitalId;
+
     //类型 1 复诊  2 初诊
     private Integer type;
     /*滦平 start 20201105 */
@@ -475,4 +484,36 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest {
     public void setBarCode(String barCode) {
         this.barCode = barCode;
     }
+
+    public String getCzprovinceId() {
+        return czprovinceId;
+    }
+
+    public void setCzprovinceId(String czprovinceId) {
+        this.czprovinceId = czprovinceId;
+    }
+
+    public String getCzcityId() {
+        return czcityId;
+    }
+
+    public void setCzcityId(String czcityId) {
+        this.czcityId = czcityId;
+    }
+
+    public String getCzareaId() {
+        return czareaId;
+    }
+
+    public void setCzareaId(String czareaId) {
+        this.czareaId = czareaId;
+    }
+
+    public String getCzhospitalId() {
+        return czhospitalId;
+    }
+
+    public void setCzhospitalId(String czhospitalId) {
+        this.czhospitalId = czhospitalId;
+    }
 }
-- 
1.8.3.1