Merge remote-tracking branch 'origin/main'

src/components/outpatient/MedicalQueue.vue

@@ -38,7 +38,7 @@
                 </span>
               <span class="item-name">{{ item.name }}</span>
               <span class="item-time">
-                {{ formatListTime(item.createDatetime) }}
+                {{ formatListTime(item.appointmentTime) }}
               </span>
               <span class="item-type">{{ item.type == 2 ? '医保' : '自费' }}</span>
             </li>

src/components/registration/Edit.vue

@@ -385,32 +385,24 @@ const tableData = ref<any>([])
 const multipleTable = ref<any>()
 const socialCardUpdate = (e: any) => {
   isShowCard.value = false
-  if (e) {
+  if (!e) return;
-    console.log(e.data.baseinfo.psn_cert_type)
+  isShowCard.value = false
-    isShowCard.value = false
+  edit_data.value.gender = Number(e.data.baseinfo.gend)
-    edit_data.value.gender = Number(e.data.baseinfo.gend)
+  edit_data.value.name = e.data.baseinfo.psn_name
-    edit_data.value.name = e.data.baseinfo.psn_name
+  edit_data.value.certType = e.data.baseinfo.psn_cert_type
-    edit_data.value.certType = e.data.baseinfo.psn_cert_type
+  edit_data.value.certNo = e.data.baseinfo.certno
-    edit_data.value.certNo = e.data.baseinfo.certno
+  edit_data.value.age = Math.floor(e.data.baseinfo.age)
-    edit_data.value.age = Math.floor(e.data.baseinfo.age)
+  tableData.value = e.data.insuinfo
-    tableData.value = e.data.insuinfo
+  edit_data.value.type = 2
-    edit_data.value.type = 2
+  if (!edit_data.value.certNo) return;
-    if (edit_data.value.certNo) {
+  post('vip/vip/list', {
-      post('vip/vip/list', {
+    keyword: edit_data.value.certNo,
-        keyword: edit_data.value.certNo,
+    page: 1,
-        page: 1,
+    pageSize: 50
-        pageSize: 50
+  }).then((res: any) => {
-      }).then((res: any) => {
+    edit_data.value.phone = res.list[0].phone
-        edit_data.value.name = res.list[0].name
+  })
-        edit_data.value.gender = res.list[0].sex
+
-        edit_data.value.phone = res.list[0].phone
-        edit_data.value.certType = res.list[0].certType
-        edit_data.value.certNo = res.list[0].certNo
-        edit_data.value.memo = res.list[0].remark
-        edit_data.value.visitType = 1
-      })
-    }
-  }
   nextTick(() => {
     if (tableData.value.length > 0) {
       height.value = 820