bugfix

src/views/encoder/doctorBlKf.vue

@@ -65,7 +65,7 @@ export default {
     }
   },
   created() {
-    const { start_time, end_time } = this.$route.query
+    const { start_time, end_time, doctor_name } = this.$route.query
     this.$set(this.searchData, 'time', [start_time, end_time])
     this.$set(this.searchData, 'doctor_name', [doctor_name])
     this.getList()

src/views/encoder/errors.vue

@@ -64,8 +64,9 @@ export default {
     }
   },
   created() {
-    const { start_time, end_time } = this.$route.query
+    const { start_time, end_time, dep_id } = this.$route.query
     this.$set(this.formInline, 'AAC01', [start_time, end_time])
+    this.$set(this.formInline, 'AAC11C', dep_id)
     this.getList()
   },
   methods: {
@@ -125,7 +126,7 @@ export default {
       const params = {
         hospital_name: '',
         bl_type: 2,
-        is_export: 0,
+        is_export: 1,
         rule_id: this.$route.query.rule_id,
         ...this.formInline
       }

src/views/encoder/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="bg-box">
+  <div class="bg-box" style="padding-top: 0;">
     <!-- 搜索栏 -->
     <div class="bg-card" style="margin-bottom: 18px;">
       <el-form :inline="true" :model="formInline" class="demo-form-inline">
@@ -373,8 +373,9 @@ import { bmyDoctorRanking } from '@/api/excel'
         qxxqData: {
           radio: 2,
           dep_id: '',
-          level: ''
+          type: ''
         },
+        qxPieDom: null,
         tableData: [],
         paginationData: {
           page: 1,
@@ -511,7 +512,7 @@ import { bmyDoctorRanking } from '@/api/excel'
       // 缺陷详情列表
       toPage(row) {
         const { start_time, end_time } = this.formInline
-        this.$router.push({ name: 'EncoderErrors', query: { rule_id: row.error_rule, start_time, end_time }})
+        this.$router.push({ name: 'EncoderErrors', query: { rule_id: row.error_rule, start_time, end_time, ...this.qxxqData }})
       },
       // 全局筛选
       async onGobalSearch() {
@@ -523,11 +524,11 @@ import { bmyDoctorRanking } from '@/api/excel'
       },
       // 获取缺陷数据
       getQuexianData() {
-        const { dep_id, level } = this.qxxqData
+        const { dep_id, type } = this.qxxqData
         const { page, size } = this.paginationData
         const params = {
           dep_id,
-          level,
+          type,
           page,
           page_size: size,
           ...this.formInline
@@ -653,7 +654,7 @@ import { bmyDoctorRanking } from '@/api/excel'
       },
       // 缺陷环图
       qxxqPie() {
-        this.tongjiDom = this.$echarts.init(
+        this.qxPieDom = this.$echarts.init(
           document.getElementById('qxxq_pie')
         )
         const option = {
@@ -699,10 +700,10 @@ import { bmyDoctorRanking } from '@/api/excel'
             }
           ]
         }
-        this.tongjiDom.setOption(option)
+        this.qxPieDom.setOption(option)
         // 窗口大小改变 重新渲染
         window.addEventListener('resize', () => {
-          this.tongjiDom.resize()
+          this.qxPieDom.resize()
         })
       },
       qxxqPieUpdate() {
@@ -738,7 +739,7 @@ import { bmyDoctorRanking } from '@/api/excel'
             }
           ]
         }
-        this.tongjiDom.setOption(option)
+        this.qxPieDom.setOption(option)
       },
       // 分页
       handleSizeChange(val) {

src/views/medicalRecord/index.vue

@@ -42,6 +42,7 @@
           <td colspan="3">
             <NoValueInputVue :data="blInfo.patient_address_info.AAA09 ? blInfo.patient_address_info.AAA09.replace('省', '') : ''" />（省）
             <NoValueInputVue :data="blInfo.patient_address_info.AAA10 ? blInfo.patient_address_info.AAA10.replace('市', '') : ''" />（市）
+            <NoValueInputVue :data="blInfo.patient_address_info.AAA10 ? blInfo.patient_address_info.AAA11.replace('区', '') : ''" />（市）
           </td>
           <td class="label">籍贯</td>
           <td colspan="3">
@@ -68,7 +69,15 @@
           <td colspan="7">
             <NoValueInputVue :data="blInfo.patient_address_info.AAA48 ? blInfo.patient_address_info.AAA48.replace('省', '') : ''" />（省）
             <NoValueInputVue :data="blInfo.patient_address_info.AAA49 ? blInfo.patient_address_info.AAA49.replace('市', '') : ''" />（市）
-            <NoValueInputVue :data="blInfo.patient_address_info.AAA50 ? blInfo.patient_address_info.AAA50.replace('县', '') : ''" />（县）
+            <span v-if="blInfo.patient_address_info.AAA50.includes('县')">
+              <NoValueInputVue :data="blInfo.patient_address_info.AAA50 ? blInfo.patient_address_info.AAA50.replace('县', '') : ''" />（县）
+            </span>
+            <span v-else-if="blInfo.patient_address_info.AAA50.includes('区')">
+              <NoValueInputVue :data="blInfo.patient_address_info.AAA50 ? blInfo.patient_address_info.AAA50.replace('区', '') : ''" />（区）
+            </span>
+            <span v-else>
+              <NoValueInputVue :data="blInfo.patient_address_info.AAA50" />
+            </span>
             <NoValueInputVue :data="blInfo.patient_address_info.AAA15" />
           </td>
           <td class="label">电话</td>
@@ -81,7 +90,15 @@
           <td colspan="9">
             <NoValueInputVue :data="blInfo.patient_address_info.AAA45 ? blInfo.patient_address_info.AAA45.replace('省', '') : ''" />（省）
             <NoValueInputVue :data="blInfo.patient_address_info.AAA46 ? blInfo.patient_address_info.AAA46.replace('市', '') : ''" />（市）
-            <NoValueInputVue :data="blInfo.patient_address_info.AAA47 ? blInfo.patient_address_info.AAA47.replace('县', '') : ''" />（县）
+            <span v-if="blInfo.patient_address_info.AAA47.includes('县')">
+              <NoValueInputVue :data="blInfo.patient_address_info.AAA47 ? blInfo.patient_address_info.AAA47.replace('县', '') : ''" />（县）
+            </span>
+            <span v-else-if="blInfo.patient_address_info.AAA47.includes('区')">
+              <NoValueInputVue :data="blInfo.patient_address_info.AAA47 ? blInfo.patient_address_info.AAA47.replace('区', '') : ''" />（区）
+            </span>
+            <span v-else>
+              <NoValueInputVue :data="blInfo.patient_address_info.AAA47" />
+            </span>
             <NoValueInputVue :data="blInfo.patient_address_info.AAA12" />
           </td>
           <td class="label">邮编</td>