From b786c5e656468e3c224c80f407f2ec6fe72db9ae Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Mon, 22 Jul 2024 14:42:33 +0800
Subject: [PATCH] =?UTF-8?q?pacs=E7=9B=B4=E8=BF=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../image-inspect/components/view-study.vue   |  2 +-
 .../trial-summary/image-inspect/index.vue     |  4 +--
 .../trial-summary/push-record/index.vue       | 25 ++++++++++---------
 .../components/uploadDicomFiles2.vue          |  4 +++
 .../crc-upload/components/uploadDiocmPacs.vue | 15 +++++------
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/image-inspect/components/view-study.vue b/src/views/trials/trials-panel/trial-summary/image-inspect/components/view-study.vue
index 27f4532c..40fa342e 100644
--- a/src/views/trials/trials-panel/trial-summary/image-inspect/components/view-study.vue
+++ b/src/views/trials/trials-panel/trial-summary/image-inspect/components/view-study.vue
@@ -234,7 +234,7 @@ export default {
         let res = await getPatientStudyList(data);
         this.loading = false;
         if (res.IsSuccess) {
-          this.list = res.Result;
+          this.list = res.Result.CurrentPageData;
         }
       } catch (err) {
         this.loading = false;
diff --git a/src/views/trials/trials-panel/trial-summary/image-inspect/index.vue b/src/views/trials/trials-panel/trial-summary/image-inspect/index.vue
index a8acfdd1..546770a7 100644
--- a/src/views/trials/trials-panel/trial-summary/image-inspect/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/image-inspect/index.vue
@@ -155,7 +155,7 @@
           show-overflow-tooltip
           sortable="custom"
           ><template slot-scope="scope">
-            {{ scope.row.CallingAEList.join(", ") }}
+            {{ scope.row.CalledAEList.join(", ") }}
           </template>
         </el-table-column>
         <!--发送端AE-->
@@ -198,7 +198,7 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ scope.row.trialSiteCode }},{{ scope.row.trialSiteName }}
+            {{ scope.row.TrialSiteCode }},{{ scope.row.TrialSiteAliasName }}
           </template>
         </el-table-column>
         <!--受试者ID-->
diff --git a/src/views/trials/trials-panel/trial-summary/push-record/index.vue b/src/views/trials/trials-panel/trial-summary/push-record/index.vue
index cc1f5bba..31338ef7 100644
--- a/src/views/trials/trials-panel/trial-summary/push-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/push-record/index.vue
@@ -108,15 +108,11 @@
         <!--发送端AE-->
         <el-table-column
           :label="$t('trials:pushRecord:table:callingAEList')"
-          prop="CallingAEList"
+          prop="CallingAE"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
-        >
-          <template slot-scope="scope">
-            {{ scope.row.CallingAEList.join(", ") }}
-          </template>
-        </el-table-column>
+        />
         <!--发送端IP-->
         <el-table-column
           :label="$t('trials:pushRecord:table:callingAEIP')"
@@ -128,14 +124,11 @@
         <!--接收端AE-->
         <el-table-column
           :label="$t('trials:pushRecord:table:calledAEList')"
-          prop="CalledAEList"
+          prop="CalledAE"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
-          ><template slot-scope="scope">
-            {{ scope.row.CallingAEList.join(", ") }}
-          </template>
-        </el-table-column>
+        />
 
         <!--检查数-->
         <el-table-column
@@ -160,7 +153,15 @@
           min-width="160"
           show-overflow-tooltip
           sortable="custom"
-        />
+        >
+          <template slot-scope="scope">
+            <span>{{
+              scope.row.FileSize && scope.row.FileSize > 0
+                ? `${(scope.row.FileSize / 1024 / 1024).toFixed(2)}MB`
+                : 0
+            }}</span>
+          </template>
+        </el-table-column>
         <!--推送开始时间-->
         <el-table-column
           :label="$t('trials:pushRecord:table:startTime')"
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 04336c95..20b17fd3 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -575,6 +575,7 @@
       >
         <uploadDicomPacs
           v-if="uploadActiveName === 'pacs'"
+          ref="dicomPacs"
           :subjectVisitId="subjectVisitId"
           :subjectId="subjectId"
           @getList="getParentList"
@@ -1941,6 +1942,9 @@ export default {
             .then((res) => {
               if (res.IsSuccess) {
                 this.getStudyInfo();
+                if (this.uploadActiveName === "pacs") {
+                  this.$refs.dicomPacs.getList();
+                }
                 if (
                   this.$route.path !== "/trials/trials-panel/visit/crc-question"
                 ) {
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue
index fe67452f..8b39ac65 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDiocmPacs.vue
@@ -10,11 +10,13 @@
           prop="TrialSiteKeyInfo"
         >
           <el-input
-            v-model="searchData.TrialSiteKeyInfo"
+            v-model="searchData.PatientInfo"
             size="small"
             clearable
-            style="width: 150px"
-            :placeholder="$t('trials:pushRecord:placeholder:trialSiteKeyInfo')"
+            style="width: 190px"
+            :placeholder="
+              $t('trials:visit:crcUpload:uploadDicomPacs:search:placeholder')
+            "
           />
         </el-form-item>
         <!--检查技术-->
@@ -136,10 +138,8 @@
         </el-table-column>
         <!--检查申请号-->
         <el-table-column
-          :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:accNumber')
-          "
-          prop="AccNumber"
+          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:accNumber')"
+          prop="AccessionNumber"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
@@ -231,6 +231,7 @@ import Pagination from "@/components/Pagination";
 import moment from "moment";
 const searchDataDefault = () => {
   return {
+    PatientInfo: null,
     EarliestStudyTime: null,
     LatestStudyTime: null,
     Modalities: null,