Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

src/components/outpatient/MedicalQueue.vue

@@ -68,7 +68,7 @@ const emit = defineEmits(['clickItem', 'changeTab'])
 const datePickerRef = ref()
 const clickTab = (item: any) => {
   curStatus.value = item.status
-  emit('changeTab')
+  emit('changeTab',item.status)
   curItem.value = {}
 }
 const setDate = function () {
@@ -142,8 +142,11 @@ const initStatusList = () => {
   })
 }
 const clickLi = (item: any, showBox: any = true) => {
+  if (!item){
+    return
+  }
   curItem.value = item
-  if (item != null && item.status == 1 && showBox) {
+  if ( item.status == 1 && showBox) {
     ElMessageBox.confirm(`您将要接诊：${item.name}`, "提示", {
       confirmButtonText: '确定',
       cancelButtonText: '取消',

src/views/outpatient/index.vue

@@ -107,7 +107,6 @@ const medicalHistoryRef = ref()
 const patientCardRef = ref()
 const patientRegistration = ref<any>({})//  当前挂号信息
 const clickItem = (item: any) => {
-  initFormData()
   if (!item) return
   curRegister.value = item
   registerId.value = item.id
@@ -126,13 +125,15 @@ const clickItem = (item: any) => {
       formData.value.diagType = Number(formData.value.diagType)
       patientRegistration.value = res.patientRegistration
       getOrderTotalPrice()
+      const diagnosisList = JSON.parse(formData.value.diagnosisDetail)
+      const nList = formData.value.diagnosisSummary.split(',')
+      caseRef.value?.initDiagnosisSearch(diagnosisList,nList);
     })
 
   }
-  const diagnosisList = JSON.parse(item.diagnosisMedicalRecord.diagnosisDetail)
-  const nList = item.diagnosisMedicalRecord.diagnosisSummary.split(',')
+
   nextTick(() => {
-    caseRef.value?.initDiagnosisSearch(diagnosisList,nList);
+
     medicalHistoryRef.value?.init(patientId.value);
     patientCardRef.value?.init(curRegister.value?.id)
   })