From 62a09a8b9480b019e5e35b1e10035c209b3c1403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=BA=91?= <赵云@gentronhealth.com>
Date: Mon, 11 May 2026 09:03:30 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Bug=20#412:=20=E9=97=A8=E8=AF=8A=E5=8C=BB?=
 =?UTF-8?q?=E7=94=9F=E7=AB=99=EF=BC=9A=E4=BC=A0=E6=9F=93=E7=97=85=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E5=8D=A1=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根因：infectiousDiseaseReportDialog.vue 的 show() 函数将 cardNo 初始化为空字符串，
而后端 DTO 的 cardNo 字段有 @NotBlank 校验，导致保存时后端拒绝请求。
同仓库的 infectiousReport/index.vue 已有此修复（调用 getNextCardNo API），
但诊断流程使用的 infectiousDiseaseReportDialog.vue 漏掉了此修复。

修复：在 show() 函数中调用 getNextCardNo API 获取卡片编号，
API 失败时降级为 TEMP_ 前缀的临时卡号，与 infectiousReport/index.vue 保持一致。
---
 .../infectiousDiseaseReportDialog.vue         | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
index a29463e2..8a4efca8 100755
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
@@ -486,7 +486,7 @@
 <script setup>
 import { ref, computed, getCurrentInstance, watch } from 'vue';
 import pcas from 'china-division/dist/pcas-code.json';
-import { saveInfectiousDiseaseReport } from '../api';
+import { saveInfectiousDiseaseReport, getNextCardNo } from '../api';
 import useUserStore from '@/store/modules/user';
 import { useDict } from '@/utils/dict';
 
@@ -1201,7 +1201,7 @@ function calculateAge() {
  * 显示对话框并初始化表单数据
  * @param {Object} diagnosisData - 诊断数据，包含已选疾病和地址信息
  */
-function show(diagnosisData) {
+async function show(diagnosisData) {
   dialogVisible.value = true;
 
   // 重置地址选择器状态
@@ -1231,12 +1231,24 @@ function show(diagnosisData) {
     });
   }
 
-  // 生成默认卡片编号：医疗机构编码+当前年月日+4位流水
+  // 生成默认卡片编号：调用后端接口获取
   const orgCode = userStore.fixmedinsCode || '0000';
+  let cardNo = '';
+  try {
+    const res = await getNextCardNo(orgCode);
+    if (res.code === 200 && res.data) {
+      cardNo = res.data;
+    } else {
+      cardNo = 'TEMP_' + Date.now();
+    }
+  } catch (err) {
+    console.error('获取卡片编号失败:', err);
+    cardNo = 'TEMP_' + Date.now();
+  }
 
   form.value = {
     // 卡片编号：单位自编，与网络直报一致
-    cardNo: '',
+    cardNo: cardNo,
 
     // 患者基本信息
     patName: patientInfo.patientName || patientInfo.name || '', // 患者姓名