From 726137ca1eab4249a1e0dc10847fa6a84e3ea01c Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu>
Date: Fri, 19 May 2023 08:49:26 +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

---
 .../lyms/platform/operate/web/facade/PatientFacade.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 2beb6a4..9025f4e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -2748,13 +2748,20 @@ public class PatientFacade extends BaseServiceImpl {
                 patientManagerQueryModel.setLevel(patients.getRiskLevelId());
                 String join = org.apache.commons.lang.StringUtils.join( patients.getRiskFactorId(), ",");
                 patientManagerQueryModel.setRiskFactorId(join);
-                try {
-                    String hname = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId())).getName();
-                    patientManagerQueryModel.setCouponCommunity(hname);
-                } catch (Exception e) {
-                    patientManagerQueryModel.setCouponCommunity("");
+
+                Organization org = organizationService.getOrganization(Integer.valueOf(patients.getHospitalId()));
+                if(null != org){
+                    patientManagerQueryModel.setOrgType(org.getType());
                 }
 
+                String comm = "未分配";
+                if(StringUtils.isNotEmpty(patients.getCommunityId())){
+                    CommunityConfig communityConfig = communityConfigService.getCommunityById(patients.getCommunityId());
+                    if(null != communityConfig){
+                        comm = communityConfig.getName();
+                    }
+                }
+                patientManagerQueryModel.setCouponCommunity(comm);
                 patientManagerQueryModel.setTypeStr(patients.getType() == 1 ? "未分娩" : "已分娩");
                 patientManagerQueryModel.setYyzyfmHospitalName(
                         (patients.getYyzyfmHospitalId() != null && "-1".equals(patients.getYyzyfmHospitalId())) ? "其他" :  couponMapper.getHospitalName(patients.getYyzyfmHospitalId()));
-- 
1.8.3.1