From c102dbe9f2e24ecbd1b09bf719e2ca4d911ec12d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 18 Apr 2024 17:19:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/uploadZip.js                        |  3 ++-
 .../hirVisit/components/current-study.vue     | 17 +++++++++++++-
 .../hirVisit/components/studyInfo.vue         | 22 +++++++++++++++++++
 .../hirVisit/components/visit-info.vue        | 16 +++++++++-----
 .../trials/trials-panel/hirVisit/index.vue    | 10 ++++++---
 .../reading/reading-tracking/index.vue        | 13 +++++++++--
 6 files changed, 68 insertions(+), 13 deletions(-)

diff --git a/src/utils/uploadZip.js b/src/utils/uploadZip.js
index 22e54bf..5656071 100644
--- a/src/utils/uploadZip.js
+++ b/src/utils/uploadZip.js
@@ -1,6 +1,7 @@
 import JSZip from "jszip";
 import axios from "axios";
 import { saveAs } from "file-saver";
+import Vue from 'vue';
 import {
     getSubjectImageZipInfo,
 } from "@/api/trials/visit.js";
@@ -89,7 +90,7 @@ const setfolder = async (item) => {
 const handleBatchDown = async (item, zip) => {
     return new Promise((resolve) => {
         getFileData(
-            this.OSSclientConfig.basePath + item.instancePath.slice(1)
+            Vue.prototype.OSSclientConfig.basePath + item.instancePath.slice(1)
         ).then((res) => {
             const fileName = item.dicomName + ".dcm";
             zip.file(fileName, res.data, { binary: true });
diff --git a/src/views/trials/trials-panel/hirVisit/components/current-study.vue b/src/views/trials/trials-panel/hirVisit/components/current-study.vue
index 765f90b..b323bee 100644
--- a/src/views/trials/trials-panel/hirVisit/components/current-study.vue
+++ b/src/views/trials/trials-panel/hirVisit/components/current-study.vue
@@ -20,6 +20,7 @@
         v-loading="loading"
         :data="list"
         stripe
+        v-adaptive="{ bottomOffset: 60 }"
         height="300"
       >
         <!-- <el-table-column type="selection" align="center" width="45" /> -->
@@ -30,6 +31,13 @@
           :label="$t('trials:uploadDicomList:table:pId')"
           show-overflow-tooltip
         ></el-table-column>
+        <!-- 患者姓名 -->
+        <el-table-column
+          prop="PatientName"
+          :label="$t('trials:uploadDicomList:table:patientName')"
+          min-width="80"
+          show-overflow-tooltip
+        />
         <!--检查类型-->
         <el-table-column
           align="center"
@@ -80,6 +88,13 @@
               circle
               @click="handleViewStudy(scope.row)"
             />
+            <!-- 诊断报告 -->
+            <el-button
+              icon="el-icon-document"
+              disabled
+              :title="$t('trials:inspection:button:diagnosticReport')"
+              circle
+            />
           </template>
         </el-table-column>
       </el-table>
@@ -144,7 +159,7 @@ export default {
       });
       var newWindow = window.open(routeData.href, "_blank");
       this.$emit("setOpenWindow", newWindow);
-    }
+    },
   },
 };
 </script>
diff --git a/src/views/trials/trials-panel/hirVisit/components/studyInfo.vue b/src/views/trials/trials-panel/hirVisit/components/studyInfo.vue
index da7dcdb..fb6c438 100644
--- a/src/views/trials/trials-panel/hirVisit/components/studyInfo.vue
+++ b/src/views/trials/trials-panel/hirVisit/components/studyInfo.vue
@@ -16,8 +16,23 @@
       v-loading="studyLoading"
       :data="studyList"
       style="width: 100%"
+      v-adaptive="{ bottomOffset: 60 }"
       height="300"
     >
+      <!-- 患者编号 -->
+      <el-table-column
+        prop="PatientIdStr"
+        :label="$t('trials:uploadDicomList:table:pId')"
+        min-width="80"
+        show-overflow-tooltip
+      />
+      <!-- 患者姓名 -->
+      <el-table-column
+        prop="PatientName"
+        :label="$t('trials:uploadDicomList:table:patientName')"
+        min-width="80"
+        show-overflow-tooltip
+      />
       <!-- 检查编号 -->
       <el-table-column
         prop="StudyCode"
@@ -92,6 +107,13 @@
             circle
             @click="handleViewStudy(scope.row)"
           />
+          <!-- 诊断报告 -->
+          <el-button
+            icon="el-icon-document"
+            disabled
+            :title="$t('trials:inspection:button:diagnosticReport')"
+            circle
+          />
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/trials/trials-panel/hirVisit/components/visit-info.vue b/src/views/trials/trials-panel/hirVisit/components/visit-info.vue
index d48794f..089647e 100644
--- a/src/views/trials/trials-panel/hirVisit/components/visit-info.vue
+++ b/src/views/trials/trials-panel/hirVisit/components/visit-info.vue
@@ -18,9 +18,11 @@
       </el-breadcrumb>
     </span>
     <div class="base-modal-body">
-      <!-- DICOM影像  -->
-      <h4 class="box-title">{{ $t("trials:crcUpload:label:dicom") }}</h4>
-      <el-card class="box-card">
+      <!-- 已提交DICOM影像  -->
+      <h4 class="box-title" v-if="rowData.SubmitState === 2">
+        {{ $t("trials:trials-panel:hirVisit:label:subDicom") }}
+      </h4>
+      <el-card class="box-card" v-if="rowData.SubmitState === 2">
         <StudyInfo
           v-if="rowData.SubjectId"
           :data="rowData"
@@ -28,9 +30,11 @@
           @setOpenWindow="setOpenWindow"
         />
       </el-card>
-      <!-- 检查列表  -->
-      <h4 class="box-title">{{ $t("trials:dicom-show:nowStudy") }}</h4>
-      <el-card class="box-card">
+      <!-- 未提交DICOM影像  -->
+      <h4 class="box-title" v-if="rowData.SubmitState < 2">
+        {{ $t("trials:trials-panel:hirVisit:label:notSubDicom") }}
+      </h4>
+      <el-card class="box-card" v-if="rowData.SubmitState < 2">
         <currentStudy
           v-if="rowData.SubjectId"
           :data="rowData"
diff --git a/src/views/trials/trials-panel/hirVisit/index.vue b/src/views/trials/trials-panel/hirVisit/index.vue
index 4cdc508..f5a67a4 100644
--- a/src/views/trials/trials-panel/hirVisit/index.vue
+++ b/src/views/trials/trials-panel/hirVisit/index.vue
@@ -275,14 +275,18 @@
                   v-hasPermi="['trials:trials-panel:hirVisit:result']"
                   disabled
                   command="result"
-                  >{{ $t("trials:adReview:title:result") }}</el-dropdown-item
+                  >{{
+                    $t("trials:trials-panel:hirVisit:ImageData")
+                  }}</el-dropdown-item
                 >
                 <!--评估报告-->
                 <el-dropdown-item
                   v-hasPermi="['trials:trials-panel:hirVisit:result']"
                   disabled
                   command="result"
-                  >{{ $t("trials:adReview:title:result") }}</el-dropdown-item
+                  >{{
+                    $t("trials:trials-panel:hirVisit:EvaluationReport")
+                  }}</el-dropdown-item
                 >
                 <!--数据导出-->
                 <el-dropdown-item
@@ -499,7 +503,7 @@ export default {
     downloadReport() {},
     // 下载影像
     async downloadImage(item) {
-      downloadImage(item.subjectId);
+      downloadImage(item.SubjectId);
     },
   },
 };
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index 8219740..ac05ef8 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -198,6 +198,13 @@
             >
           </template>
         </el-table-column>
+        <!-- 阅片完成时间 -->
+        <el-table-column
+          prop="SignTime"
+          :label="$t('trials:reviewTrack:table:signTime')"
+          show-overflow-tooltip
+          sortable="custom"
+        />
         <!-- 阅片标准 -->
         <el-table-column
           prop="TrialReadingCriterionName"
@@ -233,7 +240,6 @@
               icon="el-icon-download"
               :title="$t('trials:reading:button:download')"
               @click="downloadReport(scope.row)"
-              disabled
             />
           </template>
         </el-table-column>
@@ -256,6 +262,7 @@ import Pagination from "@/components/Pagination";
 import { getPatientVisitTaskList } from "@/api/readManagenent.js";
 import { getToken } from "@/utils/auth";
 import { getSystemConfirmedCreiterionList } from "@/api/trials";
+import { downloadImage } from "@/utils/uploadZip.js";
 const defaultSearchData = () => {
   return {
     SubjectCode: null,
@@ -370,7 +377,9 @@ export default {
       }
     },
     // 下载报告
-    downloadReport() {},
+    downloadReport(item) {
+      downloadImage(item.SubjectId);
+    },
     // 阅片结果
     readResult(row) {
       if (this.openWindow) {