pacs

src/components/doctorCheck/CheckItemList.vue

@@ -169,8 +169,8 @@
       </el-dialog>
 
       <!--Pacs结果录入模版-->
-      <el-dialog :title="'Pacs结果录入模版 -- ' + doctorCheck.checkItemList[pacsParams.index].itemName" v-if="dialogWinPacsTemplate"
-        :visible.sync="dialogWinPacsTemplate" width="880px" :close-on-click-modal="false">
+      <el-dialog :title="'Pacs结果录入模版 -- ' + doctorCheck.checkItemList[pacsParams.index].itemName"
+        v-if="dialogWinPacsTemplate" :visible.sync="dialogWinPacsTemplate" width="880px" :close-on-click-modal="false">
         <PacsTemplate :refParams="pacsParams" :refFuncOther="handlePacsResult" />
       </el-dialog>
 
@@ -294,7 +294,7 @@ export default {
     tableHeight() {
       let temp = this.window.pageHeight < 600 ? 600 : this.window.pageHeight;
       return Math.floor(
-        ((temp - 292 - (this.isCheckPicture ? 110 : 0)) * 3) / 5
+        ((temp - 310 - (this.isCheckPicture ? 110 : 0)) * 3) / 5
       );
     },
   },
@@ -927,9 +927,9 @@ export default {
 
           // 点击时全选结果
           input.addEventListener("click", (event) => {
-            if(this.isSelectAll == 'Y'){
+            if (this.isSelectAll == 'Y') {
               input.select();
-            }            
+            }
           });
         });
       });

src/components/doctorCheck/CheckSumSug.vue

@@ -31,7 +31,7 @@
         </el-table>
       </div>
       <div
-        :style="`display: flex;position: absolute; top:${window.pageHeight - sumHeight - 42}px;right:${sumWidth + 125}px;z-index: 1;`">
+        :style="`display: flex;position: absolute; top:${window.pageHeight - sumHeight - 226}px;right:${sumWidth + 8}px;z-index: 1;`">
         <div v-show="checkPagePriv(pagePriv.privs, '生成小结')">
           <el-button type="primary" class="btnClass" @click="btnMakeDiagnosis"
             :disabled="doctorBtnDisabled('btnMakeDiagnosis')">生成小结</el-button>

src/components/doctorCheck/PacsDcmPreview.vue

@@ -0,0 +1,80 @@
+<template>
+  <div>
+    <iframe :src="iframeSrc" :height="window.pageHeight - 205" :width="window.pageWidth - 320"></iframe>
+  </div>
+</template>
+<script>
+
+import { mapState } from "vuex";
+
+
+export default {
+  components: {
+    
+  },
+  data() {
+    return {
+      sysConfig: {}, //
+      
+      checkRequestNo: '',
+      
+      iframeSrc: ''
+      
+      
+    };
+  },
+
+  created() {   
+    this.sysConfig = JSON.parse(window.sessionStorage.getItem('sysConfig')) 
+  },
+
+  //挂载完成
+  mounted() {
+    this.brushDcm()
+  },
+
+  computed: {
+    ...mapState([
+      "window",
+      "doctorCheck",
+    ]),
+    
+  },
+  methods: {
+        // 浏览Dcm文件
+    brushDcm() {      
+      // console.log('this.sysConfig',this.sysConfig,this.doctorCheck.checkRequestNo)
+      if(!this.doctorCheck.checkRequestNo) return
+      switch (this.doctorCheck.checkTypeFlag) {
+        case '2':
+        case '3':           
+          let token = window.sessionStorage.getItem('token')
+          this.iframeSrc = ''
+          this.iframeSrc = `${this.sysConfig.dcmViewers}/?mrn=${this.doctorCheck.checkRequestNo}&token=${token}&pacsapi=${this.sysConfig.pacsApiHttps}`
+          break;
+      
+        default:
+          this.iframeSrc = ''
+          break;
+      }
+    },
+
+  },
+
+  //监听事件
+  watch: {
+    //检查项目未切换换时 也可以强制刷新数据
+    "doctorCheck.checkRequestNo": {
+      // immediate: true,
+      handler(newVal, oldVal) {
+        console.log(`watch 检查条码 newVal:${newVal} oldVal:${oldVal}`);
+        if (newVal != oldVal) this.brushDcm();
+      }
+    },
+
+  },
+};
+</script>
+<style scoped>
+
+</style>

src/components/doctorCheck/RegisterCheckList.vue

@@ -116,7 +116,8 @@ export default {
       this.doctorCheck.RegisterCheckId = row.id
       this.doctorCheck.asbitemName = row.asbitemName
       this.doctorCheck.checkRequestNo = row.checkRequestNo
-
+      this.doctorCheck.checkTypeFlag = row.checkTypeFlag
+      //console.log('rowClick this.doctorCheck.checkRequestNo',this.doctorCheck.checkRequestNo)
       this.dataTransOpts.tableS.register_check.id = row.id
 
       this.dataTransOpts.refresh.register_check.S++

src/components/report/BtnReport.vue

@@ -270,6 +270,8 @@ export default {
                     try {
                         if (e.completeFlag == '3') {
                             toOutShell.BusinessCode = e.patientRegisterId
+                            toOutShell.customerOrgName = e.customerOrgName||''  // 增加单位名称参数
+                            toOutShell.departmentName = e.departmentName||''
                             let jsonToOutShell = JSON.stringify(toOutShell)
                             console.log('toOutShell', jsonToOutShell)
                             let res = await this.$peisAPI.upLoadReportPdf(jsonToOutShell)

src/store/index.js

@@ -242,6 +242,7 @@ export default new Vuex.Store({
                 auditorUserId: null,
                 auditTime: '',
             }, //组合项目详情
+            checkRequestNo:'', // 医生诊台当前检查条码号
             doctorCheckDialogVisible: false,
             RegisterCheckList: [], //人员体检 组合项目列表
             RegisterCheck: {}, //单组合项目记录

src/views/doctorCheck/doctorCheck.vue

@@ -30,6 +30,7 @@
                 <QueueCheckList />
               </el-tab-pane>
             </el-tabs>
+
             <el-tabs v-model="activeMain" :style="'width:' + (window.pageWidth - 200 - 110 - 15) + 'px;'">
               <el-tab-pane label="检查情况" name="text">
                 <div :style="'margin-left: 2px;'">
@@ -51,6 +52,12 @@
                   <RegisterCheckEdit :registerCheckId="dataTransOpts.tableS.register_check.id" />
                 </div>
               </el-tab-pane>
+              <el-tab-pane v-if="isCheckPicture" label="图片预览" name="imgPre">
+                
+              </el-tab-pane>
+              <el-tab-pane v-if="isCheckPicture" label="DCM" name="dcm">
+                <PacsDcmPreview />
+              </el-tab-pane>
             </el-tabs>
           </div>
         </div>
@@ -84,10 +91,13 @@ import QueueCheckList from "../../components/doctorCheck/QueueCheckList.vue";
 import CheckItemList from "../../components/doctorCheck/CheckItemList.vue";
 import CheckSumSug from "../../components/doctorCheck/CheckSumSug.vue";
 import RegisterCheckEdit from "../../components/doctorCheck/RegisterCheckEdit.vue";
+import PacsDcmPreview from "../../components/doctorCheck/PacsDcmPreview.vue";
 import FollowCriticalCheck from "../../components/follow/FollowCriticalCheck.vue";
+
 import moment from 'moment';
 import Follow from "@/components/follow/follow.vue";
 
+
 export default {
   components: {
     RegisterCheckList,
@@ -98,6 +108,7 @@ export default {
     CheckItemList,
     CheckSumSug,
     RegisterCheckEdit,
+    PacsDcmPreview,
     FollowCriticalCheck,
   },
   data() {
@@ -666,7 +677,7 @@ export default {
                   this.doctorCheck.RegisterCheckId = this.doctorCheck.RegisterCheckList[lfind].id
                   this.doctorCheck.asbitemName = this.doctorCheck.RegisterCheckList[lfind].asbitemName
                   this.doctorCheck.checkRequestNo = this.doctorCheck.RegisterCheckList[lfind].checkRequestNo
-
+                  this.doctorCheck.checkTypeFlag = this.doctorCheck.RegisterCheckList[lfind].checkTypeFlag
                   this.dataTransOpts.tableS.register_check.id = this.doctorCheck.RegisterCheckList[lfind].id
 
                   this.dataTransOpts.refresh.register_check.S++