From dba3996140978061dcf3a639e5503c1425c27343 Mon Sep 17 00:00:00 2001
From: pengjun <158915633@qq.com>
Date: Mon, 8 Jan 2024 17:57:45 +0800
Subject: [PATCH] doctor

---
 src/components/doctorCheck/ButtonList.vue     |  87 ++++-
 src/components/doctorCheck/CheckItemList.vue  |   4 +-
 src/components/doctorCheck/CheckPicture.vue   | 362 +++++++++++-------
 src/components/doctorCheck/CheckSumSug.vue    |   2 +-
 src/components/sumDoctorCheck/ButtonList.vue  |  33 +-
 .../sumDoctorCheck/CheckDetails.vue           |  11 +-
 src/components/sumDoctorCheck/SumHistory.vue  |  12 +-
 src/components/sumDoctorCheck/SumItems.vue    |  13 +-
 .../sumDoctorCheck/SumItemsType.vue           |  11 +-
 src/components/sumDoctorCheck/SumSug.vue      |  11 +-
 src/views/doctorCheck/doctorCheck.vue         |   2 +-
 src/views/doctorCheck/sumDoctorCheck.vue      |  11 +-
 12 files changed, 365 insertions(+), 194 deletions(-)

diff --git a/src/components/doctorCheck/ButtonList.vue b/src/components/doctorCheck/ButtonList.vue
index bdcbdec..484a941 100644
--- a/src/components/doctorCheck/ButtonList.vue
+++ b/src/components/doctorCheck/ButtonList.vue
@@ -42,10 +42,10 @@
             <el-button type="primary" class="btnClass" @click="unAudit">取消审核</el-button>
         </div>        
         <div>
-            <el-button type="primary" class="btnClass">历次结果</el-button>
+            <el-button type="primary" class="btnClass" @click="btnCheckHistory">历次结果</el-button>
         </div>
         <div>
-            <el-button type="primary" class="btnClass">体检报告</el-button>
+            <el-button type="primary" class="btnClass" @click="report">体检报告</el-button>
         </div>
         <div>
             <el-button type="primary" class="btnClass" @click="toSumDoctorCheck">总检</el-button>
@@ -110,7 +110,31 @@
                 <el-button @click="dialogVisibleSetStartDate = false">取 消</el-button>
                 <el-button type="primary" @click="btnSetStartDate">确 定</el-button>
             </span>
-        </el-dialog>        
+        </el-dialog>
+
+        <el-dialog
+            title="历次结果" 
+            :visible.sync="dialogVisibleCheckHistory"
+            :close-on-click-modal="false" 
+            width="800px" 
+            >
+            <div style="padding: 0 20px;">
+                <el-tabs v-model="tabChoosed">                    
+                    <el-tab-pane label="明细结果" name="2">
+                        <CheckDetails :patientRegisterId="doctorCheck.prBase.id" />
+                    </el-tab-pane>                    
+                    <el-tab-pane label="项目对比" name="4">
+                        <SumItemsType :patientId="doctorCheck.prBase.patientId" />
+                    </el-tab-pane>
+                    <el-tab-pane label="横向对比" name="5">
+                        <SumItems :patientId="doctorCheck.prBase.patientId" />
+                    </el-tab-pane>
+                    <el-tab-pane label="历次综述" name="6">
+                        <SumHistory :patientId="doctorCheck.prBase.patientId" />
+                    </el-tab-pane>
+                </el-tabs>
+            </div>
+        </el-dialog>     
     </div>
 </template>
 <script>
@@ -120,12 +144,22 @@ import { arrayExistObj,objCopy } from "../../utlis/proFunc";
 
 import PatientRegisterEdit from "../../components/patientRegister/PatientRegisterEdit.vue";
 import PatientRegisterList from "./PatientRegisterList.vue";
+
+import CheckDetails from "../../components/sumDoctorCheck/CheckDetails.vue";
+import SumItemsType from "../../components/sumDoctorCheck/SumItemsType.vue";
+import SumItems from "../../components/sumDoctorCheck/SumItems.vue";
+import SumHistory from "../../components/sumDoctorCheck/SumHistory.vue";
+
 import moment from 'moment';
 
 export default {
     components: {
         PatientRegisterEdit,
         PatientRegisterList,
+        CheckDetails,
+        SumItemsType,
+        SumItems,
+        SumHistory
     },
     props:["optGrant","addSummary","btnMakeDiagnosis","save","audit","unAudit"],
 
@@ -200,7 +234,8 @@ export default {
             },
 
             displayPrList:false,    //是否显示人员列表
-            
+            dialogVisibleCheckHistory:false,  //历次结果
+            tabChoosed:'2',
         };
     },
 
@@ -474,8 +509,50 @@ export default {
           
         },
 
+        // 历次结果
+        btnCheckHistory() {
+            if(!this.doctorCheck.prBase.id) return;
+            this.dialogVisibleCheckHistory = true;
+        },
         
-        
+        //体检报告
+        report() {
+            
+            if(!this.$peisAPI) {
+                this.$message.info("此功能，需要在壳客户端才可运行！")
+                return       
+            }
+            ///3a0c990e-5756-2dc0-19d5-69a617fe4048
+            let ReportCode = '0005';
+            let token = window.sessionStorage.getItem('token');
+            let user = window.sessionStorage.getItem('user');
+            let toOutShell = {
+                ReportCode, token,
+                preViewCanPrint: this.doctorCheck.prBase.isAudit, //this.sumDoctorCheck.sumPREdit.isAudit
+                Parameters: [
+                    { Name: 'printer', Value: user },
+                    { Name: 'LTS', Value: 'Y' }, //Y、N   N只看不能打印
+                    { Name: 'hisLog', Value: 'pic/hisLog.jpg' },
+                    { Name: "peisReportFirstPage", Value: "pic/peisReportFirstPage.jpg" },
+                    { Name: "peisReportPageHeader", Value: "pic/peisReportPageHeader.jpg" },
+                    { Name: "peisReportPageFooter", Value: "pic/peisReportPageFooter.jpg" }
+                ],
+            };
+
+
+            postapi(`/api/app/printreport/getpeisreport?PatientRegisterId=${this.doctorCheck.prBase.id}`)
+                .then((res) => {
+                    if (res.code != -1) {
+                        toOutShell.ReportTable = res.data;
+                        console.log('JSON.stringify(toOutShell)', JSON.stringify(toOutShell));
+                        return this.$peisAPI.printPre(JSON.stringify(toOutShell));
+                    }
+                })
+                .catch(err => {
+                    this.$message.warning(err);
+                });
+
+        },
         
         //总检
         toSumDoctorCheck() {
diff --git a/src/components/doctorCheck/CheckItemList.vue b/src/components/doctorCheck/CheckItemList.vue
index 50a6789..171b31b 100644
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@@ -5,8 +5,8 @@
       style="width: 100%"
       :height="
         window.pageHeight < 600
-          ? Math.floor(((420 - 40 - (isCheckPicture ? 100:0)) * 3) / 5)
-          : Math.floor(((window.pageHeight - 260 - 40 - (isCheckPicture ? 120:0)) * 3) / 5)
+          ? Math.floor(((420 - 40 - (isCheckPicture ? 110:0)) * 3) / 5)
+          : Math.floor(((window.pageHeight - 260 - 40 - (isCheckPicture ? 110:0)) * 3) / 5)
       "
       :row-style="{ height: '30px' }"
       border highlight-current-row
diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue
index f29b102..fc5e696 100644
--- a/src/components/doctorCheck/CheckPicture.vue
+++ b/src/components/doctorCheck/CheckPicture.vue
@@ -1,62 +1,120 @@
 <template>
-  <div style="display: flex; ">
+  <div style="display: flex;">
     <div>
       <div>
-        <el-button type="primary" class="btnClass" @click="btnGetPic" size="small">采图</el-button>
+        <el-button
+          type="primary"
+          class="btnClass"
+          @click="btnGetPic"
+          size="small"
+          >采图</el-button
+        >
       </div>
       <div>
-        <el-button type="primary" class="btnClass" @click="btnExpPic" size="small">导图</el-button>
+        <el-button
+          type="primary"
+          class="btnClass"
+          @click="btnExpPic"
+          size="small"
+          >导图</el-button
+        >
       </div>
       <div>
-        <el-button type="primary" class="btnClass" @click="btnSavePic" size="small">保存</el-button>
+        <el-button
+          type="primary"
+          class="btnClass"
+          @click="btnSavePic"
+          size="small"
+          >保存</el-button
+        >
       </div>
     </div>
-    <div :style="`display: flex; white-space: nowrap;overflow-x: scroll;width: ${Math.floor((window.pageWidth - 200 - 110 - 45 - 4))}px;`">
-      <div class="demo-image__preview" v-for="(item,index) in checkPictures" :key="item.id" style="display: inline-block;padding: 0 0 0 2px;"
-        > 
-        <div style="position: relative;font-size:24px;margin: -6px 0 0 55px;z-index:2;">
-          <el-tooltip content="删除该图" placement="bottom" effect="light">
-            <i class="el-icon-close" @click="btnDelImage(index)"
-              style="color: red;cursor:pointer;"></i>
-          </el-tooltip>
-        </div>
-        <div style="margin-top: -25px;">
-          <el-image 
-            style="width: 80px; height: 80px;border-radius:5px;"
-            :src="item.pictureFilename.indexOf('http') > -1 ? item.pictureFilename:apiUrl+item.pictureFilename" 
-            :preview-src-list="[item.pictureFilename.indexOf('http') > -1 ? item.pictureFilename:apiUrl+item.pictureFilename]">
-          </el-image>
-        </div>
-        <div style="display: flex;">
-          <div style="margin: -6px 0 0 1px;">
-            <el-checkbox v-model="item.isPrintTrans"></el-checkbox>
-          </div>
-          <div style="font-size:12px;margin: -2px 0 0 1px;">打印</div>        
-          <div style="font-size:15px;margin: -5px 0 0 2px;">
-            <el-tooltip content="保存后，图片将按序号从小到大排序" placement="bottom" effect="light">
-              <input placeholder="排序" v-model="item.displayOrder" @onkeyup="validateInteger(e,index)" 
-                style="width: 35px" />
+    <!--  -->
+    <div :style="`overflow-x: scroll;width:${Math.floor((window.pageWidth - 200 - 110 - 45 - 4))}px;`">
+      <div style="display: flex;">
+        <div
+          class="demo-image__preview"
+          v-for="(item, index) in checkPictures"
+          :key="item.id"
+          style="display: inline-block; padding: 0 0 0 2px"
+        >
+          <div
+            style="
+              position: relative;
+              font-size: 24px;
+              margin: -6px 0 0 55px;
+              z-index: 2;
+            "
+          >
+            <el-tooltip content="删除该图" placement="bottom" effect="light">
+              <i
+                class="el-icon-close"
+                @click="btnDelImage(index)"
+                style="color: red; cursor: pointer"
+              ></i>
             </el-tooltip>
           </div>
+          <div style="margin-top: -25px">
+            <el-image
+              style="width: 80px; height: 80px; border-radius: 5px"
+              :src="
+                item.pictureFilename.indexOf('http') > -1
+                  ? item.pictureFilename
+                  : apiUrl + item.pictureFilename
+              "
+              :preview-src-list="[
+                item.pictureFilename.indexOf('http') > -1
+                  ? item.pictureFilename
+                  : apiUrl + item.pictureFilename,
+              ]"
+            >
+            </el-image>
+          </div>
+          <div style="display: flex">
+            <div style="margin: -6px 0 0 1px">
+              <el-checkbox v-model="item.isPrintTrans"></el-checkbox>
+            </div>
+            <div style="font-size: 12px; margin: -2px 0 0 1px">打印</div>
+            <div style="font-size: 15px; margin: -5px 0 0 2px">
+              <el-tooltip
+                content="保存后，图片将按序号从小到大排序"
+                placement="bottom"
+                effect="light"
+              >
+                <input
+                  placeholder="排序"
+                  v-model="item.displayOrder"
+                  @onkeyup="validateInteger(e, index)"
+                  style="width: 30px"
+                />
+              </el-tooltip>
+            </div>
+          </div>
         </div>
       </div>
     </div>
-    <el-dialog title="图片上传"
+    <el-dialog
+      title="图片上传"
       :visible.sync="dialogCheckPictureUpload"
       :close-on-click-modal="false"
-      width="800px" @close="getCheckPictures(doctorCheck.RegisterCheckId)"
-      >
-      <CheckPictureUpload :registerCheckId="doctorCheck.RegisterCheckId" :uploadSeq="uploadSeq" :closePicUpload="closePicUpload"/>
-  </el-dialog>
+      width="800px"
+      @close="getCheckPictures(doctorCheck.RegisterCheckId)"
+    >
+      <CheckPictureUpload
+        :registerCheckId="doctorCheck.RegisterCheckId"
+        :uploadSeq="uploadSeq"
+        :closePicUpload="closePicUpload"
+      />
+    </el-dialog>
   </div>
 </template>
 <script>
 import moment from "moment";
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
-import { deepCopy } from '@/utlis/proFunc';
-import CheckPictureUpload from './CheckPictureUpload.vue'
-import server from "../../utlis/mm"
+import { deepCopy } from "@/utlis/proFunc";
+import CheckPictureUpload from "./CheckPictureUpload.vue";
+import server from "../../utlis/mm";
 
 export default {
   components: {
@@ -64,24 +122,29 @@ export default {
   },
   data() {
     return {
-      checkPictures:[{
-        id:'1',
-        registerCheckId:'registerCheckId',
-        isPrint:'Y',
-        isPrintTrans:true,
-        pictureFilename:'https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg'
-      },{
-        id:'2',
-        registerCheckId:'registerCheckId',
-        isPrint:'Y',
-        isPrintTrans:true,
-        pictureFilename:'https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg'
-      }],
-      
-      apiUrl:server.apiurl,
+      checkPictures: [
+        {
+          id: "1",
+          registerCheckId: "registerCheckId",
+          isPrint: "Y",
+          isPrintTrans: true,
+          pictureFilename:
+            "https://fuss10.elemecdn.com/8/27/f01c15bb73e1ef3793e64e6b7bbccjpeg.jpeg",
+        },
+        {
+          id: "2",
+          registerCheckId: "registerCheckId",
+          isPrint: "Y",
+          isPrintTrans: true,
+          pictureFilename:
+            "https://fuss10.elemecdn.com/1/8e/aeffeb4de74e2fde4bd74fc7b4486jpeg.jpeg",
+        },
+      ],
+
+      apiUrl: server.apiurl,
       //图片上传
-      dialogCheckPictureUpload:false,   
-      uploadSeq:0, //第几次点图片上传，每点一次清空前次所选图片      
+      dialogCheckPictureUpload: false,
+      uploadSeq: 0, //第几次点图片上传，每点一次清空前次所选图片
     };
   },
 
@@ -91,17 +154,23 @@ export default {
   mounted() {},
 
   computed: {
-    ...mapState(["window", "dict", "doctorCheck","patientRegister", "customerOrg"]),
+    ...mapState([
+      "window",
+      "dict",
+      "doctorCheck",
+      "patientRegister",
+      "customerOrg",
+    ]),
     lmoment(date, forMat) {
       return moment(new Date(date)).format(forMat);
     },
   },
   methods: {
     // 根据checkId获取图片列表信息
-    getCheckPictures(registerCheckId){
-      this.checkPictures = []
-      if(!registerCheckId){        
-        return
+    getCheckPictures(registerCheckId) {
+      this.checkPictures = [];
+      if (!registerCheckId) {
+        return;
       }
       // {
       //   "registerCheckId": "3a0f6a3c-88a5-d5f7-d59b-ef3b3807490b",
@@ -116,46 +185,52 @@ export default {
       //   "creatorId": "3a0c4180-107c-0c89-b25b-0bd34666dcec",
       //   "id": "3a0f6a3c-88a5-d5f7-d59b-ef3b38074901"
       // }
-      getapi(`/api/app/registercheckpicture/getregistercheckpictureinregistercheckid?RegisterCheckId=${registerCheckId}`)
-      .then(res =>{
-        if(res.code != -1){
-          res.data.forEach(e => {
-            this.checkPictures.push(Object.assign({isPrintTrans:e.isPrint == 'Y' ? true:false},e))
+      getapi(
+        `/api/app/registercheckpicture/getregistercheckpictureinregistercheckid?RegisterCheckId=${registerCheckId}`
+      ).then((res) => {
+        if (res.code != -1) {
+          res.data.forEach((e) => {
+            this.checkPictures.push(
+              Object.assign(
+                { isPrintTrans: e.isPrint == "Y" ? true : false },
+                e
+              )
+            );
           });
         }
-      })
+      });
     },
 
-    btnGetPic(){
-      if(!this.doctorCheck.RegisterCheckId){
-        this.$message.warning("未选中组合项目！")
-        return
+    btnGetPic() {
+      if (!this.doctorCheck.RegisterCheckId) {
+        this.$message.warning("未选中组合项目！");
+        return;
       }
-      console.log('采图，开发中……')
+      console.log("采图，开发中……");
     },
 
     //导图（上传图片）
-    btnExpPic(){
-      if(!this.doctorCheck.RegisterCheckId){
-        this.$message.warning("未选中组合项目！")
-        return
+    btnExpPic() {
+      if (!this.doctorCheck.RegisterCheckId) {
+        this.$message.warning("未选中组合项目！");
+        return;
       }
       this.uploadSeq++;
       this.dialogCheckPictureUpload = true;
     },
 
     //关闭上传图片窗口
-    closePicUpload(){
+    closePicUpload() {
       this.dialogCheckPictureUpload = false;
     },
 
-    btnSavePic(){
-      if(!this.doctorCheck.RegisterCheckId){
-        this.$message.warning("未选中组合项目！")
-        return
+    btnSavePic() {
+      if (!this.doctorCheck.RegisterCheckId) {
+        this.$message.warning("未选中组合项目！");
+        return;
       }
 
-      let body = []
+      let body = [];
       // [
       //   {
       //     "registerCheckPictureId": "3fa85f64-5717-4562-b3fc-2c963f66afa6",  // 新增无需传此值
@@ -165,98 +240,107 @@ export default {
       //     "displayOrder": 0
       //   }
       // ]
-      if(this.checkPictures.length == 0){
-        this.$message.warning("没有可保存的图片数据！")
-        return
+      if (this.checkPictures.length == 0) {
+        this.$message.warning("没有可保存的图片数据！");
+        return;
       }
 
-      let checkPictures = deepCopy(this.checkPictures)
-      checkPictures.sort((a,b) =>{
-        let seq1 = 0
-        let seq2 = 0
+      let checkPictures = deepCopy(this.checkPictures);
+      checkPictures.sort((a, b) => {
+        let seq1 = 0;
+        let seq2 = 0;
         try {
-          seq1 = parseInt(a.displayOrder)
+          seq1 = parseInt(a.displayOrder);
         } catch (error) {
-          seq1 = 0
+          seq1 = 0;
         }
         try {
-          seq2 = parseInt(b.displayOrder)
+          seq2 = parseInt(b.displayOrder);
         } catch (error) {
-          seq2 = 0
+          seq2 = 0;
         }
-        return seq1 - seq2
-      })
+        return seq1 - seq2;
+      });
 
-      checkPictures.forEach(e => {
+      checkPictures.forEach((e) => {
         let item = {
-          registerCheckId:e.registerCheckId,
-          pictureFilename:e.pictureFilename
+          registerCheckId: e.registerCheckId,
+          pictureFilename: e.pictureFilename,
+        };
+        if (e.id) item.registerCheckPictureId = e.id;
+        if (e.isPrintTrans) {
+          item.isPrint = "Y";
+        } else {
+          item.isPrint = "N";
         }
-        if(e.id) item.registerCheckPictureId = e.id
-        if(e.isPrintTrans){
-          item.isPrint = 'Y'
-        }else{
-          item.isPrint = 'N'
-        }        
         body.push(item);
       });
 
-      postapi('/api/app/registercheckpicture/createregistercheckpicturemany',body)
-      .then(res =>{
-        if(res.code != -1){
-          this.$message.success("操作成功！")
+      postapi(
+        "/api/app/registercheckpicture/createregistercheckpicturemany",
+        body
+      ).then((res) => {
+        if (res.code != -1) {
+          this.$message.success("操作成功！");
           this.getCheckPictures(checkPictures[0].registerCheckId);
         }
-      })
-
-      
+      });
     },
 
     // 删除图片
-    btnDelImage(index){
-      let body = [this.checkPictures[index].id]
+    btnDelImage(index) {
+      let body = [this.checkPictures[index].id];
       this.$confirm("此操作将永久删除该记录, 是否继续?", "提示", {
         confirmButtonText: "是",
         cancelButtonText: "否",
         type: "warning",
-      }).then(() => {        
-        return postapi(`/api/app/registercheckpicture/deleteregistercheckpicturemany`, body)
-      }).then((res) => {
-        if(res.code != -1){
-          this.$message.success("操作成功！")          
-          this.checkPictures.splice(index,1)
-        }   
-      }).catch((err) => {
-        if (err == "cancel") {
-          this.$message.info("已取消");          
-        }
-      });
-      
+      })
+        .then(() => {
+          return postapi(
+            `/api/app/registercheckpicture/deleteregistercheckpicturemany`,
+            body
+          );
+        })
+        .then((res) => {
+          if (res.code != -1) {
+            this.$message.success("操作成功！");
+            this.checkPictures.splice(index, 1);
+          }
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+            this.$message.info("已取消");
+          }
+        });
     },
 
-    validateInteger(e,index){
+    validateInteger(e, index) {
       var regex = /^[0-9]*$/;
-      console.log(e,index)
+      console.log(e, index);
       if (!regex.test(e.value)) {
         // 如果输入不满足整数条件，则清除输入框内容
 
         e.value = "";
       }
-    }
-
+    },
   },
 
   //监听事件
   watch: {
     //体检人员切换
-    "doctorCheck.RegisterCheckId":{
-      immediate:true,
+    "doctorCheck.RegisterCheckId": {
+      immediate: true,
       handler(newVal, oldVal) {
-        console.log("watch:doctorCheck.RegisterCheckId:", newVal, " oldVal：", oldVal);        
-        this.getCheckPictures(newVal)        
-      }
+        console.log(
+          "watch:doctorCheck.RegisterCheckId:",
+          newVal,
+          " oldVal：",
+          oldVal
+        );
+        this.getCheckPictures(newVal);
+      },
     },
-  }
+  },
 };
 </script>
 <style scoped>
@@ -266,8 +350,8 @@ export default {
   padding: 1px 1px;
 }
 
-.btnClass{
-  margin: 2px 2px 0;    
+.btnClass {
+  margin: 2px 2px 0;
   height: 26px;
   min-width: 40px;
   padding: 5px 5px; /*原始 默认值 10px 10px */
@@ -275,11 +359,11 @@ export default {
 
 /* 强制出现滚动条 */
 ::-webkit-scrollbar {
-  height: .5rem;
+  height: 0.5rem;
 }
 
 ::-webkit-scrollbar-thumb {
   background-color: #ccc;
-  border-radius: .25rem;
-} 
+  border-radius: 0.25rem;
+}
 </style>
diff --git a/src/components/doctorCheck/CheckSumSug.vue b/src/components/doctorCheck/CheckSumSug.vue
index 87c8d01..c16ef55 100644
--- a/src/components/doctorCheck/CheckSumSug.vue
+++ b/src/components/doctorCheck/CheckSumSug.vue
@@ -91,7 +91,7 @@ export default {
 
     //小结高度
     sumHeight(){
-      return this.window.pageHeight < 600 ? Math.floor((395 - (this.isCheckPicture ? 100:0))*2/5):Math.floor((this.window.pageHeight - 205 - (this.isCheckPicture ? 120:0))*2/5);
+      return this.window.pageHeight < 600 ? Math.floor((395 - (this.isCheckPicture ? 110:0))*2/5):Math.floor((this.window.pageHeight - 205 - (this.isCheckPicture ? 110:0))*2/5);
     }
   },
 
diff --git a/src/components/sumDoctorCheck/ButtonList.vue b/src/components/sumDoctorCheck/ButtonList.vue
index 1c56c01..d29d4d1 100644
--- a/src/components/sumDoctorCheck/ButtonList.vue
+++ b/src/components/sumDoctorCheck/ButtonList.vue
@@ -147,8 +147,8 @@ export default {
         save() {
             let ret = this.optGrant('save')
             if (ret) {
-                alert(ret)
-                return
+                this.$message.warning(ret);                
+                return;
             }
 
             //更新总检
@@ -165,14 +165,19 @@ export default {
         edit() {
             let ret = this.optGrant('edit')
             if (ret) {
-                alert(ret)
-                return
+                this.$message.warning(ret);                
+                return;
             }
             this.sumDoctorCheck.sumPREdit.completeFlag = '2'
         },
 
         //取消结果
         del() {
+            let ret = this.optGrant('del')
+            if (ret) {
+                this.$message.warning(ret);                
+                return;
+            }
             let body = {
                 patientRegisterId: this.sumDoctorCheck.sumPREdit.id,
                 //summaryDoctor: this.sumDoctorCheck.sumPREdit.summaryDoctor,
@@ -211,8 +216,8 @@ export default {
         audit() {
             let ret = this.optGrant('audit')
             if (ret) {
-                alert(ret)
-                return
+                this.$message.warning(ret);                
+                return;
             }
             let body = {
                 patientRegisterId: this.sumDoctorCheck.sumPREdit.id,
@@ -239,8 +244,8 @@ export default {
         unAudit() {
             let ret = this.optGrant('unAudit')
             if (ret) {
-                alert(ret)
-                return
+                this.$message.warning(ret);                
+                return;
             }
 
             let body = {
@@ -268,8 +273,8 @@ export default {
         report() {
             let ret = this.optGrant('report')
             if (ret) {
-                alert(ret)
-                return
+                this.$message.warning(ret);                
+                return;
             }
             if(!this.$peisAPI) {
                 this.$message.info("此功能，需要在壳客户端才可运行！")
@@ -329,8 +334,8 @@ export default {
             console.log("parseID('123456198007240000')", parseID('123456198007240000'))
             let ret = this.optGrant('reCheck')
             if (ret) {
-                alert(ret)
-                return
+                this.$message.warning(ret);                
+                return;
             }
 
         },
@@ -339,8 +344,8 @@ export default {
         intervene() {
             let ret = this.optGrant('intervene')
             if (ret) {
-                alert(ret)
-                return
+                this.$message.warning(ret);                
+                return;
             }
         },
 
diff --git a/src/components/sumDoctorCheck/CheckDetails.vue b/src/components/sumDoctorCheck/CheckDetails.vue
index acdd85d..39913ef 100644
--- a/src/components/sumDoctorCheck/CheckDetails.vue
+++ b/src/components/sumDoctorCheck/CheckDetails.vue
@@ -51,6 +51,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj } from '@/utlis/proFunc';
 export default {
   components: {},
+  props:["patientRegisterId"],
   data() {
     return {
       tableData:[],
@@ -61,9 +62,9 @@ export default {
 
   //挂载完成
   mounted() {
-    if(this.sumDoctorCheck.sumPREdit.id){
-      this.CheckDetails(this.sumDoctorCheck.sumPREdit.id);
-    }    
+    // if(this.patientRegisterId){
+    //   this.CheckDetails(this.patientRegisterId);
+    // }    
   },
 
   computed: {
@@ -103,10 +104,10 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "sumDoctorCheck.sumPREdit.id":{
+    "patientRegisterId":{
       immediate:true,
       handler(newVal, oldVal) {
-        console.log("watch sumDoctorCheck.sumPREdit.id newVal：", newVal, " oldVal：", oldVal);      
+        console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal);      
         this.CheckDetails(newVal);        
       }
     },
diff --git a/src/components/sumDoctorCheck/SumHistory.vue b/src/components/sumDoctorCheck/SumHistory.vue
index 8afe996..5f1d48f 100644
--- a/src/components/sumDoctorCheck/SumHistory.vue
+++ b/src/components/sumDoctorCheck/SumHistory.vue
@@ -29,6 +29,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj } from '@/utlis/proFunc';
 export default {
   components: {},
+  props:["patientId"],
   data() {
     return {
       tableData:[],   //显示数据
@@ -39,9 +40,9 @@ export default {
 
   //挂载完成
   mounted() { 
-    if(this.sumDoctorCheck.sumPREdit.patientId){
-      this.SumHistory(this.sumDoctorCheck.sumPREdit.patientId);
-    }
+    // if(this.patientId){
+    //   this.SumHistory(this.patientId);
+    // }
   },
 
   computed: {
@@ -82,10 +83,11 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "sumDoctorCheck.sumPREdit.patientId":{
+    "patientId":{
       immediate:true,
       handler(newVal, oldVal) {
-        console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal);      
+        console.log("watch SumHistory.patientId newVal：", newVal, " oldVal：", oldVal);  
+        debugger    
         this.SumHistory(newVal)        
       }
     },
diff --git a/src/components/sumDoctorCheck/SumItems.vue b/src/components/sumDoctorCheck/SumItems.vue
index 37d2e94..0bffdf4 100644
--- a/src/components/sumDoctorCheck/SumItems.vue
+++ b/src/components/sumDoctorCheck/SumItems.vue
@@ -28,6 +28,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj } from '@/utlis/proFunc';
 export default {
   components: {},
+  props:["patientId"],
   data() {
     return {
       RegisterCheckList: [],
@@ -41,9 +42,9 @@ export default {
 
   //挂载完成
   mounted() {
-    if(this.sumDoctorCheck.sumPREdit.patientId){
-      this.registerCheckList(this.sumDoctorCheck.sumPREdit.patientId);
-    }
+    // if(this.sumDoctorCheck.sumPREdit.patientId){
+    //   this.registerCheckList(this.sumDoctorCheck.sumPREdit.patientId);
+    // }
   },
 
   computed: {
@@ -83,7 +84,7 @@ export default {
 
     rowClick(row) {
       //console.log('row',row) //asbitemId
-      this.SumItems(this.sumDoctorCheck.sumPREdit.patientId, row.asbitemId)
+      this.SumItems(this.patientId, row.asbitemId)
     },
 
 
@@ -153,10 +154,10 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "sumDoctorCheck.sumPREdit.patientId":{
+    "patientId":{
       immediate:true,
       handler(newVal, oldVal) {
-        console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal);      
+        console.log("watch patientId newVal：", newVal, " oldVal：", oldVal);      
         this.registerCheckList(newVal)
       }
     },
diff --git a/src/components/sumDoctorCheck/SumItemsType.vue b/src/components/sumDoctorCheck/SumItemsType.vue
index 4bf1d55..d9c5b83 100644
--- a/src/components/sumDoctorCheck/SumItemsType.vue
+++ b/src/components/sumDoctorCheck/SumItemsType.vue
@@ -16,6 +16,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj } from '@/utlis/proFunc';
 export default {
   components: {},
+  props:["patientId"],
   data() {
     return {
       orgData:[],     //原始的数据，
@@ -29,9 +30,9 @@ export default {
 
   //挂载完成
   mounted() { 
-    if(this.sumDoctorCheck.sumPREdit.patientId){
-      this.SumItems(this.sumDoctorCheck.sumPREdit.patientId);
-    }
+    // if(this.patientId){
+    //   this.SumItems(this.patientId);
+    // }
   },
 
   computed: {
@@ -98,10 +99,10 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "sumDoctorCheck.sumPREdit.patientId":{
+    "patientId":{
       immediate:true,
       handler(newVal, oldVal) {
-        console.log("watch sumDoctorCheck.sumPREdit.patientId newVal：", newVal, " oldVal：", oldVal);      
+        console.log("watch patientId newVal：", newVal, " oldVal：", oldVal);      
         this.SumItems(newVal)        
       }
     },
diff --git a/src/components/sumDoctorCheck/SumSug.vue b/src/components/sumDoctorCheck/SumSug.vue
index 5951db8..10f3881 100644
--- a/src/components/sumDoctorCheck/SumSug.vue
+++ b/src/components/sumDoctorCheck/SumSug.vue
@@ -10,7 +10,7 @@
               <el-table :id="scope.row.id" :row-key="scope.$index + scope.row.id" style="margin-left: 30px;"
                 :data="scope.row.details" border @row-click="rowClick" :show-header="false"
                 :row-style="{ height: '30px' }">
-                <el-table-column prop="summaryContent" label="综述">
+                <el-table-column prop="summaryContent" label="综述" min-width="200">
                   <template slot-scope="scope2">
                     <el-input type="textarea" v-model="scope2.row.summaryContent" placeholder="请输入综述" style="width: 95%"
                       :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
@@ -51,7 +51,7 @@
                     <div>{{ scope2.$index + 1 }}</div>
                   </template>
                 </el-table-column>
-                <el-table-column prop="suggestionContent" label="建议" min-width="400">
+                <el-table-column prop="suggestionContent" label="建议" min-width="200">
                   <template slot-scope="scope2">                    
                     <el-input type="textarea" v-model="scope2.row.suggestionContent" placeholder="请输入建议内容"
                       :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
@@ -59,7 +59,7 @@
                     </el-input>                                
                   </template>
                 </el-table-column>
-                <el-table-column prop="suggestionContent" label="操作" min-width="60">
+                <el-table-column prop="suggestionContent" label="操作" width="62">
                   <template slot-scope="scope2">                    
                     <el-button type="danger" style="min-width:30px;" icon="el-icon-delete" @click="delSug(scope.row.details, scope2.$index)"
                       :disabled="sumDoctorCheck.sumPREdit.completeFlag == '3' || sumDoctorCheck.sumPREdit.isAudit == 'Y'"
@@ -81,6 +81,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 import { arrayExistObj } from '@/utlis/proFunc';
 export default {
   components: {},
+  props:["patientRegisterId"],
   data() {
     return {
       sumDetails: [],
@@ -306,10 +307,10 @@ export default {
   //监听事件
   watch: {
     //检查项目切换
-    "sumDoctorCheck.sumPREdit.id":{
+    "patientRegisterId":{
       immediate:true,
       handler(newVal, oldVal) {
-        console.log("watch sumDoctorCheck.sumPREdit.id newVal：", newVal, " oldVal：", oldVal);        
+        console.log("watch patientRegisterId newVal：", newVal, " oldVal：", oldVal);        
         this.summaryList(newVal)
         this.suggestionList(newVal)        
       }
diff --git a/src/views/doctorCheck/doctorCheck.vue b/src/views/doctorCheck/doctorCheck.vue
index cf4d14b..0057e5f 100644
--- a/src/views/doctorCheck/doctorCheck.vue
+++ b/src/views/doctorCheck/doctorCheck.vue
@@ -48,7 +48,7 @@
               <div :style="'margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'" >
                 <CheckItemList :isCheckPicture="isCheckPicture"/>
               </div>
-              <div v-if="isCheckPicture" class="demo-image__preview" :style="'margin-top: 2px;margin-left: 2px;height:100px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'">
+              <div v-if="isCheckPicture" class="demo-image__preview" :style="'margin-top: 2px;margin-left: 2px;height:110px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'">
                 <CheckPicture />
               </div>
               <div :style="'margin-top: 2px;margin-left: 2px;width:' + (window.pageWidth - 200 - 110 - 45 - 2) + 'px;'">
diff --git a/src/views/doctorCheck/sumDoctorCheck.vue b/src/views/doctorCheck/sumDoctorCheck.vue
index 9c67463..325ae76 100644
--- a/src/views/doctorCheck/sumDoctorCheck.vue
+++ b/src/views/doctorCheck/sumDoctorCheck.vue
@@ -15,24 +15,23 @@
               <el-tab-pane label="综述建议" name="1">
                 <div>
                   <!-- -->
-                  <SumSug />                  
+                  <SumSug :patientRegisterId="sumDoctorCheck.sumPREdit.id" />                  
                   <SumPREdit />
                   <SumAsbItemStatus :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
-                  
                 </div>
               </el-tab-pane>
               <el-tab-pane label="明细结果" name="2">
-                <CheckDetails />
+                <CheckDetails :patientRegisterId="sumDoctorCheck.sumPREdit.id" />
               </el-tab-pane>
               <el-tab-pane label="危急值" name="3"> </el-tab-pane>
               <el-tab-pane label="项目对比" name="4">
-                <SumItemsType />
+                <SumItemsType :patientId="sumDoctorCheck.sumPREdit.patientId" />
               </el-tab-pane>
               <el-tab-pane label="横向对比" name="5">
-                <SumItems />
+                <SumItems :patientId="sumDoctorCheck.sumPREdit.patientId" />
               </el-tab-pane>
               <el-tab-pane label="历次综述" name="6">
-                <SumHistory />
+                <SumHistory :patientId="sumDoctorCheck.sumPREdit.patientId" />
               </el-tab-pane>
             </el-tabs>
           </div>