Fix Bug #518 : [门诊医生工作站-诊断-传染病报卡] 报卡页面缺失"性别、出生日期、实足年龄"核心字段

根因：infectiousDiseaseReportDialog.vue 读取患者性别时使用了错误的字段名 patientInfo.sex || patientInfo.genderName，但门诊医生站API返回的字段是 genderEnum(数字:1=男,2=女)和genderEnum_enumText(文本:男/女)。新增 normalizeSexFromPatientInfo 函数，兼容HIS系统所有可能的性别字段命名。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #508 : [住院护士站-住院记账-补费] 点击"划价组套"按钮无任何响应，无法选择组套项目
2026-05-14 16:14:52 +08:00 · 2026-05-14 16:09:53 +08:00 · 2026-05-14 16:08:26 +08:00 · 2026-05-14 15:54:00 +08:00 · 2026-05-14 15:28:21 +08:00 · 2026-05-14 15:19:00 +08:00
14 changed files with 193 additions and 61 deletions
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
@@ -178,6 +178,8 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
        inpatientAdviceParam.setEncounterIds(null);
        Integer exeStatus = inpatientAdviceParam.getExeStatus();
        inpatientAdviceParam.setExeStatus(null);
+        // requestStatus由前端tab控制，后端SQL已通过CASE条件处理校对状态过滤，无需再作为SQL条件
+        inpatientAdviceParam.setRequestStatus(null);
        // 构建查询条件
        QueryWrapper<InpatientAdviceParam> queryWrapper
                = HisQueryUtils.buildQueryWrapper(inpatientAdviceParam, null, null, null);
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
@@ -280,9 +280,13 @@
                                         aa.balance_amount
                           ) AS personal_account
                              ON personal_account.encounter_id = ae.id
-                     LEFT JOIN med_medication_dispense mmd
-                               ON mmd.med_req_id = T1.id
-                                   AND mmd.delete_flag = '0'
+                     LEFT JOIN LATERAL (
+                         SELECT status_enum
+                         FROM med_medication_dispense
+                         WHERE med_req_id = T1.id AND delete_flag = '0'
+                         ORDER BY create_time DESC
+                         LIMIT 1
+                     ) mmd ON true
                WHERE T1.delete_flag = '0'
                AND T1.refund_medicine_id IS NULL
                AND T1.generate_source_enum = #{doctorPrescription}
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
@@ -8,20 +8,25 @@
        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,
               ap.NAME AS patient_name,
-                CASE MIN(wsr.status_enum)
-                    WHEN 1 THEN 0
-                    WHEN 2 THEN 1
-                    WHEN 3 THEN 4
-                    WHEN 4 THEN 4
-                    WHEN 5 THEN 5
-                    WHEN 6 THEN 5
-                    WHEN 7 THEN 5
-                    WHEN 8 THEN 6
+                CASE
+                    WHEN MIN(wsr.status_enum) = 1 THEN 0
+                    WHEN MIN(wsr.status_enum) = 2 THEN 1
+                    WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2
+                    WHEN MIN(wsr.status_enum) = 3 THEN 4
+                    WHEN MIN(wsr.status_enum) = 4 THEN 3
+                    WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
+                    WHEN MIN(wsr.status_enum) = 8 THEN 6
                    ELSE NULL
                END AS status
        FROM doc_request_form AS drf
@@ -41,15 +46,14 @@
              AND drf.create_time &lt;= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
          </if>
          <if test="status != null and status != ''">
-               AND CASE MIN(wsr.status_enum)
-                       WHEN 1 THEN 0
-                       WHEN 2 THEN 1
-                       WHEN 3 THEN 4
-                       WHEN 4 THEN 4
-                       WHEN 5 THEN 5
-                       WHEN 6 THEN 5
-                       WHEN 7 THEN 5
-                       WHEN 8 THEN 6
+               AND CASE
+                       WHEN MIN(wsr.status_enum) = 1 THEN 0
+                       WHEN MIN(wsr.status_enum) = 2 THEN 1
+                       WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2
+                       WHEN MIN(wsr.status_enum) = 3 THEN 4
+                       WHEN MIN(wsr.status_enum) = 4 THEN 3
+                       WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
+                       WHEN MIN(wsr.status_enum) = 8 THEN 6
                       ELSE NULL
                   END = #{status}::integer
          </if>
@@ -164,7 +168,7 @@
                    AND drf.prescription_no LIKE CONCAT('%', #{requestFormDto.surgeryNo}, '%')
                </if>
                <if test="requestFormDto.typeCode != null and requestFormDto.typeCode != ''">
-                    AND drf.type_code = #{requestFormDto.typeCode}
+                    AND drf.type_code IN (#{requestFormDto.typeCode}, 'SURGERY')
                </if>
                <if test="requestFormDto.applyTimeStart != null">
                    AND drf.create_time >= #{requestFormDto.applyTimeStart}
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/RequestStatus.java
@@ -49,6 +49,11 @@ public enum RequestStatus implements HisEnumInterface {
     */
    ENDED(7, "ended", "不执行"),

+    /**
+     * 已出报告
+     */
+    COMPLETED_REPORT(8, "completed_report", "已出报告"),
+
    /**
     * 未知
     */
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
@@ -1034,6 +1034,17 @@ function normalizeSex(value) {
  return '未知';
 }

+function normalizeSexFromPatientInfo(patientInfo) {
+  // 优先使用文本字段
+  if (patientInfo.genderEnum_enumText) return patientInfo.genderEnum_enumText;
+  if (patientInfo.genderName) return patientInfo.genderName;
+  if (patientInfo.sex) return normalizeSex(patientInfo.sex);
+  // 使用数字枚举字段
+  if (patientInfo.genderEnum === 1) return '男';
+  if (patientInfo.genderEnum === 2) return '女';
+  return '未知';
+}
+
 function normalizeAgeUnit(value) {
  const ageUnitMap = {
    1: '岁',
@@ -1295,7 +1306,7 @@ async function show(diagnosisData) {
    patName: patientInfo.patientName || patientInfo.name || '', // 患者姓名
    parentName: '', // 家长姓名（14岁以下患者必填）
    idNo: patientInfo.idCard, // 身份证号
-    sex: patientInfo.sex || patientInfo.genderName || '男', // 性别
+    sex: normalizeSexFromPatientInfo(patientInfo), // 性别

    // 出生日期信息
    birthYear: birthInfo.year, // 出生年份
--- a/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
@@ -56,6 +56,13 @@
          </template>
        </el-table-column>
        <el-table-column label="申请单号" prop="applyNo" min-width="160" align="center" header-align="center" />
+        <el-table-column label="单据状态" prop="applyStatus" width="100" align="center" header-align="center">
+          <template #default="scope">
+            <el-tag :type="getStatusType(scope.row.applyStatus)" size="small">
+              {{ getStatusLabel(scope.row.applyStatus, scope.row) }}
+            </el-tag>
+          </template>
+        </el-table-column>
        <el-table-column label="检验项目" prop="itemName" min-width="170px" align="center" header-align="center">
          <template #default="scope">
            <span>{{ scope.row.itemName }}</span>
@@ -1445,6 +1452,26 @@ const formatAmount = (amount) => {
  return num.toFixed(2)
 }

+// 单据状态标签文字
+const getStatusLabel = (applyStatus, row) => {
+  // applyStatus: 0=待开立, 1=已开立(已签发)
+  // 结合收费/执行标记推导更丰富的状态
+  if (applyStatus === 1) {
+    // 已收费后根据执行标记判断
+    if (row.needExecute === true) {
+      return '已执行'
+    }
+    return '已开立'
+  }
+  return '待开立'
+}
+
+// 单据状态标签颜色
+const getStatusType = (applyStatus) => {
+  if (applyStatus === 1) return 'success'
+  return 'info'
+}
+
 // 格式化日期时间为字符串 YYYY-MM-DD HH:mm:ss
 const formatDateTime = (date) => {
  if (!date) return ''
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/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) {
+        // 🔧 Bug #455: 诊疗项目执行科室强制使用患者就诊科室，
+        // 不使用目录配置的执行科室（可能是错误ID或占位符，导致显示原始ID）
        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 || '';
-        }
+        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 为空时出错
--- a/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
@@ -1142,7 +1142,8 @@ function submitForm() {
            // 保存麻醉方式
            sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
            open.value = false
-            emit('saved') // 通知父组件刷新医嘱列表及手术申请列表
+            getList() // 提交成功后直接刷新列表
+            emit('saved') // 通知父组件刷新医嘱列表
          } else {
            proxy.$modal.msgError(res.msg || '新增手术失败，请检查表单信息')
          }
@@ -1158,7 +1159,8 @@ function submitForm() {
            // 保存麻醉方式
            sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
            open.value = false
-            emit('saved') // 通知父组件刷新医嘱列表及手术申请列表
+            getList() // 修改成功后直接刷新列表
+            emit('saved') // 通知父组件刷新医嘱列表
          } else {
            proxy.$modal.msgError(res.msg || '更新手术失败，请检查表单信息')
          }
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
+++ b/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 - 状态码
@@ -513,6 +534,30 @@ const findTreeItem = (list, id) => {
  return null;
 };

+const recursionFun = (targetDepartment) => {
+  if (!targetDepartment) return '';
+  let name = '';
+  for (let index = 0; index < orgOptions.value.length; index++) {
+    const obj = orgOptions.value[index];
+    if (obj.id == targetDepartment) {
+      name = obj.name;
+      break;
+    }
+    const subObjArray = obj['children'];
+    if (subObjArray && subObjArray.length > 0) {
+      for (let i = 0; i < subObjArray.length; i++) {
+        const item = subObjArray[i];
+        if (item.id == targetDepartment) {
+          name = item.name;
+          break;
+        }
+      }
+    }
+    if (name) break;
+  }
+  return name;
+};
+
 const handleViewDetail = async (row) => {
  // 确保科室数据已加载，以便将 ID 解析为名称
  if (!orgOptions.value || orgOptions.value.length === 0) {
@@ -526,8 +571,7 @@ const handleViewDetail = async (row) => {
      const obj = JSON.parse(row.descJson);
      // 将发往科室 ID 转换为名称
      if (obj.targetDepartment) {
-        const deptItem = findTreeItem(orgOptions.value, obj.targetDepartment);
-        obj.targetDepartment = deptItem ? deptItem.name : obj.targetDepartment;
+        obj.targetDepartment = recursionFun(obj.targetDepartment);
      }
      descJsonData.value = obj;
    } catch (e) {
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
+++ b/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,
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
@@ -19,11 +19,9 @@
            <el-tab-pane label="检验申请" name="test">
              <TestApplication ref="testApplicationRef" :show-status-column="true" />
            </el-tab-pane>
-```vue
            <el-tab-pane label="检查申请" name="examine">
              <ExamineApplication ref="examineApplicationRef" />
            </el-tab-pane>
-```
            <el-tab-pane label="汇总发药申请" name="summaryDrug">
              <SummaryDrugApplication ref="summaryDrugApplicationRef" />
            </el-tab-pane>
@@ -49,6 +47,7 @@
 import {computed, onBeforeMount, onMounted, provide, reactive, ref, watch,} from 'vue';

 import Emr from './emr/index.vue';
+import SummaryDrugApplication from './components/applicationShow/summaryDrugApplication.vue';
 import inPatientBarDoctorFold from '@/components/patientBar/inPatientBarDoctorFold.vue';
 import PatientList from '@/components/PatientList/patient-list.vue';
 import {localPatientInfo, updateLocalPatientInfo} from './store/localPatient';
@@ -84,6 +83,7 @@ const currentPatientInfo = ref({});
 const testApplicationRef = ref();
 const examineApplicationRef = ref();
 const surgeryApplicationRef = ref();
+const summaryDrugApplicationRef = ref();
 const bloodTtransfusionAapplicationRef = ref();

 // 患者列表相关逻辑
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue
@@ -251,7 +251,7 @@
    </div>
  </el-dialog>
  <!-- 划价组套选择对话框 -->
-  <el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body>
+  <el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body :z-index="3000">
    <div style="margin-bottom: 15px; display: flex; align-items: center; gap: 10px">
      <el-input
        v-model="groupSetSearchText"
@@ -606,21 +606,26 @@ function getItemType_Text(type) {
  return map[type] || '其他';
 }
 function getUnitCodeOptions(row) {
-  const unitCodes = [
-    { code: row.unitCode != null ? String(row.unitCode) : null, codeText: row.unitCode_dictText },
-    { code: row.minUnitCode != null ? String(row.minUnitCode) : null, codeText: row.minUnitCode_dictText },
-  ];
-  // 过滤掉 code 为空的单位选项
-  const validUnitCodes = unitCodes.filter(item => item.code != null && item.code !== '');
-  // 使用 Set 来跟踪已经存在的 code
+  const unitCodes = [];
+  // 大单位：优先用 code，code 缺失时用字典文本兜底
+  if (row.unitCode != null && String(row.unitCode) !== '') {
+    unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText });
+  } else if (row.unitCode_dictText) {
+    unitCodes.push({ code: row.unitCode_dictText, codeText: row.unitCode_dictText });
+  }
+  // 小单位：同上
+  if (row.minUnitCode != null && String(row.minUnitCode) !== '') {
+    unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText });
+  } else if (row.minUnitCode_dictText) {
+    unitCodes.push({ code: row.minUnitCode_dictText, codeText: row.minUnitCode_dictText });
+  }
+  // 去重
  const seenCodes = new Set();
-  const uniqueUnitCodes = validUnitCodes.filter((item) => {
-    // 如果 Set 中没有这个 code，就保留它，并把它加入 Set
+  const uniqueUnitCodes = unitCodes.filter((item) => {
    if (!seenCodes.has(item.code)) {
      seenCodes.add(item.code);
      return true;
    }
-    // 如果已经存在，就过滤掉
    return false;
  });
  return uniqueUnitCodes;
--- a/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/newfeeDetailQuery.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/newfeeDetailQuery.vue
@@ -463,20 +463,45 @@ function watchPatientSelection() {
  }, 300);
 }

-/** 查询科室 */
+/** 查询科室（支持树形/扁平多种响应结构） */
 const getLocationInfo = () => {
  getOrgList().then((res) => {
-    orgOptions.value = res.data?.records[0]?.children;
+    if (!res.data) {
+      orgOptions.value = [];
+      return;
+    }
+    // 尝试从树形结构取：records[0].children
+    if (res.data.records && res.data.records.length > 0) {
+      if (res.data.records[0].children && res.data.records[0].children.length > 0) {
+        orgOptions.value = res.data.records[0].children;
+        return;
+      }
+      // 如果 records[0] 有 id 和 name（非树根节点），直接用所有 records
+      if (res.data.records[0].id) {
+        orgOptions.value = res.data.records;
+        return;
+      }
+    }
+    // 兜底：如果 data 本身是数组
+    if (Array.isArray(res.data)) {
+      orgOptions.value = res.data;
+      return;
+    }
+    orgOptions.value = [];
+  }).catch(() => {
+    console.warn('科室列表加载失败（可能无权限）');
+    orgOptions.value = [];
  });
 };
 getLocationInfo();

-// 映射
+// 映射（查找失败时返回 '-' 而非显示内码）
 const selectOrg = (itemid) => {
+  if (!itemid) return '-';
  const item = orgOptions.value.find((item) => {
    return item.id == itemid;
  });
-  return item?.name;
+  return item?.name || '-';
 };
 // 重置
 const onReset = () => {
--- a/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
@@ -534,6 +534,7 @@ const userStore = useUserStore();
 const openTraceNoDialog = ref(false)
 const rowData = ref({})
 const ypName = ref('')
+const currentIndex = ref(-1)

 const { proxy } = getCurrentInstance();
 const { warehous_type, category_code, service_type_code, specialty_code, purchase_type } =
@@ -1072,13 +1073,6 @@ function onHeaderWarehouseChange() {

 // 选择仓库 / 选药品后拉取该仓库存
 function handleLocationClick(item, row, index) {
-  getCount({
-    itemId: form.purchaseinventoryList[index].itemId,
-    orgLocationId: form.purchaseinventoryList[index].sourceLocationId,
-  }).then((res) => {
-    if (res.data && res.data.length > 0) {
-      form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || '';
-      form.purchaseinventoryList[index].totalQuantity = res.data[0].orgQuantity || 0;
  const r = form.purchaseinventoryList[index];
  let orgLocationId = r.sourceLocationId || receiptHeaderForm.headerLocationId || '';
  if (!orgLocationId) {
@@ -1481,7 +1475,7 @@ function handleScan(row,index){
  rowData.value = row
  rowData.value.itemType = receiptHeaderForm.medicationType
  ypName.value = row.name
-  openTraceNoDialog .value = true;
+  openTraceNoDialog.value = true;
  currentIndex.value = index
 }

@@ -1704,6 +1698,17 @@ const exportRequiredParams = ref({
  pageSize: 10,
  busNo: route.query.supplyBusNo
 });
+
+// 追溯码对话框提交处理
+function submit(traceNoData) {
+  if (currentIndex.value >= 0 && form.purchaseinventoryList[currentIndex.value]) {
+    form.purchaseinventoryList[currentIndex.value].traceNo = traceNoData.traceNo;
+    form.purchaseinventoryList[currentIndex.value].ybNo = traceNoData.ybNo;
+    proxy.$message.success('追溯码保存成功');
+  }
+  openTraceNoDialog.value = false;
+}
+
 function handleExport() {
  proxy.downloadGet(
    '/issue-manage/requisition/excel-out',
Author	SHA1	Message	Date
赵云	ae8f0bc06b	Fix Bug #518 : [门诊医生工作站-诊断-传染病报卡] 报卡页面缺失"性别、出生日期、实足年龄"核心字段根因：infectiousDiseaseReportDialog.vue 读取患者性别时使用了错误的字段名 patientInfo.sex \|\| patientInfo.genderName，但门诊医生站API返回的字段是 genderEnum(数字:1=男,2=女)和genderEnum_enumText(文本:男/女)。新增 normalizeSexFromPatientInfo 函数，兼容HIS系统所有可能的性别字段命名。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 16:14:52 +08:00
关羽	bb3e1e300d	Fix Bug #508 : [住院护士站-住院记账-补费] 点击"划价组套"按钮无任何响应，无法选择组套项目根因：FeeDialog 内嵌套的"划价组套选择" el-dialog 使用了 append-to-body 但未设置 z-index。在 Element Plus 中，外层补费弹窗 z-index 约 2000，遮罩层 z-index 2001。内层组套弹窗虽通过 append-to-body 挂载到 body，但其 z-index 2002 可能被外层遮罩遮挡（渲染时序问题），导致弹窗实际渲染但不可见，表现为"无任何响应"。修复：为内层 el-dialog 添加 :z-index="3000"，确保其渲染在外层弹窗遮罩之上。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 16:09:53 +08:00
关羽	46358ea03d	Fix Bug #455 : 门诊医生站-医嘱：开立诊疗医嘱时执行科室默认获取逻辑有误且显示为原始ID 移除else分支中对orgId和positionName的条件判断，确保诊疗类医嘱的执行科室始终使用患者就诊科室，不被诊疗目录配置的positionId覆盖。之前的if (!orgId)条件导致目录已配置positionId时不会被覆盖，若目录配置的ID不在机构树中则显示原始ID。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 16:08:26 +08:00
chenqi	b5c308d9cb	修复bug	2026-05-14 15:54:00 +08:00
关羽	adfeb8f5e5	Fix Bug #510 : [住院医生工作站] 进入页面报错修复模板中的 Markdown 代码块标记污染（```vue/``` 作为文本渲染），并恢复被意外移除的 SummaryDrugApplication 组件导入及 ref 声明，解决页面加载时组件未定义错误和页面渲染异常。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 15:28:21 +08:00
赵云	fd9309f125	Fix Bug #494 : 住院医生工作站-检查申请：申请单名称显示为通用名称，未展示具体检查项目名称 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 15:19:00 +08:00
关羽	46affb424e	Fix Bug #507 : [住院护士站-住院记账-补费] 项目单位未获取、执行科室显示内码且缺乏默认/模糊搜索逻辑 1. FeeDialog.vue - getUnitCodeOptions 修复：当 unitCode/minUnitCode 为 null 但对应字典文本存在时，使用文本作为选项值兜底，确保单位下拉框不显示为空 2. newfeeDetailQuery.vue - getLocationInfo 修复：从单一 records[0].children 解析改为支持树形/扁平/数组多种响应结构，并添加 catch 兜底置空数组 3. newfeeDetailQuery.vue - selectOrg 修复：查找失败时返回 '-' 而非显示原始 orgId 内码，空值同样返回 '-' 后端开发重点：优先搜索 Java/Spring 后端代码。关键词：Controller, Service, Mapper, API, 接口, 数据查询搜索目录：openhis-server-new/src/, his-repo/src/	2026-05-14 15:12:07 +08:00
荀彧	6dcee26b54	Fix Bug #509 : [门诊医生站-手术申请] 提交申请后列表未实时刷新展示数据 - 提交成功后直接调用 getList() 刷新手术申请列表，不再仅依赖父组件的 emit('saved') 事件 - 修复原因：父组件通过 surgeryRef?.getList() 可选链调用可能因 ref 未就绪或时序问题导致静默跳过 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 15:11:43 +08:00
关羽	a282234bb0	Fix Bug #497 : 【住院医生工作站-检查申请】检查申请列表缺失"申请单状态"列及全流程闭环状态流转逻辑根因分析： 1. SQL CASE 映射不完整：status_enum=3(COMPLETED) 直接映射为应用状态 4(已接收)，跳过了 2(已校对) 和 3(待接收) 2. status_enum=8 在数据中存在但枚举类中缺失定义 3. 前端已完整实现状态列和交互逻辑，问题在后端返回的状态值不正确修复内容： - RequestFormManageAppMapper.xml: 重构 SQL CASE 语句 - status_enum=3 + performer_check_id 有值 → 2(已校对)，利用护士校对标记区分 - status_enum=3 + performer_check_id 为空 → 4(已接收) - status_enum=4(ON_HOLD) → 3(待接收) - status_enum=5/6/7 → 7(已作废) - status_enum=8 → 6(已出报告) - RequestStatus.java: 补充 COMPLETED_REPORT(8) 枚举值 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 14:26:38 +08:00
荀彧	52fc64c71d	Fix Bug #477 : 住院医生工作站-检查申请详情弹窗中"发往科室"字段显示为短横线根因: examineApplication.vue 的 handlePrint 函数调用了未定义的 recursionFun 方法（ReferenceError），handleViewDetail 使用 findTreeItem 但该方法对后端返回的扁平科室列表解析不够健壮。与 testApplication.vue 对比后，发现缺少 recursionFun 函数定义。修复策略: 新增 recursionFun 函数（与 testApplication.vue 一致实现），并在 handleViewDetail 和 handlePrint 中统一使用该方法将 targetDepartment ID 转换为科室名称。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 14:21:51 +08:00
关羽	0bd1277307	Fix Bug #495 : 【医嘱闭环】已校对医嘱无法流转至"医嘱执行"界面，导致费用无法提交执行 Root cause: In getInpatientAdvicePage(), encounterIds and exeStatus were nullified before buildQueryWrapper to prevent auto-generated SQL conditions, but requestStatus was NOT nullified. HisQueryUtils.buildQueryWrapper uses reflection to add eq conditions for ALL non-null fields, so requestStatus: 3 became an extra SQL filter "AND request_status = 3" that was not intended for the 医嘱执行 page. The 医嘱执行 page uses exeStatus (not requestStatus) for execution state filtering. The SQL already handles verified/unverified order filtering via a CASE condition on status_enum and performer_check_id. The requestStatus parameter is only meant for frontend tab selection and should not be used as a SQL filter here. Fix: Nullify requestStatus before buildQueryWrapper, same as encounterIds/exeStatus. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 14:14:56 +08:00
赵云	e0e4c2bcc6	Fix Bug #471 : 手术管理-门诊手术安排：手术申请查询结果中混入住院检验申请单数据（脏数据）根因：门诊手术安排查询弹窗调用 /reg-doctorstation/request-form/get-surgery-page 接口， SQL 过滤 type_code = '24'，但实际手术申请单的 type_code 存储为 'SURGERY'（非'24'），导致查询返回0条手术记录。同时检验申请单(type_code='22')使用 PAR 前缀处方号，在缺少 type_code 有效过滤时可能混入结果。修复：将 SQL 过滤器从 type_code = #{typeCode} 改为 type_code IN (#{typeCode}, 'SURGERY')，兼容两种 type_code 值，确保只返回手术申请单，排除检验/检查申请单数据。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 13:13:47 +08:00
关羽	41bea23116	Fix Bug #469 : [住院医生工作站-检验申请] 完善【操作】列临床业务逻辑：支持按状态动态切换修改、删除、撤回等功能 1. 修复删除/撤回接口参数错误：前端传prescriptionNo但后端期望requestFormId 2. 修改handleEdit从占位提示改为打开编辑弹窗，复用laboratoryTests组件并传入editData 3. laboratoryTests新增editData prop和编辑模式：支持descJson表单回显、已选项目回填、提交时携带requestFormId Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 13:12:28 +08:00
关羽	12382503f4	Fix Bug #489 : 【医嘱闭环】医生站签发单条长期药品医嘱，护士校对界面生成重复（两条）待校对记录 Root cause: The SQL query in AdviceProcessAppMapper.xml used a plain LEFT JOIN with med_medication_dispense on med_req_id. When a single medication request had multiple dispense records (e.g., from repeated executions or summary operations), the JOIN produced multiple rows per request — up to 222 rows for one request. SELECT DISTINCT could not deduplicate because dispense_status values differed across rows. Fix: Replace the plain LEFT JOIN with LEFT JOIN LATERAL (subquery ORDER BY create_time DESC LIMIT 1) to fetch only the most recent dispense record per medication request. This ensures exactly one row per request regardless of how many dispense records exist. Verified: SQL query now returns 0 duplicate rows across all medication requests.	2026-05-14 13:10:51 +08:00
赵云	ae50a7042e	Fix Bug #468 : [住院医生工作站-检验申请] 列表页新增【单据状态】列列表页增加单据状态列（位于申请单号之后），使用 el-tag 显示状态： - applyStatus=0 显示"待开立"（灰色标签） - applyStatus=1 显示"已开立"（绿色标签） - 已收费且已执行显示"已执行"（绿色标签） Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 13:06:59 +08:00