From 063be326ebe8e759179d8f9cd7bc8e039c6df405 Mon Sep 17 00:00:00 2001
From: HuangShun <148689675+huabuweixin@users.noreply.github.com>
Date: Mon, 2 Feb 2026 10:55:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBug125=20=E3=80=90?=
 =?UTF-8?q?=E4=BD=8F=E9=99=A2=E7=99=BB=E8=AE=B0=E3=80=91=E7=9A=84=E5=85=A5?=
 =?UTF-8?q?=E9=99=A2=E7=A7=91=E5=AE=A4=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=EF=BC=8C=E5=85=A5=E9=99=A2=E7=97=85=E5=8C=BA=E4=B9=9F=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E9=80=89=E6=8B=A9=EF=BC=9B=E4=BF=AE=E6=94=B9=E7=A7=91?=
 =?UTF-8?q?=E5=AE=A4=E6=95=B0=E6=8D=AE=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charge/register/components/api.js         | 14 +++++++++++
 .../register/components/registerForm.vue      | 24 ++++++++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/api.js b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/api.js
index f7e7923a..a3ea9cae 100644
--- a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/api.js
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/api.js
@@ -192,3 +192,17 @@ export function getProvincesAndCities(encounterId) {
     method: 'get',
   });
 }
+
+// 获取所有病区
+export function getAllWards(params = {}) {
+  return request({
+    url: '/base-data-manage/location/location-page',
+    method: 'get',
+    params: {
+      pageNum: params.pageNum ?? 1,
+      pageSize: params.pageSize ?? 1000,
+      formEnum: params.formEnum ?? 4,
+      ...params,
+    },
+  });
+}
diff --git a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue
index 6a8c8514..05f42564 100644
--- a/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue
+++ b/openhis-ui-vue3/src/views/inHospitalManagement/charge/register/components/registerForm.vue
@@ -202,6 +202,7 @@
 <script setup>
 import {
   diagnosisInit,
+  getAllWards,
   getBedInfo,
   getContractList,
   getDiagnosisDefinitionList,
@@ -423,12 +424,29 @@ function handleWardClick(item) {
 }
 
 function getInitOptions() {
-  getOrgList().then((res) => {
-    // 直接从records中过滤，而不是从records[0].children
-    organization.value = res.data.records.filter(
+  // 获取所有科室
+  const orgPromise = getOrgList();
+  // 获取所有病区
+  const wardPromise = getAllWards();
+
+  Promise.all([orgPromise, wardPromise]).then(([orgRes, wardRes]) => {
+    const allOrgs = orgRes.data.records.filter(
       (record) => record.typeEnum === 2 && checkClassEnumValue(record.classEnum, 2)
     );
+    const allWards = wardRes.data.records || [];
+
+    // 提取所有病区关联的科室ID
+    const linkedOrgIds = new Set();
+    allWards.forEach((ward) => {
+      if (ward.organizationId) {
+        linkedOrgIds.add(ward.organizationId);
+      }
+    });
+
+    // 过滤出与病区关联过的科室
+    organization.value = allOrgs.filter((org) => linkedOrgIds.has(org.id));
   });
+
   // if (!props.noFile) {
   //   wardList().then((res) => {
   //     wardListOptions.value = res.data;

From 96941cb4e00418c92649aaa9b5a4539082ee6fb8 Mon Sep 17 00:00:00 2001
From: HuangShun <148689675+huabuweixin@users.noreply.github.com>
Date: Mon, 2 Feb 2026 11:50:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9C=80=E6=B1=8256=20?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE-?=
 =?UTF-8?q?=E3=80=8B=E6=A3=80=E6=9F=A5=E7=B1=BB=E5=9E=8B=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E4=B8=AD=E5=8E=BB=E6=8E=89=E9=80=89=E6=8B=A9=E9=83=A8=E4=BD=8D?=
 =?UTF-8?q?=E5=8B=BE=E9=80=89=E6=A1=86=E7=82=B9=E5=87=BB=E3=80=90=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E3=80=91=E6=8C=89=E9=92=AE=E6=9C=AA=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E5=82=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/maintainSystem/checkprojectSettings/index.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue
index 40d221d8..a3c676dd 100644
--- a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue
+++ b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue
@@ -811,7 +811,7 @@ onMounted(async () => {
         code: item.code,
         name: item.name,
         type: item.type,
-        selected: true,
+        selected: item.selected ?? true,
         department: item.department || '',
         number: item.number || '999999',
         remark: item.remark || '',
@@ -930,7 +930,7 @@ async function loadMenuData(menu) {
             code: item.code,
             name: item.name,
             type: item.type,
-            selected: true,
+            selected: item.selected ?? true,
             department: item.department || '',
             number: item.number || '999999',
             remark: item.remark || '',