Merge branch 'master' of https://gitlab.taihe.com/lighter/vue-intergration-platform

src/utils/readcard.js

@@ -1,12 +1,8 @@
 import { ElMessageBox } from 'element-plus'
 import { readCardCallback } from '../api/medical-insurance/si-inpatient'
 
-export function prepareReadCard(type, inpatientNo, bizType) {
-  const param = type + '_' + inpatientNo + '_' + bizType
-  startReadCard(param)
-}
-
-const startReadCard = (param) => {
+export function prepareReadCard(type, inpatientNo) {
+  const param = type + '_' + inpatientNo
   window.open('ReadCard://' + param, '_self')
   readCardCallback(param).then((res) => {
     ElMessageBox.alert(res.message, '提示', {

src/views/dictionary/NationalSiMatch.vue

@@ -134,43 +134,23 @@
       <el-table :height="dialogTableHeight" stripe :data="cptNationalItems">
         <el-table-column prop="nationalCode" label="国家代码"></el-table-column>
         <el-table-column prop="nationalName" label="国家名称"></el-table-column>
-        <el-table-column prop="registeredDosage" label="注册剂型" v-if="queryParam.type === 1"></el-table-column>
-        <el-table-column prop="actualDosage" label="实际剂型" v-if="queryParam.type === 1"></el-table-column>
-        <el-table-column prop="makeRegisteredSpecification" label="注册规格" v-if="queryParam.type === 1"></el-table-column>
-        <el-table-column prop="makeActualSpecification" label="实际规格" v-if="queryParam.type === 1"></el-table-column>
+        <el-table-column prop="actualDosage" label="剂型" v-if="queryParam.type === 1"></el-table-column>
+        <el-table-column prop="specifications" label="规格" v-if="queryParam.type === 1"></el-table-column>
         <el-table-column prop="packingMaterial" label="包装材质" v-if="queryParam.type === 1"></el-table-column>
         <el-table-column prop="factory" label="生产厂家" v-if="queryParam.type === 1"></el-table-column>
         <el-table-column prop="approvalNumber" label="批准文号" v-if="queryParam.type === 1"></el-table-column>
         <el-table-column prop="drugStandardCode" label="药品本位码" v-if="queryParam.type === 1"></el-table-column>
-        <el-table-column prop="classificationMark" label="归类标识" v-if="queryParam.type === 1"></el-table-column>
-        <el-table-column prop="medicinalMaterialsName" label="药材名称" v-if="queryParam.type === 2"></el-table-column>
-        <el-table-column prop="efficacyClass" label="功效分类" v-if="queryParam.type === 2"></el-table-column>
-        <el-table-column prop="medicinalMaterialsFamily" label="药材科" v-if="queryParam.type === 2"></el-table-column>
-        <el-table-column prop="medicinalMaterialsSpecies" label="药材种" v-if="queryParam.type === 2"></el-table-column>
-        <el-table-column prop="medicinalParts" label="药用部位" v-if="queryParam.type === 2"></el-table-column>
-        <el-table-column prop="properties" label="性味与归经" v-if="queryParam.type === 2"></el-table-column>
-        <el-table-column prop="usageDosage" label="用法用量" v-if="queryParam.type === 2"></el-table-column>
-        <el-table-column prop="siPolicy" label="医保" v-if="queryParam.type === 2"></el-table-column>
-        <el-table-column prop="localMedicalServiceCode" label="地方代码" v-if="queryParam.type === 3"></el-table-column>
-        <el-table-column prop="localMedicalServiceName" label="地方名称" v-if="queryParam.type === 3"></el-table-column>
+        <el-table-column prop="startTime" label="开始日期" v-if="queryParam.type === 2"></el-table-column>
+        <el-table-column prop="endTime" label="结束日期" v-if="queryParam.type === 2"></el-table-column>
         <el-table-column prop="projectConnotation" label="项目内涵" v-if="queryParam.type === 3"></el-table-column>
         <el-table-column prop="exclusions" label="除外内容" v-if="queryParam.type === 3"></el-table-column>
         <el-table-column prop="valuationUnit" label="计价单位" v-if="queryParam.type === 3"></el-table-column>
         <el-table-column prop="projectDescription" label="项目说明" v-if="queryParam.type === 3"></el-table-column>
-        <el-table-column prop="firstClassPrice" label="一类价格" v-if="queryParam.type === 3"></el-table-column>
-        <el-table-column prop="nineBitCode" label="9位编码" v-if="queryParam.type === 3"></el-table-column>
-        <el-table-column prop="reimbursementFlag" label="是否报销" v-if="queryParam.type === 3"></el-table-column>
-        <el-table-column prop="siReimbursementClass" label="报销分类" v-if="queryParam.type === 3"></el-table-column>
-        <el-table-column prop="selfpayPercentage" label="自付比例" v-if="queryParam.type === 3"></el-table-column>
-        <el-table-column prop="firstClass" label="一级分类" v-if="queryParam.type === 4"></el-table-column>
-        <el-table-column prop="secondClass" label="二级分类" v-if="queryParam.type === 4"></el-table-column>
-        <el-table-column prop="thirdClass" label="三级分类" v-if="queryParam.type === 4"></el-table-column>
         <el-table-column prop="siName" label="医保通用名" v-if="queryParam.type === 4"></el-table-column>
         <el-table-column prop="material" label="材质" v-if="queryParam.type === 4"></el-table-column>
-        <el-table-column prop="fetures" label="特征" v-if="queryParam.type === 4"></el-table-column>
-        <el-table-column prop="registrationCertificateNo" label="注册证号" v-if="queryParam.type === 4"></el-table-column>
         <el-table-column prop="factory" label="耗材企业" v-if="queryParam.type === 4"></el-table-column>
-        <el-table-column prop="specificationNum" label="规格型号数" v-if="queryParam.type === 4"></el-table-column>
+        <el-table-column prop="startTime" label="开始时间" v-if="queryParam.type === 4"></el-table-column>
+        <el-table-column prop="endTime" label="结束时间" v-if="queryParam.type === 4"></el-table-column>
         <el-table-column label="匹配">
           <template #default="scope">
             <el-button circle type="success" icon="el-icon-thumb" @click="doMatch(scope.row)"></el-button>
@@ -267,7 +247,7 @@ export default {
         })
       } else if (queryParam.type === 4) {
         return data.national.filter((item) => {
-          return item.factory.indexOf(factory.value) !== -1 && item.registrationCertificateNo.indexOf(certiNo.value) !== -1
+          return item.factory.indexOf(factory.value) !== -1
         })
       } else {
         return data.national.filter((item) => {

src/views/medical-insurance/inpatient/AdmRegistration.vue

@@ -576,8 +576,10 @@ export default {
     }
 
     const beforeReadCard = (val) => {
-      if (nullPatient()) return
-      prepareReadCard(val, patient.value.inpatientNo, '01103')
+      if (nullPatient()) {
+        return
+      }
+      prepareReadCard(val, patient.value.inpatientNo)
     }
 
     const formatYbRegisterDate = () => {

src/views/medical-insurance/inpatient/DiscSettlement.vue

@@ -144,9 +144,9 @@
             <el-button type="info"> 读卡<i class="el-icon-arrow-down el-icon--right"></i> </el-button>
             <template #dropdown>
               <el-dropdown-menu>
-                <el-dropdown-item icon="el-icon-bank-card" command="normal">普通IC卡</el-dropdown-item>
+                <el-dropdown-item icon="el-icon-bank-card" command="sicard">社保卡</el-dropdown-item>
                 <el-dropdown-item icon="el-icon-s-grid" command="qrcode">二维码</el-dropdown-item>
-                <el-dropdown-item disabled icon="el-icon-user" command="face">刷脸</el-dropdown-item>
+                <el-dropdown-item icon="el-icon-user" command="idcard">身份证</el-dropdown-item>
               </el-dropdown-menu>
             </template>
           </el-dropdown>
@@ -226,10 +226,9 @@ import { dismissCalculate, getActOrders, selfPayDismiss } from '@/api/yibao/dism
 import { getDatetime, formatDatetime } from '@/utils/date'
 import { nullPatient } from '@/utils/validate'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { dischargeProcessing, revokeSettlement } from '@/api/medical-insurance/si-inpatient'
+import { dischargeProcessing, revokeSettlement, readCardCallback } from '@/api/medical-insurance/si-inpatient'
 import { getSiPatInfo } from '@/api/medical-insurance/si-query'
 import { getDetailConventions, getRoughConventions, retractConventions } from '@/api/yibao/conventions'
-import { prepareReadCard } from '@/utils/readcard'
 import { getGreatestRole } from '@/utils/permission'
 import { injurySettlement, revokeInjurySettlement } from '@/api/medical-insurance/si-injury'
 import { baseinfo } from '@/data/inpatient'
@@ -486,8 +485,19 @@ export default {
     }
 
     const beforeReadCard = (val) => {
-      if (nullPatient()) return
-      prepareReadCard(val, patient.value.responceType, patient.value.inpatientNo)
+      if (nullPatient()) {
+        return
+      }
+      const param = val + '_' + patient.value.inpatientNo
+      window.open('ReadCard://' + param, '_self')
+      readCardCallback(param).then((res) => {
+        patient.value.mdtrtCertType = val
+        patient.value.mdtrtCertNo = res.out
+        ElMessageBox.alert(res.message, '提示', {
+          type: 'success',
+          showCancelButton: false,
+        }).then(() => {})
+      })
     }
 
     const cancelDismiss = () => {