门诊医生站-》开立诊断 页面调整

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/addDiagnosisDialog.vue

@@ -2,7 +2,7 @@
   <el-dialog
     title="添加中医诊断"
     v-model="props.openAddDiagnosisDialog"
-    width="1500px"
+    width="1300px"
     append-to-body
     destroy-on-close
     @open="handleOpen"
@@ -92,6 +92,7 @@ import {
   getTcmSyndrome,
   saveTcmDiagnosis,
   updateTcmDiagnosis,
+  getTcmDiagnosis,
 } from '@/views/doctorstation/components/api';
 
 const props = defineProps({
@@ -120,141 +121,144 @@ const { proxy } = getCurrentInstance();
 const emit = defineEmits(['close']);
 
 function handleOpen() {
+  // 获取诊断列表
   getTcmCondition().then((res) => {
     conditionList.value = res.data.records;
   });
-  tcmDiagonsisSaveList.value=[];
-  tcmDiagonsisList.value=[];
-  debugger;
-  if (props.updateZy.length>0) {
+  
+  // 清空数据
+  tcmDiagonsisSaveList.value = [];
+  tcmDiagonsisList.value = [];
+  syndromeSelected.value = true; // 设置为true，允许添加新的诊断
+  
+  // 如果是修改模式，加载传入的诊断数据
+  if (props.updateZy.length > 0) {
     props.updateZy.forEach((item) => {
-        let updateIds=item.updateId.split("-");
-        let name=item.name.split("-");
-        tcmDiagonsisSaveList.value.push({
+      let updateIds = item.updateId.split("-");
+      let name = item.name.split("-");
+      tcmDiagonsisSaveList.value.push(
+        {
           conditionId: updateIds[0],
           definitionId: item.illnessDefinitionId,
           ybNo: item.ybNo,
           syndromeGroupNo: item.syndromeGroupNo,
           verificationStatusEnum: 4,
           medTypeCode: '11',
-          diagSrtNo:item.diagSrtNo,
-        });
-        tcmDiagonsisList.value.push({
-          conditionName: name[0],
-          syndromeGroupNo: item.syndromeGroupNo,
-        });
-        tcmDiagonsisSaveList.value.push({
+          diagSrtNo: item.diagSrtNo,
+          isExisting: true // 标记为已存在
+        },
+        {
           conditionId: updateIds[1],
           definitionId: item.symptomDefinitionId,
           ybNo: item.symptomYbNo,
           syndromeGroupNo: item.syndromeGroupNo,
-          diagSrtNo:item.diagSrtNo,
+          diagSrtNo: item.diagSrtNo,
+          isExisting: true // 标记为已存在
+        }
+      );
+      tcmDiagonsisList.value.push({
+        conditionName: name[0],
+        syndromeName: name[1],
+        syndromeGroupNo: item.syndromeGroupNo,
+        isExisting: true // 标记为已存在
       });
-        tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = name[1];
-        console.log("这是修改时带入的数据");
-        console.log(tcmDiagonsisList.value);
-        console.log(tcmDiagonsisSaveList.value);
-        syndromeSelected.value = true;                      
+      syndromeSelected.value = true;
     });
+  } else {
+    // 不是修改模式，加载已保存的中医诊断
+    if (props.patientInfo && props.patientInfo.encounterId) {
+      getTcmDiagnosis({ encounterId: props.patientInfo.encounterId }).then((res) => {
+        if (res.code === 200 && res.data.illness && res.data.illness.length > 0) {
+          res.data.illness.forEach((item, index) => {
+            const symptom = res.data.symptom[index];
+            if (symptom) {
+              // 添加到显示列表
+              tcmDiagonsisList.value.push({
+                conditionName: item.name,
+                syndromeName: symptom.name,
+                syndromeGroupNo: item.syndromeGroupNo,
+                isExisting: true // 标记为已存在
+              });
+              
+              // 添加到保存列表
+              tcmDiagonsisSaveList.value.push(
+                {
+                  conditionId: item.conditionId,
+                  definitionId: item.definitionId,
+                  ybNo: item.ybNo,
+                  syndromeGroupNo: item.syndromeGroupNo,
+                  verificationStatusEnum: item.verificationStatusEnum || 4,
+                  medTypeCode: item.medTypeCode || '11',
+                  diagSrtNo: item.diagSrtNo,
+                  isExisting: true // 标记为已存在
+                },
+                {
+                  conditionId: symptom.conditionId,
+                  definitionId: symptom.definitionId,
+                  ybNo: symptom.ybNo,
+                  syndromeGroupNo: item.syndromeGroupNo,
+                  diagSrtNo: item.diagSrtNo,
+                  isExisting: true // 标记为已存在
+                }
+              );
+            }
+          });
+        }
+      }).catch(err => {
+        console.error('加载已保存的中医诊断失败:', err);
+      });
+    }
   }
 }
 
 // 点击诊断列表处理，点击以后才显示证候列表
 function handleClickRow(row) {
   if (syndromeSelected.value || tcmDiagonsisList.value.length == 0) {
-      syndromeSelected.value = false;
+    syndromeSelected.value = false;
     selectedDisease.value = true;
     timestamp.value = Date.now();
     getTcmSyndrome().then((res) => {
       syndromeList.value = res.data.records;
     });
     
-    if (props.updateZy.length>0) {
-        props.updateZy.forEach((item) => {
-          let updateIds=item.updateId.split("-");
-          tcmDiagonsisSaveList.value.push({
-          updateId:updateIds[0],
-          conditionId: updateIds[0],
-          definitionId: row.id,
-          ybNo: row.ybNo,
-          syndromeGroupNo: timestamp.value,
-          verificationStatusEnum: 4,
-          medTypeCode: '11',
-          diagSrtNo:item.diagSrtNo,
-        });
-        debugger;
-        if(tcmDiagonsisList.value.length>0){
-          tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].conditionName = row.name;
-        }else{
-          tcmDiagonsisList.value.push({
-            conditionName: row.name,
-            syndromeGroupNo: timestamp.value,
-          });
-        }
-      });
-    }else{
-       tcmDiagonsisSaveList.value.push({
-        definitionId: row.id,
-        ybNo: row.ybNo,
-        syndromeGroupNo: timestamp.value,
-        verificationStatusEnum: 4,
-        medTypeCode: '11',
-      });
-        tcmDiagonsisList.value.push({
-          conditionName: row.name,
-          syndromeGroupNo: timestamp.value,
-      });
-    }
-
-
-    }
-
-      // tcmDiagonsisList.value.push({
-      //   conditionName: row.name,
-      //   syndromeGroupNo: timestamp.value,
-      // });
-
+    // 添加新的诊断
+    tcmDiagonsisSaveList.value.push({
+      definitionId: row.id,
+      ybNo: row.ybNo,
+      syndromeGroupNo: timestamp.value,
+      verificationStatusEnum: 4,
+      medTypeCode: '11',
+      isExisting: false // 标记为新增
+    });
+    tcmDiagonsisList.value.push({
+      conditionName: row.name,
+      syndromeGroupNo: timestamp.value,
+      isExisting: false // 标记为新增
+    });
   }
+}
 
 function clickSyndromeRow(row) {
-  debugger;
-  let flag=true;
-  tcmDiagonsisList.value.forEach( item => {
-    if(tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].conditionName==item.conditionName){
-      if(item.syndromeName==row.name ){
-        proxy.$modal.msgWarning('不能存在完全相同的诊断和证侯');
-        flag=false;
-      }
+  // 检查是否已存在完全相同的诊断和证候
+  let flag = true;
+  const currentConditionName = tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].conditionName;
+  
+  tcmDiagonsisList.value.forEach(item => {
+    if (item.conditionName === currentConditionName && item.syndromeName === row.name) {
+      proxy.$modal.msgWarning('不能存在完全相同的诊断和证候');
+      flag = false;
     }
   });
-  if(flag){
-      if(props.updateZy.length>0){
-        props.updateZy.forEach((item) => {
-          let updateIds=item.updateId.split("-");
-            tcmDiagonsisSaveList.value.push({
-              updateId:updateIds[1],
-              conditionId: updateIds[1],
-              definitionId: row.id,
-              ybNo: row.ybNo,
-              syndromeGroupNo: timestamp.value,
-            });
-            tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = row.name;
-            syndromeSelected.value = true;
-        });
-        
-      }else{
-        tcmDiagonsisSaveList.value.push({
-            definitionId: row.id,
-            ybNo: row.ybNo,
-            syndromeGroupNo: timestamp.value,
-        });
-        tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = row.name;
-        syndromeSelected.value = true;
-      }
-
-    
-      // tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = row.name;
-      // syndromeSelected.value = true;
+  
+  if (flag) {
+    tcmDiagonsisSaveList.value.push({
+      definitionId: row.id,
+      ybNo: row.ybNo,
+      syndromeGroupNo: timestamp.value,
+      isExisting: false // 标记为新增
+    });
+    tcmDiagonsisList.value[tcmDiagonsisList.value.length - 1].syndromeName = row.name;
+    syndromeSelected.value = true;
   }
 }
 
@@ -268,38 +272,52 @@ function removeDiagnosis(row, index) {
 }
 
 function save() {
-  if(props.updateZy.length>0){
+  // 只保存新增的诊断，过滤掉已存在的
+  const newDiagnosisList = tcmDiagonsisSaveList.value.filter(item => !item.isExisting);
+  
+  if (newDiagnosisList.length === 0) {
+    proxy.$modal.msgWarning('没有新增的诊断需要保存');
+    return;
+  }
+  
+  if (props.updateZy.length > 0) {
+    // 修改模式
     updateTcmDiagnosis({
       patientId: props.patientInfo.patientId,
       encounterId: props.patientInfo.encounterId,
-      diagnosisChildList: tcmDiagonsisSaveList.value,
-      }).then((res) => {
-        if (res.code == 200) {
-          emit('close');
-          proxy.$modal.msgSuccess('诊断已保存');
-        }
+      diagnosisChildList: newDiagnosisList,
+    }).then((res) => {
+      if (res.code == 200) {
+        emit('close');
+        proxy.$modal.msgSuccess('诊断已保存');
+      }
     });
-  }else{
+  } else {
+    // 新增模式
     saveTcmDiagnosis({
       patientId: props.patientInfo.patientId,
       encounterId: props.patientInfo.encounterId,
-      diagnosisChildList: tcmDiagonsisSaveList.value,
-      }).then((res) => {
-        if (res.code == 200) {
-          emit('close');
-          proxy.$modal.msgSuccess('诊断已保存');
-        }
+      diagnosisChildList: newDiagnosisList,
+    }).then((res) => {
+      if (res.code == 200) {
+        emit('close');
+        proxy.$modal.msgSuccess('诊断已保存');
+      }
     });
   }
-  
 }
 
 function submit() {
-  debugger;
-  if (
-    tcmDiagonsisSaveList.value.length > 0 &&
-    (syndromeSelected.value || tcmDiagonsisSaveList.value.length % 2 == 0)
-  ) {
+  // 检查是否有新增的诊断
+  const hasNewDiagnosis = tcmDiagonsisSaveList.value.some(item => !item.isExisting);
+  
+  if (!hasNewDiagnosis) {
+    // 如果没有新增诊断，直接关闭
+    emit('close');
+    return;
+  }
+  
+  if (syndromeSelected.value || tcmDiagonsisSaveList.value.length % 2 == 0) {
     save();
   } else {
     proxy.$modal.msgWarning('请选择证候');

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue

@@ -75,19 +75,17 @@
         <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="typeName" width="120">
+            <el-table-column label="诊断排序" align="center" prop="diagSrtNo" width="120">
               <template #default="scope">
-                <el-select v-model="scope.row.typeName" placeholder="请选择">
-                  <el-option label="西医" value="西医" />
-                  <el-option label="中医" value="中医" />
-                  <el-option label="证型" value="证型" />
-                  <el-option label="其他" value="其他" />
-                </el-select>
+                <el-form-item :prop="`diagnosisList.${scope.$index}.diagSrtNo`" :rules="rules.diagSrtNo">
+                  <el-input-number v-model="scope.row.diagSrtNo" controls-position="right" :controls="false"
+                    style="width: 80px" />
+                </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="诊断类型" align="center" prop="medTypeCode" width="180">
+            <el-table-column label="诊断类别" align="center" prop="diagSrtNo" width="180">
               <template #default="scope">
-                <el-form-item :prop="`diagnosisList.${scope.$index}.medTypeCode`" :rules="rules.medTypeCode" style="margin-bottom: 0;">
+                <el-form-item :prop="`diagnosisList.${scope.$index}.medTypeCode`" :rules="rules.medTypeCode">
                   <el-select v-model="scope.row.medTypeCode" placeholder=" " style="width: 150px">
                     <el-option
                       v-for="item in diag_type"
@@ -99,9 +97,9 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="诊断" align="center" prop="name">
+            <el-table-column label="诊断名称" align="center" prop="name">
               <template #default="scope">
-                <el-form-item :prop="`diagnosisList.${scope.$index}.name`" :rules="rules.name" style="margin-bottom: 0;">
+                <el-form-item :prop="`diagnosisList.${scope.$index}.name`" :rules="rules.name">
                   <el-popover
                     :popper-style="{ padding: '0' }"
                     placement="bottom-start"
@@ -122,26 +120,24 @@
                 </el-form-item>
               </template>
             </el-table-column>
-            <el-table-column label="主诊断" align="center" width="120">
-              <template #default="scope">
-                <el-select v-model="scope.row.maindiseFlag" placeholder="是否为主诊断" @change="(value) => handleMaindise(value, scope.$index)">
-                  <el-option label="是" :value="1"/>
-                  <el-option label="否" :value="0"/>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="诊断备注" align="center" prop="diagnosisDesc" min-width="150">
-              <template #default="scope">
-                <el-input v-model="scope.row.diagnosisDesc" placeholder="请输入备注" />
-              </template>
-            </el-table-column>
-            <el-table-column label="ICD编码" align="center" prop="ybNo" width="180" />
-            <el-table-column label="诊断状态" align="center" prop="maindiseFlag" width="150">
+            <el-table-column label="医保码" align="center" prop="ybNo" width="180" />
+            <el-table-column label="类别" align="center" prop="typeName" width="100" />
+            <el-table-column label="诊断类型" align="center" prop="maindiseFlag">
               <template #default="scope">
+              <div style="display:flex;flex-direction:column;align-items:center;gap:5px;">
+                <el-checkbox
+                  label="主诊断"
+                  :true-value="1"
+                  :false-value="0"
+                  v-model="scope.row.maindiseFlag"
+                  border
+                  size="small"
+                  @change="(value) => handleMaindise(value, scope.$index)"
+                />
                 <el-select
                   v-model="scope.row.verificationStatusEnum"
                   placeholder=" "
-                  style="width: 100%;"
+                  style="width: 100%; padding-bottom: 5px; padding-left: 10px"
                   size="small"
                 >
                   <el-option
@@ -151,32 +147,7 @@
                     :value="item.value"
                   />
                 </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="发病日期" align="center" prop="onsetDate" width="180">
-              <template #default="scope">
-                <el-date-picker
-                  v-model="scope.row.onsetDate"
-                  type="date"
-                  placeholder="选择日期"
-                  format="YYYY-MM-DD"
-                  value-format="YYYY-MM-DD"
-                  style="width: 100%"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column label="诊断日期" align="center" prop="diagnosisTime" width="180">
-              <template #default="scope">
-                {{ scope.row.diagnosisTime ? scope.row.diagnosisTime.split(' ')[0] : '' }}
-              </template>
-            </el-table-column>
-            <el-table-column label="医生" align="center" prop="diagnosisDoctor" width="120" />
-            <el-table-column label="长效诊断标识" align="center" prop="longTermDiagnosisFlag" width="150">
-              <template #default="scope">
-                <el-select v-model="scope.row.longTermDiagnosisFlag" placeholder="请选择" clearable>
-                  <el-option label="长期有效" value="1" />
-                  <el-option label="临时" value="2" />
-                </el-select>
+              </div>
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="130">
@@ -247,7 +218,7 @@ const props = defineProps({
 const emits = defineEmits(['diagnosisSave']);
 const { proxy } = getCurrentInstance();
 const userStore = useUserStore();
-const { diag_type, long_term_diagnosis_flag } = proxy.useDict('diag_type', 'long_term_diagnosis_flag');
+const { diag_type } = proxy.useDict('diag_type');
 const rules = ref({
   name: [{ required: true, message: '请选择诊断', trigger: 'change' }],
   medTypeCode: [{ required: true, message: '请选择诊断类型', trigger: 'change' }],
@@ -281,7 +252,8 @@ function getList() {
   getEncounterDiagnosis(props.patientInfo.encounterId)
     .then((res) => {
       if (res.code == 200) {
-        form.value.diagnosisList = res.data;
+        // 过滤掉中医诊断，只保留西医诊断
+        form.value.diagnosisList = res.data.filter(item => item.typeName !== '中医诊断');
         emits('diagnosisSave', false);
       }
       maxNo = form.value.diagnosisList.length;
@@ -437,13 +409,10 @@ function getTree() {
 function handleAddDiagnosis() {
   proxy.$refs.formRef.validate((valid) => {
     if (valid) {
-      // if (!allowAdd.value) {
-      //   proxy.$modal.msgWarning('请先填写病历');
-      //   return;
-      // }
-      const maxSortNo = form.value.diagnosisList.length > 0
-        ? Math.max(...form.value.diagnosisList.map(item => item.diagSrtNo || 0))
+      const maxSortNo = form.value.diagnosisList.length > 0 
+        ? Math.max(...form.value.diagnosisList.map(item => item.diagSrtNo || 0)) 
         : 0;
+      
       form.value.diagnosisList.push({
         showPopover: false,
         name: undefined,
@@ -453,9 +422,7 @@ function handleAddDiagnosis() {
         iptDiseTypeCode: 2,
         diagnosisDesc: '',
         diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-        diagnosisTime: new Date().toLocaleString('zh-CN'),
-        typeName: '西医',
-        longTermDiagnosisFlag: ''
+        diagnosisTime: new Date().toLocaleString('zh-CN')
       });
       
       // 添加后按排序号排序
@@ -524,6 +491,7 @@ function handleSaveDiagnosis() {
         return false;
       } else if (!form.value.diagnosisList.some((diagnosis) => diagnosis.maindiseFlag === 1)) {
         proxy.$modal.msgWarning('至少添加一条主诊断');
+        return false;
       } else {
         // 保存前按排序号排序
         form.value.diagnosisList.sort((a, b) => (a.diagSrtNo || 0) - (b.diagSrtNo || 0));

openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosislist.vue

@@ -38,7 +38,7 @@ watch(
     queryParams.value.searchKey = newValue;
     getList();
   },
-  { immdiate: true }
+  { immediate: true }
 );
 
 getList();