lihong 3 месяцев назад
Родитель
Сommit
14720bd457

+ 29 - 7
src/views/hospitalization/zy-gl/AdmissionRegistration.vue

@@ -23,7 +23,7 @@
                 <el-col :span="6">
                   <el-form-item label="姓名" prop="name">
                     <el-input v-model="admissFormData.name" clearable  show-word-limit placeholder="姓名"
-                    >
+                              @keyup.enter="queryPatientInfo(admissFormData.name)">
                       <template #append>
                         <el-button  icon="Search" @click="queryPatientInfo(admissFormData.name)"/>
                       </template>
@@ -59,7 +59,7 @@
                 <el-col :span="6">
                   <el-form-item label="门诊号" prop="patientId">
                     <el-input v-model="admissFormData.patientId" clearable  show-word-limit placeholder="门诊号"
-                    >
+                              @keyup.enter="queryPatientInfo(admissFormData.patientId)">
                       <template #append>
                         <el-button  icon="Search" @click="queryPatientInfo(admissFormData.patientId)"/>
                       </template>
@@ -69,7 +69,7 @@
                 <el-col :span="6">
                   <el-form-item label="手机号码" prop="homeTel">
                     <el-input v-model="admissFormData.homeTel" clearable  show-word-limit placeholder="手机号码"
-                              >
+                              @keyup.enter="queryPatientInfo(admissFormData.homeTel)">
                       <template #append>
                         <el-button  icon="Search" @click="queryPatientInfo(admissFormData.homeTel)" />
                       </template>
@@ -178,7 +178,7 @@
                 </el-col>
                 <el-col :span="6">
                   <el-form-item label="证件号" prop="socialNo">
-                    <el-input v-model="admissFormData.socialNo" clearable     placeholder="证件号">
+                    <el-input v-model="admissFormData.socialNo" clearable  @keyup.enter="queryPatientInfo(admissFormData.socialNo)"    placeholder="证件号">
                       <template #append>
                         <el-button  icon="Search" @click="queryPatientInfo(admissFormData.socialNo)"/>
                       </template>
@@ -235,7 +235,7 @@
                 <el-col :span="6">
                   <el-form-item label="住院号" prop="inpatientNo">
                     <el-input v-model="admissFormData.inpatientNo" clearable  show-word-limit placeholder="住院号"
-                    >
+                              @keyup.enter="queryPatientByZyh" >
                       <template #append>
                         <el-button  icon="Search" @click="queryPatientByZyh"/>
                       </template>
@@ -518,6 +518,7 @@ import {getFormatDatetime} from "@/utils/date.js";
 import {ElMessage, ElMessageBox, genFileId} from "element-plus";
 import {stringIsBlank, stringNotBlank} from "@/utils/blank-utils.js";
 import env from "@/utils/setting.ts";
+import router from "@/router";
 import {useUserStore} from "@/pinia/user-store";
 import ReadCard from '@/components/medical-insurance/readcard/Index.vue'
 const updatePatientIdVisible = ref(false)
@@ -754,6 +755,17 @@ const uploadSfz = ()=>{
 
 }
 
+const toAdvancePaymentDeal = (inpatientNo)=>{
+  if(stringNotBlank(inpatientNo)){
+    router.push({
+      name: 'advancePaymentDeal',
+      query: {
+        patNo: inpatientNo
+      }
+    })
+  }
+}
+
 // 读卡结果
 const afterReadCard = async (result)=>{
   clearReadSfzInfo()
@@ -1105,8 +1117,18 @@ const saveAdmissData =()=>{
             responceType : admissFormData.value.responceType,
             inpatientNo : admissFormData.value.inpatientNo,
           }
-          saveZyPatient(zyPatient).then(res=>{
-            clearPatient()
+          saveZyPatient(zyPatient).then(ress=>{
+            ElMessageBox.confirm('是否跳转预交金处理页面', {
+              cancelButtonText: '否',
+              confirmButtonText: '是',
+              type: 'warning',
+            }).then(()=>{
+              let patNo = admissFormData.value.inpatientNo
+              clearPatient()
+              toAdvancePaymentDeal(patNo)
+            }).catch(()=>{
+              clearPatient()
+            })
           })
         })
       })

+ 9 - 0
src/views/hospitalization/zy-gl/AdvancePaymentDeal.vue

@@ -219,6 +219,8 @@
 </template>
 <script setup>
 import {onMounted, ref} from "vue";
+import router from "@/router";
+import sleep from "@/utils/sleep";
 import {
   queryAdvancePayment,
   saveAdvancePayment,
@@ -252,6 +254,13 @@ const printData = ref({
   cdFlag:'',
 })
 
+onActivated(async ()=>{
+  const params = router.currentRoute.value.query;
+  if(params && params.patNo){
+    await sleep(300);
+    queryPatientList(params.patNo)
+  }
+})
 const clearPrintData=()=>{
   printData.value = {
     patientId:'',

+ 2 - 2
src/views/medical-advice/nursing-manage/NursingRecord.vue

@@ -1021,7 +1021,7 @@ const patientInfoDialogData = ref({
     patNo:'',
     admissTimes:null,
     leaveHospital:1,
-    admissDate:null
+    admissDate:""
 })
 
 
@@ -1032,7 +1032,7 @@ const dics = ref([])
 const openPatientInfo= async ()=>{
     patientInfoDialogData.value.patNo=patientInfo.value.inpatientNo
     patientInfoDialogData.value.admissTimes=patientInfo.value.admissTimes
-    patientInfoDialogData.value.admissDate=getFormatDatetime(patientInfo.value.admissDate,'yyyy-MM-DD HH:mm:ss')
+    patientInfoDialogData.value.admissDate=getFormatDatetime(patientInfo.value.admissDate)
     patientInfoDialog.value =true
 }