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>
Fix Bug #471 : 手术管理-门诊手术安排：手术申请查询结果中混入住院检验申请单数据（脏数据）
2026-05-14 14:14:39 +08:00 · 2026-05-14 14:14:24 +08:00 · 2026-05-14 14:14:24 +08:00 · 2026-05-14 13:10:17 +08:00
16 changed files with 72 additions and 184 deletions
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
@@ -96,9 +96,4 @@ public class DiagnosisQueryDto {
     */
    private String diagnosisDoctor;

-    /**
-     * 是否已有传染病报卡（0-无，1-有）
-     */
-    private Integer hasInfectiousReport;
-
 }
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
@@ -134,11 +134,7 @@
               T2.yb_no,
               T1.onset_date AS onsetDate,
               T1.diagnosis_time AS diagnosisTime,
-               T1.doctor AS diagnosisDoctor,
-               CASE WHEN EXISTS (
-                   SELECT 1 FROM infectious_card T4
-                   WHERE T4.diag_id = T2.id AND T4.delete_flag = '0' AND T4.status >= 1
-               ) THEN 1 ELSE 0 END AS hasInfectiousReport
+               T1.doctor AS diagnosisDoctor
        FROM adm_encounter_diagnosis AS T1
                 LEFT JOIN cli_condition AS T2 ON T2.ID = T1.condition_id
            AND T2.delete_flag = '0' AND T2.tcm_flag = 0
--- 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,25 +8,20 @@
        SELECT drf.id  AS request_form_id,
               drf.encounter_id,
               drf.prescription_no,
-               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.NAME,
               drf.desc_json,
               drf.requester_id,
               drf.create_time,
               ap.NAME AS patient_name,
-                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
+                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
                    ELSE NULL
                END AS status
        FROM doc_request_form AS drf
@@ -46,14 +41,15 @@
              AND drf.create_time &lt;= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
          </if>
          <if test="status != null and status != ''">
-               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
+               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
                       ELSE NULL
                   END = #{status}::integer
          </if>
--- 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,11 +49,6 @@ public enum RequestStatus implements HisEnumInterface {
     */
    ENDED(7, "ended", "不执行"),

-    /**
-     * 已出报告
-     */
-    COMPLETED_REPORT(8, "completed_report", "已出报告"),
-
    /**
     * 未知
     */
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
@@ -692,7 +692,6 @@ async function handleFoodDiseasesCheck() {
 /**
 * 传染病报告卡处理
 * 通过诊断名称自动识别并勾选传染病报告卡中的疾病
- * 修复 Bug #519：跳过已有已提交报卡的诊断
 */
 function handleInfectiousDiseaseReport() {
  // 疾病名称到报卡编码的映射（根据传染病报告卡弹窗中的疾病列表）
@@ -744,9 +743,8 @@ function handleInfectiousDiseaseReport() {
    '手足口病': '0311',
  };

-  // 获取所有诊断名称对应的报卡编码，但跳过已有已提交报卡的诊断
+  // 获取所有诊断名称对应的报卡编码
  const allSelectedDiseases = form.value.diagnosisList
-    .filter(d => d.name && d.hasInfectiousReport !== 1)
    .map(d => diseaseNameToCode[d.name] || null)
    .filter(code => code);

@@ -754,9 +752,9 @@ function handleInfectiousDiseaseReport() {
    return;
  }

-  // 优先使用主诊断（同样跳过已有报卡的）
-  const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1 && d.hasInfectiousReport !== 1);
-  const firstDiagnosis = form.value.diagnosisList.find(d => d.hasInfectiousReport !== 1) || form.value.diagnosisList[0];
+  // 优先使用主诊断
+  const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1);
+  const firstDiagnosis = form.value.diagnosisList[0];

  const diagnosisToShow = {
    ...(mainDiagnosis || firstDiagnosis),
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
@@ -1034,17 +1034,6 @@ 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: '岁',
@@ -1306,7 +1295,7 @@ async function show(diagnosisData) {
    patName: patientInfo.patientName || patientInfo.name || '', // 患者姓名
    parentName: '', // 家长姓名（14岁以下患者必填）
    idNo: patientInfo.idCard, // 身份证号
-    sex: normalizeSexFromPatientInfo(patientInfo), // 性别
+    sex: patientInfo.sex || patientInfo.genderName || '男', // 性别

    // 出生日期信息
    birthYear: birthInfo.year, // 出生年份
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -3591,10 +3591,13 @@ async function setValue(row) {
        prescriptionList.value[rowIndex.value].categoryEnum = 31; // 会诊的category_enum设置为31
      } else {
        // 诊疗类型（adviceType == 3）
-        // 🔧 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 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 #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,8 +1142,7 @@ function submitForm() {
            // 保存麻醉方式
            sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
            open.value = false
-            getList() // 提交成功后直接刷新列表
-            emit('saved') // 通知父组件刷新医嘱列表
+            emit('saved') // 通知父组件刷新医嘱列表及手术申请列表
          } else {
            proxy.$modal.msgError(res.msg || '新增手术失败，请检查表单信息')
          }
@@ -1159,8 +1158,7 @@ function submitForm() {
            // 保存麻醉方式
            sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
            open.value = false
-            getList() // 修改成功后直接刷新列表
-            emit('saved') // 通知父组件刷新医嘱列表
+            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,11 +86,7 @@
          </template>
          <el-table-column type="index" label="序号" width="60" align="center" />
          <el-table-column prop="patientName" label="患者姓名" width="120" />
-          <el-table-column label="申请单名称" width="140">
-            <template #default="scope">
-              <span>{{ buildApplicationName(scope.row) }}</span>
-            </template>
-          </el-table-column>
+          <el-table-column prop="name" label="申请单名称" width="140" />
          <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" />
@@ -433,23 +429,6 @@ 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 - 状态码
@@ -534,30 +513,6 @@ 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) {
@@ -571,7 +526,8 @@ const handleViewDetail = async (row) => {
      const obj = JSON.parse(row.descJson);
      // 将发往科室 ID 转换为名称
      if (obj.targetDepartment) {
-        obj.targetDepartment = recursionFun(obj.targetDepartment);
+        const deptItem = findTreeItem(orgOptions.value, obj.targetDepartment);
+        obj.targetDepartment = deptItem ? deptItem.name : 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,7 +545,6 @@ 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/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -1503,16 +1503,16 @@ function handleSaveBatch() {
 }

 function setValue(row) {
-  // 构造单位列表，确保 value 始终为 String 类型，避免 el-select 值类型不匹配
+  // 构造单位列表
  unitCodeList.value = [
-    { value: String(row.unitCode ?? ''), label: row.unitCode_dictText, type: 'unit' },
+    { value: row.unitCode, label: row.unitCode_dictText, type: 'unit' },
    {
-      value: String(row.doseUnitCode ?? ''),
+      value: row.doseUnitCode,
      label: row.doseUnitCode_dictText,
      type: 'dose',
    },
    {
-      value: String(row.minUnitCode ?? ''),
+      value: row.minUnitCode,
      label: row.minUnitCode_dictText,
      type: 'minUnit',
    },
@@ -1577,9 +1577,9 @@ function setValue(row) {
    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: String(row.doseUnitCode ?? ''),
-    minUnitCode: String(row.minUnitCode ?? ''),
-    unitCode: row.partAttributeEnum == 1 ? String(row.minUnitCode ?? '') : String(row.unitCode ?? ''),
+    doseUnitCode: row.doseUnitCode,
+    minUnitCode: row.minUnitCode,
+    unitCode: row.partAttributeEnum == 1 ? row.minUnitCode : row.unitCode,
    categoryEnum: row.categoryCode,
    definitionId: row.chargeItemDefinitionId,
    executeNum: 1,
@@ -1595,10 +1595,6 @@ function setValue(row) {
            ? new Decimal(selectedStock.price).div(row.partPercent).toFixed(6)
            : prevRow.minUnitPrice,
          positionName: selectedStock?.locationName,
-          // 🔧 Bug #523 修复：初始化 totalPrice 为 0，避免总金额列显示为横杠
-          totalPrice: row.quantity
-            ? new Decimal(row.quantity).mul(selectedStock?.price ?? 0).toFixed(6)
-            : '0',
        }
      : {
          quantity: 1,
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
@@ -19,9 +19,11 @@
            <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>
@@ -47,7 +49,6 @@
 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';
@@ -83,7 +84,6 @@ 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 :z-index="3000">
+  <el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body>
    <div style="margin-bottom: 15px; display: flex; align-items: center; gap: 10px">
      <el-input
        v-model="groupSetSearchText"
@@ -606,26 +606,21 @@ function getItemType_Text(type) {
  return map[type] || '其他';
 }
 function getUnitCodeOptions(row) {
-  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 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 seenCodes = new Set();
-  const uniqueUnitCodes = unitCodes.filter((item) => {
+  const uniqueUnitCodes = validUnitCodes.filter((item) => {
+    // 如果 Set 中没有这个 code，就保留它，并把它加入 Set
    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,45 +463,20 @@ function watchPatientSelection() {
  }, 300);
 }

-/** 查询科室（支持树形/扁平多种响应结构） */
+/** 查询科室 */
 const getLocationInfo = () => {
  getOrgList().then((res) => {
-    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 = [];
+    orgOptions.value = res.data?.records[0]?.children;
  });
 };
 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/inpatientNurse/tprChart/components/addTprDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/tprChart/components/addTprDialog.vue
@@ -1057,8 +1057,8 @@ function confirmCharge() {
  params.recordingDate = formData.value.recordingDate || moment(new Date()).format('YYYY-MM-DD');

  addVitalSigns(params).then(res => {
+    console.log('保存成功:', res);
    if (res.code === 200) {
-      proxy.msgSuccess('保存成功');
      // 保存成功后刷新列表
      getPatientList();
      // 清空表单
@@ -1087,6 +1087,8 @@ function confirmCharge() {
        urineVolume: '',
        stoolVolume: '',
      };
+      // 保存成功后关闭弹窗
+      closeDialog();
    }
  });
 }
--- a/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
@@ -534,7 +534,6 @@ 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 } =
@@ -1073,6 +1072,13 @@ 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) {
@@ -1475,7 +1481,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
 }

@@ -1698,17 +1704,6 @@ 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
关羽	c6f58596c0	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:39 +08:00
赵云	4492666008	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 14:14:24 +08:00
关羽	884fe09706	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 14:14:24 +08:00
关羽	94040e68fb	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:17 +08:00