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

src/views/dictionary/NationalSiMatch.vue

@@ -147,8 +147,7 @@
         <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="channels" 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>

src/views/medical-insurance/allpatient/Catalogue.vue

@@ -6,13 +6,13 @@
       </el-select>
       <el-divider direction="vertical"></el-divider>
       <span v-show="showUpdtTime"> <el-date-picker v-model="updtTime" size="small" placeholder="请选择更新日期" style="width: 160px"></el-date-picker>&nbsp; </span>
-      <el-button type="primary" icon="el-icon-download" :disabled="!cataType" @click="beforeDownload">从中心获取</el-button>
+      <el-button size="mini" type="primary" icon="el-icon-download" :disabled="!cataType" @click="beforeDownload">从中心获取</el-button>
       <span v-show="!showUpdtTime && cataType !== '1901'">
-        &nbsp;<el-button type="primary" icon="el-icon-download" :disabled="!cataType" @click="fetchData">从医院获取</el-button>
+        &nbsp;<el-button size="mini" type="primary" icon="el-icon-download" :disabled="!cataType" @click="fetchData">从医院获取</el-button>
       </span>
     </el-header>
     <el-main>
-      <el-table :height="tableHeight" :data="data.list" stripe>
+      <el-table size="mini" :height="tableHeight" :data="data.list" stripe>
         <el-table-column v-if="!showUpdtTime" prop="code" label="医疗目录编码"></el-table-column>
         <!-- 西药中成药目录 -->
         <el-table-column v-if="cataType === '1301'" prop="drugTradeName" label="药品商品名"></el-table-column>
@@ -167,17 +167,17 @@
         style="margin-top: 5px"
       ></el-pagination>
       <el-dialog title="字典表查询" v-model="showDldDict" width="40%">
-        <el-select v-model="dictType" placeholder="请选择字典类型" filterable>
+        <el-select v-model="dictType" size="mini" placeholder="请选择字典类型" filterable>
           <el-option v-for="item in siDictTypes" :key="item.code" :value="item.code" :label="item.name"></el-option>
         </el-select>
         &nbsp;
-        <el-select v-model="valiFlag" style="width: 100px">
+        <el-select v-model="valiFlag" size="mini" style="width: 100px">
           <el-option label="有效" value="1"></el-option>
           <el-option label="已失效" value="0"></el-option>
         </el-select>
         <el-divider direction="vertical"></el-divider>
-        <el-button type="primary" icon="el-icon-search" @click="qrySiDicts">查询</el-button>
-        <el-table :data="dictVals" stripe height="300">
+        <el-button type="primary" size="mini" icon="el-icon-search" @click="qrySiDicts">查询</el-button>
+        <el-table :data="dictVals" stripe size="mini" height="300">
           <el-table-column prop="sort" label="序号" width="60"></el-table-column>
           <el-table-column prop="version" label="版本号" width="80"></el-table-column>
           <el-table-column prop="value" label="字典键值" width="120"></el-table-column>

src/views/medical-insurance/outpatient/MzRegister.vue

@@ -29,6 +29,7 @@
         </template>
       </el-dropdown>
       <el-button type="primary" icon="el-icon-edit-outline" @click="mzPreSetl" style="margin-left: 8px"> 试算 </el-button>
+      <el-button type="danger" icon="el-icon-refresh" @click="clearinfo" style="margin-left: 8px"> 重置 </el-button>
     </el-header>
     <el-main>
       <el-row :gutter="5">
@@ -432,6 +433,23 @@ export default {
       })
     }
 
+    const clearinfo = () => {
+      patientId.value = ''
+      times.value = null
+      data.value = []
+      mzPatient.value = {}
+      psnBaseinfo.value = {}
+      mzVisit.value = {}
+      receipts.value = {}
+      orderNos.value = []
+      currentReceipts.value = []
+      totalFee.value = null
+      timesTable.value = null
+      ordersTable.value = null
+      currentOrder.value = {}
+      spcChrDiseAccts.value = []
+    }
+
     onMounted(() => {
       getMedTypesByFlag('clinic').then((res) => {
         medTypes.value = res
@@ -470,6 +488,7 @@ export default {
       spcChrDiseAccts,
       showSpcChrAccts,
       uploadFees,
+      clearinfo,
     }
   },
 }

src/views/medical-insurance/outpatient/SpcChrRcd.vue

@@ -5,20 +5,10 @@
         <el-input style="width: 320px" size="small" v-model="patNo" clearable>
           <template #prepend>门诊ID/身份证</template>
         </el-input>
-        <el-date-picker
-          v-model="dateRange"
-          type="daterange"
-          :shortcuts="maxHalfYear"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          size="small"
-          style="width: 260px"
-        ></el-date-picker>
         <el-divider direction="vertical"></el-divider>
         <el-button type="success" @click="qryPsnBscInfo">参保信息查询</el-button>
         <el-button type="success" @click="qrySpcChrRcd"> 慢特病备案查询 </el-button>
-        <el-button type="success" @click="qryMedUseRcd"> 用药记录查询 </el-button>
+        <el-button type="success" @click="beforeQryMedUseRcd"> 用药记录查询 </el-button>
         <el-button type="primary" @click="beforeSlwSpcChrRcd"> 慢特病备案 </el-button>
         <el-button type="primary" @click="beforeRvkSlwSpcChrRcd"> 撤销备案 </el-button>
       </el-header>
@@ -58,7 +48,7 @@
             {{ baseinfo.psnNo }}
           </el-descriptions-item>
         </el-descriptions>
-        <div style="height: 8px"></div>
+        <div style="height: 12px"></div>
         <el-tag type="primary">人员参保信息</el-tag>
         <el-table :data="baseinfo.insuinfo" stripe highlight-current-row @row-click="handleClickInsuinfo">
           <el-table-column property="balc" label="余额" width="50"></el-table-column>
@@ -72,8 +62,8 @@
           <el-table-column property="insuplcAdmdvsName" label="参保地名称"></el-table-column>
           <el-table-column property="empName" label="单位名称"></el-table-column>
         </el-table>
-        <div style="height: 8px"></div>
-        <el-tag type="info">人员身份信息</el-tag>
+        <div style="height: 12px"></div>
+        <el-tag color="#66FFCC">人员身份信息</el-tag>
         <el-table :data="baseinfo.idetinfo">
           <el-table-column label="人员身份类别" prop="psnIdetTypeName"></el-table-column>
           <el-table-column label="人员类别等级" prop="psnTypeLv"></el-table-column>
@@ -81,30 +71,49 @@
           <el-table-column label="开始时间" prop="begntime"></el-table-column>
           <el-table-column label="结束时间" prop="endtime"></el-table-column>
         </el-table>
-        <div style="height: 8px"></div>
-        <el-tag type="warning">慢特病备案信息</el-tag>
-        <el-table :data="spcChrRcds" stripe>
-          <el-table-column property="begndate" label="开始日期"></el-table-column>
-          <el-table-column prop="enddate" label="结束日期"></el-table-column>
-          <el-table-column prop="opspDiseCode" label="病种编码"></el-table-column>
-          <el-table-column prop="opspDiseName" label="病种名称"></el-table-column>
-        </el-table>
-        <div style="height: 8px"></div>
-        <el-tag type="danger">用药记录</el-tag>
-        <el-table :data="medUseRcds" stripe>
-          <el-table-column prop="fixmedinsCode" label="定点医药机构编号"></el-table-column>
-          <el-table-column prop="fixmedinsName" label="定点医药机构名称"></el-table-column>
-          <el-table-column prop="cnt" label="数量"></el-table-column>
-          <el-table-column prop="pric" label="单价"></el-table-column>
-          <el-table-column prop="hilistCode" label="医保目录编码"></el-table-column>
-          <el-table-column prop="hilistName" label="医保目录名称"></el-table-column>
-          <el-table-column prop="medListCodg" label="医疗目录编码"></el-table-column>
-          <el-table-column prop="medinsListCodg" label="医药机构目录编码"></el-table-column>
-          <el-table-column prop="medinsListName" label="医药机构目录名称"></el-table-column>
-          <el-table-column prop="prodname" label="商品名"></el-table-column>
-          <el-table-column prop="spec" label="规格"></el-table-column>
-          <el-table-column prop="dosformName" label="剂型"></el-table-column>
-        </el-table>
+        <el-dialog v-model="showDateRange" title="请选择时间范围" width="300px">
+          <el-date-picker
+            v-model="dateRange"
+            type="daterange"
+            :shortcuts="maxHalfYear"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            size="small"
+            style="width: 260px"
+          ></el-date-picker>
+          <div style="width: 260px; text-align: right; margin-top: 24px">
+            <el-button type="primary" @click="qryMedUseRcd" icon="el-icon-check">确定</el-button>
+          </div>
+        </el-dialog>
+
+        <el-dialog v-model="showSpcChrRcds" title="慢特病备案信息">
+          <el-table :data="spcChrRcds" stripe>
+            <el-table-column property="begndate" label="开始日期"></el-table-column>
+            <el-table-column prop="enddate" label="结束日期"></el-table-column>
+            <el-table-column prop="opspDiseCode" label="病种编码"></el-table-column>
+            <el-table-column prop="opspDiseName" label="病种名称"></el-table-column>
+            <el-table-column prop="ideFixmedinsName" label="备案机构"></el-table-column>
+          </el-table>
+        </el-dialog>
+
+        <el-dialog v-model="showMedUseRcds" title="慢特病用药记录">
+          <el-table :data="medUseRcds" stripe height="360">
+            <el-table-column prop="fixmedinsCode" label="定点医药机构编号"></el-table-column>
+            <el-table-column prop="fixmedinsName" label="定点医药机构名称"></el-table-column>
+            <el-table-column prop="cnt" label="数量"></el-table-column>
+            <el-table-column prop="pric" label="单价"></el-table-column>
+            <el-table-column prop="hilistCode" label="医保目录编码"></el-table-column>
+            <el-table-column prop="hilistName" label="医保目录名称"></el-table-column>
+            <el-table-column prop="medListCodg" label="医疗目录编码"></el-table-column>
+            <el-table-column prop="medinsListCodg" label="医药机构目录编码"></el-table-column>
+            <el-table-column prop="medinsListName" label="医药机构目录名称"></el-table-column>
+            <el-table-column prop="prodname" label="商品名"></el-table-column>
+            <el-table-column prop="spec" label="规格"></el-table-column>
+            <el-table-column prop="dosformName" label="剂型"></el-table-column>
+          </el-table>
+        </el-dialog>
+
         <el-dialog v-model="showSlwSpcChrRcd" width="70%" title="人员慢特病备案申请">
           <div style="height: 12px"></div>
           <el-row :gutter="5">
@@ -237,17 +246,20 @@ import { formatDatetime } from '@/utils/date'
 import { searchData } from '@/api/yibao/dictionary'
 export default {
   setup() {
-    const patNo = ref('430105196211120016')
+    const patNo = ref('')
     const dateRange = ref(null)
     const baseinfo = ref({})
     const currentInsuinfo = ref({})
+    const showSpcChrRcds = ref(false)
     const spcChrRcds = ref([])
+    const showMedUseRcds = ref(false)
     const medUseRcds = ref([])
     const slwSpcChrRcd = ref({})
     const showSlwSpcChrRcd = ref(false)
     const allSlwSpcChrRcds = ref([])
     const showAllSlwSpcChrRcds = ref(false)
     const currentSlwSpcChrRcd = ref({})
+    const showDateRange = ref(false)
     const nullPatNo = () => {
       if (!patNo.value) {
         ElMessage({
@@ -305,9 +317,17 @@ export default {
         patNo: patNo.value,
         medType: '14',
       }
-      obtainBasicPersonInfo(param).then((res) => {
-        baseinfo.value = res
-      })
+      obtainBasicPersonInfo(param)
+        .then((res) => {
+          baseinfo.value = res
+          spcChrRcds.value = []
+          medUseRcds.value = []
+        })
+        .catch(() => {
+          baseinfo.value = {}
+          spcChrRcds.value = []
+          medUseRcds.value = []
+        })
     }
 
     const handleClickInsuinfo = (row) => {
@@ -318,14 +338,23 @@ export default {
       if (nullBaseinfo()) {
         return
       }
+      if (nullInsuinfo()) {
+        return
+      }
       querySpecialChronicDiseasesAccreditation({
         psnNo: baseinfo.value.psnNo,
+        admdvs: currentInsuinfo.value.insuplcAdmdvs,
         needAllRcd: 1,
       }).then((res) => {
         spcChrRcds.value = res
+        showSpcChrRcds.value = true
       })
     }
 
+    const beforeQryMedUseRcd = () => {
+      showDateRange.value = true
+    }
+
     const qryMedUseRcd = () => {
       if (nullBaseinfo()) {
         return
@@ -340,6 +369,7 @@ export default {
       }
       querySpecialChronicDiseasesMedicalRecord(param).then((res) => {
         medUseRcds.value = res
+        showMedUseRcds.value = true
       })
     }
 
@@ -469,13 +499,17 @@ export default {
       baseinfo,
       currentInsuinfo,
       spcChrRcds,
+      showSpcChrRcds,
       medUseRcds,
+      showMedUseRcds,
       slwSpcChrRcd,
       showSlwSpcChrRcd,
       allSlwSpcChrRcds,
       showAllSlwSpcChrRcds,
       qryPsnBscInfo,
       qrySpcChrRcd,
+      showDateRange,
+      beforeQryMedUseRcd,
       qryMedUseRcd,
       handleClickInsuinfo,
       beforeSlwSpcChrRcd,