diff --git a/src/api/trials.js b/src/api/trials.js index a49ed798..52d32c26 100644 --- a/src/api/trials.js +++ b/src/api/trials.js @@ -4522,4 +4522,24 @@ export function addOrUpdateCommonUploadRecord(data) { method: 'post', data, }) -} \ No newline at end of file +} + +export function getInspectionById(data) { + return request({ + url: `/Inspection/getInspectionById`, + method: 'post', + data, + }) +} + +export function setJsonDetail(data) { + return request({ + url: `/Inspection/setJsonDetail`, + method: 'post', + data, + }) +} + + + + diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue index 8187cc0f..60089e3c 100644 --- a/src/components/uploadDicomAndNonedicom/dicomFile.vue +++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue @@ -1256,53 +1256,55 @@ export default { dicomInfo.uploadFileSize += o.file.size Record.Existed.push(name) Record.FileCount++ - } else if (o.myPath) { - instanceList.push({ - studyInstanceUid: dicomInfo.studyUid, - seriesInstanceUid: v.seriesUid, - SOPClassUID: o.SOPClassUID, - TransferSytaxUID: o.TransferSytaxUID, - MediaStorageSOPInstanceUID: - o.MediaStorageSOPInstanceUID, - MediaStorageSOPClassUID: - o.MediaStorageSOPClassUID, - sopInstanceUid: o.instanceUid, - instanceNumber: o.instanceNumber, - instanceTime: o.instanceTime, - imageRows: o.imageRows, - imageColumns: o.imageColumns, - sliceLocation: o.sliceLocation, - sliceThickness: o.sliceThickness, - numberOfFrames: o.numberOfFrames, - pixelSpacing: o.pixelSpacing, - imagerPixelSpacing: o.imagerPixelSpacing, - frameOfReferenceUID: o.frameOfReferenceUID, - windowCenter: o.windowCenter, - windowWidth: o.windowWidth, - path: o.myPath, - FileSize: o.FileSize, + } + // else if (o.myPath) { + // instanceList.push({ + // studyInstanceUid: dicomInfo.studyUid, + // seriesInstanceUid: v.seriesUid, + // SOPClassUID: o.SOPClassUID, + // TransferSytaxUID: o.TransferSytaxUID, + // MediaStorageSOPInstanceUID: + // o.MediaStorageSOPInstanceUID, + // MediaStorageSOPClassUID: + // o.MediaStorageSOPClassUID, + // sopInstanceUid: o.instanceUid, + // instanceNumber: o.instanceNumber, + // instanceTime: o.instanceTime, + // imageRows: o.imageRows, + // imageColumns: o.imageColumns, + // sliceLocation: o.sliceLocation, + // sliceThickness: o.sliceThickness, + // numberOfFrames: o.numberOfFrames, + // pixelSpacing: o.pixelSpacing, + // imagerPixelSpacing: o.imagerPixelSpacing, + // frameOfReferenceUID: o.frameOfReferenceUID, + // windowCenter: o.windowCenter, + // windowWidth: o.windowWidth, + // path: o.myPath, + // FileSize: o.FileSize, - PhotometricInterpretation: - o.PhotometricInterpretation, - BitsAllocated: o.BitsAllocated, - PixelRepresentation: o.PixelRepresentation, - RescaleIntercept: o.RescaleIntercept, - RescaleSlope: o.RescaleSlope, - ImagePositionPatient: o.ImagePositionPatient, - ImageOrientationPatient: - o.ImageOrientationPatient, - SequenceOfUltrasoundRegions: - o.SequenceOfUltrasoundRegions, - FrameTime: o.FrameTime, - CorrectedImage: o.CorrectedImage, - Units: o.Units, - DecayCorrection: o.DecayCorrection, - EncapsulatedDocument: o.EncapsulatedDocument, - }) - Record.Uploaded.push(name) - dicomInfo.failedFileCount++ - Record.FileCount++ - } else { + // PhotometricInterpretation: + // o.PhotometricInterpretation, + // BitsAllocated: o.BitsAllocated, + // PixelRepresentation: o.PixelRepresentation, + // RescaleIntercept: o.RescaleIntercept, + // RescaleSlope: o.RescaleSlope, + // ImagePositionPatient: o.ImagePositionPatient, + // ImageOrientationPatient: + // o.ImageOrientationPatient, + // SequenceOfUltrasoundRegions: + // o.SequenceOfUltrasoundRegions, + // FrameTime: o.FrameTime, + // CorrectedImage: o.CorrectedImage, + // Units: o.Units, + // DecayCorrection: o.DecayCorrection, + // EncapsulatedDocument: o.EncapsulatedDocument, + // }) + // Record.Uploaded.push(name) + // dicomInfo.failedFileCount++ + // Record.FileCount++ + // } + else { let path = `/${params.trialId}/Image/${params.subjectId }/${params.subjectVisitId}/${dicomInfo.visitTaskId }/${scope.getGuid( diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue index dd926ddd..a1334bb0 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue @@ -309,9 +309,10 @@
{{ $t('trials:reading:button:reset') }}
-
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue index 1affeed4..e45451f3 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue @@ -128,7 +128,7 @@ export default { immediate: true, handler(val) { if (val) { - this.readingTaskState = val + this.readingTaskState = 1 } } } @@ -169,7 +169,7 @@ export default { if (i > -1) { this.visitTaskId = this.visitTaskList[i].VisitTaskId this.taskBlindName = this.visitTaskList[i].TaskBlindName - this.readingTaskState = this.visitTaskList[i].ReadingTaskState + this.readingTaskState = 1 console.log(this.visitTaskList[i].IsInit) if (!this.visitTaskList[i].IsInit) { var loading = this.$loading({ fullscreen: true }) @@ -306,9 +306,9 @@ export default { } this.signVisible = false // 设置当前任务阅片状态为已读 - this.readingTaskState = 2 - store.dispatch('reading/setVisitTaskReadingTaskState', { visitTaskId: this.visitTaskId, readingTaskState: 2 }) - DicomEvent.$emit('setReadingState', 2) + this.readingTaskState = 1 + store.dispatch('reading/setVisitTaskReadingTaskState', { visitTaskId: this.visitTaskId, readingTaskState: 1 }) + DicomEvent.$emit('setReadingState', 1) window.opener.postMessage('refreshTaskList', window.location) this.$confirm(this.$t('trials:oncologyReview:title:msg2'), { type: 'warning', diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue index 61fac838..fe0b1bf7 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue @@ -1,6 +1,6 @@ @@ -630,11 +647,12 @@ import { getTrialSiteSelect, getTrialVisitStageSelect, - getTrialCriterionList + getTrialCriterionList, } from '@/api/trials' import { getInspectionList, getInspectionJsonDataList } from '@/api/trials/inspection' import { getFrontAuditConfigList, getAuditConfigChildList, getModuleTypeDescriptionList, setInspectionEnumValue, getModuleTypeList } from '@/api/dictionary/checkConfig' import Pagination from '@/components/Pagination' +import JsonEditor from './components/JsonEditor' import BaseContainer from '@/components/BaseContainer' import BaseModel from '@/components/BaseModel' import { getToken } from '@/utils/auth' @@ -670,7 +688,7 @@ const searchDataDefault = () => { } } export default { - components: { BaseContainer, Pagination, BaseModel }, + components: { BaseContainer, Pagination, JsonEditor, BaseModel }, dicts: ['OptType', 'ModuleType', 'ChildrenType'], data() { @@ -708,7 +726,10 @@ export default { imagesList: [], moduleTypeList: [], list2_total: 0, - list2_searchData: {} + list2_searchData: {}, + editDialogVisible: false, + jsonData: null, + editRow: null } }, mounted() { @@ -1346,7 +1367,12 @@ export default { }).catch(() => { this.loading = false }) - } + }, + edit(row) { + this.editRow = Object.assign({}, row) + this.editDialogVisible = true + + }, } } 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 ea97a047..e765c321 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 @@ -1577,53 +1577,55 @@ export default { dicomInfo.uploadFileSize += o.file.size Record.Existed.push(name) Record.FileCount++ - } else if (o.myPath) { - instanceList.push({ - studyInstanceUid: dicomInfo.studyUid, - seriesInstanceUid: v.seriesUid, - SOPClassUID: o.SOPClassUID, - TransferSytaxUID: o.TransferSytaxUID, - MediaStorageSOPInstanceUID: - o.MediaStorageSOPInstanceUID, - MediaStorageSOPClassUID: - o.MediaStorageSOPClassUID, - sopInstanceUid: o.instanceUid, - instanceNumber: o.instanceNumber, - instanceTime: o.instanceTime, - imageRows: o.imageRows, - imageColumns: o.imageColumns, - sliceLocation: o.sliceLocation, - sliceThickness: o.sliceThickness, - numberOfFrames: o.numberOfFrames, - pixelSpacing: o.pixelSpacing, - imagerPixelSpacing: o.imagerPixelSpacing, - frameOfReferenceUID: o.frameOfReferenceUID, - windowCenter: o.windowCenter, - windowWidth: o.windowWidth, - path: o.myPath, - FileSize: o.FileSize, + } + // else if (o.myPath) { + // instanceList.push({ + // studyInstanceUid: dicomInfo.studyUid, + // seriesInstanceUid: v.seriesUid, + // SOPClassUID: o.SOPClassUID, + // TransferSytaxUID: o.TransferSytaxUID, + // MediaStorageSOPInstanceUID: + // o.MediaStorageSOPInstanceUID, + // MediaStorageSOPClassUID: + // o.MediaStorageSOPClassUID, + // sopInstanceUid: o.instanceUid, + // instanceNumber: o.instanceNumber, + // instanceTime: o.instanceTime, + // imageRows: o.imageRows, + // imageColumns: o.imageColumns, + // sliceLocation: o.sliceLocation, + // sliceThickness: o.sliceThickness, + // numberOfFrames: o.numberOfFrames, + // pixelSpacing: o.pixelSpacing, + // imagerPixelSpacing: o.imagerPixelSpacing, + // frameOfReferenceUID: o.frameOfReferenceUID, + // windowCenter: o.windowCenter, + // windowWidth: o.windowWidth, + // path: o.myPath, + // FileSize: o.FileSize, - PhotometricInterpretation: - o.PhotometricInterpretation, - BitsAllocated: o.BitsAllocated, - PixelRepresentation: o.PixelRepresentation, - RescaleIntercept: o.RescaleIntercept, - RescaleSlope: o.RescaleSlope, - ImagePositionPatient: o.ImagePositionPatient, - ImageOrientationPatient: - o.ImageOrientationPatient, - SequenceOfUltrasoundRegions: - o.SequenceOfUltrasoundRegions, - FrameTime: o.FrameTime, - CorrectedImage: o.CorrectedImage, - Units: o.Units, - DecayCorrection: o.DecayCorrection, - EncapsulatedDocument: o.EncapsulatedDocument, - }) - Record.Uploaded.push(name) - dicomInfo.failedFileCount++ - Record.FileCount++ - } else { + // PhotometricInterpretation: + // o.PhotometricInterpretation, + // BitsAllocated: o.BitsAllocated, + // PixelRepresentation: o.PixelRepresentation, + // RescaleIntercept: o.RescaleIntercept, + // RescaleSlope: o.RescaleSlope, + // ImagePositionPatient: o.ImagePositionPatient, + // ImageOrientationPatient: + // o.ImageOrientationPatient, + // SequenceOfUltrasoundRegions: + // o.SequenceOfUltrasoundRegions, + // FrameTime: o.FrameTime, + // CorrectedImage: o.CorrectedImage, + // Units: o.Units, + // DecayCorrection: o.DecayCorrection, + // EncapsulatedDocument: o.EncapsulatedDocument, + // }) + // Record.Uploaded.push(name) + // dicomInfo.failedFileCount++ + // Record.FileCount++ + // } + else { let path = `/${params.trialId}/Image/${params.subjectId }/${params.subjectVisitId}/${dicomInfo.studyUid }/${scope.getGuid( diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue index f4d9edb1..92ec4682 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/index.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue @@ -300,19 +300,7 @@ - +