From 24e8a3cfdf0d96888a7933ecd1074fcb462aac29 Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Fri, 20 Mar 2026 17:46:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(consultation):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BC=9A=E8=AF=8A=E7=A1=AE=E8=AE=A4=E9=A1=B5=E9=9D=A2=E5=8C=BB?=
 =?UTF-8?q?=E5=B8=88=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=20-=20=E5=B0=86co?=
 =?UTF-8?q?nfirmingPhysicianText=E5=AD=97=E6=AE=B5=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E4=B8=BAconfirmingPhysician=E4=BB=A5=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8F=82=E4=B8=8E=E5=8C=BB=E5=B8=88=20-=20?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9EdisplayApplicationTime=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=BB=A5=E5=8C=BA=E5=88=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=92=8C=E7=BC=96=E8=BE=91=E6=97=B6=E7=9A=84=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=20-=20=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81=E5=B9=B6=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consultationconfirmation/index.vue        | 23 +++++++++----------
 .../doctorstation/components/consultation.vue | 13 ++++++++++-
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/openhis-ui-vue3/src/views/consultationmanagement/consultationconfirmation/index.vue b/openhis-ui-vue3/src/views/consultationmanagement/consultationconfirmation/index.vue
index 10adb6a1..6ece2e66 100644
--- a/openhis-ui-vue3/src/views/consultationmanagement/consultationconfirmation/index.vue
+++ b/openhis-ui-vue3/src/views/consultationmanagement/consultationconfirmation/index.vue
@@ -136,7 +136,7 @@
         </el-form-item>
 
         <el-form-item label="会诊确认参加医师">
-          <el-input v-model="formData.confirmingPhysicianText" type="textarea" :rows="3" disabled />
+          <el-input v-model="formData.confirmingPhysician" type="textarea" :rows="3" />
         </el-form-item>
 
         <el-form-item label="会诊意见" required>
@@ -211,7 +211,7 @@
 </template>
 
 <script setup name="consultationConfirmation">
-import { computed, ref, onMounted, watch } from 'vue'
+import { computed, ref, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Check } from '@element-plus/icons-vue'
 import useUserStore from '@/store/modules/user'
@@ -249,9 +249,8 @@ const formData = ref({
   consultationPurpose: '',
   provisionalDiagnosis: '',
   confirmingPhysician: '',
-  confirmingPhysicianText: '', // 显示所有参与确认的医师
-  consultationOpinion: '',
   confirmingPhysicianName: '',
+  consultationOpinion: '',
   confirmingDeptName: '',
   signature: '',
   signatureDate: null,
@@ -330,7 +329,7 @@ const applyRowToForm = (row) => {
     consultationPurpose: row.consultationPurpose,
     provisionalDiagnosis: row.provisionalDiagnosis,
     confirmingPhysician: row.confirmingPhysician || '',
-    confirmingPhysicianText: '', // 初始化为空，稍后根据opinionList设置
+    confirmingPhysicianName: '',
     consultationOpinion: '',  // 先清空，后面从 opinionList 中获取
     confirmingPhysicianName: row.confirmingPhysicianName || '',
     confirmingDeptName: row.confirmingDeptName || '',
@@ -345,14 +344,14 @@ const applyRowToForm = (row) => {
   if (opinionList.value.length > 0) {
     // 生成所有参与确认医师的文本（格式：科室-医生姓名；科室-医生姓名）
     const allConfirmingPhysicians = opinionList.value.map(op => `${op.deptName}-${op.physicianName}`).join('；')
-    formData.value.confirmingPhysicianText = allConfirmingPhysicians
+    formData.value.confirmingPhysician = allConfirmingPhysicians  // 这个字段显示所有确认的医生
 
     // 从会诊意见列表中获取当前医生的信息
     const currentPhysicianId = userStore.practitionerId || userStore.user?.practitionerId
     const myOpinion = opinionList.value.find(op => op.physicianId === currentPhysicianId)
 
     if (myOpinion) {
-      // 如果当前医生已确认，回显其信息
+      // 如果当前医生已确认，回显其信息到所属医生字段
       formData.value.confirmingPhysicianName = myOpinion.physicianName
       formData.value.confirmingDeptName = myOpinion.deptName
 
@@ -435,9 +434,9 @@ const handleConfirm = async () => {
     } else {
       // 确认会诊
       if (!formData.value.consultationOpinion.trim()) {
-      ElMessage.warning('请先填写会诊意见')
-      return
-    }
+        ElMessage.warning('请先填写会诊意见')
+        return
+      }
       
       loading.value = true
       const data = {
@@ -560,8 +559,8 @@ const loadData = async () => {
           // 然后应用数据到表单
           applyRowToForm(updatedRow)
         } else {
-  currentRow.value = null
-  applyRowToForm(null)
+          currentRow.value = null
+          applyRowToForm(null)
           opinionList.value = []
         }
       }
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/consultation.vue b/openhis-ui-vue3/src/views/doctorstation/components/consultation.vue
index afa6acd9..bc12c4d0 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/consultation.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/consultation.vue
@@ -117,7 +117,7 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="申请时间：">
-                <el-input v-model="currentTime" disabled />
+                <el-input v-model="displayApplicationTime" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -381,6 +381,17 @@ const selectedRow = ref(null);
 const currentTime = ref('');
 let timeTimer = null;  // 定时器引用
 
+// 计算显示的申请时间 - 如果有选中行则显示其申请时间，否则显示当前时间
+const displayApplicationTime = computed(() => {
+  if (selectedRow.value && selectedRow.value.consultationRequestDate) {
+    // 如果是编辑已有记录，则显示其申请时间（不是动态时间）
+    return selectedRow.value.consultationRequestDate;
+  } else {
+    // 如果是新增记录，则显示当前时间（动态时间）
+    return currentTime.value;
+  }
+});
+
 // 表单数据
 const formData = reactive({
   consultationId: '',