From 3be2c2e46636443c9270c42032b7afc2c0dc5020 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu>
Date: Fri, 19 May 2023 10:34:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E6=A1=A3=E4=B8=8E=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E5=88=86=E5=BC=80=E5=8A=9F=E8=83=BD:=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=9C=BA=E6=9E=84=E7=B1=BB=E5=9E=8BorgType=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/BookbuildingFacade.java  | 16 ++++++++--------
 .../operate/web/result/BookbuildingRecordResult.java     | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 62be948..05adf48 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -1545,13 +1545,11 @@ public class BookbuildingFacade {
         patientsQuery.setExtEnable(false);
 
         String hospitalId = autoMatchFacade.getHospitalId(userId);
-
+        //只查询当前医院所在市的所有建档记录
+        Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
         //如果身份证号码不为空就以身份证号码查询
         if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) {
             patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo());
-
-            //只查询当前医院所在市的所有建档记录
-            Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
             List<String> hids = new ArrayList<>();
             if (org != null) {
                 OrganizationQuery query = new OrganizationQuery();
@@ -1681,10 +1679,10 @@ public class BookbuildingFacade {
                 if (pat != null) {
                     BookbuildingRecordResult result = new BookbuildingRecordResult();
                     if (StringUtils.isNotEmpty(pat.getHospitalId())) {
-                        Organization org = organizationService.getOrganization(Integer.valueOf(pat.getHospitalId()));
-                        if (org != null) {
-                            result.setBookbuildHospital(org.getName());
-                            result.setHospitalId(String.valueOf(org.getId()));
+                        Organization orgObj = organizationService.getOrganization(Integer.valueOf(pat.getHospitalId()));
+                        if (orgObj != null) {
+                            result.setBookbuildHospital(orgObj.getName());
+                            result.setHospitalId(String.valueOf(orgObj.getId()));
                         }
                     }
 
@@ -1696,6 +1694,7 @@ public class BookbuildingFacade {
                         }
                     }
 
+
                     result.setCouponCommunity(comm);
                     result.setFmTime(DateUtil.getyyyy_MM_dd(pat.getFmDate()));
                     result.setBookbuildDate(DateUtil.getyyyy_MM_dd(pat.getBookbuildingDate()));
@@ -1773,6 +1772,7 @@ public class BookbuildingFacade {
 //        是否在本医院所在区域建档
         mapData.put("rBType", count > 0);
         mapData.put("pid", pid);
+        mapData.put("orgType", org.getType());
         mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date()));
         list.add(mapData);
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java
index d4779a3..8d92957 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BookbuildingRecordResult.java
@@ -37,6 +37,20 @@ public class BookbuildingRecordResult {
     //领劵社区
     private String couponCommunity;
 
+    /**
+     * 机构类型
+     * 1:卫生与计划生育委员会,2:妇幼保健院/站,3:妇产(科)医院,4:综合医院,5:计生站,6:卫生院,7:卫生所,8:其他
+     */
+    private Integer orgType;
+
+    public Integer getOrgType() {
+        return orgType;
+    }
+
+    public void setOrgType(Integer orgType) {
+        this.orgType = orgType;
+    }
+
     public String getCouponCommunity() {
         return couponCommunity;
     }
-- 
1.8.3.1