Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/hir-web into main

2024-04-22 16:57:07 +08:00 · 2024-04-22 16:57:07 +08:00 · 9130cfeb91
parent 60b9b6043c 551095fbd2
commit 9130cfeb91
9 changed files with 49 additions and 58 deletions
--- a/src/api/trials/visit.js
+++ b/src/api/trials/visit.js
@ -298,9 +298,9 @@ export function getPatientSubejctVisitList(param) {
 }

 // 下载影像
-export function getSubjectImageZipInfo(id) {
+export function getSubjectImageZipInfo(id, id2) {
  return request({
-    url: `/Patient/getSubjectImageZipInfo/${id}`,
+    url: `/Patient/getSubjectImageZipInfo/${id}/${id2}`,
    method: 'get',
  })
 }
--- a/src/utils/uploadZip.js
+++ b/src/utils/uploadZip.js
@ -5,9 +5,9 @@ import Vue from 'vue';
 import {
    getSubjectImageZipInfo,
 } from "@/api/trials/visit.js";
-export const downloadImage = async (id) => {
+export const downloadImage = async (id, id2) => {
    try {
-        let res = await getSubjectImageZipInfo(id);
+        let res = await getSubjectImageZipInfo(id, id2);
        if (res.IsSuccess) {
            let item = res.Result;
            await setfolder(item);
@ -18,52 +18,44 @@ export const downloadImage = async (id) => {
 };
 const setfolder = async (item) => {
    const zip = new JSZip(); // 创建实例对象
+    let patientIds = item.PatientList.map(i => i.PatientIdStr);
+    let zipName = `${item.SubjectCode}_${patientIds.join(',')}`;
    let zipObj = {};
    const promises = [];
-    for (let patient of item.PatientList) {
-        if (!zipObj[patient.PatientIdStr]) {
-            zipObj[patient.PatientIdStr] = zip.folder(
-                `${item.SubjectCode}_${patient.PatientIdStr}`
-            );
+    for (let visit of item.VisitList) {
+        if (!zipObj[`${visit.VisitName}`]) {
+            zipObj[`${visit.VisitName}`] = zip.folder(visit.VisitName);
        }
-        for (let visit of patient.VisitList) {
-            if (!zipObj[`${patient.PatientIdStr}${visit.VisitName}`]) {
-                zipObj[`${patient.PatientIdStr}${visit.VisitName}`] = zipObj[
-                    patient.PatientIdStr
-                ].folder(visit.VisitName);
-            }
-            for (let study of visit.StudyList) {
-                let date = study.StudyTime.split(" ")[0];
-                for (let series of study.SeriesList) {
-                    if (
-                        !zipObj[
-                        `${patient.PatientIdStr}${visit.VisitName}${series.Modality}`
-                        ]
-                    ) {
+        for (let study of visit.StudyList) {
+            let date = study.StudyTime.split(" ")[0];
+            for (let series of study.SeriesList) {
+                if (
+                    !zipObj[
+                    `${visit.VisitName}${series.Modality}`
+                    ]
+                ) {
+                    zipObj[
+                        `${visit.VisitName}${series.Modality}`
+                    ] = zipObj[`${visit.VisitName}`].folder(
+                        `${date}_${series.Modality}`
+                    );
+                }
+                for (let instance of series.InstancePathList) {
+                    let obj = {
+                        subjectCode: item.SubjectCode,
+                        visitName: visit.VisitName,
+                        date: study.StudyTime.split(" ")[0],
+                        modality: series.Modality,
+                        instancePath: instance.Path,
+                        dicomName: instance.Path.split("/Dicom/")[1],
+                    };
+                    const promise = handleBatchDown(
+                        obj,
                        zipObj[
-                            `${patient.PatientIdStr}${visit.VisitName}${series.Modality}`
-                        ] = zipObj[`${patient.PatientIdStr}${visit.VisitName}`].folder(
-                            `${date}_${series.Modality}`
-                        );
-                    }
-                    for (let instance of series.InstancePathList) {
-                        let obj = {
-                            subjectCode: item.SubjectCode,
-                            patientIdStr: patient.PatientIdStr,
-                            visitName: visit.VisitName,
-                            date: study.StudyTime.split(" ")[0],
-                            modality: series.Modality,
-                            instancePath: instance.Path,
-                            dicomName: instance.Path.split("/Dicom/")[1],
-                        };
-                        const promise = handleBatchDown(
-                            obj,
-                            zipObj[
-                            `${patient.PatientIdStr}${visit.VisitName}${series.Modality}`
-                            ]
-                        );
-                        promises.push(promise);
-                    }
+                        `${visit.VisitName}${series.Modality}`
+                        ],
+                    );
+                    promises.push(promise);
                }
            }
        }
@ -81,7 +73,7 @@ const setfolder = async (item) => {
                    },
                })
                .then((res) => {
-                    saveAs(res, item.SubjectCode + new Date().getTime() + "_CV.zip"); // 使用FileSaver.saveAs保存文件，文件名可自定义
+                    saveAs(res, zipName + ".zip"); // 使用FileSaver.saveAs保存文件，文件名可自定义
                    zipObj = null;
                });
        })
--- a/src/views/trials/trials-inspection/components/research-trials-list.vue
+++ b/src/views/trials/trials-inspection/components/research-trials-list.vue
@ -239,6 +239,7 @@ export default {
        let params = {
          PatientId: this.Patient.PatientId,
          SubjectId: item.SubjectId,
+          TrialId: item.TrialId,
        };
        this.loading = true;
        let res = await deleteSubjectPatientBinding(params);
--- a/src/views/trials/trials-inspection/index.vue
+++ b/src/views/trials/trials-inspection/index.vue
@ -139,7 +139,6 @@
          label="Called AE"
          show-overflow-tooltip
          min-width="140"
-          sortable="custom"
        >
          <template slot-scope="scope">
            <span
@ -157,7 +156,6 @@
          label="Calling AE"
          show-overflow-tooltip
          min-width="140"
-          sortable="custom"
        >
          <template slot-scope="scope">
            <span
--- a/src/views/trials/trials-list/components/TrialForm.vue
+++ b/src/views/trials/trials-list/components/TrialForm.vue
@ -147,15 +147,15 @@
      <!-- 授权时长 -->
      <el-form-item
        :label="$t('trials:trials-list:table:durationAuthorized')"
-        prop="AuthorizationYear"
+        prop="AuthorizationDuration"
      >
        <div style="position: relative">
          <el-input
-            v-model="trialForm.AuthorizationYear"
+            v-model="trialForm.AuthorizationDuration"
            type="number"
            clearable
          />
-          <span style="position: absolute; right: -20px; top: 0">年</span>
+          <span style="position: absolute; right: -20px; top: 0">月</span>
        </div>
      </el-form-item>
      <!-- 授权时间 -->
@ -249,7 +249,7 @@ export default {
        CriterionTypeList: [],
        ContactUser: "",
        ContactPhone: "",
-        AuthorizationYear: null,
+        AuthorizationDuration: null,
        AuthorizationDate: null,
      },
      indicationGrouping: null,
@ -263,7 +263,7 @@ export default {
          },
        ],
        // 授权时长
-        AuthorizationYear: [
+        AuthorizationDuration: [
          {
            required: true,
            message: this.$t(
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@ -224,7 +224,7 @@
        </el-table-column>
        <!--授权时长-->
        <el-table-column
-          prop="AuthorizationYear"
+          prop="AuthorizationDuration"
          :label="$t('trials:trials-list:table:durationAuthorized')"
          show-overflow-tooltip
          sortable="custom"
--- a/src/views/trials/trials-panel/hirVisit/index.vue
+++ b/src/views/trials/trials-panel/hirVisit/index.vue
@ -518,7 +518,7 @@ export default {
    downloadReport() {},
    // 下载影像
    async downloadImage(item) {
-      downloadImage(item.SubjectId);
+      downloadImage(item.SubjectId, item.SubjectVisitId);
    },
    // 评估报告
    showReport(item) {
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@ -378,7 +378,7 @@ export default {
    },
    // 下载报告
    downloadReport(item) {
-      downloadImage(item.SubjectId);
+      downloadImage(item.SubjectId, item.SourceSubjectVisitId);
    },
    // 阅片结果
    readResult(row) {
--- a/src/views/trials/trials-panel/trial-summary/trial-information/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/trial-information/index.vue
@ -89,7 +89,7 @@
      <el-descriptions-item
        :label="$t('trials:trials-list:table:durationAuthorized')"
      >
-        {{ trialInfo.AuthorizationYear }}年
+        {{ trialInfo.AuthorizationDuration }}年
      </el-descriptions-item>
      <!--授权日期-->
      <el-descriptions-item