bugfix

src/styles/custom.scss

@@ -86,6 +86,7 @@
   .link2 {
     color: #004983;
     cursor: pointer;
+    text-decoration: underline;
   }
   .c_FF786F {
     color: #FF786F;

src/views/encoder/index.vue

@@ -132,7 +132,7 @@
       <el-collapse-transition>
         <div v-show="quxian_show">
           <el-row :gutter="20">
-            <el-col :span="16">
+            <el-col :span="14">
               <!-- <div class="mb20">
                 <el-radio-group v-model="qxxqData.radio" text-color="#185DA6" fill="#ffffff" @change="handleRadioChange">
                   <el-radio-button :label="1">缺陷问题（前十）</el-radio-button>
@@ -150,7 +150,7 @@
                 </el-form-item>
                 <el-form-item label="出院科室" style="margin-bottom: 0">
                   <el-select v-model="qxxqData.dep_id" clearable filterable placeholder="全部">
-                    <el-option v-for="(item, index) in departmentList" :label="item.name" :value="item.id" :key="index"></el-option>
+                    <el-option v-for="(item, index) in departmentList" :label="item.dep_name" :value="item.dep_id" :key="index"></el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item style="margin-bottom: 0">
@@ -204,19 +204,24 @@
                 </el-table-column>
               </el-table>
               <!-- 分页 -->
-              <div class="text-right" v-if="qxxqData.radio === 2">
+              <div v-if="qxxqData.radio === 2">
+                <div style="float: left; line-height: 32px;">
+                  <span>共{{ paginationDataDoctor.total }}条记录</span>
+                  <span style="margin-left: 10px;">第{{ paginationDataDoctor.page }}/{{ Math.ceil(paginationDataDoctor.total / paginationDataDoctor.size) }}页</span>
+                </div>
                 <el-pagination
+                  style="float: right;"
                   background
                   @size-change="handleSizeChange"
                   @current-change="handleCurrentChange"
                   :current-page="paginationData.page"
                   :page-size="paginationData.size"
-                  layout="total, sizes, prev, pager, next, jumper"
+                  layout="prev, pager, next, jumper"
                   :total="paginationData.total">
                 </el-pagination>
               </div>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="10">
               <div id="qxxq_pie"></div>
             </el-col>
           </el-row>
@@ -239,7 +244,7 @@
       </CardTitle>
       <el-collapse-transition>
         <div v-show="doctor_show">
-          <el-row :gutter="40">
+          <el-row :gutter="20">
             <el-col :span="14">
               <el-table
                 :data="doctor_tableData"
@@ -300,18 +305,25 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-pagination
-                background
-                @size-change="handleDoctorSizeChange"
-                @current-change="handleDoctorCurrentChange"
-                :current-page="paginationDataDoctor.page"
-                :page-size="paginationDataDoctor.size"
-                layout="total, sizes, prev, pager, next, jumper"
-                :total="paginationDataDoctor.total">
-              </el-pagination>
+              <div style="overflow: hidden;">
+                <div style="float: left; line-height: 32px;">
+                  <span>共{{ paginationDataDoctor.total }}条记录</span>
+                  <span style="margin-left: 10px;">第{{ paginationDataDoctor.page }}/{{ Math.ceil(paginationDataDoctor.total / paginationDataDoctor.size) }}页</span>
+                </div>
+                <el-pagination
+                  style="float: right;"
+                  background
+                  @size-change="handleDoctorSizeChange"
+                  @current-change="handleDoctorCurrentChange"
+                  :current-page="paginationDataDoctor.page"
+                  :page-size="paginationDataDoctor.size"
+                  layout="prev, pager, next, jumper"
+                  :total="paginationDataDoctor.total">
+                </el-pagination>
+              </div>
             </el-col>
             <el-col :span="10">
-              <DoctorRankVue v-if="doctor_rank.length" :data="doctor_rank" />
+              <DoctorRankVue v-if="doctor_tableData.length" :data="doctor_tableData" />
             </el-col>
           </el-row>
         </div>
@@ -377,114 +389,112 @@ import { bmyDoctorRanking } from '@/api/excel'
           size: 10,
           total: 0
         },
-        doctor_tableData: [],
-        // doctor_tableData: [
-        //   {
-        //     "docker_name": "杜晓峰",
-        //     "bl_sum": 28,
-        //     "qx_sum": 22,
-        //     "sum_score": 2800,
-        //     "df_score": 2158,
-        //     "kf_score": 642,
-        //     "proportion": "77.07",
-        //     "avg_score": 88
-        //   },
-        //   {
-        //     "docker_name": "杜晓峰",
-        //     "bl_sum": 28,
-        //     "qx_sum": 22,
-        //     "sum_score": 2800,
-        //     "df_score": 2158,
-        //     "kf_score": 642,
-        //     "proportion": "77.07",
-        //     "avg_score": 88
-        //   },
-        //   {
-        //     "docker_name": "杜晓峰",
-        //     "bl_sum": 28,
-        //     "qx_sum": 22,
-        //     "sum_score": 2800,
-        //     "df_score": 2158,
-        //     "kf_score": 642,
-        //     "proportion": "77.07",
-        //     "avg_score": 88
-        //   },
-        //   {
-        //     "docker_name": "杜晓峰",
-        //     "bl_sum": 28,
-        //     "qx_sum": 22,
-        //     "sum_score": 2800,
-        //     "df_score": 2158,
-        //     "kf_score": 642,
-        //     "proportion": "77.07",
-        //     "avg_score": 88
-        //   },
-        //   {
-        //     "docker_name": "杜晓峰",
-        //     "bl_sum": 28,
-        //     "qx_sum": 22,
-        //     "sum_score": 2800,
-        //     "df_score": 2158,
-        //     "kf_score": 642,
-        //     "proportion": "77.07",
-        //     "avg_score": 88
-        //   },
-        //   {
-        //     "docker_name": "杜晓峰",
-        //     "bl_sum": 28,
-        //     "qx_sum": 22,
-        //     "sum_score": 2800,
-        //     "df_score": 2158,
-        //     "kf_score": 642,
-        //     "proportion": "77.07",
-        //     "avg_score": 88
-        //   },
-        //   {
-        //     "docker_name": "杜晓峰",
-        //     "bl_sum": 28,
-        //     "qx_sum": 22,
-        //     "sum_score": 2800,
-        //     "df_score": 2158,
-        //     "kf_score": 642,
-        //     "proportion": "77.07",
-        //     "avg_score": 88
-        //   },
-        //   {
-        //     "docker_name": "杜晓峰",
-        //     "bl_sum": 28,
-        //     "qx_sum": 22,
-        //     "sum_score": 2800,
-        //     "df_score": 2158,
-        //     "kf_score": 642,
-        //     "proportion": "77.07",
-        //     "avg_score": 88
-        //   },
-        //   {
-        //     "docker_name": "杜晓峰",
-        //     "bl_sum": 28,
-        //     "qx_sum": 22,
-        //     "sum_score": 2800,
-        //     "df_score": 2158,
-        //     "kf_score": 642,
-        //     "proportion": "77.07",
-        //     "avg_score": 88
-        //   },
-        //   {
-        //     "docker_name": "杜晓峰",
-        //     "bl_sum": 28,
-        //     "qx_sum": 22,
-        //     "sum_score": 2800,
-        //     "df_score": 2158,
-        //     "kf_score": 642,
-        //     "proportion": "77.07",
-        //     "avg_score": 88
-        //   }
-        // ],
-        doctor_rank: []
+        // doctor_tableData: [],
+        doctor_tableData: [
+          {
+            "docker_name": "杜晓峰",
+            "bl_sum": 28,
+            "qx_sum": 22,
+            "sum_score": 2800,
+            "df_score": 2158,
+            "kf_score": 642,
+            "proportion": "77.07",
+            "avg_score": 88
+          },
+          {
+            "docker_name": "杜晓峰",
+            "bl_sum": 28,
+            "qx_sum": 22,
+            "sum_score": 2800,
+            "df_score": 2158,
+            "kf_score": 642,
+            "proportion": "77.07",
+            "avg_score": 88
+          },
+          {
+            "docker_name": "杜晓峰",
+            "bl_sum": 28,
+            "qx_sum": 22,
+            "sum_score": 2800,
+            "df_score": 2158,
+            "kf_score": 642,
+            "proportion": "77.07",
+            "avg_score": 88
+          },
+          {
+            "docker_name": "杜晓峰",
+            "bl_sum": 28,
+            "qx_sum": 22,
+            "sum_score": 2800,
+            "df_score": 2158,
+            "kf_score": 642,
+            "proportion": "77.07",
+            "avg_score": 88
+          },
+          {
+            "docker_name": "杜晓峰",
+            "bl_sum": 28,
+            "qx_sum": 22,
+            "sum_score": 2800,
+            "df_score": 2158,
+            "kf_score": 642,
+            "proportion": "77.07",
+            "avg_score": 88
+          },
+          {
+            "docker_name": "杜晓峰",
+            "bl_sum": 28,
+            "qx_sum": 22,
+            "sum_score": 2800,
+            "df_score": 2158,
+            "kf_score": 642,
+            "proportion": "77.07",
+            "avg_score": 88
+          },
+          {
+            "docker_name": "杜晓峰",
+            "bl_sum": 28,
+            "qx_sum": 22,
+            "sum_score": 2800,
+            "df_score": 2158,
+            "kf_score": 642,
+            "proportion": "77.07",
+            "avg_score": 88
+          },
+          {
+            "docker_name": "杜晓峰",
+            "bl_sum": 28,
+            "qx_sum": 22,
+            "sum_score": 2800,
+            "df_score": 2158,
+            "kf_score": 642,
+            "proportion": "77.07",
+            "avg_score": 88
+          },
+          {
+            "docker_name": "杜晓峰",
+            "bl_sum": 28,
+            "qx_sum": 22,
+            "sum_score": 2800,
+            "df_score": 2158,
+            "kf_score": 642,
+            "proportion": "77.07",
+            "avg_score": 88
+          },
+          {
+            "docker_name": "杜晓峰",
+            "bl_sum": 28,
+            "qx_sum": 22,
+            "sum_score": 2800,
+            "df_score": 2158,
+            "kf_score": 642,
+            "proportion": "77.07",
+            "avg_score": 88
+          }
+        ],
       }
     },
     async mounted() {
-      this.doctor_rank = JSON.parse(JSON.stringify(this.doctor_tableData)).slice(0, 10)
       const year = new Date().getFullYear()
       const month = new Date().getMonth() + 1 > 10 ? `0${new Date().getMonth() + 1}` : new Date().getMonth() + 1
       const day = new Date().getDay() < 10 ? `0${new Date().getDay()}` : new Date().getDay()
@@ -794,7 +804,6 @@ import { bmyDoctorRanking } from '@/api/excel'
           }
           this.doctor_tableData = res.data.list
           this.paginationDataDoctor.total = res.data.count
-          this.doctor_rank = JSON.parse(JSON.stringify(res.data.list)).slice(0, 10)
         })
       },
       // 导出

src/views/medicalRecord/index.vue

@@ -179,7 +179,7 @@
           <th class="label">入院病情</th>
         </tr>
         <tr v-for="i of zdRows" :key="'zd'+i">
-          <td colspan="3">{{ zdList[i-1] ? `${zdLevel(i)}` +zdList[i-1].ICD10_NAME : '' }}</td>
+          <td colspan="3">{{ zdList[i-1] ? `${zdLevel(i)}` +(zdList[i-1].ICD10_NAME ? zdList[i-1].ICD10_NAME : '') : '' }}</td>
           <td class="center">{{ zdList[i-1] ? zdList[i-1].ICD10_ID1 : '' }}</td>
           <td class="center">{{ zdList[i-1] ? zdList[i-1].CYQK : '' }}</td>
           <td colspan="3">{{ zdList[zdRows+i-1] ? `${zdLevel(zdRows+i-1)}` + zdList[zdRows+i-1].ICD10_NAME : (i===1 ? '其他诊断：' : '') }}</td>
@@ -187,8 +187,8 @@
           <td class="center">{{ zdList[zdRows+i-1]? zdList[zdRows+i-1].RYQK : '' }}</td>
         </tr>
         <tr>
-          <td class="label">入院病情</td>
-          <td colspan="9">1.有<span class="mlr10" />2.临床未确定<span class="mlr10" />3.情况不明<span class="mlr10" />4.无</td>
+          <!-- <td class="label">入院病情</td> -->
+          <td colspan="10">入院病情：1.有<span class="mlr10" />2.临床未确定<span class="mlr10" />3.情况不明<span class="mlr10" />4.无</td>
         </tr>
         <tr>
           <td class="label">损伤、中毒的外部原因</td>