预约bug修复

CallCenterWeb.UI/RMYY/debug.log

@@ -1,4 +0,0 @@
-[0811/162409.052:ERROR:process_info.cc(329)] VirtualQueryEx: 拒绝访问。 (0x5)
-[0811/162409.056:ERROR:process_info.cc(556)] ReadMemoryInfo failed
-[0811/162409.056:ERROR:scoped_process_suspend.cc(40)] NtResumeProcess: 已尝试访问正在退出的过程。 (0xc000010a)
-[1015/091639.060:ERROR:directory_reader_win.cc(43)] FindFirstFile: 系统找不到指定的路径。 (0x3)

CallCenterWeb.UI/RMYY/src/views/callScreen/components/NoRegList.vue

@@ -34,9 +34,9 @@
         <div class="itemLine2">
           <div class="lineSpan1">{{item.F_Hospital}}</div>
           <div class="lineSpan2">{{item.F_Dept}}</div>
-          <div class="lineSpan3">急诊医生:{{item.F_Doctor}}</div>
-          <div class="lineSpan3">预约时间:{{item.F_RegisterDate}}</div>
-          <div class="lineSpan4">挂号费用:{{item.F_Price}}</div>
+          <div class="lineSpan3">医生:{{item.F_Doctor}}</div>
+          <div class="lineSpan3">预约时间:{{item.F_RegisterDate}}   {{item.F_RegisterTimeRange}}</div>
+          <!-- <div class="lineSpan4">挂号费用:{{item.F_RegisterTimeRange}}</div> -->
           <div class="lineSpan4">
             <el-button class="btn" size="small" type="primary" @click="handleReg(item)">取消预约</el-button>
           </div>

CallCenterWeb.UI/RMYY/src/views/callScreen/components/RegList.vue

@@ -1,21 +1,21 @@
 <template>
   <div class="app-container">
     <div class="filter-container" style="margin-top: 10px">
-      <el-date-picker v-model="searchData.searchTime" type="date" class="filter-item" value-format="yyyy-MM-dd"
-        size="medium" style="width: 150px;" clearable placeholder="选择日期" />
-      <el-select v-model="searchData.hosid" size="medium" class="filter-item" style="width: 150px;" clearable
+      <el-date-picker v-model="searchData.searchTime" type="date" class="search-item" value-format="yyyy-MM-dd"
+        size="medium" clearable placeholder="选择日期" />
+      <el-select v-model="searchData.hosid" size="medium" class="search-item" clearable
         placeholder="请选择院区" @change="handleHospital">
         <el-option v-for="(item, index) in hosarr" :key="index" :label="item.yymc" :value="item.yydm" />
       </el-select>
-      <el-select v-model="searchData.deptid" size="medium" class="filter-item" style="width: 150px;" clearable
+      <el-select v-model="searchData.deptid" size="medium" class="search-item" clearable filterable
         placeholder="请选择科室" @change="handleDept">
-        <el-option v-for="(item, index) in deptarr" :key="index" :label="item.yjksmc" :value="item.yjksdm" />
+        <el-option v-for="(item, index) in deptarr" :key="index" :label="item.ksmc+'-'+rankidObj[item.czlx]" :value="item.ksdm +'_'+ item.czlx" />
       </el-select>
-      <el-select v-model="searchData.doctorid" size="medium" class="filter-item" style="width: 150px;" clearable
+      <el-select v-model="searchData.doctorid" size="medium" class="search-item" clearable filterable
         placeholder="请选择医生" @change="handleDoctor">
         <el-option v-for="(item, index) in doctorarr" :key="index" :label="item.ysmc" :value="item.ysdm" />
       </el-select>
-      <el-select v-model="searchData.hyId" size="medium" class="filter-item" style="width: 150px;" clearable
+      <el-select v-model="searchData.hyId" size="medium" class="search-item" clearable filterable
         placeholder="请选择号源" @change="handleHy">
         <el-option v-for="(item, index) in hytarr" :key="index" :label="item.zzlxmc" :value="item.pbxh" />
       </el-select>
@@ -35,7 +35,7 @@
           <div class="lineSpan1">{{ item.hosName }}</div>
           <div class="lineSpan2">{{ item.deptName ? item.deptName : '未知' }}</div>
           <div class="lineSpan3">坐诊时间:{{ item.zzlxmc ? item.zzlxmc : '未知' }}</div>
-          <div class="lineSpan4">挂号费用:{{ item.ghf }}</div>
+          <!-- <div class="lineSpan4">挂号费用:{{ item.ghf }}</div> -->
         </div>
         <div class="itemLine2">
           <div class="lineSpan1">挂号号序：{{ item.ghhx }}</div>
@@ -63,7 +63,7 @@
         <el-row>
           <el-col :span="20">
             <el-form-item label="患者姓名">
-              <el-input v-model="ruleForm.patientName" placeholder="请输入患者姓名" @change="handlePatient($event.target.value, 'patientName')" />
+              <el-input v-model="ruleForm.patientName" placeholder="请输入患者姓名" @change="handlePatient($event, 'patientName')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -71,7 +71,7 @@
         <el-row>
           <el-col :span="20">
             <el-form-item label="身份证号">
-              <el-input v-model="ruleForm.identityCard" placeholder="请输入身份证号"  @change="handlePatient($event.target.value, 'identityCard')"/>
+              <el-input v-model="ruleForm.identityCard" placeholder="请输入身份证号"  @change="handlePatient($event, 'identityCard')"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -254,7 +254,6 @@ export default {
   },
   methods: {
     submitForm() {
-      console.log(this.ruleForm)
       const params = this.ruleForm
       if(!this.ruleForm.patientName){
         this.$message.error('请填入患者姓名')
@@ -281,11 +280,8 @@ export default {
           this.$message.error('请填入监护人证件号')
           return
         }
-      }
-      console.log(params)
-      
+      }      
       GetYygh(params).then((res) => {
-        console.log(res)
         this.drawer = false
         this.handleHy(this.hyName)
         this.$message.success('预约成功')
@@ -298,18 +294,12 @@ export default {
       this.ruleForm.yyhx = item.ghhx // 预约号序
       this.ruleForm.pbxh = item.pbxh // 排班序号
       this.ruleForm.identityCard = decrypt(window.localStorage.getItem('huancardShow')) // 身份证号
-      this.ruleForm.identityCard = '411282202009122320'
-      if (this.ruleForm.identityCard) {
-        this.ruleForm.sex  = this.parseIDCard(this.ruleForm.identityCard).gender
-        this.ruleFormAge  = this.parseIDCard(this.ruleForm.identityCard).age
-        this.ruleForm.birthday  = this.parseIDCard(this.ruleForm.identityCard).birthDate
-      }
-      
+      // this.ruleForm.identityCard = '411282202009122320'
+      this.changeIDcard()
       this.ruleForm.patientName = window.localStorage.getItem('huanxm') // 患者姓名
       // this.ruleForm.pid  患者id
       this.ruleForm.tel = this.callinNum // 患者电话
       this.ruleForm.yydm = item.yydm // 院区代码
-
       this.getPatient()
       // 患者部分
       // this.ruleForm.pid = decrypt(window.localStorage.getItem('huancardShow')
@@ -325,8 +315,10 @@ export default {
       }
       if (key === 'identityCard') {
         this.ruleForm.identityCard = value
+        this.changeIDcard()
       }
-      getPatient()
+      console.log(value,key)
+      // this.getPatient()
     },
     // 获取院区数据
     getPatient() {
@@ -339,28 +331,28 @@ export default {
         getZLId(params).then((res) => {
           this.hosarr = []
           if (res.patinfos.length > 0) {
-            
             const resultData = res.patinfos[0]
             this.ruleForm.pid = resultData.patid
             this.ruleForm.identityCard = resultData.zjh
             this.ruleForm.patientName = resultData.hzxm
-            if (this.ruleForm.identityCard) {
-              this.ruleForm.sex  = this.parseIDCard(this.ruleForm.identityCard).gender
-              this.ruleFormAge  = this.parseIDCard(this.ruleForm.identityCard).age
-              this.ruleForm.birthday  = this.parseIDCard(this.ruleForm.identityCard).birthDate
-            }
-            if (this.ruleFormAge <= 12) {
-              this.ruleForm.lxrxm = resultData.lxrxm
-              this.ruleForm.lxrdh = resultData.lxrdh
-              this.ruleForm.lxrdh = resultData.lxrdh
-            }
-            
-
+            this.changeIDcard()
           }
         })
       }
       
     },
+    changeIDcard() {
+      if (this.ruleForm.identityCard) {
+        this.ruleForm.sex  = this.parseIDCard(this.ruleForm.identityCard).gender
+        this.ruleFormAge  = this.parseIDCard(this.ruleForm.identityCard).age
+        this.ruleForm.birthday  = this.parseIDCard(this.ruleForm.identityCard).birthDate
+      }
+      if (this.ruleFormAge <= 12) {
+        this.ruleForm.lxrxm = resultData.lxrxm
+        this.ruleForm.lxrdh = resultData.lxrdh
+        this.ruleForm.lxrdh = resultData.lxrdh
+      }
+    },
     // 获取院区数据
     getHospital() {
       const params = {}
@@ -373,7 +365,6 @@ export default {
     },
     // 获取部门数据，院区改变时触发
     handleHospital(e) {
-      console.log(e)
       this.tableObj.hosName = this.findNameById(e, this.hosarr, 'yymc', 'yydm')
       this.tableObj.yydm = e
       const params = {
@@ -383,7 +374,6 @@ export default {
       }
       GetRegDept(params).then((res) => {
         this.deptarr = []
-        console.log(res)
         if (res.length > 0) {
           this.deptarr = res
         }
@@ -393,9 +383,10 @@ export default {
     // 获取医生数据，部门改变时触发
     handleDept(e) {
       console.log(e)
-      this.tableObj.deptName = this.findNameById(e, this.deptarr, 'yjksmc', 'yjksdm')
+      const newValue = e.split('_')[0]
+      this.tableObj.deptName = this.findNameById(newValue, this.deptarr, 'ksmc', 'ksdm')
       const params = {
-        ksdm: e,
+        ksdm: newValue,
         ksrq: this.searchData.searchTime,
         jsrq: this.searchData.searchTime,
         yydm: this.searchData.hosid
@@ -408,11 +399,10 @@ export default {
     },
     // 获取号源数据，医生改变时触发
     handleDoctor(e) {
-      console.log(e)
-      const resultItem = this.findItemById(e, this.doctorarr, 'ysdm')
+      const resultItem = this.findItemById(e, this.doctorarr, 'ysdm')   
       this.tableObj.doctorName = resultItem.ysmc
       this.tableObj.yszc = resultItem.yszc
-      this.tableObj.czlx = this.rankidObj[resultItem.czlx]
+      this.tableObj.czlx = this.rankidObj[resultItem.czlx]  
       
 
       const params = {
@@ -429,7 +419,6 @@ export default {
     },
     // 获取号序数据，号源改变时触发
     handleHy(e) {
-      console.log(e)
       const resultItem = this.findItemById(e, this.hytarr, 'pbxh')
       this.hyName = e
       this.tableObj.ghf = resultItem.ghf
@@ -454,8 +443,6 @@ export default {
             const resultObj = { ...this.tableObj, ...newObj }
             this.tableData.push(resultObj)
           });
-          console.log(this.tableData)
-
         }
       })
     },
@@ -481,9 +468,6 @@ export default {
         birthDate = `${idCard.slice(6, 10)}-${idCard.slice(10, 12)}-${idCard.slice(12, 14)}`;
         // 提取第 17 位数字判断性别，奇数为男性，偶数为女性
         const genderCode = parseInt(idCard[16], 10);
-        console.log(idCard)
-        console.log(idCard[16])
-        console.log(genderCode)
         gender = genderCode % 2 === 1 ? '男' : '女';
       } else if (idCard.length === 15) {
         // 15 位身份证号码解析
@@ -520,7 +504,13 @@ export default {
 }
 </script>
 
-<style rel="stylesheet/scss" lang="scss">
+<style rel="stylesheet/scss" lang="scss" scoped>
+.filter-container .search-item {
+  margin-left: 10px;
+  margin-bottom: 10px;
+  width: 230px;
+}
+
 .regList {
   height: 590px;
   overflow-y: auto;

CallCenterWeb.UI/RMYY/src/views/callScreen/components/callScreen.vue

@@ -180,7 +180,7 @@ export default {
       }
     })
     this.callinNum = this.telCallNum // 来电号码  $route.params.telInNumber
-    this.callinNum = '15638114211' // 来电号码  $route.params.telInNumber
+    // this.callinNum = '15638114211' // 来电号码  $route.params.telInNumber
     this.ldphone = this.$route.params.telInNumber
     if (this.$route.params.callid) {
       this.callinCallid = this.$route.params.callid.toString() // 来电callid  $route.params.callid