Merge remote-tracking branch 'origin/develop' into develop

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,
+    },
+  });
+}

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
+  const orgPromise = getOrgList();
-    organization.value = res.data.records.filter(
+  // 获取所有病区
+  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;

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 || '',