From f41909b431c28e509f05c9294e77d38f1a09a3fe Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Fri, 15 Mar 2024 11:02:07 +0800
Subject: [PATCH] sumdoctor

---
 src/components/sumDoctorCheck/ButtonList.vue  | 25 +++----
 .../sumDoctorCheck/CheckDetails.vue           | 74 ++++++++++---------
 .../sumDoctorCheck/SumAsbItemStatus.vue       |  6 +-
 .../sumDoctorCheck/SumDiagnosis.vue           |  6 +-
 src/components/sumDoctorCheck/SumHistory.vue  | 47 +++++++-----
 src/components/sumDoctorCheck/SumItems.vue    | 69 ++++++++---------
 .../sumDoctorCheck/SumItemsType.vue           | 69 ++++++++---------
 src/components/sumDoctorCheck/SumSug.vue      | 11 ++-
 src/views/doctorCheck/doctorCheck.vue         |  2 +-
 src/views/doctorCheck/sumDoctorCheck.vue      | 14 ++--
 10 files changed, 178 insertions(+), 145 deletions(-)

diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index 3e15504..298b7db 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -1,28 +1,28 @@
 <template>
     <div>
         <div v-show="checkPagePriv(pagePriv.privs,'人员列表')" class="listBtn">
-            <el-button type="primary" class="btnClass" @click="prList">人员列表</el-button>
+            <el-button type="primary" class="commonbutton" @click="prList">人员列表</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'医生诊台')" class="listBtn">
-            <el-button type="primary" class="btnClass" @click="toDoctorCheck">医生诊台</el-button>
+            <el-button type="primary" class="commonbutton" @click="toDoctorCheck">医生诊台</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'保存')" class="listBtn">
-            <el-button type="primary" class="btnClass" @click="save">保存</el-button>
+            <el-button type="primary" class="commonbutton" @click="save">保存</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'修改')" class="listBtn">
-            <el-button type="primary" class="btnClass" @click="edit">修改</el-button>
+            <el-button type="primary" class="commonbutton" @click="edit">修改</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'取消总检')" class="listBtn">
-            <el-button type="primary" class="btnClass" @click="del">取消总检</el-button>
+            <el-button type="primary" class="commonbutton" @click="del">取消总检</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'审核')" class="listBtn">
-            <el-button type="primary" class="btnClass" @click="audit">审核</el-button>
+            <el-button type="primary" class="commonbutton" @click="audit">审核</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'取消审核')" class="listBtn">
-            <el-button type="primary" class="btnClass" @click="unAudit">取消审核</el-button>
+            <el-button type="primary" class="commonbutton" @click="unAudit">取消审核</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'新增建议')" class="listBtn">
-            <el-button type="primary" class="btnClass" @click="addSuggtion">新增建议</el-button>
+            <el-button type="primary" class="commonbutton" @click="addSuggtion">新增建议</el-button>
         </div>
         <!-- 直接放在 建议旁边
         <div class="listBtn">
@@ -30,13 +30,13 @@
         </div>
         -->
         <div v-show="checkPagePriv(pagePriv.privs,'体检报告')" class="listBtn">
-            <el-button type="primary" class="btnClass" @click="report">体检报告</el-button>
+            <el-button type="primary" class="commonbutton" @click="report">体检报告</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'复查')" class="listBtn">
-            <el-button type="primary" class="btnClass" @click="reCheck">复查</el-button>
+            <el-button type="primary" class="commonbutton" @click="reCheck">复查</el-button>
         </div>
         <div v-show="checkPagePriv(pagePriv.privs,'干预措施')" class="listBtn">
-            <el-button type="primary" class="btnClass" @click="intervene">干预措施</el-button>
+            <el-button type="primary" class="commonbutton" @click="intervene">干预措施</el-button>
         </div>
        
 
@@ -481,7 +481,4 @@ export default {
     text-align: center;
 }
 
-.btnClass {
-    width: 100px;
-}
 </style>
\ No newline at end of file
diff --git a/src/components/sumDoctorCheck/CheckDetails.vue b/src/components/sumDoctorCheck/CheckDetails.vue
index 0fa9f11..3dca09c 100644
--- a/src/components/sumDoctorCheck/CheckDetails.vue
+++ b/src/components/sumDoctorCheck/CheckDetails.vue
@@ -1,15 +1,18 @@
-<template>  
-  <div :style="'overflow: scroll;width:100%;height:'+(window.pageHeight < 600 ? 330:window.pageHeight-270)+'px;'">
-    <table width="100%" style="font-size:14px;">   
-      <tbody v-for="(item,index) of tableData" :key="index">  
-        <tr height="30"><td style="text-align: center;font-weight: bolder;">{{item.itemTypeName}}</td></tr>
+<template>
+  <div :style="'overflow: scroll;width:100%;height:' + divHeight + 'px;'">
+    <table width="100%" style="font-size:14px;">
+      <tbody v-for="(item, index) of tableData" :key="index">
+        <tr height="30">
+          <td style="text-align: center;font-weight: bolder;">{{ item.itemTypeName }}</td>
+        </tr>
         <tr>
-          <table v-for="(item2,index2) in item.asbitems" :key="index + '-' + index2" width="100%" border="1" cellspacing="0" bordercolor="#909399" style="border-collapse:collapse;">
+          <table v-for="(item2, index2) in item.asbitems" :key="index + '-' + index2" width="100%" border="1"
+            cellspacing="0" bordercolor="#909399" style="border-collapse:collapse;">
             <tr height="24">
-              <td width="200">{{item2.asbitemName}}</td>
+              <td width="200">{{ item2.asbitemName }}</td>
               <td width="604" colspan="5">{{ '检查日期：' + item2.checkDate + ' 检查医生：' + item2.checkDoctorName }}</td>
             </tr>
-            
+
             <tr style="text-align: center;" height="24">
               <td width="200">项目</td>
               <td width="270">结果</td>
@@ -17,37 +20,37 @@
               <td width="100">警告参考值</td>
               <td width="80">单位</td>
               <td width="50">提示</td>
-            </tr>                 
-                  
-            <tr height="24" v-for="(item3,index3) in item2.items" :key="index + '-' + index2 + '-' + index3">
-              <td>{{item3.itemName}}</td>
-              <td>{{item3.itemResult}}</td>
-              <td>{{item3.referenceRangeValue}}</td>
-              <td>{{item3.criticalRangeValue}}</td>
-              <td>{{item3.unit}}</td>
-              <td>{{item3.resultStatusName}}</td>
             </tr>
-                  
+
+            <tr height="24" v-for="(item3, index3) in item2.items" :key="index + '-' + index2 + '-' + index3">
+              <td>{{ item3.itemName }}</td>
+              <td>{{ item3.itemResult }}</td>
+              <td>{{ item3.referenceRangeValue }}</td>
+              <td>{{ item3.criticalRangeValue }}</td>
+              <td>{{ item3.unit }}</td>
+              <td>{{ item3.resultStatusName }}</td>
+            </tr>
+
             <tr height="24">
-              <td colspan="6">小结：{{ mergeSummarys(item2.summarys,'summary') }}</td>
+              <td colspan="6">小结：{{ mergeSummarys(item2.summarys, 'summary') }}</td>
             </tr>
           </table>
         </tr>
-      </tbody>       
+      </tbody>
     </table>
   </div>
 </template>
-<script lang="ts">
+<script>
 import { mapState } from 'vuex';
 import Sortable from "sortablejs";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj } from '@/utlis/proFunc';
 export default {
   components: {},
-  props:["patientRegisterId"],
+  props: ["patientRegisterId"],
   data() {
     return {
-      tableData:[],
+      tableData: [],
     };
   },
 
@@ -61,13 +64,18 @@ export default {
   },
 
   computed: {
-    ...mapState(['window','dict', 'doctorCheck', 'sumDoctorCheck']),
+    ...mapState(['window', 'dict', 'doctorCheck', 'sumDoctorCheck']),
+
+    divHeight() {
+      let tempHeight = this.window.pageHeight < 600 ? 600 : this.window.pageHeight
+      return tempHeight - 195
+    },
   },
 
   methods: {
     //获取结果明细
-    CheckDetails(RegisterId) { 
-      if(!RegisterId){
+    CheckDetails(RegisterId) {
+      if (!RegisterId) {
         this.tableData = []
         return
       }
@@ -84,24 +92,24 @@ export default {
         });
     },
 
-    
-    mergeSummarys(array,itemKey){
+
+    mergeSummarys(array, itemKey) {
       let ret = ''
       array.forEach(e => {
         return ret += ';' + e[itemKey]
       })
-      return ret.substring(1,ret.length)
+      return ret.substring(1, ret.length)
     }
   },
 
   //监听事件
   watch: {
     //检查项目切换
-    "patientRegisterId":{
-      immediate:true,
+    "patientRegisterId": {
+      immediate: true,
       handler(newVal, oldVal) {
-        console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal);      
-        this.CheckDetails(newVal);        
+        console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal);
+        this.CheckDetails(newVal);
       }
     },
   },
diff --git a/src/components/sumDoctorCheck/SumAsbItemStatus.vue b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
index 2ae1350..521ea8b 100644
--- a/src/components/sumDoctorCheck/SumAsbItemStatus.vue
+++ b/src/components/sumDoctorCheck/SumAsbItemStatus.vue
@@ -59,6 +59,10 @@ export default {
 
   computed: {
     ...mapState(["window","dict", "doctorCheck", "sumDoctorCheck"]),
+    sumHeight(){
+      let tempHeight = this.window.pageHeight < 600 ? 600:this.window.pageHeight
+      return tempHeight - 320
+    },
   },
   methods: {
     getSumAsbItemStatus(PatientRegisterId) {
@@ -96,7 +100,7 @@ export default {
 <style scoped>
 .asbitemListClass {
   display: block;
-  width: v-bind("Math.floor((window.pageWidth - 110 - 15 - 45)/4) + 'px'");
+  width: v-bind("Math.floor((window.pageWidth - 110 - 15 - 15)/4) + 'px'");
   margin-left: 3px;
 }
 
diff --git a/src/components/sumDoctorCheck/SumDiagnosis.vue b/src/components/sumDoctorCheck/SumDiagnosis.vue
index 45cf7b5..2d4dd14 100644
--- a/src/components/sumDoctorCheck/SumDiagnosis.vue
+++ b/src/components/sumDoctorCheck/SumDiagnosis.vue
@@ -10,7 +10,7 @@
       </div>
     </div>
     <div>
-      <el-table :data="sumDoctorCheck.diagnosisList" :height="window.pageHeight < 600 ? 178 : window.pageHeight - 390 - 32" width="100%" size="small">
+      <el-table :data="sumDoctorCheck.diagnosisList" :height="sumHeight" width="100%" size="small">
         <!-- temporaryselection   personnelUnit.nogroupselected-->
         <!--
         "patientRegisterId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",
@@ -69,6 +69,10 @@ export default {
   mounted() { },
   computed: {
     ...mapState(["window", "dict", "patientRegister", "customerOrg", "doctorCheck", "sumDoctorCheck", "report"]),
+    sumHeight(){
+      let tempHeight = this.window.pageHeight < 600 ? 600:this.window.pageHeight
+      return tempHeight - 352
+    },
   },
   methods: {
     checkPagePriv, 
diff --git a/src/components/sumDoctorCheck/SumHistory.vue b/src/components/sumDoctorCheck/SumHistory.vue
index 5f1d48f..6dc8522 100644
--- a/src/components/sumDoctorCheck/SumHistory.vue
+++ b/src/components/sumDoctorCheck/SumHistory.vue
@@ -1,19 +1,23 @@
-<template>  
-  <div :style="'overflow: scroll;width:100%;height:'+(window.pageHeight < 600 ? 330:window.pageHeight-270)+'px;'">
-    <table width="800">   
-      <tbody v-for="(item,index) of tableData" :key="index">
+<template>
+  <div :style="'overflow: scroll;width:100%;height:' + divHeight + 'px;'">
+    <table width="800">
+      <tbody v-for="(item, index) of tableData" :key="index">
         <tr height="40">
           <td width="100">体检次数：</td>
           <td width="100">{{ item.medicalTimes }}</td>
           <td width="200">总检医生：{{ item.summaryDoctor }}</td>
           <td>总检日期：{{ item.summaryDate }}</td>
         </tr>
-        <tr height="10"><td colspan="4"></td></tr>
+        <tr height="10">
+          <td colspan="4"></td>
+        </tr>
         <tr height="40">
           <td width="100" style="vertical-align: top;">检查综述：</td>
           <td colspan="3" v-html="item.sumSummarys"></td>
         </tr>
-        <tr height="20"><td colspan="4"></td></tr>
+        <tr height="20">
+          <td colspan="4"></td>
+        </tr>
         <tr height="40">
           <td width="100" style="vertical-align: top;">医生建议：</td>
           <td colspan="3" v-html="item.sumSuggestions"></td>
@@ -29,24 +33,28 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj } from '@/utlis/proFunc';
 export default {
   components: {},
-  props:["patientId"],
+  props: ["patientId"],
   data() {
     return {
-      tableData:[],   //显示数据
+      tableData: [],   //显示数据
     };
   },
 
   created() { },
 
   //挂载完成
-  mounted() { 
+  mounted() {
     // if(this.patientId){
     //   this.SumHistory(this.patientId);
     // }
   },
 
   computed: {
-    ...mapState(['window','dict', 'doctorCheck', 'sumDoctorCheck']),
+    ...mapState(['window', 'dict', 'doctorCheck', 'sumDoctorCheck']),
+    divHeight() {
+      let tempHeight = this.window.pageHeight < 600 ? 600 : this.window.pageHeight
+      return tempHeight - 195
+    },
   },
 
   methods: {
@@ -60,7 +68,7 @@ export default {
     // },    
     SumHistory(patientId) {
       this.tableData = []
-      if(!patientId) return
+      if (!patientId) return
       console.log(`/api/app/sumsummaryreport/gethistoricalreviewlist?PatientId=${patientId}`)
       getapi(`/api/app/sumsummaryreport/gethistoricalreviewlist?PatientId=${patientId}`)
         .then((res) => {
@@ -74,8 +82,8 @@ export default {
         });
     },
 
-    lreplaceAll(str){
-      return str.replaceAll('*',"<br/>")
+    lreplaceAll(str) {
+      return str.replaceAll('*', "<br/>")
     },
 
   },
@@ -83,12 +91,12 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "patientId":{
-      immediate:true,
+    "patientId": {
+      immediate: true,
       handler(newVal, oldVal) {
-        console.log("watch SumHistory.patientId newVal：", newVal, " oldVal：", oldVal);  
-        debugger    
-        this.SumHistory(newVal)        
+        console.log("watch SumHistory.patientId newVal：", newVal, " oldVal：", oldVal);
+        debugger
+        this.SumHistory(newVal)
       }
     },
   },
@@ -98,6 +106,5 @@ export default {
 ::v-deep .el-table td.el-table__cell,
 .el-table th.el-table__cell.is-leaf {
   padding: 0;
-}
-</style>
+}</style>
   
\ No newline at end of file
diff --git a/src/components/sumDoctorCheck/SumItems.vue b/src/components/sumDoctorCheck/SumItems.vue
index 26c9b00..526f79e 100644
--- a/src/components/sumDoctorCheck/SumItems.vue
+++ b/src/components/sumDoctorCheck/SumItems.vue
@@ -1,50 +1,49 @@
 <template>
-  <div style="display: flex;width:100%;">  
+  <div style="display: flex;width:100%;">
     <div style="width:180;">
       <!-- :row-class-name="tableRowClassName" -->
-      <el-table :data="RegisterCheckList" width="180" 
-        :height="window.pageHeight < 600 ? 330:window.pageHeight-270"
-        border highlight-current-row
+      <el-table :data="RegisterCheckList" width="180" :height="divHeight" border highlight-current-row
         @row-click="rowClick">
         <el-table-column prop="asbitemName" label="组合项目" width="180">
           <template slot-scope="scope">
-              <div>
-                <el-tooltip class="item" effect="dark" content="未检" placement="top">
-                  <i v-show="scope.row.completeFlag == '0'" class="el-icon-circle-plus" style="font-size: 18px;color: red;"></i>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="已检" placement="top">
-                  <i v-show="scope.row.completeFlag == '1'" class="el-icon-success" style="font-size: 18px;color: green;"></i>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="弃检" placement="top">
-                  <i v-show="scope.row.completeFlag == '2'" class="el-icon-remove" style="font-size: 18px;"></i>
-                </el-tooltip>
-                {{scope.row.asbitemName}}
-              </div>
+            <div>
+              <el-tooltip class="item" effect="dark" content="未检" placement="top">
+                <i v-show="scope.row.completeFlag == '0'" class="el-icon-circle-plus"
+                  style="font-size: 18px;color: red;" />
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="已检" placement="top">
+                <i v-show="scope.row.completeFlag == '1'" class="el-icon-success"
+                  style="font-size: 18px;color: green;" />
+              </el-tooltip>
+              <el-tooltip class="item" effect="dark" content="弃检" placement="top">
+                <i v-show="scope.row.completeFlag == '2'" class="el-icon-remove" style="font-size: 18px;" />
+              </el-tooltip>
+              {{ scope.row.asbitemName }}
+            </div>
           </template>
         </el-table-column>
       </el-table>
     </div>
-    <div :style="'width:' + (window.pageWidth - 180 - 110 - 45) + 'px;'">
-      <el-table :data="tableData" :width="(window.pageWidth - 330 - 80)" 
-        :height="window.pageHeight < 600 ? 330:window.pageHeight-270"
-        border highlight-current-row>
+    <div :style="'width:' + (window.pageWidth - 180 - 110 - 15) + 'px;'">
+      <el-table :data="tableData" :height="divHeight" border highlight-current-row>
         <el-table-column prop="itemName" label="项目" width="150" />
-        <el-table-column prop="unitName" label="单位" width="80" align="center"/>
-        <el-table-column prop="referenceRangeValue" label="参考范围" width="80" align="center"/>
-        <el-table-column v-for="(item, index) of tableCols" :label="item" :prop="item" :key="index" min-width="150" align="center">
+        <el-table-column prop="unitName" label="单位" width="80" align="center" />
+        <el-table-column prop="referenceRangeValue" label="参考范围" width="80" align="center" />
+        <el-table-column v-for="(item, index) of tableCols" :label="item" :prop="item" :key="index" min-width="150"
+          align="center">
         </el-table-column>
       </el-table>
     </div>
   </div>
 </template>
-<script lang="ts">
+<script>
 import { mapState } from 'vuex';
 import Sortable from "sortablejs";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj } from '@/utlis/proFunc';
 export default {
   components: {},
-  props:["patientId"],
+  props: ["patientId"],
   data() {
     return {
       RegisterCheckList: [],
@@ -64,7 +63,12 @@ export default {
   },
 
   computed: {
-    ...mapState(['window','dict', 'doctorCheck', 'sumDoctorCheck']),
+    ...mapState(['window', 'dict', 'doctorCheck', 'sumDoctorCheck']),
+
+    divHeight() {
+      let tempHeight = this.window.pageHeight < 600 ? 600 : this.window.pageHeight
+      return tempHeight - 195
+    },
   },
 
   methods: {
@@ -76,13 +80,13 @@ export default {
       } else if (row.completeFlag === '2') {
         return 'info'; //弃检
       }
-      return '';      
+      return '';
     },
 
     //获取检查组合项目
     registerCheckList(patientId) {
       this.RegisterCheckList = []
-      if(!patientId) return
+      if (!patientId) return
       console.log(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`)
       getapi(`/api/app/sumsummaryreport/gethorizontalcomparisonasbitemlist?PatientId=${patientId}`)
         .then((res) => {
@@ -170,10 +174,10 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "patientId":{
-      immediate:true,
+    "patientId": {
+      immediate: true,
       handler(newVal, oldVal) {
-        console.log("watch patientId newVal：", newVal, " oldVal：", oldVal);      
+        console.log("watch patientId newVal：", newVal, " oldVal：", oldVal);
         this.registerCheckList(newVal)
       }
     },
@@ -181,7 +185,6 @@ export default {
 };
 </script>
 <style scoped>
-@import  '../../assets/css/global_table.css';
-
+@import '../../assets/css/global_table.css';
 </style>
   
\ No newline at end of file
diff --git a/src/components/sumDoctorCheck/SumItemsType.vue b/src/components/sumDoctorCheck/SumItemsType.vue
index c30463f..9ac4299 100644
--- a/src/components/sumDoctorCheck/SumItemsType.vue
+++ b/src/components/sumDoctorCheck/SumItemsType.vue
@@ -1,10 +1,8 @@
 <template>
-  <div :style="'width:100%;height:'+(window.pageHeight < 600 ? 330:window.pageHeight-270)+'px;'">
-    <el-table :data="tableData" 
-      :height="window.pageHeight < 600 ? 330:window.pageHeight-270" 
-      border highlight-current-row >
-      <el-table-column prop="itemTypeName" label="项目" width="180"/>
-      <el-table-column v-for="(item,index) of tableCols" :label="item" :prop="item" :key="index" width="200">
+  <div style="'width:100%;">
+    <el-table :data="tableData" :height="divHeight" border highlight-current-row>
+      <el-table-column prop="itemTypeName" label="项目" width="180" />
+      <el-table-column v-for="(item, index) of tableCols" :label="item" :prop="item" :key="index" width="200">
       </el-table-column>
     </el-table>
   </div>
@@ -16,34 +14,39 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj } from '@/utlis/proFunc';
 export default {
   components: {},
-  props:["patientId"],
+  props: ["patientId"],
   data() {
     return {
-      orgData:[],     //原始的数据，
-      tableData:[],   //显示数据
-      tableRows:[],   //动态行
-      tableCols:[],   //动态列
+      orgData: [],     //原始的数据，
+      tableData: [],   //显示数据
+      tableRows: [],   //动态行
+      tableCols: [],   //动态列
     };
   },
 
   created() { },
 
   //挂载完成
-  mounted() { 
+  mounted() {
     // if(this.patientId){
     //   this.SumItems(this.patientId);
     // }
   },
 
   computed: {
-    ...mapState(['window','dict', 'doctorCheck', 'sumDoctorCheck']),
+    ...mapState(['window', 'dict', 'doctorCheck', 'sumDoctorCheck']),
+
+    divHeight() {
+      let tempHeight = this.window.pageHeight < 600 ? 600 : this.window.pageHeight
+      return tempHeight - 195
+    },
   },
 
   methods: {
     //获取结果明细 3a0c6589-9989-4d7f-ba54-61e5b0138220
-    SumItems(patientId) {  
+    SumItems(patientId) {
       this.orgData = []
-      if(!patientId) return
+      if (!patientId) return
       console.log(`/api/app/sumsummaryreport/getitemtypecontrastlist?PatientId=${patientId}`)
       getapi(`/api/app/sumsummaryreport/getitemtypecontrastlist?PatientId=${patientId}`)
         .then((res) => {
@@ -62,15 +65,15 @@ export default {
     // "itemTypeName": "一般检查",
     // "registerDate": "2023-07-14",
     // "summarys": "身高体重:重度肥胖"
-    crossTable(tableData){
-      this.tableData=[]   //显示数据
-      this.tableRows=[]   //动态行
-      this.tableCols=[]   //动态列
+    crossTable(tableData) {
+      this.tableData = []   //显示数据
+      this.tableRows = []   //动态行
+      this.tableCols = []   //动态列
 
-      console.log('tableData',tableData)
+      console.log('tableData', tableData)
       tableData.forEach(e => {
-        if(this.tableRows.indexOf(e.itemTypeName) == - 1) this.tableRows.push(e.itemTypeName)
-        if(this.tableCols.indexOf(e.registerDate) == - 1) this.tableCols.push(e.registerDate)
+        if (this.tableRows.indexOf(e.itemTypeName) == - 1) this.tableRows.push(e.itemTypeName)
+        if (this.tableCols.indexOf(e.registerDate) == - 1) this.tableCols.push(e.registerDate)
       });
       this.tableCols.sort();
 
@@ -79,8 +82,8 @@ export default {
         let summarys = ''
         item['itemTypeName'] = r
         this.tableCols.forEach(c => {
-          for(let i=0;i<tableData.length;i++){
-            if(tableData[i].itemTypeName == r && tableData[i].registerDate == c){
+          for (let i = 0; i < tableData.length; i++) {
+            if (tableData[i].itemTypeName == r && tableData[i].registerDate == c) {
               summarys = tableData[i].summarys
               break;
             }
@@ -89,27 +92,27 @@ export default {
         });
         this.tableData.push(item)
       });
-      console.log('this.tableRows',this.tableRows)
-      console.log('this.tableCols',this.tableCols)
-      console.log('this.tableData',this.tableData)
+      console.log('this.tableRows', this.tableRows)
+      console.log('this.tableCols', this.tableCols)
+      console.log('this.tableData', this.tableData)
     }
-    
+
   },
 
   //监听事件
   watch: {
     //检查项目切换
-    "patientId":{
-      immediate:true,
+    "patientId": {
+      immediate: true,
       handler(newVal, oldVal) {
-        console.log("watch patientId newVal：", newVal, " oldVal：", oldVal);      
-        this.SumItems(newVal)        
+        console.log("watch patientId newVal：", newVal, " oldVal：", oldVal);
+        this.SumItems(newVal)
       }
     },
   },
 };
 </script>
 <style scoped>
-@import  '../../assets/css/global_table.css';
+@import '../../assets/css/global_table.css';
 </style>
   
\ No newline at end of file
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index cfc0059..965610a 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -2,7 +2,7 @@
   <div style="display: flex;">
     <div style="width:50%;">
       <el-table id="tableSummary" row-key="id" :data="sumDoctorCheck.summaryList" width="100%" 
-        :height="window.pageHeight < 600 ? 210 : window.pageHeight - 390" border size="small">
+        :height="sumHeight" border size="small">
         <el-table-column type="index" width="20" align="center"/>
         <el-table-column prop="summaryTitle" label="综述">
           <template slot-scope="scope">
@@ -31,7 +31,7 @@
     </div>
     <div style="width:50%;">
       <el-table id="tableSuggestion" row-key="id" :data="sumDoctorCheck.suggestionList" width="100%"
-        :height="window.pageHeight < 600 ? 210 : window.pageHeight - 390" border size="small">
+        :height="sumHeight" border size="small">
         <el-table-column type="index" width="20" align="center">
         </el-table-column>
         <el-table-column prop="suggestionTitle" label="建议">
@@ -79,7 +79,7 @@
     </div>
   </div>
 </template>
-<script lang="ts">
+<script>
 import { mapState } from 'vuex';
 import Sortable from "sortablejs";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
@@ -112,6 +112,11 @@ export default {
 
   computed: {
     ...mapState(['window', 'dict', 'doctorCheck', 'sumDoctorCheck']),
+
+    sumHeight(){
+      let tempHeight = this.window.pageHeight < 600 ? 600:this.window.pageHeight
+      return tempHeight - 320
+    },
   },
 
   methods: {
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index 7a5f6a4..3878bfc 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -3,7 +3,7 @@
     <div>
       <div style="display: flex;justify-content:space-between;"> 
         <div class="contenttitle">
-          体检登记 /<span class="contenttitleBold">体检人员登记</span>
+          体检 /<span class="contenttitleBold">检查医生诊台</span>
         </div>  
         <div style="position: absolute;top:50px;right:10px;z-index: 2000;">
           <el-image
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 85c50d4..5b255fd 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -1,21 +1,23 @@
 <template>
   <div>
-    <el-card style="display: block">
-      <div slot="header">总检医生诊台</div>
+    <div>      
+      <div class="contenttitle">
+        体检 /<span class="contenttitleBold">总检医生诊台</span>
+      </div> 
       <div style="display: flex">
-        <div :style="'width:' + (window.pageWidth - 110 - 45) + 'px;'">
+        <div :style="'width:' + (window.pageWidth - 110 - 15) + 'px;'">
           <div>
             <PatientRegisterBase />
           </div>
           <div :style="'height:' +
-            (window.pageHeight < 600 ? 380 : window.pageHeight - 220) +
+            (window.pageHeight < 600 ? 435 : window.pageHeight - 165) +
             'px;'
             ">
             <el-tabs v-model="tabChoosed">
               <el-tab-pane label="综述建议" name="1">
                 <div style="display: flex;">
                   <!-- 综述建议 -->
-                  <div :style="'width:' + (window.pageWidth - 110 - 45 - 200) + 'px;'">
+                  <div :style="'width:' + (window.pageWidth - 110 - 15 - 200) + 'px;'">
                     <SumSug :patientRegisterId="sumDoctorCheck.sumPREdit.id" :curGetFocusSuggestionId="curGetFocusSuggestionId"/>
                   </div>
                   <div style="width:200px;">
@@ -49,7 +51,7 @@
           <ButtonList :fnSetSuggestionFocus="fnSetSuggestionFocus" />
         </div>
       </div>
-    </el-card>
+    </div>
   </div>
 </template>
 <script>