diff --git a/src/api/reading.js b/src/api/reading.js index 28c2feb0..4bc72f32 100644 --- a/src/api/reading.js +++ b/src/api/reading.js @@ -200,4 +200,4 @@ export function getTaskUploadedDicomStudyList(param) { method: 'post', data: param }) -} \ No newline at end of file +} diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue index 244d8bbc..fc12f20b 100644 --- a/src/views/dicom-show/dicom-visit.vue +++ b/src/views/dicom-show/dicom-visit.vue @@ -6,7 +6,7 @@
-
+
{{ visitInfo }}
@@ -261,6 +261,7 @@ import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader' import dicomViewer from '@/components/Dicom/DicomViewer' import { getVisitStudyList, getAllRelationStudyList, getSeriesList } from '@/api/reading' import { setSeriesStatus } from '@/api/trials' +import { getTaskUploadedDicomStudyList } from '@/api/reading' import requestPoolManager from '@/utils/request-pool' import store from '@/store' import { changeURLStatic } from '@/utils/history.js' @@ -301,7 +302,8 @@ export default { relationActiveName: [], showSeriesList: [], currentLoadIns: [], - isFromCRCUpload: false + isFromCRCUpload: false, + visitTaskId: null } }, mounted() { @@ -318,6 +320,7 @@ export default { this.isReading = this.$router.currentRoute.query.isReading ? this.$router.currentRoute.query.isReading * 1 : 0 this.showDelete = parseInt(this.$router.currentRoute.query.showDelete) this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload + this.visitTaskId = this.$router.currentRoute.query.visitTaskId // cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded) this.getStudiesInfo() cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress) @@ -338,7 +341,12 @@ export default { async getStudiesInfo() { this.studyList = [] try { - const res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading) + let res = null + if (this.visitTaskId) { + res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId }) + } else { + res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading) + } if (res.IsSuccess) { res.Result.forEach((study, studyIndex) => { const data = {} diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionForm.vue index 530643a6..7936bf69 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionForm.vue @@ -328,6 +328,7 @@ export default { }, limitBlur(qId, valueType) { const value = this.questionForm[qId] + if (isNaN(parseInt(value))) return if (valueType === 0) { this.$set(this.questionForm, qId, parseInt(value)) } else if (valueType === 3) { diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue index b05fb7e2..e68bbab6 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue @@ -549,6 +549,7 @@ export default { }, limitBlur(qId, valueType) { const value = this.questionForm[qId] + if (isNaN(parseInt(value))) return if (valueType === 0) { this.$set(this.questionForm, qId, parseInt(value)) } else if (valueType === 3) { @@ -557,7 +558,7 @@ export default { this.$set(this.questionForm, qId, parseFloat(value).toFixed(this.digitPlaces)) } }, - numberToFixed(v, unit){ + numberToFixed(v, unit) { return isNaN(parseFloat(v)) ? null : `${parseFloat(v).toFixed(this.digitPlaces)}${unit}` }, async handleSave(index) { diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionForm.vue index 62eea096..bb1caa41 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionForm.vue @@ -349,6 +349,7 @@ export default { }, limitBlur(qId, valueType) { const value = this.questionForm[qId] + if (isNaN(parseInt(value))) return if (valueType === 0) { this.$set(this.questionForm, qId, parseInt(value)) } else if (valueType === 3) { diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue index 06caf8a6..423ccdfd 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue @@ -182,7 +182,7 @@