From 587c37cb9cf42633bcf9c07336b9149ed7a6a793 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 12 Apr 2024 10:27:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- .env.prop | 2 +- .env.uat | 2 +- .../trials/trials-panel/hirVisit/index.vue | 71 ++++++++++++------- .../reading/reading-tracking/index.vue | 6 +- .../subject-list/components/add-subject.vue | 9 ++- 6 files changed, 59 insertions(+), 33 deletions(-) diff --git a/.env.production b/.env.production index 5d6b600..60e960b 100644 --- a/.env.production +++ b/.env.production @@ -28,7 +28,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = true VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ # 是否开启文档签署验证 true:是 false:否 -VUE_APP_WORD_FOR_PERMISSION = true +VUE_APP_WORD_FOR_PERMISSION = false diff --git a/.env.prop b/.env.prop index 79660db..dfac3e1 100644 --- a/.env.prop +++ b/.env.prop @@ -24,7 +24,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = true VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ # 是否开启文档签署验证 true:是 false:否 -VUE_APP_WORD_FOR_PERMISSION = true +VUE_APP_WORD_FOR_PERMISSION = false # dicom文件地址 VUE_APP_DICOM_PATH = 'http://123.56.94.154:7020' diff --git a/.env.uat b/.env.uat index fa9d6bb..c2d8769 100644 --- a/.env.uat +++ b/.env.uat @@ -29,7 +29,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = true VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ # 是否开启文档签署验证 true:是 false:否 -VUE_APP_WORD_FOR_PERMISSION = true +VUE_APP_WORD_FOR_PERMISSION = false # dicom文件地址 VUE_APP_DICOM_PATH = 'https://zyypacs-uat.oss-cn-shanghai.aliyuncs.com' diff --git a/src/views/trials/trials-panel/hirVisit/index.vue b/src/views/trials/trials-panel/hirVisit/index.vue index 71b0d9e..185c2ab 100644 --- a/src/views/trials/trials-panel/hirVisit/index.vue +++ b/src/views/trials/trials-panel/hirVisit/index.vue @@ -191,15 +191,16 @@ sortable="custom" > @@ -227,6 +228,7 @@ {{ $t("trials:hirVisit:button:editStudy") }} @@ -234,7 +236,10 @@ {{ $t("common:button:submit") }} @@ -243,7 +248,7 @@ type="text" v-hasPermi="['trials:trials-panel:hirVisit:remove']" @click.stop="remove(scope.row)" - :disabled="scope.row.SubmitState > 0" + :disabled="Number(scope.row.SubmitState) > 0" >{{ $t("common:button:delete") }} @@ -259,7 +264,10 @@ type="text" v-hasPermi="['trials:trials-panel:hirVisit:download']" @click.stop="downloadImage(scope.row)" - v-if="scope.row.SubmitState > 0" + :disabled=" + Number(scope.row.SubmitState) === 0 || + !scope.row.VisitLatestStudyTime + " >{{ $t("trials:reading:button:uploadImages") }} @@ -377,7 +385,9 @@ export default { let res = await getPatientSubejctVisitList(data); this.loading = false; if (res.IsSuccess) { + console.log(res.Result.CurrentPageData[0].SubmitState, "SubmitState"); this.list = res.Result.CurrentPageData; + console.log(this.list[0].SubmitState, "list"); this.total = res.Result.TotalCount; } } catch (err) { @@ -472,22 +482,29 @@ export default { const promises = []; for (let patient of item.PatientList) { if (!zipObj[patient.PatientIdStr]) { - zipObj[patient.PatientIdStr] = zip.folder(patient.PatientIdStr); - console.log(zipObj[patient.PatientIdStr]); + zipObj[patient.PatientIdStr] = zip.folder( + `${item.SubjectCode}_${patient.PatientIdStr}` + ); } 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]; - if (!zipObj[`${patient.PatientIdStr}${date}`]) { - zipObj[`${patient.PatientIdStr}${date}`] = - zipObj[patient.PatientIdStr].folder(date); - } for (let series of study.SeriesList) { - if (!zipObj[`${patient.PatientIdStr}${date}${series.Modality}`]) { - zipObj[`${patient.PatientIdStr}${date}${series.Modality}`] = - zipObj[`${patient.PatientIdStr}${date}`].folder( - series.Modality - ); + if ( + !zipObj[ + `${patient.PatientIdStr}${visit.VisitName}${series.Modality}` + ] + ) { + zipObj[ + `${patient.PatientIdStr}${visit.VisitName}${series.Modality}` + ] = zipObj[`${patient.PatientIdStr}${visit.VisitName}`].folder( + `${date}_${series.Modality}` + ); } for (let instance of series.InstancePathList) { let obj = { @@ -501,7 +518,9 @@ export default { }; const promise = this.handleBatchDown( obj, - zipObj[`${patient.PatientIdStr}${date}${series.Modality}`] + zipObj[ + `${patient.PatientIdStr}${visit.VisitName}${series.Modality}` + ] ); promises.push(promise); } @@ -530,10 +549,8 @@ export default { }, async handleBatchDown(item, zip) { return new Promise((resolve) => { - let path = `/${item.subjectCode}_${item.patientIdStr}/${item.visitName}/${item.date}_${item.modality}${item.instancePath}`; this.getFileData( - this.OSSclientConfig.basePath + path - // "https://th.bing.com/th/id/OIP.duz6S7Fvygrqd6Yj_DcXAQHaF7?rs=1&pid=ImgDetMain" + this.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/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue index 0b9e25a..1ebb5ca 100644 --- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue @@ -157,7 +157,11 @@ :label="$t('trials:readTask:table:taskState')" show-overflow-tooltip sortable="custom" - /> + > + + { this.$refs.confirmVisit.getList();