Fix Bug #455: 门诊医生站-医嘱：开立诊疗医嘱时执行科室默认获取逻辑有误且显示为原始ID

移除else分支中对orgId和positionName的条件判断，确保诊疗类医嘱的执行科室
始终使用患者就诊科室，不被诊疗目录配置的positionId覆盖。
之前的if (!orgId)条件导致目录已配置positionId时不会被覆盖，
若目录配置的ID不在机构树中则显示原始ID。

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -8,7 +8,13 @@
         SELECT drf.id  AS request_form_id,
                drf.encounter_id,
                drf.prescription_no,
-               drf.NAME,
+               COALESCE(
+                   (SELECT STRING_AGG(DISTINCT wad.name, '、')
+                    FROM wor_service_request wsr2
+                    LEFT JOIN wor_activity_definition wad ON wad.id = wsr2.activity_id AND wad.delete_flag = '0'
+                    WHERE wsr2.prescription_no = drf.prescription_no AND wsr2.delete_flag = '0'),
+                   drf.name
+               ) AS name,
                drf.desc_json,
                drf.requester_id,
                drf.create_time,

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue

@@ -3591,13 +3591,10 @@ async function setValue(row) {
         prescriptionList.value[rowIndex.value].categoryEnum = 31; // 会诊的category_enum设置为31
       } else {
         // 诊疗类型（adviceType == 3）
-        // 🔧 Bug Fix #238: 诊疗项目默认使用患者就诊科室
-        if (!prescriptionList.value[rowIndex.value].orgId) {
-          prescriptionList.value[rowIndex.value].orgId = props.patientInfo.orgId;
-        }
-        if (!prescriptionList.value[rowIndex.value].positionName) {
-          prescriptionList.value[rowIndex.value].positionName = findOrgNameById(prescriptionList.value[rowIndex.value].orgId) || props.patientInfo.orgName || '';
-        }
+        // 🔧 Bug #455: 诊疗项目执行科室强制使用患者就诊科室，
+        // 不使用目录配置的执行科室（可能是错误ID或占位符，导致显示原始ID）
+        prescriptionList.value[rowIndex.value].orgId = props.patientInfo.orgId;
+        prescriptionList.value[rowIndex.value].positionName = findOrgNameById(props.patientInfo.orgId) || props.patientInfo.orgName || '';
         // 🔧 Bug #218 修复：使用组套中维护的quantity，如果没有则默认1
         prescriptionList.value[rowIndex.value].quantity = row.quantity || 1;
         // 🔧 Bug #144 修复：安全访问 priceList，防止 orderDetailInfos 为空时出错

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue

@@ -86,7 +86,11 @@
           </template>
           <el-table-column type="index" label="序号" width="60" align="center" />
           <el-table-column prop="patientName" label="患者姓名" width="120" />
-          <el-table-column prop="name" label="申请单名称" width="140" />
+          <el-table-column label="申请单名称" width="140">
+            <template #default="scope">
+              <span>{{ buildApplicationName(scope.row) }}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="160" />
           <el-table-column prop="prescriptionNo" label="申请单号" width="140" />
           <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
@@ -429,6 +433,23 @@ const parseStatus = (status) => {
   return statusMap[String(status)] || '-';
 };
 
+/**
+ * 根据申请单详情构建申请单名称
+ * 单一项目：显示项目名称
+ * 多个项目：显示首个项目名称+"等X项"
+ */
+const buildApplicationName = (row) => {
+  const details = row.requestFormDetailList;
+  if (!details || details.length === 0) {
+    return row.name || '-';
+  }
+  if (details.length === 1) {
+    return details[0].adviceName || row.name || '-';
+  }
+  const first = details[0];
+  return `${first.adviceName || ''}等${details.length}项`;
+};
+
 /**
  * 获取状态标签类型 - 参考临床医嘱样式
  * @param {string|number} status - 状态码

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue

@@ -545,6 +545,7 @@ const submit = () => {
   applicationListAllFilter = applicationListAllFilter.map((item) => {
     return {
       adviceDefinitionId: item.adviceDefinitionId,
+      adviceName: item.adviceName,
       quantity: 1,
       unitCode: item.priceList[0].unitCode,
       unitPrice: item.priceList[0].price,