From 821737dcc6ab01d444af6f431bbd97f02c309836 Mon Sep 17 00:00:00 2001
From: guanyu <guanyu@gentronhealth.com>
Date: Sat, 13 Jun 2026 19:45:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(#Bug#730):=20guanyu=20(=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=88=E5=85=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ATDManageAppServiceImpl.java         |   2 +
 .../impl/SpecialAdviceAppServiceImpl.java     |  47 +-
 .../inpatientmanage/PatientHomeAppMapper.xml  |   5 +
 .../prescription/prescriptionlist.vue         |  23 +-
 .../transferOrganizationDialog.vue            |   2 +
 .../home/components/order/index.vue           | 667 +++++-------------
 6 files changed, 230 insertions(+), 516 deletions(-)

diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
index 1220b336c..51b406aa3 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/ATDManageAppServiceImpl.java
@@ -606,6 +606,7 @@ public class ATDManageAppServiceImpl implements IATDManageAppService {
      * @return 结果
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public R<?> transferDepartment(Long encounterId) {
         if (encounterId == null) {
             return R.fail("转科失败，请选择有效的患者");
@@ -663,6 +664,7 @@ public class ATDManageAppServiceImpl implements IATDManageAppService {
         // 更新住院信息
         encounter.setOrganizationId(orderProcess.getTargetOrganizationId())
                 .setStatusEnum(EncounterZyStatus.REGISTERED.getValue());
+        encounterService.saveOrUpdateEncounter(encounter);
         return R.ok("转科成功");
     }
 
diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
index 7b75908b3..eeba13636 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
+++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java
@@ -6,6 +6,7 @@ import com.core.common.core.domain.R;
 import com.core.common.utils.AssignSeqUtil;
 import com.core.common.utils.MessageUtils;
 import com.core.common.utils.SecurityUtils;
+import com.core.common.utils.StringUtils;
 import com.healthlink.his.common.constant.CommonConstants;
 import com.healthlink.his.common.constant.PromptMsgConstant;
 import com.healthlink.his.common.enums.*;
@@ -18,7 +19,13 @@ import com.healthlink.his.web.regdoctorstation.dto.*;
 import com.healthlink.his.web.regdoctorstation.mapper.SpecialAdviceAppMapper;
 import com.healthlink.his.workflow.domain.ServiceRequest;
 import com.healthlink.his.workflow.service.IActivityDefinitionService;
+import com.healthlink.his.administration.domain.Encounter;
+import com.healthlink.his.administration.domain.Organization;
+import com.healthlink.his.administration.service.IEncounterService;
+import com.healthlink.his.administration.service.IOrganizationService;
 import com.healthlink.his.workflow.service.IServiceRequestService;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -56,6 +63,12 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
     @Resource
     IOrderProcessService iOrderProcessService;
 
+    @Resource
+    IEncounterService iEncounterService;
+
+    @Resource
+    IOrganizationService iOrganizationService;
+
     /**
      * 查询护理医嘱信息
      *
@@ -351,6 +364,29 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
         AdviceBaseDto activityAdviceBaseDto = iDoctorStationAdviceAppService
                 .getAdviceBaseInfo(adviceBaseDto, null, null, null, null, 1, 1, null, List.of(3), null, null, null)
                 .getRecords().get(0);
+        // 查询患者当前科室（从就诊记录获取）
+        Encounter encounter = iEncounterService.getById(encounterId);
+        Long currentOrgId = encounter != null ? encounter.getOrganizationId() : null;
+        if (currentOrgId == null) {
+            log.warn("转科医嘱：就诊记录 organizationId 为空, encounterId={}, 回退到医嘱定义默认科室", encounterId);
+            currentOrgId = activityAdviceBaseDto.getPositionId();
+        }
+
+        // 查询转入科室名称，用于医嘱名称拼接
+        String targetOrgName = "";
+        Long targetOrgId = transferOrganizationParam.getTargetOrganizationId();
+        if (targetOrgId != null) {
+            Organization targetOrg = iOrganizationService.getById(targetOrgId);
+            if (targetOrg != null && StringUtils.isNotEmpty(targetOrg.getName())) {
+                targetOrgName = targetOrg.getName();
+            } else {
+                log.warn("转科医嘱：查询转入科室失败, targetOrgId={}, 尝试通过 orgId 直接查", targetOrgId);
+            }
+        }
+        if (StringUtils.isEmpty(targetOrgName) && targetOrgId != null) {
+            log.warn("转科医嘱：转入科室名称为空, targetOrgId={}, contentJson 中 adviceName 将缺少科室名", targetOrgId);
+        }
+
         // 保存转科医嘱请求
         ServiceRequest serviceRequest = new ServiceRequest();
         serviceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态
@@ -366,9 +402,18 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService {
         serviceRequest.setPatientId(patientId); // 患者
         serviceRequest.setRequesterId(practitionerId); // 开方医生
         serviceRequest.setEncounterId(encounterId); // 就诊id
-        serviceRequest.setOrgId(activityAdviceBaseDto.getPositionId()); // 执行科室
+        serviceRequest.setOrgId(currentOrgId); // 执行科室（患者当前科室）
         serviceRequest.setConditionId(conditionId); // 诊断id
         serviceRequest.setEncounterDiagnosisId(encounterDiagnosisId); // 就诊诊断id
+        // 设置医嘱名称：转科-转入科室名称
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            ObjectNode contentNode = objectMapper.createObjectNode();
+            contentNode.put("adviceName", "转科" + (StringUtils.isNotEmpty(targetOrgName) ? "-" + targetOrgName : ""));
+            serviceRequest.setContentJson(objectMapper.writeValueAsString(contentNode));
+        } catch (Exception e) {
+            log.warn("设置转科医嘱名称失败", e);
+        }
         iServiceRequestService.save(serviceRequest);
 
         // 保存转科医嘱请求的过程数据
diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
index 23b59e544..42f456886 100755
--- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
+++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/inpatientmanage/PatientHomeAppMapper.xml
@@ -190,6 +190,11 @@
                     AND T9.status_enum = 2
                 </if>
 
+                -- 待转科
+                <if test="statusEnum == 2">
+                    AND T2.status_enum = 6
+                </if>
+
                 -- 待出院
                 <if test="statusEnum == 3">
                     AND T2.status_enum = 4
diff --git a/healthlink-his-ui/src/views/doctorstation/components/prescription/prescriptionlist.vue b/healthlink-his-ui/src/views/doctorstation/components/prescription/prescriptionlist.vue
index 8fde53f79..ba79d6f4d 100755
--- a/healthlink-his-ui/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/healthlink-his-ui/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -394,7 +394,7 @@
                     >
                       皮试：<el-checkbox
                         v-model="scope.row.skinTestFlag"
-                        :true-value="1"
+                        :true-value="true"
                         :false-value="0"
                         @change="handleSkinTestChange(scope.row, scope.rowIndex)"
                       >
@@ -837,7 +837,7 @@
                     >
                       皮试：<el-checkbox
                         v-model="scope.row.skinTestFlag"
-                        :true-value="1"
+                        :true-value="true"
                         :false-value="0"
                         @change="handleSkinTestChange(scope.row, scope.rowIndex)"
                       >
@@ -1332,7 +1332,7 @@
             <template v-if="scope.row.isEdit">
               <el-checkbox
                 v-model="scope.row.skinTestFlag"
-                :true-value="1"
+                :true-value="true"
                 :false-value="0"
                 @change="handleSkinTestChange(scope.row, scope.rowIndex)"
               >
@@ -1750,10 +1750,8 @@ onMounted(() => {
     createNewPrescription();
     handleAddPrescription(null, false);
   }
-  // 默认展开个人：只请求个人组套
-  if (props.patientInfo?.orgId) {
-    fetchOrderGroups('personal');
-  }
+  // 默认展开个人：个人组套不依赖 orgId（使用 practitionerId 查询）
+  fetchOrderGroups('personal');
 });
 
 onBeforeUnmount(() => {
@@ -1802,12 +1800,14 @@ watch(
 watch(
   () => props.patientInfo?.orgId,
   (orgId) => {
-    if (!orgId) return;
+    // 🔧 Bug #730 修复：个人组套不依赖 orgId，只需 practitionerId（登录用户自带）
     if (!orderGroupLoaded.value.personal) {
       fetchOrderGroups('personal');
     }
     // 预加载医嘱基础数据，提升搜索响应速度
-    preloadAdviceData();
+    if (orgId) {
+      preloadAdviceData();
+    }
   },
   { immediate: true }
 );
@@ -5056,8 +5056,9 @@ async function fetchOrderGroups(scope, { force = false } = {}) {
 
   const orgId = props.patientInfo?.orgId;
   console.log('[fetchOrderGroups] orgId:', orgId);
-  if (!orgId) {
-    console.log('[fetchOrderGroups] orgId 为空，返回');
+  // 🔧 Bug #730 修复：个人/科室组套不依赖 orgId，只有全院组套需要 orgId
+  if (scope === 'hospital' && !orgId) {
+    console.log('[fetchOrderGroups] 全院组套需要 orgId 但为空，返回');
     return;
   }
 
diff --git a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/applicationForm/transferOrganizationDialog.vue b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/applicationForm/transferOrganizationDialog.vue
index aeed5c3c7..121b03945 100755
--- a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/applicationForm/transferOrganizationDialog.vue
+++ b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/applicationForm/transferOrganizationDialog.vue
@@ -97,6 +97,7 @@ import {transferOrganization} from './api.js';
 import {getOrgList, getWardList} from '@/api/public.js';
 import {patientInfo} from '../../../store/patient.js';
 
+const emit = defineEmits(['success']);
 const { proxy } = getCurrentInstance();
 const dialogVisible = ref(false);
 const deptList = ref([]); // 科室列表
@@ -151,6 +152,7 @@ function submitApplicationForm() {
         if (res.code == 200) {
           proxy.$modal.msgSuccess('转科申请已提交');
           dialogVisible.value = false;
+          emit('success');
         }
       });
     } else {
diff --git a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue
index 560eb9b9c..20d25bd5f 100755
--- a/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/healthlink-his-ui/src/views/inpatientDoctor/home/components/order/index.vue
@@ -1,47 +1,20 @@
-<template>
-  <div
-    class="inpatientDoctor-order-container"
-    style="width: 100%"
-  >
-    <div
-      style="margin-bottom: 5px"
-      class="order-operate-btn"
-    >
+<template>
+  <div class="inpatientDoctor-order-container" style="width: 100%">
+    <div style="margin-bottom: 5px" class="order-operate-btn">
       <div style="height: 44px; display: flex; align-items: center; flex: none">
-        <el-button
-          type="primary"
-          :disabled="false"
-          @click="handleAddPrescription()"
-        >
+        <el-button type="primary" @click="handleAddPrescription()" :disabled="false">
           新增
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="false"
-          @click="handleSaveBatch()"
-        >
-          保存
-        </el-button>
-        <el-button
-          type="primary"
-          :disabled="isSaveDisabled"
-          @click="handleSave()"
-        >
-          签发
-        </el-button>
-        <el-button
-          type="warning"
-          plain
-          :disabled="false"
-          @click="handleSingOut()"
-        >
+        <el-button type="primary" @click="handleSaveBatch()" :disabled="false"> 保存 </el-button>
+        <el-button type="primary" @click="handleSave()" :disabled="isSaveDisabled"> 签发 </el-button>
+        <el-button type="warning" plain @click="handleSingOut()" :disabled="false">
           撤回
         </el-button>
         <el-button
           type="primary"
           plain
-          :disabled="false"
           @click="proxy.$refs.orderFroupRef.handleOpen()"
+          :disabled="false"
         >
           组套
         </el-button>
@@ -53,50 +26,17 @@
         >
           历史
         </el-button>
-        <el-button
-          type="default"
-          :disabled="false"
-          @click="combination()"
-        >
-          组合
-        </el-button>
-        <el-button
-          type="default"
-          :disabled="false"
-          @click="split()"
-        >
-          拆组
-        </el-button>
-        <el-button
-          type="danger"
-          plain
-          :disabled="false"
-          @click="handleStopAdvice()"
-        >
+        <el-button type="default" @click="combination()" :disabled="false"> 组合 </el-button>
+        <el-button type="default" @click="split()" :disabled="false"> 拆组 </el-button>
+        <el-button type="danger" plain @click="handleStopAdvice()" :disabled="false">
           停嘱
         </el-button>
-        <el-button
-          type="success"
-          plain
-          :disabled="false"
-          @click="handleResumeAdvice()"
-        >
+        <el-button type="success" plain @click="handleResumeAdvice()" :disabled="false">
           恢复
         </el-button>
-        <el-button
-          type="danger"
-          plain
-          :disabled="false"
-          @click="handleDelete()"
-        >
-          删除
-        </el-button>
+        <el-button type="danger" plain @click="handleDelete()" :disabled="false"> 删除 </el-button>
         <span class="descriptions-item-label"> 诊断： </span>
-        <el-select
-          v-model="conditionDefinitionId"
-          placeholder="诊断"
-          style="width: 180px"
-        >
+        <el-select v-model="conditionDefinitionId" placeholder="诊断" style="width: 180px">
           <el-option
             v-for="item in diagnosisList"
             :key="item.conditionId"
@@ -106,11 +46,7 @@
           />
         </el-select>
         <span class="descriptions-item-label"> 费用性质： </span>
-        <el-select
-          v-model="accountId"
-          placeholder="费用性质"
-          style="width: 180px"
-        >
+        <el-select v-model="accountId" placeholder="费用性质" style="width: 180px">
           <el-option
             v-for="item in contractList"
             :key="item.accountId"
@@ -125,96 +61,50 @@
           刷新
         </el-button> -->
       </div>
-      <div
-        class="operate-btns"
-        style="display: flex; align-items: center; gap: 12px;"
-      >
-        <el-radio-group v-model="therapyEnum">
-          <el-radio-button value="">
-            全部
-          </el-radio-button>
-          <el-radio-button value="1">
-            长期
-          </el-radio-button>
-          <el-radio-button value="2">
-            临时
-          </el-radio-button>
-        </el-radio-group>
-        <el-select
-          v-model="orderClassCode"
-          placeholder="医嘱类型"
-          style="width: 240px"
-          clearable
-        >
-          <el-option
-            v-for="item in adviceTypeList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-        <el-select
-          v-model="orderStatus"
-          placeholder="医嘱状态"
-          style="width: 240px"
-          clearable
-        >
-          <el-option
-            v-for="item in statusOption"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-        <el-button
-          link
-          type="primary"
-          @click="handleTransferOrg"
-        >
-          转科
-        </el-button>
-        <el-button
-          link
-          type="primary"
-          :disabled="buttonDisabled"
-          @click="handleLeaveHospital"
-        >
-          出院
-        </el-button>
-        <el-button
-          link
-          type="primary"
-          @click="onNursingStatus"
-        >
-          护理状态
-        </el-button>
-        <el-button
-          link
-          type="primary"
-          @click="refresh()"
-        >
-          刷新数据
-        </el-button>
+      <div class="operate-btns" style="display: flex; align-items: center; gap: 12px;">
+          <el-radio-group v-model="therapyEnum">
+            <el-radio-button>全部</el-radio-button>
+            <el-radio-button>长期</el-radio-button>
+            <el-radio-button value="2">临时</el-radio-button>
+          </el-radio-group>
+          <el-select v-model="orderClassCode" placeholder="医嘱类型" style="width: 240px" clearable>
+            <el-option
+              v-for="item in adviceTypeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <el-select v-model="orderStatus" placeholder="医嘱状态" style="width: 240px" clearable>
+            <el-option
+              v-for="item in statusOption"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+          <el-button link type="primary" @click="handleTransferOrg">转科</el-button>
+          <el-button link type="primary" :disabled="buttonDisabled" @click="handleLeaveHospital">
+            出院
+          </el-button>
+          <el-button link type="primary" @click="onNursingStatus">护理状态</el-button>
+          <el-button link type="primary" @click="refresh()">刷新数据</el-button>
       </div>
     </div>
     <div class="inpatientDoctor-order-table">
       <vxe-table
-        ref="prescriptionRef"
-        v-loading="loading"
         auto-resize
         height="100%"
+        ref="prescriptionRef"
         :data="filterPrescriptionList"
-        :row-config="{ keyField: 'uniqueKey' }"
-        :expand-config="{ expandRowKeys: expandOrder }"
+        :row-config="{ keyField: 'uniqueKey' }" :expand-config="{ expandRowKeys: expandOrder }"
         border
         @cell-click="clickRow"
         @cell-dblclick="clickRowDb"
+        v-loading="loading"
         @checkbox-change="handleSelectionChange"
       >
-        <vxe-column
-          type="expand"
-          width="40"
-        >
+        <vxe-column type="expand" width="40">
           <template #content="scope">
             <OrderForm
               :row="scope.row"
@@ -228,39 +118,21 @@
             />
           </template>
         </vxe-column>
-        <vxe-column
-          type="checkbox"
-          align="center"
-          width="60"
-        />
-        <vxe-column
-          title="组"
-          align="center"
-          width="60"
-          field="groupIcon"
-        />
+        <vxe-column type="checkbox" align="center" width="60" />
+        <vxe-column title="组" align="center" width="60" field="groupIcon" />
 
-        <vxe-column
-          title="类型"
-          align="center"
-          field=""
-          width="140"
-        >
+        <vxe-column title="类型" align="center" field="" width="140">
           <template #default="scope">
             <el-radio-group
-              v-if="getRowDisabled(scope.row)"
               v-model="scope.row.therapyEnum"
               size="small"
+              v-if="getRowDisabled(scope.row)"
               :disabled="scope.row.dischargeFlag"
-              style="white-space: nowrap"
               @click.stop
+              style="white-space: nowrap"
             >
-              <el-radio-button value="1">
-                长期
-              </el-radio-button>
-              <el-radio-button value="2">
-                临时
-              </el-radio-button>
+              <el-radio-button value="1">长期</el-radio-button>
+              <el-radio-button value="2">临时</el-radio-button>
             </el-radio-group>
             <span
               v-else
@@ -270,22 +142,12 @@
             </span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="开嘱医生"
-          align="center"
-          field="requesterId_dictText"
-          width="120"
-        >
+        <vxe-column title="开嘱医生" align="center" field="requesterId_dictText" width="120">
           <template #default="scope">
             {{ scope.row.requesterId_dictText || '-' }}
           </template>
         </vxe-column>
-        <vxe-column
-          title="开始时间"
-          align="center"
-          field="startTime"
-          width="200"
-        >
+        <vxe-column title="开始时间" align="center" field="startTime" width="200">
           <template #default="scope">
             <el-date-picker
               v-if="scope.row.isEdit"
@@ -302,20 +164,14 @@
             </span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="医嘱"
-          align="center"
-          field="productName"
-          width="300"
-        >
+        <vxe-column title="医嘱" align="center" field="productName" width="300">
           <template #default="scope">
             <template v-if="getRowDisabled(scope.row)">
               <el-select
-                :ref="'adviceTypeRef' + scope.rowIndex"
                 style="width: 35%; margin-right: 8px"
                 :model-value="getRowSelectValue(scope.row)"
+                :ref="'adviceTypeRef' + scope.rowIndex"
                 :disabled="!isCategoryLoaded"
-                clearable
                 @change="
                   (value) => {
                     filterPrescriptionList[scope.rowIndex].adviceName = undefined;
@@ -350,6 +206,7 @@
                     }
                   }
                 "
+                clearable
               >
                 <el-option
                   v-for="item in adviceTypeList"
@@ -362,18 +219,18 @@
                 :popper-style="{ padding: '0' }"
                 placement="bottom-start"
                 :visible="scope.row.showPopover"
-                :width="950"
+                :width="1200"
               >
                 <adviceBaseList
                   ref="adviceTableRef"
-                  :patient-info="patientInfo"
-                  @select-advice-base="(row) => selectAdviceBase(scope.row.uniqueKey, row)"
+                  :patientInfo="patientInfo"
+                  @selectAdviceBase="(row) => selectAdviceBase(scope.row.uniqueKey, row)"
                 />
                 <template #reference>
                   <el-input
                     :ref="'adviceRef' + scope.rowIndex"
-                    v-model="scope.row.adviceName"
                     style="width: 62%"
+                    v-model="scope.row.adviceName"
                     placeholder="请选择项目"
                     @input="handleChange"
                     @focus="handleFocus(scope.row, scope.rowIndex)"
@@ -398,99 +255,32 @@
             <span v-else>{{ scope.row.adviceName }}</span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="状态"
-          align="center"
-          field=""
-          width="90"
-        >
+        <vxe-column title="状态" align="center" field="" width="90">
           <template #default="scope">
-            <el-tag
-              v-if="scope.row.chargeStatus == 5"
-              type="info"
-            >
+            <el-tag v-if="scope.row.chargeStatus == 5" type="info">
               {{ scope.row.chargeStatus_enumText }}
             </el-tag>
-            <el-tag
-              v-else-if="scope.row.statusEnum == 2"
-              type="success"
-            >
-              已签发
-            </el-tag>
-            <el-tag
-              v-else-if="!scope.row.requestId && scope.row.statusEnum == 1"
-              type="warning"
-            >
+            <el-tag v-else-if="scope.row.statusEnum == 2" type="success">已签发</el-tag>
+            <el-tag v-else-if="!scope.row.requestId && scope.row.statusEnum == 1" type="warning">
               待保存
             </el-tag>
-            <el-tag
-              v-else-if="scope.row.statusEnum == 1"
-              type="primary"
-            >
-              待签发
-            </el-tag>
-            <el-tag
-              v-else-if="scope.row.statusEnum == 10"
-              type="primary"
-            >
-              已校对
-            </el-tag>
-            <el-tag
-              v-else-if="scope.row.statusEnum == 11"
-              type="primary"
-            >
-              待接收
-            </el-tag>
-            <el-tag
-              v-else-if="scope.row.statusEnum == 3"
-              type="success"
-            >
-              已校对
-            </el-tag>
-            <el-tag
-              v-else-if="scope.row.statusEnum == 13"
-              type="warning"
-            >
-              已停嘱
-            </el-tag>
-            <el-tag
-              v-else-if="scope.row.statusEnum == 6"
-              type="danger"
-            >
-              停止
-            </el-tag>
-            <el-tag
-              v-else-if="scope.row.statusEnum == 20"
-              type="success"
-            >
-              已完成
-            </el-tag>
-            <el-tag
-              v-else
-              type="info"
-            >
-              {{ scope.row.chargeStatus_enumText }}
-            </el-tag>
+            <el-tag v-else-if="scope.row.statusEnum == 1" type="primary">待签发</el-tag>
+            <el-tag v-else-if="scope.row.statusEnum == 10" type="primary">已校对</el-tag>
+            <el-tag v-else-if="scope.row.statusEnum == 11" type="primary">待接收</el-tag>
+            <el-tag v-else-if="scope.row.statusEnum == 3" type="success">已校对</el-tag>
+            <el-tag v-else-if="scope.row.statusEnum == 6" type="danger">停止</el-tag>
+            <el-tag v-else-if="scope.row.statusEnum == 20" type="success">已完成</el-tag>
+            <el-tag v-else type="info">{{ scope.row.chargeStatus_enumText }}</el-tag>
           </template>
         </vxe-column>
-        <vxe-column
-          title="单次剂量"
-          align="center"
-          field=""
-          width="120"
-        >
+        <vxe-column title="单次剂量" align="center" field="" width="120">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">
               {{ scope.row.dose ? scope.row.dose + ' ' + scope.row.doseUnitCode_dictText : '' }}
             </span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="总量"
-          align="center"
-          field=""
-          width="100"
-        >
+        <vxe-column title="总量" align="center" field="" width="100">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">
               {{
@@ -501,77 +291,43 @@
             </span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="总金额"
-          align="right"
-          field=""
-          header-align="center"
-          width="100"
-        >
+        <vxe-column title="总金额" align="right" field="" header-align="center" width="100">
           <template #default="scope">
-            <span
-              v-if="!scope.row.isEdit"
-              style="text-align: right"
-            >
+            <span v-if="!scope.row.isEdit" style="text-align: right">
               {{ scope.row.totalPrice ? Number(scope.row.totalPrice).toFixed(2) + ' 元' : '-' }}
             </span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="药房/科室"
-          align="center"
-          field=""
-          width="240"
-        >
+        <vxe-column title="药房/科室" align="center" field="" width="240">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">
               {{ scope.row.positionName || scope.row.orgName }}
             </span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="频次/用法"
-          align="center"
-          field=""
-          width="180"
-        >
+        <vxe-column title="频次/用法" align="center" field="" width="180">
           <template #default="scope">
-            <span
-              v-if="!scope.row.isEdit && (scope.row.adviceType == 1 || scope.row.adviceType == 7 || scope.row.adviceType == 8)"
-              style="text-align: right"
-            >
+            <span v-if="!scope.row.isEdit && scope.row.adviceType == 1" style="text-align: right">
               {{
-                scope.row.adviceType == 8
-                  ? (scope.row.rateCode_dictText || scope.row.rateCode || '-')
-                  : [
-                    scope.row.rateCode_dictText,
-                    scope.row.dispensePerDuration ? scope.row.dispensePerDuration + '天' : '',
-                    scope.row.methodCode_dictText,
-                  ]
-                    .filter(Boolean)
-                    .join(' ')
+                [
+                  scope.row.rateCode_dictText,
+                  scope.row.dispensePerDuration ? scope.row.dispensePerDuration + '天' : '',
+                  scope.row.methodCode_dictText,
+                ]
+                  .filter(Boolean)
+                  .join(' ')
               }}
             </span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="注射药品"
-          align="center"
-          field=""
-          width="80"
-        >
+        <vxe-column title="注射药品" align="center" field="" width="80">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">
               {{ scope.row.injectFlag_enumText || '-' }}
             </span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="皮试"
-          align="center"
-          field=""
-          width="80"
-        >
+        <vxe-column title="皮试" align="center" field="" width="80">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">
               {{ scope.row.skinTestFlag_enumText || '-' }}
@@ -583,60 +339,33 @@
               size="small"
               @click.stop
             >
-              <el-option
-                :value="1"
-                label="是"
-              />
-              <el-option
-                :value="0"
-                label="否"
-              />
+              <el-option :value="1" label="是" />
+              <el-option :value="0" label="否" />
             </el-select>
           </template>
         </vxe-column>
-        <vxe-column
-          title="停嘱医生"
-          align="center"
-          field="stopUserName"
-          width="120"
-        >
+        <vxe-column title="停嘱医生" align="center" field="stopUserName" width="120">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">
               {{ scope.row.stopUserName || "-" }}
             </span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="停嘱时间"
-          align="center"
-          field="stopTime"
-          width="170"
-        >
+        <vxe-column title="停嘱时间" align="center" field="stopTime" width="170">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">
               {{ scope.row.stopTime || "-" }}
             </span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="备注"
-          align="center"
-          field="remark"
-          width="150"
-          show-overflow="title"
-        >
+        <vxe-column title="备注" align="center" field="remark" width="150" show-overflow="title">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">
               {{ scope.row.remark || '-' }}
             </span>
           </template>
         </vxe-column>
-        <vxe-column
-          title="诊断"
-          align="center"
-          field="diagnosisName"
-          width="150"
-        >
+        <vxe-column title="诊断" align="center" field="diagnosisName" width="150">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">
               {{ scope.row.diagnosisName || scope.row.conditionDefinitionName }}
@@ -646,21 +375,18 @@
       </vxe-table>
     </div>
     <!-- // 底部按钮   -->
-    <application-form-bottom-btn
-      :patient-info="patientInfo"
-      @ref-resh="refresh"
-    />
+    <application-form-bottom-btn :patientInfo="patientInfo" @refResh="refresh" />
     <OrderGroupDrawer
       ref="orderFroupRef"
       :diagnosis="diagnosisInfo"
-      :organization-id="patientInfo?.orgId || ''"
-      @use-order-group="handleSaveGroup"
+      :organizationId="patientInfo?.orgId || ''"
+      @useOrderGroup="handleSaveGroup"
     />
     <PrescriptionHistory
       ref="prescriptionHistoryRef"
       :diagnosis="diagnosisInfo"
-      :patient-info="patientInfo || {}"
-      @user-prescription-history="handleSaveHistory"
+      :patientInfo="patientInfo || {}"
+      @userPrescriptionHistory="handleSaveHistory"
     />
     <LeaveHospitalDialog
       ref="leaveHospitalDialogRef"
@@ -670,7 +396,7 @@
       :encounter-diagnosis-id="encounterDiagnosisId"
       @success="handleLeaveHospitalSuccess"
     />
-    <TransferOrganizationDialog ref="transferOrganizationRef" />
+    <TransferOrganizationDialog ref="transferOrganizationRef" @success="handleTransferOrgSuccess" />
   </div>
   <!-- <el-drawer v-model="openDrawer" size="100%">
     <template #default>
@@ -679,27 +405,12 @@
       </div>
     </template>
   </el-drawer> -->
-  <el-dialog
-    v-model="openDrawer"
-    width="85%"
-    style="height: 800px"
-  >
-    <NursingStatus />
+  <el-dialog v-model="openDrawer" width="85%" style="height: 800px">
+    <NursingStatus></NursingStatus>
   </el-dialog>
-  <el-dialog
-    v-model="stopDialogVisible"
-    title="停嘱确认"
-    width="400px"
-    :close-on-click-modal="false"
-  >
-    <el-form
-      :model="stopForm"
-      label-width="100px"
-    >
-      <el-form-item
-        label="停嘱时间"
-        required
-      >
+  <el-dialog v-model="stopDialogVisible" title="停嘱确认" width="400px" :close-on-click-modal="false">
+    <el-form :model="stopForm" label-width="100px">
+      <el-form-item label="停嘱时间" required>
         <el-date-picker
           v-model="stopForm.stopTime"
           type="datetime"
@@ -711,15 +422,8 @@
       </el-form-item>
     </el-form>
     <template #footer>
-      <el-button @click="stopDialogVisible = false">
-        取消
-      </el-button>
-      <el-button
-        type="primary"
-        @click="confirmStopAdvice"
-      >
-        确定
-      </el-button>
+      <el-button @click="stopDialogVisible = false">取消</el-button>
+      <el-button type="primary" @click="confirmStopAdvice">确定</el-button>
     </template>
   </el-dialog>
 </template>
@@ -743,13 +447,12 @@ import {
 } from '../api';
 import adviceBaseList from '../adviceBaseList';
 import {calculateQuantityByDays} from '@/utils/his';
-import {localPatientInfo as localPatientInfoRef} from '../../store/localPatient.js';
+import {localPatientInfo as patientInfo} from '../../store/localPatient.js';
 import OrderGroupDrawer from '@/views/doctorstation/components/prescription/orderGroupDrawer.vue';
 import PrescriptionHistory from '@/views/doctorstation/components/prescription/prescriptionHistory.vue';
 import Decimal from 'decimal.js';
 import {ElMessage, ElMessageBox} from 'element-plus';
 import useUserStore from '@/store/modules/user';
-import {RequestStatus} from '@/utils/medicalConstants';
 import ApplicationFormBottomBtn from './applicationForm/applicationFormBottomBtn.vue';
 import LeaveHospitalDialog from './applicationForm/leaveHospitalDialog.vue';
 import TransferOrganizationDialog from './applicationForm/transferOrganizationDialog.vue';
@@ -814,10 +517,10 @@ const unitMap = ref({
   unit: 'unit',
 });
 const buttonDisabled = computed(() => {
-  return !localPatientInfoRef.value;
+  return !patientInfo.value;
 });
 const isSaveDisabled = computed(() => {
-  return !localPatientInfoRef.value || prescriptionList.value.length === 0;
+  return !patientInfo.value || prescriptionList.value.length === 0;
 });
 const props = defineProps({
   patientInfo: {
@@ -878,10 +581,9 @@ const adviceTypeList = computed(() => {
       hasShownPharmacyConfigWarning.value = true;
     }
     
-    // 只返回不需要取药科室配置的类别（诊疗、耗材、手术、出院带药）
+    // 只返回不需要取药科室配置的类别（诊疗、手术、出院带药）
     return [
       { label: '诊疗', value: 3, adviceType: 3, categoryCode: '' },
-      { label: '耗材', value: 2, adviceType: 2, categoryCode: '' },
       { label: '手术', value: 6, adviceType: 6, categoryCode: '' },
       { label: '出院带药', value: 7, adviceType: 7, categoryCode: '' },
       { label: '文字', value: 8, adviceType: 8, categoryCode: '' },
@@ -908,9 +610,8 @@ const adviceTypeList = computed(() => {
     typeList.push({ label: '中草药', value: '1-4', adviceType: 1, categoryCode: '4' });
   }
   
-  // 始终添加诊疗、耗材和手术（它们不受取药配置限制）
+  // 始终添加诊疗和手术（它们不受取药配置限制）
   typeList.push({ label: '诊疗', value: 3, adviceType: 3, categoryCode: '' });
-  typeList.push({ label: '耗材', value: 2, adviceType: 2, categoryCode: '' });
   typeList.push({ label: '手术', value: 6, adviceType: 6, categoryCode: '' });
   
   // 始终添加"出院带药"选项（不需要取药科室配置）
@@ -934,10 +635,6 @@ const statusOption = [
     label: '已签发',
     value: 2,
   },
-  {
-    label: '已停嘱',
-    value: 13,
-  },
   {
     label: '停止',
     value: 6,
@@ -1011,7 +708,7 @@ function getListInfo(addNewRow) {
   const orgTreePromise = getOrgTree().then((res) => {
     organization.value = res?.data?.records ?? res?.data ?? [];
   });
-  getPrescriptionList(localPatientInfoRef.value.encounterId).then((res) => {
+  getPrescriptionList(patientInfo.value.encounterId).then((res) => {
     // 等待科室树加载完成后再处理处方数据，确保 resolveOrgId 能正确匹配
     orgTreePromise.then(() => {
       loading.value = false;
@@ -1027,11 +724,6 @@ function getListInfo(addNewRow) {
           return {
             ...parsedContent,
             ...item,
-            // 🔧 修复：确保开嘱医生名称正确显示
-            // 优先使用后端返回的 requesterId_dictText，其次从 userStore 获取
-            requesterId_dictText: item.requesterId_dictText || item.requesterId_dict_text
-              || (String(item.requesterId) === String(userStore.practitionerId) ? userStore.name : '')
-              || parsedContent?.requesterId_dictText || '-',
             // 🔧 修复：contentJson 中的 totalPrice 优先于 charge_item 表的 totalPrice
             // charge_item.totalPrice 可能为 0 或 null（新建医嘱时），导致总金额显示为 "-"
             totalPrice: parsedContent?.totalPrice || item.totalPrice,
@@ -1059,9 +751,6 @@ function getListInfo(addNewRow) {
             // 🔧 修复：同时保存 orgName，当 orgId 在科室树中匹配不到时作为兜底显示
             // 优先从科室树查找名称，其次用 positionName（后端已保存的科室名），最后用 contentJson 中的 orgName
             orgName: findOrgName(item.positionId || parsedContent?.orgId || item.orgId) || item.positionName || parsedContent?.orgName || undefined,
-            // 确保文字医嘱的 rateCode / rateCode_dictText 不被 item 中的 null/undefined 覆盖
-            rateCode: item.rateCode || parsedContent?.rateCode || undefined,
-            rateCode_dictText: item.rateCode_dictText || parsedContent?.rateCode_dictText || undefined,
             // Bug #589: 从contentJson检测出院带药标记，恢复类型显示
             // 后端存储时adviceType转为1（药品），通过prescriptionCategory=3标识出院带药
             ...(parsedContent?.prescriptionCategory == 3 ? {
@@ -1083,10 +772,10 @@ function getListInfo(addNewRow) {
       }
     });
   }).catch(() => { loading.value = false; });
-  getContract({ encounterId: localPatientInfoRef.value.encounterId }).then((res) => {
+  getContract({ encounterId: patientInfo.value.encounterId }).then((res) => {
     contractList.value = res.data;
   });
-  accountId.value = localPatientInfoRef.value.accountId;
+  accountId.value = patientInfo.value.accountId;
   
   // 加载已配置的药品类别
   loadConfiguredCategories();
@@ -1096,7 +785,7 @@ function getListInfo(addNewRow) {
  * 加载已配置的药品类别
  */
 function loadConfiguredCategories() {
-  const orgId = localPatientInfoRef.value?.inHospitalOrgId;
+  const orgId = patientInfo.value?.inHospitalOrgId;
   if (!orgId) {
     isCategoryLoaded.value = true; // 标记已加载（即使没有科室ID）
     return;
@@ -1162,15 +851,7 @@ const filterPrescriptionList = computed(() => {
   const pList = prescriptionList.value.filter((item) => {
     return (
       (!therapyEnum.value || therapyEnum.value == item.therapyEnum) &&
-      (() => {
-        if (!orderClassCode.value) return true;
-        const code = String(orderClassCode.value);
-        if (code.includes('-')) {
-          const [aType, cCode] = code.split('-');
-          return item.adviceType == aType && item.categoryCode == cCode;
-        }
-        return orderClassCode.value == item.adviceType;
-      })() &&
+      (!orderClassCode.value || orderClassCode.value == item.adviceType) &&
       (!orderStatus.value || (orderStatus.value == item.statusEnum && item.requestId))
     );
   });
@@ -1178,7 +859,7 @@ const filterPrescriptionList = computed(() => {
 });
 
 function getDiagnosisInfo() {
-  getEncounterDiagnosis(localPatientInfoRef.value.encounterId).then((res) => {
+  getEncounterDiagnosis(patientInfo.value.encounterId).then((res) => {
     diagnosisList.value = res.data;
     let diagnosisInfo = diagnosisList.value.filter((item) => {
       return item.maindiseFlag == 1;
@@ -1206,14 +887,13 @@ function getRowSelectValue(row) {
   if (row.adviceType == 7) {
     return 7;
   }
-  // 耗材(adviceType=2)直接返回数字值，与 adviceTypeList 中的 value 匹配
   return row.adviceType;
 }
 
 // 新增医嘱
 function handleAddPrescription() {
   // 校验是否选中患者
-  if (!localPatientInfoRef.value || !localPatientInfoRef.value.encounterId) {
+  if (!patientInfo.value || !patientInfo.value.encounterId) {
     proxy.$modal.msgWarning('请先选择患者');
     return;
   }
@@ -1262,9 +942,9 @@ function checkUnit(item, row) {
  * @returns {boolean} true=通过, false=不通过
  */
 function validateStartTime(startTime) {
-  if (!startTime || !localPatientInfoRef.value?.inHospitalTime) return true;
+  if (!startTime || !patientInfo.value?.inHospitalTime) return true;
   const startDate = new Date(startTime);
-  const inHospitalDate = new Date(localPatientInfoRef.value.inHospitalTime);
+  const inHospitalDate = new Date(patientInfo.value.inHospitalTime);
   if (startDate < inHospitalDate) {
     const pad = (n) => String(n).padStart(2, '0');
     const d = inHospitalDate;
@@ -1304,13 +984,6 @@ function clickRowDb({ row, column, event }) {
   if (row.statusEnum == 1) {
     // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
     row.therapyEnum = String(row.therapyEnum ?? '1');
-    if (row.adviceType == 8) {
-      if (!row.orgId && userStore.orgId) {
-        row.orgId = userStore.orgId;
-        row.positionId = userStore.orgId;
-        row.orgName = userStore.orgName || findOrgName(userStore.orgId) || '';
-      }
-    }
     row.isEdit = true;
     const index = prescriptionList.value.findIndex((item) => item.uniqueKey === row.uniqueKey);
     rowIndex.value = index;
@@ -1393,14 +1066,6 @@ function handleDiagnosisChange(item) {
 function expandTextRow(rowIndex) {
   const row = filterPrescriptionList.value[rowIndex];
   if (!row) return;
-  
-  // 自动获取当前用户所在的科室
-  if (!row.orgId && userStore.orgId) {
-    row.orgId = userStore.orgId;
-    row.positionId = userStore.orgId;
-    row.orgName = userStore.orgName || findOrgName(userStore.orgId) || '';
-  }
-  
   expandOrder.value = [row.uniqueKey];
   nextTick(() => {
     if (prescriptionRef.value?.setRowExpand) {
@@ -1783,9 +1448,9 @@ function handleSave() {
   // 签发处理逻辑
   function executeSaveLogic() {
     saveList.forEach((item) => {
-      item.patientId = localPatientInfoRef.value.patientId;
-      item.encounterId = localPatientInfoRef.value.encounterId;
-      item.accountId = localPatientInfoRef.value.accountId;
+      item.patientId = patientInfo.value.patientId;
+      item.encounterId = patientInfo.value.encounterId;
+      item.accountId = patientInfo.value.accountId;
       item.dbOpType = '1';
       // Bug #589: 出院带药保存时转为药品类型
       if (item.adviceType == 7) {
@@ -1814,11 +1479,11 @@ function handleSave() {
     // 保存签发按钮
     isSaving.value = true;
     console.log('签发处方参数：', {
-      organizationId: localPatientInfoRef.value.inHospitalOrgId,
+      organizationId: patientInfo.value.inHospitalOrgId,
       adviceSaveList: list,
     });
     savePrescriptionSign({
-      organizationId: localPatientInfoRef.value.inHospitalOrgId,
+      organizationId: patientInfo.value.inHospitalOrgId,
       regAdviceSaveList: list,
     })
       .then((res) => {
@@ -1880,8 +1545,8 @@ function handleOrderBindInfo(bindIdInfo) {
       const newRow = {
         ...prescriptionList.value[rowIndex.value],
         uniqueKey: nextId.value++,
-        patientId: localPatientInfoRef.value.patientId,
-        encounterId: localPatientInfoRef.value.encounterId,
+        patientId: patientInfo.value.patientId,
+        encounterId: patientInfo.value.encounterId,
         accountId: accountId.value,
         quantity: item.quantity,
         methodCode: item.methodCode,
@@ -1984,8 +1649,8 @@ function handleSaveSign(row, index) {
 
   // 执行保存
   row.contentJson = undefined;
-  row.patientId = localPatientInfoRef.value.patientId;
-  row.encounterId = localPatientInfoRef.value.encounterId;
+  row.patientId = patientInfo.value.patientId;
+  row.encounterId = patientInfo.value.encounterId;
   row.accountId = accountId.value;
 
   // 🔧 文字医嘱(type=8)：跳过计费逻辑，总金额为0
@@ -2233,9 +1898,9 @@ function setValue(row) {
     // 2. 诊疗类型优先使用项目维护的所属科室(row.orgId)，其次positionId
     // 3. 如果都为空，回退到患者当前所在科室(patientInfo.orgId)
     // 4. 使用 resolveOrgId 从组织树中匹配正确的 String id，解决大 Long 精度丢失问题
-    orgId: row.adviceType != 3 ? undefined : (resolveOrgId(row.orgId || row.positionId || localPatientInfoRef.value?.inHospitalOrgId) || ''),
+    orgId: row.adviceType != 3 ? undefined : (resolveOrgId(row.orgId || row.positionId || patientInfo.value?.inHospitalOrgId) || ''),
     // 🔧 修复：同时保存 orgName，当 orgId 在科室树中匹配不到时作为兜底显示
-    orgName: row.adviceType != 3 ? undefined : (findOrgName(row.orgId || row.positionId || localPatientInfoRef.value?.inHospitalOrgId) || row.orgName || localPatientInfoRef.value?.inHospitalOrgName || ''),
+    orgName: row.adviceType != 3 ? undefined : (findOrgName(row.orgId || row.positionId || patientInfo.value?.inHospitalOrgId) || row.orgName || patientInfo.value?.inHospitalOrgName || ''),
     // dose: undefined, Removed to preserve dose value from group package
     unitCodeList: unitCodeList.value,
     doseUnitCode: row.doseUnitCode,
@@ -2339,8 +2004,8 @@ function handleSaveGroup(orderGroupList) {
     // 创建新的处方项目
     const newRow = {
       ...prescriptionList.value[tempIndex],
-      patientId: localPatientInfoRef.value.patientId,
-      encounterId: localPatientInfoRef.value.encounterId,
+      patientId: patientInfo.value.patientId,
+      encounterId: patientInfo.value.encounterId,
       accountId: accountId.value,
       // 🔧 修复 Bug #403：从 mergedDetail 读取明细字段，而非直接从 item 取
       // item.dose 等字段可能为 null，mergedDetail 已做 ?? 兜底
@@ -2354,9 +2019,9 @@ function handleSaveGroup(orderGroupList) {
       unitCode: mergedDetail.unitCode ?? item.unitCode,
       unitCode_dictText: item.unitCodeName || mergedDetail.unitCodeName || '',
       statusEnum: 1,
-      orgId: resolveOrgId(mergedDetail.orgId || localPatientInfoRef.value?.inHospitalOrgId) || '',
+      orgId: resolveOrgId(mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || '',
       // 🔧 修复：同时存储 orgName，确保树匹配不到时仍有中文名称可显示
-      orgName: findOrgName(mergedDetail.orgId || localPatientInfoRef.value?.inHospitalOrgId) || mergedDetail.orgName || localPatientInfoRef.value?.inHospitalOrgName || '',
+      orgName: findOrgName(mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || mergedDetail.orgName || patientInfo.value?.inHospitalOrgName || '',
       startTime: mergedDetail.startTime || defaultStartTimeFn(),
       dbOpType: prescriptionList.value[tempIndex].requestId ? '2' : '1',
       conditionId: conditionId.value,
@@ -2398,8 +2063,8 @@ function handleSaveGroup(orderGroupList) {
 function handleSaveHistory(value) {
   let saveRow = {
     ...value,
-    patientId: localPatientInfoRef.value.patientId,
-    encounterId: localPatientInfoRef.value.encounterId,
+    patientId: patientInfo.value.patientId,
+    encounterId: patientInfo.value.encounterId,
     accountId: accountId.value,
     uniqueKey: undefined,
     startTime: defaultStartTimeFn(),
@@ -2561,10 +2226,10 @@ function handleStopAdvice() {
         break;
       }
     }
-    // 找出停嘱的（已停止=6 或 已停嘱=13 的不允许再停）
+    // 找出停嘱的
     for (let index = 0; index < selectRows.length; index++) {
       const item = selectRows[index];
-      if (item.statusEnum == 6 || item.statusEnum == 13) {
+      if (item.statusEnum == 6) {
         isStop = false;
         break;
       }
@@ -2623,9 +2288,9 @@ function confirmStopAdvice() {
     return;
   }
   // 校验：停嘱时间不能早于患者入院时间
-  if (localPatientInfoRef.value?.inHospitalTime) {
+  if (patientInfo.value?.inHospitalTime) {
     const stopDate = new Date(stopForm.stopTime);
-    const inHospitalDate = new Date(localPatientInfoRef.value.inHospitalTime);
+    const inHospitalDate = new Date(patientInfo.value.inHospitalTime);
     if (stopDate < inHospitalDate) {
       const pad = (n) => String(n).padStart(2, '0');
       const d = inHospitalDate;
@@ -2668,11 +2333,11 @@ function handleResumeAdvice() {
     });
     return;
   }
-  // 校验：只有状态为"停止"(statusEnum=6)或"已停嘱"(statusEnum=13)的医嘱才能恢复
+  // 校验：只有状态为"停止"(statusEnum=6)的医嘱才能恢复
   let hasStopOrder = false;
   for (let index = 0; index < selectRows.length; index++) {
     const item = selectRows[index];
-    if (item.statusEnum == 6 || item.statusEnum == 13) {
+    if (item.statusEnum == 6) {
       hasStopOrder = true;
       break;
     }
@@ -2680,7 +2345,7 @@ function handleResumeAdvice() {
   if (!hasStopOrder) {
     ElMessage({
       type: 'error',
-      message: '请选择已停止或已停嘱的医嘱进行恢复',
+      message: '请选择已停止的医嘱进行恢复',
     });
     return;
   }
@@ -2688,7 +2353,7 @@ function handleResumeAdvice() {
   let allStop = true;
   for (let index = 0; index < selectRows.length; index++) {
     const item = selectRows[index];
-    if (item.statusEnum != 6 && item.statusEnum != 13) {
+    if (item.statusEnum != 6) {
       allStop = false;
       break;
     }
@@ -2696,7 +2361,7 @@ function handleResumeAdvice() {
   if (!allStop) {
     ElMessage({
       type: 'error',
-      message: '恢复操作只能选择已停止或已停嘱的医嘱，请重新选择',
+      message: '恢复操作只能选择已停止的医嘱，请重新选择',
     });
     return;
   }
@@ -2742,10 +2407,10 @@ function combination() {
         break;
       }
     }
-    // 找出停嘱的（已停止或已停嘱的不允许组合）
+    // 找出停嘱的
     for (let index = 0; index < selectRows.length; index++) {
       const item = selectRows[index];
-      if (item.statusEnum == RequestStatus.STOPPED || item.statusEnum == RequestStatus.PENDING_STOP) {
+      if (item.statusEnum == 6) {
         isStop = false;
         break;
       }
@@ -2842,10 +2507,10 @@ function split() {
         break;
       }
     }
-    // 找出停嘱的（已停止或已停嘱的不允许拆组）
+    // 找出停嘱的
     for (let index = 0; index < selectRows.length; index++) {
       const item = selectRows[index];
-      if (item.statusEnum == RequestStatus.STOPPED || item.statusEnum == RequestStatus.PENDING_STOP) {
+      if (item.statusEnum == 6) {
         isStop = false;
         break;
       }
@@ -3063,25 +2728,16 @@ function calculateTotalAmount(row, index) {
 }
 
 // 选择框改变时的处理
-// 防止 toggleCheckboxRow 触发 @checkbox-change 导致递归
-let _groupSelectLock = false;
 function handleSelectionChange({ selection, row }) {
-  if (_groupSelectLock) return;
   if (!row || !selection) return;
-  if (!row.groupId) return;
   const isSelected = selection.some((item) => item.uniqueKey === row.uniqueKey);
-  const siblings = prescriptionList.value.filter(
-    (item) => item.groupId && item.groupId == row.groupId
-  );
-  if (siblings.length <= 1) return;
-  _groupSelectLock = true;
-  try {
-    siblings.forEach((sibling) => {
-      prescriptionRef.value.setCheckboxRow([sibling], isSelected);
+  prescriptionList.value
+    .filter((item) => {
+      return item.groupId && item.groupId == row?.groupId;
+    })
+    .forEach((row) => {
+      prescriptionRef.value.toggleCheckboxRow(row, isSelected);
     });
-  } finally {
-    nextTick(() => { _groupSelectLock = false; });
-  }
 }
 
 /**
@@ -3149,7 +2805,7 @@ function sortPrescriptionList() {
 }
 
 function handleLeaveHospital() {
-  if (!localPatientInfoRef.value) {
+  if (!patientInfo.value) {
     proxy.$modal.msgWarning('请先选择患者');
     return;
   }
@@ -3161,6 +2817,9 @@ function handleLeaveHospitalSuccess() {
 function handleTransferOrg() {
   proxy.$refs['transferOrganizationRef'].openDialog();
 }
+function handleTransferOrgSuccess() {
+  getListInfo(false);
+}
 
 // 校验每个组号数量是否大于5和对应分组金额是否大于500
 function validateGroups(saveList) {