提交merge1.3

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

@@ -8,10 +8,6 @@
             <el-button icon="Search" @click="queryDiagnosisUse" />
           </template>
         </el-input>
-<<<<<<< HEAD
-        <el-tree ref="treeRef" :data="tree" node-key="id" :props="{ label: 'name', children: 'children' }"
-          highlight-current default-expand-all :filter-node-method="filterNode" @node-click="handleNodeClick">
-=======
         <el-tree
           ref="treeRef"
           :data="tree"
@@ -24,22 +20,17 @@
           @node-click="handleNodeClick"
           max-height="650"
         >
->>>>>>> v1.3
           <template #default="{ node, data }">
             <div class="custom-tree-node">
               <span>{{ node.label }}</span>
               <span class="tree-node-actions">
                 <template v-if="node.level === 1 && data.name != '常用' && data.name != '历史'">
-<<<<<<< HEAD
-                  <el-button style="color: #000000" type="text" size="small" @click.stop="addChild(data)">
-=======
                   <el-button
                     style="color: #000000"
                     type="text"
                     size="small"
                     @click.stop="addChild(data)"
                   >
->>>>>>> v1.3
                     <el-icon>
                       <Plus />
                     </el-icon>
@@ -48,13 +39,6 @@
                 <el-popconfirm width="200" :hide-after="10" title="确认删除此常用诊断吗" placement="top-start"
                   @confirm="deleteChild(data)">
                   <template #reference>
-<<<<<<< HEAD
-                    <el-button style="color: #000000" v-if="
-                      node.level === 2 &&
-                      node.parent.data.name != '常用' &&
-                      node.parent.data.name != '历史'
-                    " type="text" size="small" @click.stop="">
-=======
                     <el-button
                       style="color: #000000"
                       v-if="
@@ -66,7 +50,6 @@
                       size="small"
                       @click.stop=""
                     >
->>>>>>> v1.3
                       <el-icon>
                         <Minus />
                       </el-icon>
@@ -117,11 +100,6 @@
             <el-table-column label="诊断名称" align="center" prop="name">
               <template #default="scope">
                 <el-form-item :prop="`diagnosisList.${scope.$index}.name`" :rules="rules.name">
-<<<<<<< HEAD
-                  <el-popover :popper-style="{ padding: '0' }" placement="bottom-start" :visible="scope.row.showPopover"
-                    trigger="manual" :width="800">
-                    <diagnosislist :diagnosisSearchkey="diagnosisSearchkey" @selectDiagnosis="handleSelsectDiagnosis" />
-=======
                   <el-popover
                     :popper-style="{ padding: '0' }"
                     placement="bottom-start"
@@ -134,7 +112,6 @@
                       :diagnosisSearchkey="diagnosisSearchkey"
                       @selectDiagnosis="handleSelsectDiagnosis"
                     />
->>>>>>> v1.3
                     <template #reference>
                       <el-input v-model="scope.row.name" placeholder="请选择诊断" @input="handleChange"
                         @focus="handleFocus(scope.row, scope.$index)" @blur="handleBlur(scope.row)" />
@@ -143,17 +120,9 @@
                 </el-form-item>
               </template>
             </el-table-column>
-<<<<<<< HEAD
-            
-            <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" width="120">
-=======
             <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">
->>>>>>> v1.3
               <template #default="scope">
               <div style="display:flex;flex-direction:column;align-items:center;gap:5px;">
                 <el-checkbox
@@ -192,11 +161,6 @@
         </el-form>
       </el-col>
     </el-row>
-<<<<<<< HEAD
-    <diagnosisdialog :openDiagnosis="openDiagnosis" @close="closeDiagnosisDialog" :radio="orgOrUser" />
-    <AddDiagnosisDialog :openAddDiagnosisDialog="openAddDiagnosisDialog" :patientInfo="props.patientInfo"
-      @close="closeDiagnosisDialog" />
-=======
     <diagnosisdialog
       :openDiagnosis="openDiagnosis"
       @close="closeDiagnosisDialog"
@@ -208,7 +172,6 @@
       :patientInfo="props.patientInfo"
       @close="closeDiagnosisDialog"
     />
->>>>>>> v1.3
   </div>
 </template>
 
@@ -287,46 +250,6 @@ function refreshData() {
 }
 let maxNo = 99;
 function getList() {
-<<<<<<< HEAD
-  if (!props.patientInfo || !props.patientInfo.encounterId) {
-    console.warn('患者就诊信息不完整，无法获取诊断数据');
-    return;
-  }
-  
-  getEncounterDiagnosis(props.patientInfo.encounterId).then((res) => {
-    if (res.code == 200) {
-      // 为每个诊断项添加默认的诊断医生和时间（如果不存在）
-      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')
-      }));
-      
-      // 获取诊断列表后按排序号排序
-      form.value.diagnosisList.sort((a, b) => (a.diagSrtNo || 0) - (b.diagSrtNo || 0));
-      
-      emits('diagnosisSave', false);
-    }
-  });
-  
-  getTcmDiagnosis({ encounterId: props.patientInfo.encounterId }).then((res) => {
-    if (res.code == 200) {
-      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 || ''),
-            ybNo: item.ybNo,
-            medTypeCode: item.medTypeCode,
-            diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-            diagnosisTime: new Date().toLocaleString('zh-CN')
-          });
-        });
-      }
-      emits('diagnosisSave', false);
-    }
-  });
-  
-=======
   getEncounterDiagnosis(props.patientInfo.encounterId)
     .then((res) => {
       if (res.code == 200) {
@@ -362,7 +285,6 @@ function getList() {
         }
       });
     });
->>>>>>> v1.3
   getTree();
 }
 
@@ -487,22 +409,10 @@ function getTree() {
 function handleAddDiagnosis() {
   proxy.$refs.formRef.validate((valid) => {
     if (valid) {
-<<<<<<< HEAD
-      if (!allowAdd.value) {
-        proxy.$modal.msgWarning('请先填写病历');
-        return;
-      }
-      // 计算现有最大排序号
-      const maxSortNo = form.value.diagnosisList.length > 0 
-        ? Math.max(...form.value.diagnosisList.map(item => item.diagSrtNo || 0)) 
-        : 0;
-        
-=======
       // if (!allowAdd.value) {
       //   proxy.$modal.msgWarning('请先填写病历');
       //   return;
       // }
->>>>>>> v1.3
       form.value.diagnosisList.push({
         showPopover: false,
         name: undefined,
@@ -717,14 +627,10 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
 .el-checkbox.is-bordered.el-checkbox--small {
   background-color: #ffffff;
 }
-<<<<<<< HEAD
-
-=======
 .tree-with-scrollbar {
   max-height: 650px;
   overflow-y: auto;
 }
->>>>>>> v1.3
 .custom-tree-node {
   display: flex;
   align-items: center;