From d25fd589a912aa970a6642a90e44de20843799aa Mon Sep 17 00:00:00 2001
From: Flow <958079825@qq.com>
Date: Wed, 25 Jun 2025 16:03:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/inspectpatient/vo/PatientDetailsVO.java         | 3 +++
 .../service/inspectpatient/InspectPatientServiceImpl.java | 5 +++++
 yudao-server/src/main/resources/application.yaml          | 8 ++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/PatientDetailsVO.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/PatientDetailsVO.java
index 1ae7536..4f4fab6 100644
--- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/PatientDetailsVO.java
+++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/PatientDetailsVO.java
@@ -14,6 +14,9 @@ public class PatientDetailsVO {
     @Schema(description = "地址")
     private String addname;
 
+    @Schema(description = "卫生院")
+    private String orgname;
+
     @Schema(description = "所属卫生院")
     private String examhosname;
 
diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java
index b8fa638..9e545c7 100644
--- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java
+++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java
@@ -183,6 +183,7 @@ public class InspectPatientServiceImpl implements InspectPatientService {
                         InspectPatientDO::getPName,
                         InspectPatientDO::getCardId,
                         InspectPatientDO::getHospitalNo,
+                        InspectPatientDO::getOrgname,
                         InspectPatientDO::getDistrictname,
                         InspectPatientDO::getOldmanflag,
                         InspectPatientDO::getHtnflag,
@@ -225,6 +226,10 @@ public class InspectPatientServiceImpl implements InspectPatientService {
         {
             queryWrapper.eq(InspectPatientDO::getHospitalNo,  detailsVO.getHospitalNo());
         }
+        if(detailsVO.getOrgname()!=null &&  !detailsVO.getOrgname().isEmpty())
+        {
+            queryWrapper.eq(InspectPatientDO::getOrgname,  detailsVO.getOrgname());
+        }
         if(detailsVO.getOrgid()!=null&&  !detailsVO.getOrgid().isEmpty())
         {
             //特殊 乌兰察布第四医院是最大的机构 默认是1
diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml
index 24b3b84..4ede65d 100644
--- a/yudao-server/src/main/resources/application.yaml
+++ b/yudao-server/src/main/resources/application.yaml
@@ -3,7 +3,7 @@ spring:
     name: yudao-server
 
   profiles:
-    active: local
+    active: 222
 
   main:
     allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
@@ -387,6 +387,6 @@ yudao:
 debug: false
 
 #别名 需要的配置 项目名称：/admin
-#server:
-#  servlet:
-#    context-path: /adminInspect
+server:
+  servlet:
+    context-path: /adminInspect