提交merge1.3

openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue

@@ -28,16 +28,12 @@
               <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>
@@ -46,13 +42,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="
@@ -64,7 +53,6 @@
                       size="small"
                       @click.stop=""
                     >
->>>>>>> v1.3
                       <el-icon>
                         <Minus />
                       </el-icon>
@@ -197,11 +185,8 @@ import { deleteTcmDiagnosis } from '../../../../doctorstation/components/api.js'
 import diagnosisdialog from '../diagnosis/diagnosisdialog.vue';
 import AddDiagnosisDialog from './addDiagnosisDialog.vue';
 import diagnosislist from '../diagnosis/diagnosislist.vue';
-<<<<<<< HEAD
-=======
 import { patientInfo } from '../../store/patient.js';
 import { ElMessage } from 'element-plus';
->>>>>>> v1.3
 // const diagnosisList = ref([]);
 const allowAdd = ref(false);
 const tree = ref([]);
@@ -230,12 +215,8 @@ const rules = ref({
   medTypeCode: [{ required: true, message: '请选择诊断类型', trigger: 'change' }],
   diagSrtNo: [{ required: true, message: '请输入诊断序号', trigger: 'change' }],
 });
-<<<<<<< HEAD
-const isSaving = ref(false);
-=======
 const diagnosisNetDatas = ref([]);
 
->>>>>>> v1.3
 watch(
   () => form.value.diagnosisList,
   () => {
@@ -266,31 +247,6 @@ function getList() {
   
   getEncounterDiagnosis(props.patientInfo.encounterId).then((res) => {
     if (res.code == 200) {
-<<<<<<< HEAD
-      // 为每个诊断项添加默认的诊断医生和时间（如果不存在）
-      const 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')
-      }));
-      
-      // 对获取的数据进行排序
-      diagnosisList.sort((a, b) => {
-        const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
-        const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
-        return aNo - bNo;
-      });
-      
-      form.value.diagnosisList = diagnosisList;
-      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) {
-        const newList = [];
-=======
       const datas = (res.data || []).map((item) => {
         let obj = {
           ...item,
@@ -311,7 +267,6 @@ function getList() {
     if (res.code == 200) {
       if (res.data.illness.length > 0) {
         diagnosisNetDatas.value = res.data.illness;
->>>>>>> v1.3
         res.data.illness.forEach((item, index) => {
           newList.push({
             name: item.name + '-' + (res.data.symptom[index]?.name || ''),
@@ -488,27 +443,6 @@ function handleDeleteDiagnosis(row, index) {
   //中医诊断用-拼接 例如：疳气-表里俱实证
   const nameArr = row.name?.split('-') || [];
   if (row.conditionId) {
-<<<<<<< HEAD
-    delEncounterDiagnosis(row.conditionId).then(() => {
-      // 不要立即调用getList()，而是从当前列表中移除
-      form.value.diagnosisList.splice(index, 1);
-      // 重新排序剩余的项目
-      const sortedList = [...form.value.diagnosisList].sort((a, b) => {
-        const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
-        const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
-        return aNo - bNo;
-      });
-      
-      // 重新分配连续的序号
-      sortedList.forEach((item, idx) => {
-        item.diagSrtNo = idx + 1;
-      });
-      
-      // 更新列表
-      form.value.diagnosisList = sortedList.map(item => ({ ...item }));
-      getTree();
-    });
-=======
     if (nameArr.length > 1) {
       deleteTcmDiagnosis(row.syndromeGroupNo).then(() => {
         getList();
@@ -520,7 +454,6 @@ function handleDeleteDiagnosis(row, index) {
         getTree();
       });
     }
->>>>>>> v1.3
   } else {
     console.log('row============>', JSON.stringify(row));
     console.log('item============>', index);
@@ -729,7 +662,3 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
   align-items: center;
 }
 </style>
-<<<<<<< HEAD
-
-=======
->>>>>>> v1.3