Fix Bug #442 : 手术计费：点击"删除"待签发耗材时异常报错，导致操作失败

根因：DoctorStationAdviceAppMapper.xml 中 getRequestBaseInfo SQL 的第二个 UNION 查询（手术计费耗材从 adm_charge_item 关联 wor_device_request）中，biz_request_flag 和 requester_id 使用了 CI.enterer_id（计费录入人），而非 DR.requester_id（设备申请创建人）。当录入人与当前操作人不一致时，biz_request_flag 为 '0'，导致删除操作被后端拒绝。修复：将 CI.enterer_id 改为 COALESCE(DR.requester_id, CI.enterer_id)，优先使用 DeviceRequest 的 requester_id，确保 biz_request_flag 基于正确的创建人计算。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #428 : 门诊医生站-检查申请：未实现分类联动检查方法及套餐明细展示与勾选逻辑
2026-05-12 23:07:54 +08:00 · 2026-05-12 23:07:54 +08:00 · 2026-05-12 23:07:54 +08:00 · 2026-05-12 23:07:53 +08:00 · 2026-05-12 23:07:53 +08:00 · 2026-05-12 23:07:53 +08:00
14 changed files with 390 additions and 159 deletions
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/InfectiousDiseaseReportDto.java
@@ -1,5 +1,6 @@
 package com.openhis.web.doctorstation.dto;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import lombok.Data;
@@ -55,6 +56,7 @@ public class InfectiousDiseaseReportDto {
    private String sex;

    /** 出生日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
    private Date birthday;

    /** 实足年龄 */
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductTransferAppServiceImpl.java
@@ -17,6 +17,9 @@ import com.openhis.common.constant.PromptMsgConstant;
 import com.openhis.common.enums.*;
 import com.openhis.common.utils.EnumUtils;
 import com.openhis.common.utils.HisQueryUtils;
+import com.core.common.utils.SecurityUtils;
+import com.openhis.workflow.domain.InventoryItem;
+import com.openhis.workflow.service.IInventoryItemService;
 import com.openhis.web.basedatamanage.dto.LocationDto;
 import com.openhis.web.common.dto.UnitDto;
 import com.openhis.web.inventorymanage.appservice.IProductTransferAppService;
@@ -57,6 +60,9 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
    @Autowired
    private IPractitionerService practitionerService;

+    @Autowired
+    private IInventoryItemService inventoryItemService;
+
    /**
     * 商品调拨页面初始化
     *
@@ -196,6 +202,23 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
    @Override
    public R<?> addOrEditBatchTransferReceipt(List<ProductTransferDto> productTransferDtoList, Boolean flag) {

+        // 校验调拨数量：必须 > 0 且不超过源库存数量（从数据库查实时库存）
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        for (ProductTransferDto dto : productTransferDtoList) {
+            if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(java.math.BigDecimal.ZERO) <= 0) {
+                return R.fail("调拨数量必须大于0");
+            }
+            // 查询该药品在源仓库的实时库存总量
+            List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
+                dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
+            java.math.BigDecimal actualStock = inventoryList.stream()
+                .map(InventoryItem::getQuantity)
+                .reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
+            if (dto.getItemQuantity().compareTo(actualStock) > 0) {
+                return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
+            }
+        }
+
        List<String> idList = new ArrayList<>();
        if (flag) {
            // 批量保存按钮
@@ -309,6 +332,22 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
    @Override
    public R<?> addOrEditTransferReceipt(List<ProductTransferDto> productTransferDtoList) {

+        // 校验调拨数量：必须 > 0 且不超过源库存数量（从数据库查实时库存）
+        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+        for (ProductTransferDto dto : productTransferDtoList) {
+            if (dto.getItemQuantity() == null || dto.getItemQuantity().compareTo(java.math.BigDecimal.ZERO) <= 0) {
+                return R.fail("调拨数量必须大于0");
+            }
+            List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
+                dto.getItemId(), dto.getLotNumber(), dto.getSourceLocationId(), tenantId);
+            java.math.BigDecimal actualStock = inventoryList.stream()
+                .map(InventoryItem::getQuantity)
+                .reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
+            if (dto.getItemQuantity().compareTo(actualStock) > 0) {
+                return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "）");
+            }
+        }
+
        List<String> idList = new ArrayList<>();

        // 单据号取得
@@ -380,6 +419,25 @@ public class ProductTransferAppServiceImpl implements IProductTransferAppService
     */
    @Override
    public R<?> submitApproval(String busNo) {
+        // 提交前再次校验调拨数量（从数据库查实时库存）
+        List<SupplyRequest> requestList = supplyRequestService.getSupplyByBusNo(busNo);
+        if (requestList != null && !requestList.isEmpty()) {
+            Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
+            for (SupplyRequest request : requestList) {
+                if (request.getItemQuantity() == null || request.getItemQuantity().compareTo(java.math.BigDecimal.ZERO) <= 0) {
+                    return R.fail("调拨数量必须大于0，请检查后重新保存");
+                }
+                // 查询该药品在源仓库的实时库存总量
+                List<InventoryItem> inventoryList = inventoryItemService.selectInventoryByItemId(
+                    request.getItemId(), request.getLotNumber(), request.getSourceLocationId(), tenantId);
+                java.math.BigDecimal actualStock = inventoryList.stream()
+                    .map(InventoryItem::getQuantity)
+                    .reduce(java.math.BigDecimal.ZERO, java.math.BigDecimal::add);
+                if (request.getItemQuantity().compareTo(actualStock) > 0) {
+                    return R.fail("调拨数量不可超出源库存数量（当前库存：" + actualStock + "），请检查后重新保存");
+                }
+            }
+        }
        // 单据提交审核
        boolean result = supplyRequestService.submitApproval(busNo);
        return result ? R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00004, null))
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -541,9 +541,9 @@
        CI.service_id AS request_id,
        CI.service_id || '-ci-dev' AS unique_key,
        '' AS prescription_no,
-        CI.enterer_id AS requester_id,
+        COALESCE(DR.requester_id, CI.enterer_id) AS requester_id,
        CI.entered_date AS request_time,
-        CASE WHEN CI.enterer_id = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
+        CASE WHEN COALESCE(DR.requester_id, CI.enterer_id) = #{practitionerId} THEN '1' ELSE '0' END AS biz_request_flag,
        DR.content_json AS content_json,
        NULL AS skin_test_flag,
        NULL AS inject_flag,
--- a/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue
+++ b/openhis-ui-vue3/src/views/diseaseReportManagement/ReportManagement/index.vue
@@ -519,9 +519,10 @@
    >
      <template #append>
        <!-- 审核记录：查看/审核都展示，保证留痕可追溯 -->
+        <!-- 修复：查看模式始终显示区块；审核模式始终显示区块（header + 空状态 或 timeline） -->
        <div
          class="audit-records-section"
-          v-if="drawerMode === 'view' || (drawerMode === 'audit' && auditRecords.length > 0)"
+          v-if="drawerMode === 'view' || drawerMode === 'audit'"
        >
          <h3 class="section-title">审核记录</h3>
          <el-timeline v-if="auditRecords.length > 0">
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
@@ -349,11 +349,17 @@ async function getList() {
    if (res.code == 200) {
      // 过滤掉中医诊断，只保留西医诊断
      form.value.diagnosisList = res.data.filter(item => item.typeName !== '中医诊断');
-      // 为旧数据添加默认分类
+      // 为旧数据添加默认分类和selectedDiseases
      form.value.diagnosisList.forEach(item => {
        if (!item.classification) {
          item.classification = '西医';
        }
+        // 如果ybNo（诊断编码）符合传染病编码格式，添加到selectedDiseases
+        if (item.ybNo && /^(01|02|03)/.test(item.ybNo)) {
+          item.selectedDiseases = [item.ybNo];
+        } else {
+          item.selectedDiseases = item.selectedDiseases || [];
+        }
      });
      emits('diagnosisSave', false);
    }
@@ -685,23 +691,78 @@ async function handleFoodDiseasesCheck() {

 /**
 * 传染病报告卡处理
- * 通过诊断目录维护的'报卡类型'字段自动识别是否有需要填写的传染病报告卡
- * 如果有则弹出诊断对应需登记的报告卡界面
+ * 通过诊断名称自动识别并勾选传染病报告卡中的疾病
 */
 function handleInfectiousDiseaseReport() {
-  // 查找所有有报卡类型的诊断（reportTypeCode不为空）
-  const diagnosesWithReportType = form.value.diagnosisList.filter(d => d.reportTypeCode);
+  // 疾病名称到报卡编码的映射（根据传染病报告卡弹窗中的疾病列表）
+  const diseaseNameToCode = {
+    // 甲类
+    '鼠疫': '0101',
+    '霍乱': '0102',
+    // 乙类
+    '传染性非典型肺炎': '0201',
+    '艾滋病': '0202',
+    '病毒性肝炎': '0203',
+    '脊髓灰质炎': '0204',
+    '人感染高致病性禽流感': '0205',
+    '麻疹': '0206',
+    '流行性出血热': '0207',
+    '狂犬病': '0208',
+    '流行性乙型脑炎': '0209',
+    '登革热': '0210',
+    '炭疽': '0211',
+    '细菌性和阿米巴性痢疾': '0212',
+    '肺结核': '0213',
+    '伤寒和副伤寒': '0214',
+    '流行性脑脊髓膜炎': '0215',
+    '百日咳': '0216',
+    '白喉': '0217',
+    '新生儿破伤风': '0218',
+    '猩红热': '0219',
+    '布鲁氏菌病': '0220',
+    '淋病': '0221',
+    '梅毒': '0222',
+    '钩端螺旋体病': '0223',
+    '血吸虫病': '0224',
+    '疟疾': '0225',
+    '新型冠状病毒肺炎': '0226',
+    '甲型H1N1流感': '0227',
+    '人感染H7N9禽流感': '0228',
+    // 丙类
+    '流行性感冒': '0301',
+    '流行性腮腺炎': '0302',
+    '风疹': '0303',
+    '急性出血性结膜炎': '0304',
+    '麻风病': '0305',
+    '流行性和地方性斑疹伤寒': '0306',
+    '黑热病': '0307',
+    '包虫病': '0308',
+    '丝虫病': '0309',
+    '除霍乱/菌痢/伤寒副伤寒以外的感染性腹泻病': '0310',
+    '其它感染性腹泻病': '0310',
+    '手足口病': '0311',
+  };

-  if (diagnosesWithReportType.length === 0) {
+  // 获取所有诊断名称对应的报卡编码
+  const allSelectedDiseases = form.value.diagnosisList
+    .map(d => diseaseNameToCode[d.name] || null)
+    .filter(code => code);
+
+  if (allSelectedDiseases.length === 0) {
    return;
  }

-  // 优先使用主诊断，如果没有主诊断有报卡类型则使用第一个有报卡类型的诊断
-  const mainDiagnosisWithReport = diagnosesWithReportType.find(d => d.maindiseFlag === 1);
-  const targetDiagnosis = mainDiagnosisWithReport || diagnosesWithReportType[0];
+  // 优先使用主诊断
+  const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1);
+  const firstDiagnosis = form.value.diagnosisList[0];
+
+  const diagnosisToShow = {
+    ...(mainDiagnosis || firstDiagnosis),
+    selectedDiseases: allSelectedDiseases
+  };

  // 弹出传染病报告卡弹窗
-  proxy.$refs.infectiousDiseaseReportRef?.show(targetDiagnosis);
+  proxy.$refs.infectiousDiseaseReportRef?.show(diagnosisToShow);
 }

 /**
@@ -814,7 +875,8 @@ form.value.diagnosisList.push({
    classification: '西医', // 默认为西医
    onsetDate: getCurrentDate(),
    diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-    diagnosisTime: getCurrentDate()
+    diagnosisTime: getCurrentDate(),
+    selectedDiseases: data.ybNo ? [data.ybNo] : [],  // 用于传染病报告卡自动勾选
  });
  
  // 添加后按排序号排序
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
@@ -16,15 +16,15 @@
              v-model="form.cardNo"
              class="card-number-input"
              placeholder="单位自编，与网络直报一致"
-              maxlength="12"
-              :disabled="readOnly"
+              maxlength="20"
+              :disabled="readOnly || dialogReadOnly"
          />
        </el-space>
      </el-card>
    </template>

    <el-card class="report-form" shadow="never">
-      <el-form ref="formRef" :model="form" :rules="rules" label-position="top" :disabled="readOnly">
+      <el-form ref="formRef" :model="form" :rules="rules" label-position="top" :disabled="readOnly || dialogReadOnly">
        <!-- 患者姓名、家长姓名、身份证号 -->
        <el-row :gutter="16" class="form-row">
          <el-col :span="8" class="form-item">
@@ -476,9 +476,9 @@
    <template #footer>
      <slot name="footer" :close="handleClose" :submit-loading="submitLoading">
        <el-space :size="16" justify="center" class="dialog-footer-space" style="display: flex; justify-content: center; width: 100%;">
-          <el-button v-if="!readOnly" type="primary" @click="handleSubmit" :loading="submitLoading" class="blue-button">保 存</el-button>
+          <el-button v-if="!(readOnly || dialogReadOnly)" type="primary" @click="handleSubmit" :loading="submitLoading" class="blue-button">保 存</el-button>
          <el-button type="info" @click="handleClose">关 闭</el-button>
-          <el-button v-if="!readOnly" type="danger" @click="handleReset">重 置</el-button>
+          <el-button v-if="!(readOnly || dialogReadOnly)" type="danger" @click="handleReset">重 置</el-button>
        </el-space>
      </slot>
    </template>
@@ -510,6 +510,7 @@ const DISEASE_NAMES = {
 };

 const dialogVisible = ref(false);
+const dialogReadOnly = ref(false);
 const formRef = ref(null);
 // 保存按钮加载状态，防止重复提交
 const submitLoading = ref(false);
@@ -1037,8 +1038,9 @@ function resetAddressSelector() {
 * 以只读详情方式打开报卡弹窗，供报卡管理等页面复用医生站报卡样式。
 * @param {Object} reportData - 报卡详情数据
 */
-function showReport(reportData = {}) {
+function showReport(reportData = {}, readOnly = true) {
  dialogVisible.value = true;
+  dialogReadOnly.value = readOnly;

  resetAddressSelector();
  initProvinceOptions();
@@ -1069,7 +1071,7 @@ function showReport(reportData = {}) {
    addressHouse: reportData.addressHouse || '',
    patientBelong: reportData.patientBelong || 1,
    occupation: reportData.occupation || '',
-    caseClass: reportData.caseClass != null ? String(reportData.caseClass) : '',
+    caseClass: reportData.diseaseType != null ? String(reportData.diseaseType) : '',
    onsetDate: normalizeDate(reportData.onsetDate),
    diagDate: normalizeDate(reportData.diagDate),
    deathDate: normalizeDate(reportData.deathDate),
@@ -1078,13 +1080,13 @@ function showReport(reportData = {}) {
    selectedClassB: diseaseSelection.selectedClassB,
    selectedClassC: diseaseSelection.selectedClassC,
    otherDisease: reportData.otherDisease || (diseaseCode === 'OTHER' ? reportData.diseaseName || '' : ''),
-    diseaseType: reportData.diseaseType || '',
+    diseaseType: reportData.diseaseSubtype || '',
    reportOrg: reportData.reportOrg || '',
    reportOrgPhone: reportData.reportOrgPhone || '',
    reportDoc: reportData.reportDoc || '',
    reportDate: normalizeDate(reportData.reportDate || reportData.createdAt),
-    correctName: reportData.correctName || '',
-    withdrawReason: reportData.withdrawReason || '',
+    correctName: reportData.revisedDiseaseName || '',
+    withdrawReason: reportData.returnReason || '',
    remark: reportData.remark || '',
    encounterId: reportData.encounterId || reportData.visitId || '',
    patientId: reportData.patientId || reportData.patId || '',
@@ -1205,6 +1207,7 @@ function calculateAge() {
 */
 async function show(diagnosisData) {
  dialogVisible.value = true;
+  dialogReadOnly.value = false;

  // 重置地址选择器状态
  resetAddressSelector();
@@ -1238,14 +1241,13 @@ async function show(diagnosisData) {
  let cardNo = '';
  try {
    const res = await getNextCardNo(orgCode);
-    if (res.code === 200 && res.data) {
+    if (res.code === 200 && res.data && res.data.length >= 12) {
      cardNo = res.data;
-    } else {
-      cardNo = 'TEMP_' + Date.now();
    }
+    // API失败或返回不合规时保持为空字符串，由用户手动填写或后端自动生成
  } catch (err) {
    console.error('获取卡片编号失败:', err);
-    cardNo = 'TEMP_' + Date.now();
+    // 保持为空，不使用不合规的临时值
  }

  form.value = {
@@ -1424,9 +1426,9 @@ async function buildSubmitData() {
 function validateFormManually() {
  const errors = [];

-  // 卡片编号验证（可选，但如果填写了必须是12位）
-  if (form.value.cardNo && form.value.cardNo.length !== 12) {
-    errors.push('卡片编号必须为12位');
+  // 卡片编号验证（至少12位，后端自动生成16位编号）
+  if (form.value.cardNo && form.value.cardNo.length < 12) {
+    errors.push('卡片编号至少12位');
  }

  // 身份证号验证
--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
@@ -316,6 +316,7 @@
                    <span class="cat-title">{{ cat.categoryName }}</span>
                    <span v-if="categoryLoadingSet.has(cat.typeId)" class="loading-dot"></span>
                  </template>
+                  <!-- 检查项目（部位/项目列表） -->
                  <div
                    v-for="item in cat.items"
                    :key="item.id"
@@ -333,6 +334,27 @@
                  <div v-if="categoryLoadingSet.has(cat.typeId)" class="category-loading-hint">
                    加载中...
                  </div>
+                  <!-- Bug #428修复: 渲染分类联动加载的检查方法列表 -->
+                  <div
+                    v-if="cat.methods && cat.methods.length > 0"
+                    class="method-section"
+                  >
+                    <div class="method-section-title">检查方法</div>
+                    <div
+                      v-for="method in cat.methods"
+                      :key="method.id"
+                      class="method-row"
+                    >
+                      <el-checkbox
+                        :model-value="isMethodSelected(method, cat)"
+                        @change="(val) => handleMethodSelect(val, method, cat)"
+                        class="method-checkbox"
+                      >
+                        {{ method.name }}
+                      </el-checkbox>
+                      <span class="method-price-tag">¥{{ method.packagePrice || method.price || 0 }}</span>
+                    </div>
+                  </div>
                </el-collapse-item>
              </el-collapse>
            </div>
@@ -1047,6 +1069,78 @@ function handleDelete(row) {
  });
 }

+// Bug #428修复: 判断某个检查方法是否已被选中（任意项目关联了该方法）
+function isMethodSelected(method, cat) {
+  return selectedItems.value.some(item =>
+    item.selectedMethod?.id === method.id && item.checkType === cat.typeName
+  );
+}
+
+// Bug #428修复: 勾选检查方法
+async function handleMethodSelect(checked, method, cat) {
+  if (checked) {
+    // 找到该方法所属的第一个检查项目
+    const targetItem = cat.items[0];
+    if (!targetItem) {
+      // 如果分类下没有项目，尝试从其他分类找同名项目或创建
+      console.warn('分类下没有检查项目，无法关联方法');
+      return;
+    }
+
+    // 如果该项目已存在，只更新 selectedMethod
+    const existingItem = selectedItems.value.find(s => s.id === targetItem.id);
+    if (existingItem) {
+      existingItem.selectedMethod = method;
+      updateMethodDisplay();
+      return;
+    }
+
+    // 如果该项目不存在，创建一个并关联方法
+    if (selectedItems.value.length > 0) {
+      const currentCategory = selectedItems.value[0].checkType;
+      const newCategory = cat.typeCode || '';
+      if (currentCategory !== newCategory) {
+        ElMessage.warning('一个检查单不能同时选择多个项目类型的检查项目');
+        return;
+      }
+    }
+
+    selectedItems.value.push({
+      id: targetItem.id, name: targetItem.name,
+      price: targetItem.price, quantity: 1,
+      serviceFee: targetItem.serviceFee || 0,
+      unit: targetItem.unit || '次',
+      applyPart: targetItem.name,
+      checkType: cat.typeName,
+      nationalCode: targetItem.nationalCode || '',
+      checked: true,
+      methods: [method],
+      selectedMethod: method,
+      expanded: false,
+      isPackage: !!targetItem.packageName,
+      packageId: targetItem.packageId || null
+    });
+
+    // 自动回填执行科室
+    if (selectedItems.value.length === 1 && cat?.performDeptName) {
+      form.performDeptCode = cat.performDeptName;
+    }
+
+    // 同时勾选左侧项目的 checkbox
+    targetItem.checked = true;
+
+  } else {
+    // 取消选择方法：将 selectedItems 中关联该方法的项的 selectedMethod 清空
+    const itemsWithMethod = selectedItems.value.filter(
+      item => item.selectedMethod?.id === method.id
+    );
+    for (const item of itemsWithMethod) {
+      item.selectedMethod = null;
+    }
+  }
+  updateMethodDisplay();
+}
+
 // ====== 勾选逻辑 ======
 async function handleItemSelect(checked, item, cat) {
  if (checked) {
@@ -1367,6 +1461,53 @@ defineExpose({ getList });
  margin-left: 6px;
 }

+/* Bug #428修复: 分类下检查方法区域样式 */
+.method-section {
+  padding: 6px 8px;
+  background: #f0f7ff;
+  border-radius: 4px;
+  margin-top: 6px;
+}
+
+.method-section-title {
+  font-size: 12px;
+  font-weight: 600;
+  color: #409eff;
+  margin-bottom: 4px;
+  padding-bottom: 3px;
+  border-bottom: 1px dashed #d9ecff;
+}
+
+.method-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 3px 4px;
+  border-radius: 3px;
+}
+
+.method-row:hover {
+  background: #e8f4ff;
+}
+
+.method-checkbox {
+  flex: 1;
+  overflow: hidden;
+}
+
+.method-checkbox :deep(.el-checkbox__label) {
+  font-size: 12px;
+  color: #303133;
+}
+
+.method-price-tag {
+  font-size: 11px;
+  color: #e6a23c;
+  font-weight: 500;
+  flex-shrink: 0;
+  margin-left: 6px;
+}
+
 /* 已选择 tags */
 .selected-panel {
  width: 140px;  /* Bug #384修复: 加宽以适应展开内容 */
@@ -1438,6 +1579,41 @@ defineExpose({ getList });
  transform: rotate(180deg);
 }

+/* Bug #428修复: 套餐明细列表样式 */
+.package-details-list {
+  padding: 6px 10px;
+  background: #fffbe6;
+  border-top: 1px solid #ffe58f;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.detail-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 2px 6px;
+  border-radius: 3px;
+  font-size: 11px;
+  background: #fff;
+}
+
+.detail-row:hover {
+  background: #fff9e6;
+}
+
+.detail-name {
+  color: #303133;
+  font-weight: 500;
+}
+
+.detail-info {
+  color: #909399;
+  font-size: 10px;
+  white-space: nowrap;
+}
+
 /* Bug #384修复: 检查方法勾选框列表 */
 .method-list {
  padding: 6px 10px;
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -2495,11 +2495,13 @@ function handleSave(prescriptionId) {

      // 🔧 BugFix#318: 从 parsedContent 提取标准医嘱字段，排除手术特有字段
      const standardFields = [
-        'accountId', 'chargeItemId', 'conditionDefinitionId', 'conditionId', 
-        'contentJson', 'definitionDetailId', 'definitionId', 'diagnosisName', 
-        'dosageInstruction', 'effectiveOrgId', 'encounterDiagnosisId', 
-        'encounterId', 'lotNumber', 'patientId', 'practitionerId', 
-        'prescriptionNo', 'skinTestFlag', 'unitPrice', 'volume', 'ybClassEnum'
+        'accountId', 'chargeItemId', 'conditionDefinitionId', 'conditionId',
+        'contentJson', 'definitionDetailId', 'definitionId', 'diagnosisName',
+        'dosageInstruction', 'effectiveOrgId', 'encounterDiagnosisId',
+        'encounterId', 'lotNumber', 'patientId', 'practitionerId',
+        'prescriptionNo', 'skinTestFlag', 'unitPrice', 'volume', 'ybClassEnum',
+        // 🔧 Bug Fix: 添加 therapyEnum 字段（医嘱类型：1=长期, 2=临时）
+        'therapyEnum'
      ];
      let filteredContent = {};
      standardFields.forEach(field => {
@@ -3143,7 +3145,9 @@ function handleSaveBatch(prescriptionId) {
          // 🔧 Bug Fix: 添加 definitionId 和 definitionDetailId 字段
          'definitionId', 'definitionDetailId',
          // 🔧 Bug Fix: 添加 categoryEnum 字段（耗材必填）
-          'categoryEnum'
+          'categoryEnum',
+          // 🔧 Bug Fix: 添加 therapyEnum 字段（医嘱类型：1=长期, 2=临时）
+          'therapyEnum'
        ];
        let filteredItem = {};
        standardItemFields.forEach(field => {
@@ -3342,7 +3346,7 @@ function syncGroupFields(row) {
  }
 }

-function setValue(row) {
+async function setValue(row) {
  unitCodeList.value = [];
  unitCodeList.value.push({ value: row.unitCode, label: row.unitCode_dictText, type: 'unit' });
  
@@ -3394,8 +3398,8 @@ function setValue(row) {
    showPopover: false, // 确保查询框关闭
  };
  console.log('[BugFix] setValue - prescriptionList[rowIndex].adviceType_dictText:', prescriptionList.value[rowIndex.value].adviceType_dictText);
-  // 🔧 修复执行科室逻辑：优先使用项目维护的所属科室(row.orgId)，其次使用positionId，最后回退到患者科室
-  prescriptionList.value[rowIndex.value].orgId = row.orgId || row.positionId || props.patientInfo?.orgId;
+  // 🔧 Bug #455: 执行科室默认逻辑：使用positionId(诊疗执行科室配置) → 患者就诊科室，不再使用row.orgId(项目所属科室)
+  prescriptionList.value[rowIndex.value].orgId = row.positionId || props.patientInfo?.orgId;
  prescriptionList.value[rowIndex.value].dose = row.dose || row.doseQuantity;
  prescriptionList.value[rowIndex.value].quantity = row.quantity || 1;
  prescriptionList.value[rowIndex.value].unitCodeList = unitCodeList.value;
@@ -3514,7 +3518,7 @@ function setValue(row) {
      prescriptionList.value[rowIndex.value].positionId = finalLocationId;
    }
  } else {
-      getOrgList();
+      await getOrgList();
      // 会诊类型（adviceType == 5）和诊疗类型（adviceType == 3）的处理
      if (row.adviceType == 5) {
        // 会诊类型：设置默认值
--- a/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue
@@ -1133,12 +1133,13 @@ function submitForm() {
        // 新增手术
        addSurgery(form.value).then((res) => {
          if (res.code === 200) {
-            proxy.$modal.msgSuccess(res.msg || '新增成功')
+            proxy.$modal.msgSuccess(res.msg || '手术申请提交成功！')
            // 保存麻醉方式
            sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
            open.value = false
+            emit('saved') // 通知父组件刷新医嘱列表
+            // 刷新手术申请列表
            getList()
-            emit('saved') // 🔧 触发保存事件，通知父组件刷新医嘱列表
          } else {
            proxy.$modal.msgError(res.msg || '新增手术失败，请检查表单信息')
          }
@@ -1150,12 +1151,13 @@ function submitForm() {
        // 修改手术
        updateSurgery(form.value).then((res) => {
          if (res.code === 200) {
-            proxy.$modal.msgSuccess(res.msg || '修改成功')
+            proxy.$modal.msgSuccess(res.msg || '手术申请修改成功！')
            // 保存麻醉方式
            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/doctorstation/mycardmanagement/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/mycardmanagement/index.vue
@@ -151,23 +151,12 @@
      </div>
    </div>

-    <el-dialog
-      v-model="detailVisible"
-      :title="detailMode === 'view' ? '报卡详情 - 中华人民共和国传染病报告卡' : '编辑报卡 - 中华人民共和国传染病报告卡'"
-      width="1100px"
-      destroy-on-close
-      class="card-detail-dialog"
-    >
-      <InfectiousReport
-        :mode=" detailMode"
-        :card-data="currentCard"
-        @submit-edit="handleSaveEdit"
-        style="max-height: 75vh; overflow-y: auto;"
-      />
-      <template #footer>
-        <el-button @click="detailVisible = false">关闭</el-button>
-      </template>
-    </el-dialog>
+    <InfectiousDiseaseReportDialog
+      ref="infectiousDiseaseReportRef"
+      :read-only="detailMode === 'view'"
+      @success="detailVisible = false"
+      @close="detailVisible = false"
+    />
  </div>
 </template>

@@ -175,7 +164,7 @@
 import { ref, reactive, onMounted, onActivated, onBeforeUnmount, nextTick, computed } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { DataAnalysis, Warning, CircleCheck, Check, RefreshRight } from '@element-plus/icons-vue';
-import InfectiousReport from '../components/infectiousReport/index.vue';
+import InfectiousDiseaseReportDialog from '../components/diagnosis/infectiousDiseaseReportDialog.vue';
 import {
  getDoctorCardStatistics,
  getDoctorCardList,
@@ -185,7 +174,6 @@ import {
  batchDeleteCards,
  exportCardToWord,
  getCardDetail,
-  updateDoctorCard,
 } from './api';

 const loading = ref(false);
@@ -211,7 +199,7 @@ const queryParams = reactive({

 const detailVisible = ref(false);
 const detailMode = ref('view');
-const currentCard = ref({});
+const infectiousDiseaseReportRef = ref(null);

 // 计算表格高度：根据视口高度动态调整
 const tableHeight = computed(() => {
@@ -327,9 +315,11 @@ async function handleView(row) {
  try {
    const res = await getCardDetail(row.cardNo);
    if (res.code === 200) {
-      currentCard.value = res.data || {};
      detailMode.value = 'view';
      detailVisible.value = true;
+      nextTick(() => {
+        infectiousDiseaseReportRef.value?.showReport(res.data || {});
+      });
    }
  } catch (error) {
    ElMessage.error('获取详情失败');
@@ -340,57 +330,17 @@ async function handleEdit(row) {
  try {
    const res = await getCardDetail(row.cardNo);
    if (res.code === 200) {
-      currentCard.value = res.data || {};
      detailMode.value = 'edit';
      detailVisible.value = true;
+      nextTick(() => {
+        infectiousDiseaseReportRef.value?.showReport(res.data || {}, false);
+      });
    }
  } catch (error) {
    ElMessage.error('获取详情失败');
  }
 }

-async function handleSaveEdit(submitData) {
-  // submitData 来自 InfectiousReport 组件的 submit-edit 事件
-  try {
-    const updateData = {
-      cardNo: submitData.cardNo,
-      phone: submitData.phone,
-      contactPhone: submitData.contactPhone,
-      onsetDate: submitData.onsetDate,
-      diagDate: submitData.diagDate,
-      diseaseCode: submitData.diseaseCode,
-      diseaseType: submitData.diseaseType,
-      otherDisease: submitData.otherDisease,
-      caseClass: submitData.caseClass,
-      occupation: submitData.occupation,
-      patientBelong: submitData.patientBelong,
-      addressProv: submitData.addressProv,
-      addressCity: submitData.addressCity,
-      addressCounty: submitData.addressCounty,
-      addressTown: submitData.addressTown,
-      addressVillage: submitData.addressVillage,
-      addressHouse: submitData.addressHouse,
-      workplace: submitData.workplace,
-      parentName: submitData.parentName,
-      deathDate: submitData.deathDate,
-      correctName: submitData.correctName,
-      withdrawReason: submitData.withdrawReason,
-      remark: submitData.remark,
-    };
-    
-    const res = await updateDoctorCard(updateData);
-    if (res.code === 200) {
-      ElMessage.success('保存成功');
-      detailVisible.value = false;
-      getList();
-    } else {
-      ElMessage.error(res.msg || '保存失败');
-    }
-  } catch (error) {
-    ElMessage.error('保存失败：' + (error.message || '网络错误'));
-  }
-}
-
 async function handleSubmit(row) {
  try {
    await ElMessageBox.confirm('确认提交该报卡？', '提示', {
@@ -800,17 +750,4 @@ function handleResize() {
    margin-left: 0;
  }
 }
-
-/* 报卡详情弹窗 */
-:deep(.card-detail-dialog .el-dialog__body) {
-  padding: 0;
-  overflow: hidden;
-}
-
-:deep(.card-detail-dialog .infectious-report-container) {
-  padding: 16px;
-  height: auto;
-  max-height: 70vh;
-  overflow-y: auto;
-}
 </style>
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue
@@ -6,13 +6,15 @@
 <template>
  <div class="surgery-container">
    <div class="transfer-wrapper">
-      <el-transfer
-        v-model="transferValue"
-        :data="applicationList"
-        filter-placeholder="项目代码/名称"
-        filterable
-        :titles="['未选择', '已选择']"
-      />
+      <div v-loading="loading" style="min-height: 300px;">
+        <el-transfer
+          v-model="transferValue"
+          :data="applicationList"
+          filter-placeholder="项目代码/名称"
+          filterable
+          :titles="['未选择', '已选择']"
+        />
+      </div>
    </div>
    <div class="bloodTransfusion-form">
      <el-form :model="form" :rules="rules" ref="formRef" label-width="120px" class="demo-ruleForm">
@@ -104,11 +106,13 @@ const state = reactive({});
 const applicationListAll = ref([]);
 const applicationList = ref([]);
 const orgOptions = ref([]); // 科室选项
+const loading = ref(false); // 加载状态
 const getList = () => {
  if (!patientInfo.value?.inHospitalOrgId) {
    applicationList.value = [];
    return;
  }
+  loading.value = true;
  getApplicationList({
    pageSize: 500,
    pageNum: 1,
@@ -138,6 +142,9 @@ const getList = () => {
    .catch((e) => {
      console.warn('手术项目列表加载失败（可能无权限）:', e?.message || e);
      applicationList.value = [];
+    })
+    .finally(() => {
+      loading.value = false;
    });
 };
 const transferValue = ref([]);
@@ -301,7 +308,7 @@ function getDiagnosisList() {
    }
  });
 }
-defineExpose({ state, submit, getLocationInfo, getDiagnosisList });
+defineExpose({ state, submit, getLocationInfo, getDiagnosisList, getList });
 </script>
 <style lang="scss" scoped>
 .surgery-container {
--- a/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/medicalOrderProofread/components/prescriptionList.vue
@@ -11,9 +11,9 @@
    >
      <div>
        <el-radio-group v-model="type" class="ml20" @change="handleRadioChange">
-          <el-radio :label="1">全部</el-radio>
-          <el-radio :label="2">长期</el-radio>
-          <el-radio :label="3">临时</el-radio>
+          <el-radio :label="null">全部</el-radio>
+          <el-radio :label="1">长期</el-radio>
+          <el-radio :label="2">临时</el-radio>
        </el-radio-group>
        <el-button class="ml20" type="primary" plain @click="handleGetPrescription">
          查询
@@ -159,7 +159,7 @@ import {formatDateStr} from '@/utils/index';
 const activeNames = ref([]);
 const prescriptionList = ref([]);
 const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');
-const type = ref(1);
+const type = ref(null);
 const { proxy } = getCurrentInstance();
 const loading = ref(false);
 const chooseAll = ref(false);
@@ -181,7 +181,7 @@ function handleGetPrescription() {
    getPrescriptionList({
      encounterIds: encounterIds,
      requestStatus: props.requestStatus,
-      ...(type.value !== undefined ? { therapyEnum: type.value } : {}),
+      ...(type.value != null ? { therapyEnum: type.value } : {}),
      pageSize: 10000,
      pageNo: 1,
    }).then((res) => {
--- a/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue
@@ -744,11 +744,7 @@ function handleSubmitApproval() {
  } else {
    submitApproval(receiptHeaderForm.busNo).then((response) => {
      proxy.$modal.msgSuccess('提交审批成功');
-      // proxy.$tab.closePage(route).then(({ visitedViews }) => {  // 关闭当前页
-      //   toLastView(visitedViews, route)
-      // })
      tagsViewStore.delView(router.currentRoute.value);
-      // 跳转到调拨管理页面
      router.replace({ path: 'transferManagentList' });
    });
  }
@@ -871,7 +867,6 @@ function handleUnitCodeChange(row, index, value) {
 }

 function handleItemQuantityChange(row, value) {
-  debugger;
  let quantityTemp = ''; // 转换成小单位的临时变量 做校验
  // 大单位情况
  if (row.unitCodeMap[row.unitCode] == 'unit') {
@@ -882,12 +877,6 @@ function handleItemQuantityChange(row, value) {
    row.itemQuantity = value;
    quantityTemp = value;
  }
-  if (row.totalSourceQuantity < quantityTemp) {
-    proxy.$modal.msgWarning('调拨数量不可超出源库存数量');
-    row.itemQuantity = 0;
-    row.itemQuantityDisplay = 0;
-    return;
-  }
  row.totalPrice = ((row.price * quantityTemp) / row.partPercent).toFixed(2);
  // 更新总数据中对应的记录
  const totalIndex = totalIncentoryInfoList.value.findIndex((item) => item.id === row.id);
@@ -918,11 +907,12 @@ function remakeBlur(row, index) {
  editBatchTransfer(index);
 }
 function handleSave() {
-  const invalidRow = totalIncentoryInfoList.value.find(
+  // 校验单价
+  const invalidPriceRow = totalIncentoryInfoList.value.find(
    (row) => !row.price || row.price <= 0
  );
-  if (invalidRow) {
-    proxy.$message.warning('调拨单价不能为空或为0，请检查！');
+  if (invalidPriceRow) {
+    proxy.$modal.msgError('调拨单价不能为空或为0，请检查！');
    return;
  }
  addTransferProductBatch(totalIncentoryInfoList.value).then((res) => {
--- a/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagent/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/transferManagent/transferManagent/index.vue
@@ -970,12 +970,6 @@ function handleItemQuantityChange(row, value) {
    row.itemQuantity = value;
    quantityTemp = value;
  }
-  if (row.totalSourceQuantity < quantityTemp) {
-    proxy.$modal.msgWarning('调拨数量不可超出源库存数量');
-    row.itemQuantity = 0;
-    row.itemQuantityDisplay = 0;
-    return;
-  }
  row.totalPrice = ((row.price * quantityTemp) / row.partPercent).toFixed(2);
 }

@@ -1022,11 +1016,7 @@ function handleSubmitApproval() {
  } else {
    submitApproval(receiptHeaderForm.busNo).then((response) => {
      proxy.$modal.msgSuccess('提交审批成功');
-      // proxy.$tab.closePage(route).then(({ visitedViews }) => {  // 关闭当前页
-      //   toLastView(visitedViews, route)
-      // })
      tagsViewStore.delView(router.currentRoute.value);
-      // 跳转到调拨管理页面
      router.replace({ path: 'transferManagentList' });
      store.clearCurrentDataDB();
    });
Author	SHA1	Message	Date
华佗	1508fd77c6	Fix Bug #442 : 手术计费：点击"删除"待签发耗材时异常报错，导致操作失败根因：DoctorStationAdviceAppMapper.xml 中 getRequestBaseInfo SQL 的第二个 UNION 查询（手术计费耗材从 adm_charge_item 关联 wor_device_request）中，biz_request_flag 和 requester_id 使用了 CI.enterer_id（计费录入人），而非 DR.requester_id（设备申请创建人）。当录入人与当前操作人不一致时，biz_request_flag 为 '0'，导致删除操作被后端拒绝。修复：将 CI.enterer_id 改为 COALESCE(DR.requester_id, CI.enterer_id)，优先使用 DeviceRequest 的 requester_id，确保 biz_request_flag 基于正确的创建人计算。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 23:07:54 +08:00
陈琳	2d6540bce5	Fix Bug #428 : 门诊医生站-检查申请：未实现分类联动检查方法及套餐明细展示与勾选逻辑根因分析: 1. handleCategoryExpand 加载了 cat.methods 但模板从未渲染，用户展开分类后看不到检查方法 2. 缺少 isMethodSelected/handleMethodSelect 函数，无法通过勾选检查方法来联动添加到已选择列表 3. 套餐明细展示缺少 CSS 样式（package-details-list/detail-row/detail-name/detail-info）修复内容: - 模板: 在分类折叠区域添加 cat.methods 的渲染（检查方法列表 + 勾选框 + 价格） - 逻辑: 新增 isMethodSelected 和 handleMethodSelect 函数，支持直接勾选检查方法添加到已选择列表 - 样式: 添加套餐明细列表样式 + 检查方法区域样式 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 23:07:54 +08:00
刘备	533bd03a43	Fix Bug #413 : 医生个人报卡编辑/查看界面字段映射与后端DTO不一致导致数据不显示后端 InfectiousCardDto 字段名与前端 showReport 映射不匹配: - caseClass 应从 diseaseType 映射 (后端 diseaseType=病例分类) - diseaseType 应从 diseaseSubtype 映射 (后端 diseaseSubtype=疾病分型) - correctName 应从 revisedDiseaseName 映射 - withdrawReason 应从 returnReason 映射 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 23:07:54 +08:00
赵云	b4458bd395	Fix Bug #509 : [门诊医生站-手术申请] 提交申请后列表未实时刷新展示数据，且提示语需优化 1. 优化提示语：将"新增成功"/"修改成功"改为"手术申请提交成功！"/"手术申请修改成功！" 2. 优化执行顺序：先emit('saved')通知父组件刷新医嘱列表，再调用getList()刷新手术申请列表，确保数据刷新时序正确 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>	2026-05-12 23:07:53 +08:00
赵云	c6b6eff2a2	Fix Bug #470 : 住院医生工作站-手术申请单加载手术项目耗时过长，影响医生开单效率策略A-前端优化：为手术项目穿梭框添加 v-loading 加载状态指示器，解决API查询期间用户看到空白/卡住界面的问题。同时暴露 getList 方法供父组件调用（之前未暴露但已被父组件调用）。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 23:07:53 +08:00
赵云	d7e53965cf	Fix Bug #455 : 门诊医生站-医嘱：开立诊疗医嘱时执行科室默认获取逻辑有误且显示为原始ID 根因修复： 1. 默认科室逻辑错误：row.orgId来自wor_activity_definition.org_id(项目所属科室)，不是执行科室。改为优先使用positionId(adm_organization_location配置的执行科室)，回退到患者就诊科室。 2. 显示为原始ID：getOrgList()为异步调用但未await，导致findOrgNameById执行时organization树未加载。将setValue改为async函数并await getOrgList()，确保科室名称解析时数据已就绪。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 23:07:53 +08:00
Ranyunqiao	081856494e	413 460 513 514	2026-05-12 23:07:53 +08:00