From 51ee8d1b4367635d2fd8d7b884fb7fa7279de3d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=BD=87=E5=87=A1?= <2899447176@qq.com>
Date: Thu, 23 Oct 2025 15:43:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E4=BF=9D=E7=A0=81:=E5=B0=86=E5=8C=BB?=
 =?UTF-8?q?=E4=BF=9D=E7=A0=81=E4=BF=AE=E6=94=B9=E6=88=90=E8=AF=8A=E6=96=AD?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E3=80=82=20=E5=9C=A8=E8=AF=8A=E6=96=AD?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=90=8E=E5=A2=9E=E5=8A=A0=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=AF=8A=E6=96=AD=E5=8C=BB=E7=94=9F=E5=92=8C?=
 =?UTF-8?q?=E8=AF=8A=E6=96=AD=E6=97=B6=E9=97=B4=EF=BC=8C=E8=AF=8A=E6=96=AD?=
 =?UTF-8?q?=E5=8C=BB=E7=94=9F=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=BC=80=E7=AB=8B?=
 =?UTF-8?q?=E8=AF=8A=E6=96=AD=E7=9A=84=E5=8C=BB=E7=94=9F=EF=BC=8C=E8=AF=8A?=
 =?UTF-8?q?=E6=96=AD=E6=97=B6=E9=97=B4=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=BC=80?=
 =?UTF-8?q?=E7=AB=8B=E8=AF=8A=E6=96=AD=E7=9A=84=E5=BD=93=E5=89=8D=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diagnosis/addDiagnosisDialog.vue          |  9 ++-
 .../components/diagnosis/diagnosis.vue        | 68 ++++++++++++++-----
 2 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue
index 7454ad5b..5ce1e1b0 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue
@@ -162,10 +162,17 @@ function removeDiagnosis(row, index) {
 }
 
 function save() {
+  // 为每个诊断项添加诊断医生和诊断时间
+  const diagnosisChildList = tcmDiagonsisSaveList.value.map(item => ({
+    ...item,
+    diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || '',
+    diagnosisTime: new Date().toLocaleString('zh-CN')
+  }));
+  
   saveTcmDiagnosis({
     patientId: props.patientInfo.patientId,
     encounterId: props.patientInfo.encounterId,
-    diagnosisChildList: tcmDiagonsisSaveList.value,
+    diagnosisChildList: diagnosisChildList,
   }).then((res) => {
     if (res.code == 200) {
       emit('close');
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
index ee55ed92..5f5c7b15 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
@@ -76,7 +76,7 @@
         <el-form :model="form" :rules="rules" ref="formRef">
           <el-table ref="diagnosisTableRef" :data="form.diagnosisList" height="650">
             <el-table-column label="序号" type="index" width="50" />
-            <el-table-column label="诊断排序" align="center" prop="diagSrtNo" width="180">
+            <el-table-column label="诊断排序" align="center" prop="diagSrtNo" width="120">
               <template #default="scope">
                 <el-form-item
                   :prop="`diagnosisList.${scope.$index}.diagSrtNo`"
@@ -135,7 +135,10 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="医保码" align="center" prop="ybNo" width="180" />
+            
+            <el-table-column label="诊断医生" align="center" prop="diagnosisDoctor" width="120" />
+            <el-table-column label="诊断时间" align="center" prop="diagnosisTime" width="150" />
+            <el-table-column label="诊断代码" align="center" prop="ybNo" width="180" />
             <el-table-column label="诊断类型" align="center" prop="maindiseFlag">
               <template #default="scope">
                 <el-checkbox
@@ -192,6 +195,7 @@
 
 <script setup>
 import { getCurrentInstance } from 'vue';
+import useUserStore from '@/store/modules/user';
 import {
   getConditionDefinitionInfo,
   saveDiagnosis,
@@ -228,6 +232,7 @@ const props = defineProps({
 });
 const emits = defineEmits(['diagnosisSave']);
 const { proxy } = getCurrentInstance();
+const userStore = useUserStore();
 const { med_type } = proxy.useDict('med_type');
 const rules = ref({
   name: [{ required: true, message: '请选择诊断', trigger: 'change' }],
@@ -244,27 +249,45 @@ watch(
 );
 
 function getDetail(encounterId) {
+  if (!encounterId) {
+    console.warn('未提供有效的就诊ID，无法获取病历详情');
+    return;
+  }
+  
   getEmrDetail(encounterId).then((res) => {
     allowAdd.value = res.data ? true : false;
   });
 }
 
 function getList() {
+  if (!props.patientInfo || !props.patientInfo.encounterId) {
+    console.warn('患者就诊信息不完整，无法获取诊断数据');
+    return;
+  }
+  
   getEncounterDiagnosis(props.patientInfo.encounterId).then((res) => {
     if (res.code == 200) {
-      form.value.diagnosisList = res.data;
+      // 为每个诊断项添加默认的诊断医生和时间（如果不存在）
+      form.value.diagnosisList = res.data.map(item => ({
+        ...item,
+        diagnosisDoctor: item.diagnosisDoctor || props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+        diagnosisTime: item.diagnosisTime || new Date().toLocaleString('zh-CN')
+      }));
       emits('diagnosisSave', false);
       console.log(form.value.diagnosisList);
     }
   });
+  
   getTcmDiagnosis({ encounterId: props.patientInfo.encounterId }).then((res) => {
     if (res.code == 200) {
-      if (res.data.illness.length > 0) {
+      if (res.data.illness && res.data.illness.length > 0 && res.data.symptom) {
         res.data.illness.forEach((item, index) => {
           form.value.diagnosisList.push({
-            name: item.name + '-' + res.data.symptom[index].name,
+            name: item.name + '-' + (res.data.symptom[index]?.name || ''),
             ybNo: item.ybNo,
             medTypeCode: item.medTypeCode,
+            diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+            diagnosisTime: new Date().toLocaleString('zh-CN')
           });
         });
       }
@@ -272,6 +295,7 @@ function getList() {
       console.log(form.value.diagnosisList);
     }
   });
+  
   getTree();
 }
 
@@ -285,21 +309,28 @@ function init() {
 }
 
 function handleImport() {
+  if (!props.patientInfo || !props.patientInfo.encounterId) {
+    console.warn('患者就诊信息不完整，无法导入慢性病信息');
+    return;
+  }
+  
   if (props.patientInfo.contractName != '自费') {
     // 获取患者慢性病信息
     getChronicDisease({ encounterId: props.patientInfo.encounterId }).then((res) => {
-      if (res.data.length > 0) {
+      if (res.data && res.data.length > 0) {
         res.data.forEach((item, index) => {
           form.value.diagnosisList.push({
-            ...item,
-            ...{
-              medTypeCode: '140104',
-              verificationStatusEnum: 4,
-              definitionId: item.id,
-              diagSrtNo: form.value.diagnosisList.length + 1,
-              iptDiseTypeCode: 2,
-              diagnosisDesc: '',
-            },
+        ...item,
+        ...{
+          medTypeCode: '140104',
+          verificationStatusEnum: 4,
+          definitionId: item.id,
+          diagSrtNo: form.value.diagnosisList.length + 1,
+          iptDiseTypeCode: 2,
+          diagnosisDesc: '',
+              diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+              diagnosisTime: new Date().toLocaleString('zh-CN')
+        },
           });
         });
       }
@@ -342,7 +373,8 @@ const filterNode = (value, data) => {
  * 获取诊断树列表
  */
 function getTree() {
-  getConditionDefinitionInfo(props.patientInfo ? props.patientInfo.patientId : '').then((res) => {
+  const patientId = props.patientInfo?.patientId || '';
+  getConditionDefinitionInfo(patientId).then((res) => {
     if (res.code == 200) {
       let list = [];
       list = res.data.patientHistoryList;
@@ -391,6 +423,8 @@ function handleAddDiagnosis() {
         diagSrtNo: form.value.diagnosisList.length + 1,
         iptDiseTypeCode: 2,
         diagnosisDesc: '',
+        diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+        diagnosisTime: new Date().toLocaleString('zh-CN')
       });
       if (form.value.diagnosisList.length == 1) {
         form.value.diagnosisList[0].maindiseFlag = 1;
@@ -537,6 +571,8 @@ function handleNodeClick(data) {
     medTypeCode: '11',
     diagSrtNo: form.value.diagnosisList.length + 1,
     definitionId: data.definitionId,
+    diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
+    diagnosisTime: new Date().toLocaleString('zh-CN')
   });
   if (form.value.diagnosisList.length == 1) {
     form.value.diagnosisList[0].maindiseFlag = 1;