Merge remote-tracking branch 'origin/main'

src/components/outpatient/DiseaseDetails.vue

@@ -151,7 +151,9 @@ onMounted(() => {
       color: #999999;
 
       p {
-        margin-bottom: 8px;
+        margin: 0;
+        overflow: hidden;
+        white-space: nowrap;
       }
 
       .item {

src/components/outpatient/MedicalHistory.vue

@@ -6,16 +6,9 @@
           <el-collapse-item :name="index" v-for="(item, index) in list" :key="index">
             <template #title>
               <div class="list-item-content">
-                <el-tooltip
-                    class="box-item"
-                    effect="dark"
-                    :content="item.diagnosisMedicalRecord.diagnosisSummary"
-                    placement="bottom-start"
-                >
                   <span class="disease-name">{{ item.diagnosisMedicalRecord.diagnosisSummary }}</span>
-                </el-tooltip>
-<!--                <span class="doctor">{{ item.patientId }}</span>-->
-<!--                <span class="time">{{ item.createDatetime }}</span>-->
+                <span class="doctor">{{ item.registrationInfoVo.doctorName }}</span>
+                <span class="time">{{ item.createTime }}</span>
               </div>
             </template>
             <div>
@@ -36,12 +29,13 @@ const list = ref<any>([])
 const init = (patientId: any) => {
   post("medical/record/listByPatient",{patientId:patientId}).then((res: any) => {
     list.value = res
+    emit('initMedicalRecord', res[0].diagnosisMedicalRecord.allergyHistory,res[0].diagnosisMedicalRecord.beforeMedicalHistory)
   })
 }
 const clearList = () => {
   list.value = []
 }
-const emit = defineEmits(['copy','copyItem','copyGoods'])
+const emit = defineEmits(['copy','copyItem','copyGoods',"initMedicalRecord"])
 const copy = (item: any) => {
   emit('copy', item)
 }
@@ -65,14 +59,19 @@ defineExpose({init,clearList})
     justify-content: space-between;
 
     .disease-name {
-      width: 135px;
+      width: 90px;
       overflow: hidden; /* 隐藏溢出的内容 */
       white-space: nowrap; /* 防止文本换行 */
       text-overflow: ellipsis; /* 显示省略号 */
+      text-align: left;
     }
 
     .doctor {
-      width: 85px;
+      width: 80px;
+    }
+    .time{
+      display: inline-block;
+      overflow: hidden;
     }
   }
 }

src/views/outpatient/index.vue

@@ -30,7 +30,7 @@
         <MedicalInformation v-model="seeDockerInfo" ref="medicalInformationRef"></MedicalInformation>
       </div>
       <div class="bottom">
-        <MedicalHistory ref="medicalHistoryRef" @copy="copyForm" @copyItem="copyItemList" @copyGoods="copyGoodsList"></MedicalHistory>
+        <MedicalHistory ref="medicalHistoryRef" @copy="copyForm" @copyItem="copyItemList" @copyGoods="copyGoodsList" @initMedicalRecord="initMedicalRecord"></MedicalHistory>
       </div>
     </div>
   </div>
@@ -194,6 +194,11 @@ watch(() => registerId.value, (newValue) => {
   }
   getSeeDockerInfo(newValue)
 })
+
+const initMedicalRecord = (allergy:string, before:string) => {
+  formData.value.allergyHistory = allergy;
+  formData.value.beforeMedicalHistory = before;
+}
 </script>
 <style scoped lang="scss">
 .container {