+
+
{{ $t('feedBack:button:cancel') }}
-
+
{{ $t('feedBack:button:save') }}
@@ -190,6 +133,7 @@ export default {
SubjectVisitId: null,
ScreenshotList: [],
ScreenshotListStr: null,
+ Reason: null
},
rules: {
QuestionType: [
@@ -307,6 +251,7 @@ export default {
// 修改状态
async changeState() {
if (this.isImgfail) return
+ if (this.form.State !== 1 && this.form.State !== 0) return false
try {
let data = {
IdList: [this.Id],
@@ -381,6 +326,10 @@ export default {
}
+
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index eea7bdf4..92e832e6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -1081,7 +1081,8 @@ export default {
// resolve()
// })
this.loading = true
- cornerstone.metaData.addProvider(metaDataProvider, 1);
+ cornerstone.metaData.removeProvider(metaDataProvider)
+ cornerstone.metaData.addProvider(metaDataProvider, 100000)
cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
.then(async image => {
if (this.stack.imageIds.indexOf(image.imageId) !== -1) {
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 1f635265..f2a1801d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -411,7 +411,7 @@
-
+
@@ -924,7 +924,7 @@ export default {
async getHotKeys() {
// const loading = this.$loading({ fullscreen: true })
try {
- let res = await getDoctorShortcutKey({ imageToolType: 0 })
+ let res = await getDoctorShortcutKey({ imageToolType: 1 })
res.Result.map((item) => {
this.hotKeyList.push({
id: item.Id,
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
index e935303b..1edb30f7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
@@ -835,7 +835,7 @@ export default {
store.dispatch('reading/setVisitTaskReadingTaskState', { visitTaskId: this.visitTaskId, readingTaskState: 2 })
DicomEvent.$emit('setReadingState', 2)
window.opener.postMessage('refreshTaskList', window.location)
- const res = await getAutoCutNextTask()
+ const res = await getAutoCutNextTask({imageToolType: 1})
let isAutoTask = res.Result.AutoCutNextTask
if (isAutoTask) {
window.location.reload()
@@ -875,7 +875,7 @@ export default {
var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
const routeData = this.$router.resolve({ path })
- const res = await getAutoCutNextTask()
+ const res = await getAutoCutNextTask({imageToolType: 1})
let IsDoubleScreen = false
if (res.IsSuccess) {
IsDoubleScreen = res.Result.IsDoubleScreen
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/Hotkeys.vue b/src/views/trials/trials-panel/reading/dicoms/customize/Hotkeys.vue
index 6b98939a..839805a9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/Hotkeys.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/Hotkeys.vue
@@ -61,7 +61,7 @@ export default {
this.loading = true
this.hotKeyList = []
try{
- let res = await getDoctorShortcutKey({ imageToolType: this.readingTool })
+ let res = await getDoctorShortcutKey({ imageToolType: this.readingTool === 1 ? 2 : 1 })
res.Result.map(item => {
this.hotKeyList.push({ id: item.Id, keys: { controlKey: { altKey: item.AltKey, ctrlKey: item.CtrlKey, shiftKey: item.ShiftKey, metaKey: item.MetaKey, key: item.Keyboardkey, code: item.Code }, text: item.Text }, label: item.ShortcutKeyEnum })
})
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/Others.vue b/src/views/trials/trials-panel/reading/dicoms/customize/Others.vue
index 36e408e9..c84f4fe4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/Others.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/Others.vue
@@ -23,6 +23,12 @@
import { setAutoCutNextTask, getAutoCutNextTask } from '@/api/user'
export default {
name: 'Others',
+ props: {
+ imageToolType: {
+ type: Number,
+ default: 1
+ }
+ },
data() {
return {
form: {
@@ -38,7 +44,7 @@ export default {
async initForm() {
this.loading = true
try{
- await getAutoCutNextTask()
+ await getAutoCutNextTask({imageToolType: this.imageToolType})
this.form.AutoCutNextTask = res.Result.AutoCutNextTask
this.loading = false
}catch(e){
@@ -50,7 +56,8 @@ export default {
if (!valid) return
this.loading = true
try{
- await setAutoCutNextTask(this.form)
+ let params = Object.assign(this.form, {imageToolType: this.imageToolType})
+ await setAutoCutNextTask(params)
this.loading = false
this.$message.success(this.$t('common:message:savedSuccessfully'))
}catch(e){
diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue
index fafb30d9..eeaed460 100644
--- a/src/views/trials/trials-panel/reading/dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/index.vue
@@ -52,21 +52,21 @@
+ :is-reading-show-previous-results="isReadingShowPreviousResults" :is-exists-clinical-data="isExistsClinicalData"
+ :imageToolType="1" />
+ :is-reading-show-previous-results="isReadingShowPreviousResults" :is-exists-clinical-data="isExistsClinicalData"
+ :imageToolType="1" />
+ :is-reading-show-previous-results="isReadingShowPreviousResults" :is-exists-clinical-data="isExistsClinicalData"
+ :imageToolType="1" />
@@ -285,6 +285,13 @@ export default {
store.dispatch('reading/resetVisitTasks')
this.getTaskInfo()
window.addEventListener('beforeunload', this.handleWindowClose)
+ window.addEventListener('storage', (event) => {
+ if (event.key === 'closePage') {
+ if (this.$router.currentRoute.query.pageType && this.$router.currentRoute.query.pageType === 'History') {
+ window.close()
+ }
+ }
+ });
},
beforeDestroy() {
DicomEvent.$off('getNextTask')
diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/RectangleRoi/Note_RectangleRoiTool.js b/src/views/trials/trials-panel/reading/dicoms/tools/RectangleRoi/Note_RectangleRoiTool.js
new file mode 100644
index 00000000..da5b7532
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/RectangleRoi/Note_RectangleRoiTool.js
@@ -0,0 +1,97 @@
+// Note_RectangleRoiTool.js
+import * as cornerstoneTools from 'cornerstone-tools';
+
+export default class Note_RectangleRoiTool extends cornerstoneTools.RectangleRoiTool {
+ constructor(props = {}) {
+ const defaultProps = {
+ name: 'Note_RectangleRoi',
+ configuration: {
+ fillColor: 'rgba(255, 255, 0, 0.3)', // 默认填充颜色：半透明黄色
+ strokeColor: 'yellow', // 边框颜色
+ lineWidth: 2, // 边框宽度
+ drawHandles: true, // 是否绘制控制点
+ handleColor: 'white', // 控制点颜色
+ }
+ };
+ super({ ...defaultProps, ...props });
+ }
+
+ renderToolData(evt) {
+ const eventData = evt.detail;
+ const { element } = eventData;
+
+ // 获取工具状态
+ const toolData = cornerstoneTools.getToolState(element, this.name);
+
+ if (!toolData || !toolData.data || !toolData.data.length) {
+ return;
+ }
+
+ const canvas = eventData.canvasContext.canvas;
+ const context = canvas.getContext('2d');
+
+ context.save();
+
+ // 获取配置
+ const fillColor = this.configuration.fillColor || 'rgba(255, 255, 0, 0.3)';
+ const strokeColor = this.configuration.strokeColor || 'yellow';
+ const lineWidth = this.configuration.lineWidth || 2;
+ const drawHandles = this.configuration.drawHandles !== false;
+
+ // 遍历所有矩形标注
+ toolData.data.forEach((measurement) => {
+ if (!measurement.handles?.start || !measurement.handles?.end) {
+ return;
+ }
+
+ const start = measurement.handles.start;
+ const end = measurement.handles.end;
+
+ // 计算矩形坐标和尺寸
+ const x = Math.min(start.x, end.x);
+ const y = Math.min(start.y, end.y);
+ const width = Math.abs(end.x - start.x);
+ const height = Math.abs(end.y - start.y);
+
+ // 1. 绘制填充
+ if (fillColor) {
+ context.fillStyle = fillColor;
+ context.fillRect(x, y, width, height);
+ }
+
+ // 2. 绘制边框
+ context.strokeStyle = strokeColor;
+ context.lineWidth = lineWidth;
+ context.strokeRect(x, y, width, height);
+
+ // 3. 绘制控制点（可选）
+ if (drawHandles) {
+ this.drawHandles(context, measurement, eventData);
+ }
+ });
+
+ context.restore();
+ }
+
+ /**
+ * 绘制控制点
+ */
+ drawHandles(context, measurement, eventData) {
+ const handles = measurement.handles;
+ const handleColor = this.configuration.handleColor || 'white';
+
+ // 绘制所有控制点
+ Object.keys(handles).forEach(key => {
+ const handle = handles[key];
+ if (handle && typeof handle.x === 'number' && typeof handle.y === 'number') {
+ context.beginPath();
+ context.arc(handle.x, handle.y, 5, 0, 2 * Math.PI);
+ context.fillStyle = handleColor;
+ context.fill();
+ context.strokeStyle = 'black';
+ context.lineWidth = 1;
+ context.stroke();
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/MPRViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/MPRViewport.vue
index 370deaac..011693cf 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/MPRViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/MPRViewport.vue
@@ -185,7 +185,8 @@ export default {
rotateAngle: 0,
rotateBarLeft: 0,
loading: false,
- toggleClipPlayTimer: null
+ toggleClipPlayTimer: null,
+ isFlip: false
}
},
mounted() {
@@ -363,7 +364,11 @@ export default {
return 'unknown';
},
+ setFilp(f = false) {
+ this.isFlip = f
+ },
stackNewImage(e) {
+ if (this.isFlip) return this.isFlip = false
const { detail } = e
this.series.SliceIndex = detail.imageIndex
this.sliderInfo.height = detail.imageIndex * 100 / detail.numberOfSlices
@@ -512,7 +517,7 @@ export default {
const renderingEngine = getRenderingEngine(this.renderingEngineId)
const viewport = renderingEngine.getViewport(this.viewportId)
const currentImageIdIndex = viewport.getCurrentImageIdIndex()
- const numImages = viewport.getImageIds().length
+ const numImages = this.imageInfo.total
let newImageIdIndex = null
if (type === 0) {
newImageIdIndex = 0
@@ -628,6 +633,7 @@ export default {
let volume = cache.getVolume(this.volumeId)
// console.log(volume, 'volume')
if (this.series.orientation === 'AXIAL' && this.series.curIndex) return this.setFullScreen(this.series.curIndex)
+ console.log(this.series.orientation, this.series.curIndex)
let index = this.series.orientation === 'AXIAL' ? Math.ceil((volume._imageIds.length - 1) / 2) - 1 : Math.ceil((volume.dimensions[0]) / 2) - 1
this.setFullScreen(index)
} catch (e) {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
index 1395e562..2ea372c7 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
@@ -211,21 +211,23 @@ export default {
this.mousePosition.index = []
this.mousePosition.value = null
})
- document.addEventListener('mouseup', () => {
- this.sliderMouseup()
- if (this.isMip) {
- this.rotateBarMouseup()
- }
- })
- document.addEventListener('mousemove', (e) => {
- this.sliderMousemove(e)
- if (this.isMip) {
- this.rotateBarMousemove(e)
- }
- })
+ document.addEventListener('mouseup', this.handleDocumentMouseUp)
+ document.addEventListener('mousemove', this.handleDocumentMouseMove)
// console.log(cornerstoneTools)
// element.addEventListener('CORNERSTONE_STACK_NEW_IMAGE', this.stackNewImage)
},
+ handleDocumentMouseUp(e) {
+ this.sliderMouseup(e)
+ if (this.isMip) {
+ this.rotateBarMouseup(e)
+ }
+ },
+ handleDocumentMouseMove(e) {
+ this.sliderMousemove(e)
+ if (this.isMip) {
+ this.rotateBarMousemove(e)
+ }
+ },
stackNewImage(e) {
const { detail } = e
if (this.series) {
@@ -670,30 +672,32 @@ export default {
this.series = { ...data }
if (this.isMip) {
let volume = cache.getVolume(this.volumeId)
- const ptVolumeDimensions = volume.dimensions;
+ const ptVolumeDimensions = volume.dimensions
const slabThickness = Math.sqrt(
ptVolumeDimensions[0] * ptVolumeDimensions[0] +
ptVolumeDimensions[1] * ptVolumeDimensions[1] +
ptVolumeDimensions[2] * ptVolumeDimensions[2]
- );
- viewport
- .setVolumes([{
- volumeId: this.volumeId,
- callback: (r) => {
- if (this.series.Modality === 'NM') {
- setMipTransferFunctionForVolumeActor({ ...r, volumeId: this.volumeId })
- } else {
- setPetTransferFunctionForVolumeActor(r)
- }
- // setPetColorMapTransferFunctionForVolumeActor(r)
- console.log("mip渲染成功")
- },
- slabThickness,
- blendMode: BlendModes.MAXIMUM_INTENSITY_BLEND,
- defaultOptions: {
- orientation: OrientationAxis.CORONAL
+ )
+
+ await viewport.setVolumes([{
+ volumeId: this.volumeId,
+ callback: (r) => {
+ if (this.series.Modality === 'NM') {
+ setMipTransferFunctionForVolumeActor({ ...r, volumeId: this.volumeId })
+ } else {
+ setPetTransferFunctionForVolumeActor(r)
}
- }])
+ console.log("mip渲染成功")
+ },
+ slabThickness,
+ blendMode: BlendModes.MAXIMUM_INTENSITY_BLEND,
+ defaultOptions: {
+ orientation: OrientationAxis.CORONAL
+ }
+ }])
+
+ // viewport.setBlendMode(BlendModes.MAXIMUM_INTENSITY_BLEND)
+ // viewport.setSlabThickness(slabThickness)
} else {
viewport
.setVolumes([{
@@ -838,7 +842,6 @@ export default {
this.sliderInfo.isMove = false
},
handletoolsMouseWheel(e) {
- if (this.activeTool === 'Crosshairs') return
const { viewportId, wheel } = e.detail
if (this.isMip) {
const container = document.getElementById('rotateBar')
@@ -862,7 +865,6 @@ export default {
this.rotateBarInfo.isMove = false
},
rotateBarMousemove(e) {
- if (this.activeTool === 'Crosshairs') return
// 滚动旋转
if (!this.rotateBarInfo.isMove) return
const container = document.getElementById('rotateBar')
@@ -874,11 +876,11 @@ export default {
if (x > containerWidth - sliderWidth) x = containerWidth - sliderWidth
const deltaX = x - this.rotateBarLeft
const angle = Math.sin((deltaX * (360 / (containerWidth - sliderWidth))) * Math.PI / 180)
+ // const angle = (deltaX / (containerWidth - sliderWidth)) * (2 * Math.PI)
this.rotate(angle)
this.rotateBarLeft = x
},
rotateBarMousedown(e) {
- if (this.activeTool === 'Crosshairs') return
this.rotateBarInfo.initLeft = e.srcElement.offsetLeft
this.rotateBarInfo.initX = e.clientX
this.rotateBarInfo.isMove = true
@@ -917,7 +919,6 @@ export default {
viewport.render()
},
clickRotate(e) {
- if (this.activeTool === 'Crosshairs') return
// console.log('clickRotate')
const container = document.getElementById('rotateBar')
const containerWidth = container.offsetWidth
@@ -926,6 +927,7 @@ export default {
const x = Math.trunc(e.offsetX)
const deltaX = x - this.rotateBarLeft
const angle = Math.sin((deltaX * (360 / (containerWidth - sliderWidth))) * Math.PI / 180)
+ // const angle = (deltaX / (containerWidth - sliderWidth)) * (2 * Math.PI)
this.rotate(angle)
this.rotateBarLeft = x
},
@@ -936,6 +938,8 @@ export default {
},
},
beforeDestroy() {
+ document.removeEventListener('mouseup', this.handleDocumentMouseUp)
+ document.removeEventListener('mousemove', this.handleDocumentMouseMove)
this.series = null
this.topFusionVolumeActor = null
},
@@ -1180,4 +1184,5 @@ export default {
cursor: move
}
}
+
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
index dd4f680d..ec9fbe67 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -162,9 +162,14 @@
+ v-if="((criterionType === 0 && readingTool === 0) || this.readingTool === 3) && !isMPR">
+
+
@@ -180,11 +185,6 @@
@click.prevent="openFusion">
-
-
+
@@ -577,6 +577,8 @@ import colorMap from './colorMap.vue'
import RectangleROITool from './tools/RectangleROITool'
import ScaleOverlayTool from './tools/ScaleOverlayTool'
import SegmentBidirectionalTool from './tools/SegmentBidirectionalTool'
+import FusionJumpToPointTool from './tools/FusionJumpToPointTool'
+import { setPTClinicalDataForInstance, clearPTClinicalDataCache } from '@/utils/ptClinicalDataCache'
import FixedRadiusCircleROITool from './tools/FixedRadiusCircleROITool'
import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
@@ -609,7 +611,6 @@ const {
AngleTool,
CobbAngleTool,
EraserTool,
- MIPJumpToClickTool,
VolumeRotateTool,
CrosshairsTool,
EllipticalROITool,
@@ -816,6 +817,13 @@ export default {
segIndex: null,
curSegSeries: {},
fusionOverlayModality: null,
+ fusionOverlayDefaultUpper: null,
+ fusionOverlayDefaultRange: null,
+ fusionCrosshairStyle: {
+ lineWidth: 2,
+ lineLength: 20,
+ centerHoleSize: 20,
+ },
lastUpper: null,
hasFusionUpperInitialized: false,
timer: {},
@@ -1016,6 +1024,15 @@ export default {
// this.$refs.surfaceViewport.setSeriesInfo(obj)
},
async openHistogram() {
+ const renderingEngine = getRenderingEngine(this.renderingEngineId)
+ let viewportId = `${this.viewportKey}-${this.activeViewportIndex}`
+ const viewport = renderingEngine.getViewport(viewportId)
+ let imageIds = viewport.getImageIds(this.$refs[viewportId][0].volumeId)
+ let imageId = imageIds[0]
+ const imagePixelModule = metaData.get('imagePixelModule', imageId);
+ const photometricInterpretation = imagePixelModule?.photometricInterpretation;
+ console.log(photometricInterpretation, 'photometricInterpretation')
+ if (photometricInterpretation && photometricInterpretation !== 'MONOCHROME1' && photometricInterpretation !== 'MONOCHROME2') return this.$confirm(this.$t('trials:histogram:confirm:photometricInterpretationNotSupported'))
this.histogramVisible = true
this.setToolsPassive()
this.$refs.histogram.init()
@@ -1043,6 +1060,7 @@ export default {
},
handleClick(tab, event) {
this.formWrapperActiveName = tab.name
+ this.SegmentConfig.InactiveSegmentations.show = true
},
setMPRInfo(obj) {
let { type, key, value } = obj
@@ -1153,10 +1171,32 @@ export default {
let keySeriesIndex = -1
const arr = res1.Result
arr.forEach((study, studyIndex) => {
+ // 仅对 PT/PET study 缓存临床参数，供 3D SUV 计算链路覆盖原始 DICOM 元数据
+ const ptClinicalData = {
+ PatientSex: study.PatientSex,
+ PatientWeight: study.PatientWeight,
+ RadionuclideTotalDose: study.RadionuclideTotalDose,
+ RadionuclideHalfLife: study.RadionuclideHalfLife,
+ RadiopharmaceuticalStartTime: study.RadiopharmaceuticalStartTime,
+ AcquisitionTime: study.AcquisitionTime
+ }
+ const isPtStudy = ['PT、CT', 'CT、PT', 'PET-CT'].includes(study.Modalities)
+ const hasPtClinicalData =
+ isPtStudy &&
+ (
+ ptClinicalData.PatientWeight !== null ||
+ ptClinicalData.RadionuclideTotalDose !== null ||
+ ptClinicalData.RadionuclideHalfLife !== null ||
+ ptClinicalData.RadiopharmaceuticalStartTime !== null ||
+ ptClinicalData.AcquisitionTime !== null
+ )
study.SeriesList.forEach((series, seriesIndex) => {
const imageIds = []
const stack = []
series.InstanceInfoList.forEach((instance, instanceIndex) => {
+ if (hasPtClinicalData && ['PT', 'PET'].includes(String(series.Modality).toUpperCase())) {
+ setPTClinicalDataForInstance(instance.Id, ptClinicalData)
+ }
if (study.IsCriticalSequence) {
keyStudyIndex = studyIndex
keySeriesIndex = seriesIndex
@@ -1491,7 +1531,7 @@ export default {
cornerstoneTools.addTool(EllipticalROITool)
cornerstoneTools.addTool(AngleTool)
cornerstoneTools.addTool(CobbAngleTool)
- cornerstoneTools.addTool(MIPJumpToClickTool)
+ cornerstoneTools.addTool(FusionJumpToPointTool)
cornerstoneTools.addTool(VolumeRotateTool)
cornerstoneTools.addTool(CrosshairsTool)
cornerstoneTools.addTool(LabelMapEditWithContourTool)
@@ -1602,10 +1642,11 @@ export default {
getReferenceLineColor: this.setCrosshairsToolLineColor
});
} else if (toolGroupId === this.fusionToolGroupId) {
- toolGroup.addTool(CrosshairsTool.toolName, {
- getReferenceLineColor: this.setCrosshairsToolLineColor,
- getReferenceLineSlabThicknessControlsOn: (otherViewportId) => otherViewportId !== 'viewport-fusion-3'
- });
+ // toolGroup.addTool(CrosshairsTool.toolName, {
+ // getReferenceLineColor: this.setFusionCrosshairsToolLineColor,
+ // getReferenceLineSlabThicknessControlsOn: () => false,
+ // minimal: { enabled: true, lineLengthInPx: 10000 }
+ // });
} else {
toolGroup.addTool(WindowLevelTool.toolName)
}
@@ -1659,17 +1700,25 @@ export default {
})
if (viewportId === 'viewport-fusion-3') {
toolGroup.addTool(VolumeRotateTool.toolName)
- toolGroup.addTool(MIPJumpToClickTool.toolName, {
- targetViewportIds: fusionViewportIds.filter((id) => id !== viewportId)
+ toolGroup.addTool(FusionJumpToPointTool.toolName, {
+ targetViewportIds: ['viewport-fusion-0', 'viewport-fusion-1', 'viewport-fusion-2', 'viewport-fusion-3', 'viewport-fusion-hidden-sag'],
+ useBrightestPoint: true,
+ jumpToTargetViewports: true,
+ dispatchEventName: 'fusion-mip-point-selected',
+ getReferenceLineColor: this.setFusionCrosshairsToolLineColor,
+ style: this.fusionCrosshairStyle,
+ referenceLinesCenterGapRadius: this.fusionCrosshairStyle.centerHoleSize,
+ minimal: {
+ enabled: true,
+ lineLengthInPx: this.fusionCrosshairStyle.lineLength,
+ },
})
- // Set the initial state of the tools, here we set one tool active on left click.
- // This means left click will draw that tool.
- toolGroup.setToolActive(MIPJumpToClickTool.toolName, {
+ toolGroup.setToolActive(VolumeRotateTool.toolName, {
bindings: [
{
- mouseButton: MouseBindings.Primary // Left Click
- }
+ mouseButton: MouseBindings.Wheel,
+ },
]
})
}
@@ -1918,6 +1967,7 @@ export default {
const { annotation } = e.detail
try {
if (!annotation) return
+ if (annotation.metadata.toolName === CrosshairsTool.toolName) return
if (this.readingTaskState === 2 && !annotation.data.label) return false
if (this.readingTaskState === 2) {
const errorMsg = { message: 'annotation Not allowed to operate' }
@@ -2063,6 +2113,7 @@ export default {
try {
// if ( this.resetAnnotation && this.isFusion ) return false
if (!annotation) return false
+ if (annotation.metadata.toolName === CrosshairsTool.toolName) return false
if (this.readingTaskState === 2 && !annotation.data.label) return false
if (this.readingTaskState === 2) {
const errorMsg = { message: 'annotation Not allowed to operate' }
@@ -2263,6 +2314,22 @@ export default {
let index = viewportId.split("-").pop()
return colors[colors.length - 1 - Number(index)] || colors[0]
},
+ setFusionCrosshairsToolLineColor(viewportId) {
+ let colors = [
+ '#fb628b',
+ '#fb628b',
+ '#fb628b',
+ '#ffd10a',
+ '#b6d634',
+ ]
+
+ if (viewportId === 'viewport-fusion-hidden-sag') {
+ return colors[colors.length - 1]
+ } else {
+ let index = viewportId.split("-").pop()
+ return colors[Number(index)] || colors[0]
+ }
+ },
getLengthToolTextLines(data, targetId) {
const cachedVolumeStats = data.cachedStats[targetId]
const { length, unit } = cachedVolumeStats
@@ -2538,13 +2605,41 @@ export default {
setFusionMipJumpEnabled(enabled) {
if (!this.isFusion) return
const toolGroup = ToolGroupManager.getToolGroup(this.fusionToolGroupId)
- if (!toolGroup || !toolGroup.hasTool(MIPJumpToClickTool.toolName)) return
+ if (!toolGroup || !toolGroup.hasTool(FusionJumpToPointTool.toolName)) return
if (enabled) {
- toolGroup.setToolActive(MIPJumpToClickTool.toolName, {
+ toolGroup.setToolActive(FusionJumpToPointTool.toolName, {
bindings: [{ mouseButton: MouseBindings.Primary }]
})
+ this.dispatchFusionCenterPoint()
} else {
- toolGroup.setToolDisabled(MIPJumpToClickTool.toolName)
+ toolGroup.setToolDisabled(FusionJumpToPointTool.toolName)
+ }
+ },
+ dispatchFusionCenterPoint() {
+ const renderingEngine = getRenderingEngine(renderingEngineId)
+ if (!renderingEngine) return
+ const toolGroup = ToolGroupManager.getToolGroup(this.fusionToolGroupId)
+ const instance = toolGroup?.getToolInstance?.(FusionJumpToPointTool.toolName)
+ if (!instance?.setPoint) return
+ const candidates = ['viewport-fusion-2', 'viewport-fusion-1', 'viewport-fusion-0']
+ for (const viewportId of candidates) {
+ const viewport = renderingEngine.getViewport(viewportId)
+ if (!viewport?.canvasToWorld || !viewport?.element) continue
+ const width = viewport.element.clientWidth
+ const height = viewport.element.clientHeight
+ let worldPoint = null
+ if (width && height) {
+ worldPoint = viewport.canvasToWorld([width / 2, height / 2])
+ }
+ if ((!worldPoint || worldPoint.length < 3) && viewport.getCamera) {
+ worldPoint = viewport.getCamera()?.focalPoint
+ }
+ if (!worldPoint || worldPoint.length < 3) continue
+ instance.setPoint(worldPoint, viewportId, renderingEngine.id, {
+ jumpToTargetViewports: true,
+ dispatchEvent: false,
+ })
+ return
}
},
setFusionMipRotateEnabled(enabled) {
@@ -2562,14 +2657,17 @@ export default {
// 激活工具
setToolActive(toolName) {
if (this.histogramVisible) return false
+ if (this.isFusion && toolName === CrosshairsTool.toolName) return false
const toolGroupId = this.getActiveToolGroupId()
const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
if (!toolGroup) return
if (this.activeTool === toolName) {
if (toolName === CrosshairsTool.toolName) {
- toolGroup.setToolDisabled(this.activeTool)
+ if (toolGroup.hasTool(this.activeTool)) {
+ toolGroup.setToolDisabled(this.activeTool)
+ }
this.setFusionMipJumpEnabled(true)
- this.setFusionMipRotateEnabled(true)
+ // this.setFusionMipRotateEnabled(true)
} else {
toolGroup.setToolPassive(this.activeTool)
}
@@ -2577,9 +2675,11 @@ export default {
} else {
if (this.activeTool) {
if (this.activeTool === CrosshairsTool.toolName) {
- toolGroup.setToolDisabled(this.activeTool)
+ if (toolGroup.hasTool(this.activeTool)) {
+ toolGroup.setToolDisabled(this.activeTool)
+ }
this.setFusionMipJumpEnabled(true)
- this.setFusionMipRotateEnabled(true)
+ // this.setFusionMipRotateEnabled(true)
} else {
toolGroup.setToolPassive(this.activeTool)
}
@@ -2589,34 +2689,32 @@ export default {
})
if (toolName === CrosshairsTool.toolName) {
if (this.isFusion) {
- const instance = toolGroup.getToolInstance?.(CrosshairsTool.toolName)
- if (instance && !instance.__fusionSameForPatched) {
- instance.__fusionSameForPatched = true
- const original = instance._checkIfViewportsRenderingSameScene?.bind(instance)
- instance._checkIfViewportsRenderingSameScene = (viewport, otherViewport) => {
- try {
- const a = viewport?.getFrameOfReferenceUID?.()
- const b = otherViewport?.getFrameOfReferenceUID?.()
- if (a && b && a === b) return true
- } catch (e) { }
- return original ? original(viewport, otherViewport) : true
- }
- }
+ // const instance = toolGroup.getToolInstance?.(CrosshairsTool.toolName)
+ // if (instance && !instance.__fusionSameForPatched) {
+ // instance.__fusionSameForPatched = true
+ // const original = instance._checkIfViewportsRenderingSameScene?.bind(instance)
+ // instance._checkIfViewportsRenderingSameScene = (viewport, otherViewport) => {
+ // try {
+ // const a = viewport?.getFrameOfReferenceUID?.()
+ // const b = otherViewport?.getFrameOfReferenceUID?.()
+ // if (a && b && a === b) return true
+ // } catch (e) { }
+ // return original ? original(viewport, otherViewport) : true
+ // }
+ // }
}
this.setFusionMipJumpEnabled(false)
- this.setFusionMipRotateEnabled(false)
+ // this.setFusionMipRotateEnabled(false)
}
this.activeTool = toolName
}
},
hoverFusionViewport(index) {
if (!this.isFusion) return
- if (this.activeTool === CrosshairsTool.toolName) return
const toolGroup = ToolGroupManager.getToolGroup(this.fusionToolGroupId)
if (!toolGroup) return
const isMip = index === 3
- this.setFusionMipJumpEnabled(isMip)
if (isMip) {
if (toolGroup.hasTool(StackScrollTool.toolName)) {
toolGroup.setToolDisabled(StackScrollTool.toolName)
@@ -2650,7 +2748,9 @@ export default {
if (!toolGroup) return
if (this.activeTool === toolName) {
if (toolName === CrosshairsTool.toolName) {
- toolGroup.setToolDisabled(this.activeTool)
+ if (toolGroup.hasTool(this.activeTool)) {
+ toolGroup.setToolDisabled(this.activeTool)
+ }
} else {
toolGroup.setToolPassive(this.activeTool)
}
@@ -2658,7 +2758,9 @@ export default {
} else {
if (this.activeTool) {
if (this.activeTool === CrosshairsTool.toolName) {
- toolGroup.setToolDisabled(this.activeTool)
+ if (toolGroup.hasTool(this.activeTool)) {
+ toolGroup.setToolDisabled(this.activeTool)
+ }
} else {
toolGroup.setToolPassive(this.activeTool)
}
@@ -2683,7 +2785,9 @@ export default {
if (!toolGroup) return
if (this.activeTool) {
if (this.activeTool === CrosshairsTool.toolName) {
- toolGroup.setToolDisabled(this.activeTool)
+ if (toolGroup.hasTool(this.activeTool)) {
+ toolGroup.setToolDisabled(this.activeTool)
+ }
} else {
toolGroup.setToolPassive(this.activeTool)
}
@@ -2703,7 +2807,9 @@ export default {
const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
if (!toolGroup) return
if (this.activeTool === CrosshairsTool.toolName) {
- toolGroup.setToolDisabled(this.activeTool)
+ if (toolGroup.hasTool(this.activeTool)) {
+ toolGroup.setToolDisabled(this.activeTool)
+ }
} else {
toolGroup.setToolPassive(this.activeTool)
}
@@ -2733,7 +2839,9 @@ export default {
const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
if (!toolGroup) return
if (this.activeTool === CrosshairsTool.toolName) {
- toolGroup.setToolDisabled(this.activeTool)
+ if (toolGroup.hasTool(this.activeTool)) {
+ toolGroup.setToolDisabled(this.activeTool)
+ }
} else {
toolGroup.setToolPassive(this.activeTool)
}
@@ -2795,6 +2903,7 @@ export default {
const viewportId = `${this.viewportKey}-${this.activeViewportIndex}`
const viewport = renderingEngine.getViewport(viewportId)
const type = parseInt(value)
+ if (this.readingTool === 3 || this.isMPR) this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setFilp(true)
// 1：默认值；2：垂直翻转；3：水平翻转；4：左转90度；5：右转90度；
if (type === 1) {
// viewport.resetCamera()
@@ -2821,16 +2930,71 @@ export default {
}
this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].rotateOrientationMarkers(type)
},
+ resetCrosshairsAnnotationsForViewports(viewportIds = []) {
+ if (!viewportIds || viewportIds.length === 0) return
+ const viewportIdSet = new Set(viewportIds)
+ const annotations = cornerstoneTools.annotation.state.getAllAnnotations()
+ annotations.forEach((a) => {
+ if (!a) return
+ if (a.metadata.toolName !== CrosshairsTool.toolName) return
+ const vpId = a.data.viewportId
+ if (!vpId || !viewportIdSet.has(vpId)) return
+ cornerstoneTools.annotation.state.removeAnnotation(a.annotationUID)
+ })
+ },
// 重置视口
- resetViewport() {
+ async resetViewport() {
this.setToolsPassive()
const renderingEngine = getRenderingEngine(renderingEngineId)
+ if (this.isFusion) {
+ const fusionViewportIds = ['viewport-fusion-0', 'viewport-fusion-1', 'viewport-fusion-2', 'viewport-fusion-3']
+ const fusionAllViewportIds = [...fusionViewportIds, 'viewport-fusion-hidden-sag']
+ for (const id of fusionAllViewportIds) {
+ const viewport = renderingEngine.getViewport(id)
+ if (!viewport) continue
+ const ref = this.$refs[id]?.[0]
+ const index = ref?.series?.SliceIndex
+ if (ref.resetOrientationMarkers) ref.resetOrientationMarkers()
+ viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true, resetRotation: true })
+ if (viewport.resetSlabThickness) viewport.resetSlabThickness()
+ viewport.resetProperties()
+ if (id === 'viewport-fusion-3') {
+ if (ref.rotateBarLeft || ref.rotateBarLeft === 0) ref.rotateBarLeft = 0
+ if (ref.rotateAngle || ref.rotateAngle === 0) ref.rotateAngle = 0
+ const ptSeries = ref?.series
+ if (ptSeries && ptSeries.SeriesInstanceUid) {
+ await ref.setSeriesInfo({ data: ptSeries }, false, { isMip: true, colorMap: false })
+ }
+ } else {
+ viewport.render()
+ }
+ if ((index || index === 0) && ref.setFullScreen) {
+ ref.setFullScreen(index)
+ }
+ }
+ this.resetCrosshairsAnnotationsForViewports(fusionAllViewportIds)
+ renderingEngine.render()
+ this.dispatchFusionCenterPoint()
+ if (this.fusionOverlayModality === 'NM' && Number.isFinite(this.fusionOverlayDefaultUpper) && Number.isFinite(this.fusionOverlayDefaultRange)) {
+ this.lastUpper = null
+ this.hasFusionUpperInitialized = false
+ if (this.$refs.colorMap) {
+ this.$refs.colorMap.range = this.fusionOverlayDefaultRange
+ this.$refs.colorMap.upper = this.fusionOverlayDefaultUpper
+ this.$refs.colorMap.upperRangeChange(this.fusionOverlayDefaultRange)
+ this.$refs.colorMap.changeVoi(this.fusionOverlayDefaultUpper)
+ }
+ this.voiChange(this.fusionOverlayDefaultUpper)
+ }
+ return
+ }
+
const viewportId = `${this.viewportKey}-${this.activeViewportIndex}`
const viewport = renderingEngine.getViewport(viewportId)
this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].resetOrientationMarkers()
let index = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series.SliceIndex
if (this.readingTool !== 3) {
- viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true })
+ viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true, resetRotation: true })
}
viewport.resetProperties()
if (this.isMPR) {
@@ -2844,7 +3008,7 @@ export default {
viewport.setProperties({ voiRange: { upper: 5, lower: 0 } })
}
viewport.render()
- renderingEngine.render()
+ // renderingEngine.render()
if (this.readingTool === 3) {
DicomEvent.$emit('isloaded', { isChange: false, viewportId })
}
@@ -3020,7 +3184,7 @@ export default {
// 获取热键配置信息
async getHotKeys() {
try {
- const res = await getDoctorShortcutKey({ imageToolType: 0 })
+ const res = await getDoctorShortcutKey({ imageToolType: 1 })
res.Result.map(item => {
this.hotKeyList.push({ id: item.Id, altKey: item.AltKey, ctrlKey: item.CtrlKey, shiftKey: item.ShiftKey, metaKey: item.MetaKey, key: item.Keyboardkey, code: item.Code, text: item.Text, shortcutKeyEnum: item.ShortcutKeyEnum })
})
@@ -3973,7 +4137,10 @@ export default {
},
async openMPRViewport(data = null) {
return new Promise(async (resolve, reject) => {
+ this.setToolsPassive()
if (this.isMPR) {
+ this.activeSeries(this.$refs[`viewport-MPR-0`][0].series)
+ resolve(false)
if (!data) return resolve(false)
let viewportSeries = this.$refs[`viewport-MPR-0`][0].series
if (data && viewportSeries.SeriesInstanceUid === data.SeriesInstanceUid) return resolve(true)
@@ -4005,9 +4172,12 @@ export default {
await this.getVolume(series)
this.loading = false
this.loadingText = null
+ delete series.orientation
+ delete series.isLocation
this.$refs[`viewport-MPR-0`][0].setSeriesInfo(Object.assign({ orientation: 'AXIAL', isLocation: data && this.activeViewportIndex === 0 }, series))
this.$refs[`viewport-MPR-1`][0].setSeriesInfo(Object.assign({ orientation: 'SAGITTAL', isLocation: data && this.activeViewportIndex === 1 }, series))
this.$refs[`viewport-MPR-2`][0].setSeriesInfo(Object.assign({ orientation: 'CORONAL', isLocation: data && this.activeViewportIndex === 2 }, series))
+ this.setToolActive('Crosshairs')
resolve(false)
})
@@ -4041,6 +4211,9 @@ export default {
this.$refs[`viewport-1`][0].setSeriesInfo(pt)
this.$refs[`viewport-2`][0].setSeriesInfo(pt)
this.$refs[`viewport-3`][0].setSeriesInfo(pt)
+ this.$nextTick(() => {
+ this.setFusionMipJumpEnabled(true)
+ })
// this.resetAnnotation = false
return true
}
@@ -4086,12 +4259,20 @@ export default {
const nmMax = Number(rawWidth)
if (Number.isFinite(nmMax) && nmMax > 0) {
const halfMax = Math.round(nmMax * 0.5)
+ this.fusionOverlayDefaultRange = Math.round(nmMax)
+ this.fusionOverlayDefaultUpper = halfMax
+ this.lastUpper = null
+ this.hasFusionUpperInitialized = false
this.$refs.colorMap.range = Math.round(nmMax)
this.$refs.colorMap.upper = halfMax
this.$refs.colorMap.upperRangeChange(Math.round(nmMax))
this.voiChange(halfMax)
}
+ } else {
+ this.fusionOverlayDefaultRange = null
+ this.fusionOverlayDefaultUpper = null
}
+ this.setFusionMipJumpEnabled(true)
})
} catch (err) {
console.log(err)
@@ -4293,6 +4474,7 @@ export default {
},
},
beforeDestroy() {
+ clearPTClinicalDataCache()
DicomEvent.$off('isCanActiveNoneDicomTool')
DicomEvent.$off('removeNoneDicomMeasureData')
DicomEvent.$off('addNoneDicomMeasureData')
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
index 4594a05f..8ad20ec1 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -918,7 +918,7 @@ export default {
// 设置当前任务阅片状态为已读
this.readingTaskState = 2
this.$emit('setReadingTaskState', 2)
- const res = await getAutoCutNextTask()
+ const res = await getAutoCutNextTask({imageToolType: 1})
var isAutoTask = res.Result.AutoCutNextTask
if (isAutoTask) {
window.location.reload()
@@ -961,9 +961,9 @@ export default {
this.$router.currentRoute.query.isReadingTaskViewInOrder
var criterionType = this.$router.currentRoute.query.criterionType
var readingTool = this.$router.currentRoute.query.readingTool
- var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+ var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&pageType=History&TokenKey=${token}`
const routeData = this.$router.resolve({ path })
- const res = await getAutoCutNextTask()
+ const res = await getAutoCutNextTask({imageToolType: 1})
let IsDoubleScreen = false
if (res.IsSuccess) {
IsDoubleScreen = res.Result.IsDoubleScreen
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/SegmentForm.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/SegmentForm.vue
index 53de004f..198f45c0 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/SegmentForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/SegmentForm.vue
@@ -146,7 +146,6 @@ export default {
},
async handleChange(e, key) {
if (key === 'study') {
- console.log(this.studyList, 'this.studyList')
this.seriesList = this.studyList.find(item => item.StudyId === this.form.studyId).SeriesArr
}
if (key === 'series') {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Segmentations.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Segmentations.vue
index 65f9f40b..ec937680 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Segmentations.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Segmentations.vue
@@ -1,5 +1,9 @@
+
+ {{ series.TaskInfo.SubjectCode }}
+ {{ series.TaskInfo.TaskBlindName }}
+
@@ -8,24 +12,24 @@
@@ -151,6 +182,19 @@ export default {
this.$nextTick(() => {
this.activeStudy(this.studyList[0].StudyId)
})
+ DicomEvent.$on('IsBeSegment', (obj) => {
+ this.studyList.some(study => {
+ if (study.StudyId === obj.StudyId) {
+ study.SeriesList.some(series => {
+ if (series.Id === obj.Id) {
+ series.IsBeSegment = obj.IsBeSegment
+ }
+ return series.Id === obj.Id
+ })
+ }
+ return study.StudyId === obj.StudyId
+ })
+ })
},
methods: {
activeSeries(series, seriesIndex, studyIndex) {
@@ -210,10 +254,56 @@ export default {
const seriesIndex = seriseList[newIndex].SeriesIndex
this.setSeriesActive(studyIndex, seriesIndex)
this.activeSeries(seriseList[newIndex], seriesIndex, studyIndex)
+ },
+ showPatientInfo(study) {
+ console.log(study)
}
}
}
+
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
index 12286426..7d1ed7ed 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue
@@ -775,7 +775,7 @@ export default {
localStorage.setItem('taskInfo', JSON.stringify(this.taskInfo))
store.dispatch('noneDicomReview/setCurrentTaskState', 2)
window.opener.postMessage('refreshTaskList', window.location)
- const res = await getAutoCutNextTask()
+ const res = await getAutoCutNextTask({ imageToolType: 2 })
const isAutoTask = res.Result.AutoCutNextTask
if (isAutoTask) {
window.location.reload()
@@ -814,7 +814,7 @@ export default {
var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
var path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
const routeData = this.$router.resolve({ path })
- const res = await getAutoCutNextTask()
+ const res = await getAutoCutNextTask({ imageToolType: 2 })
let IsDoubleScreen = false
if (res.IsSuccess) {
IsDoubleScreen = res.Result.IsDoubleScreen
diff --git a/src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue b/src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue
index 40392b58..bbf65430 100644
--- a/src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue
+++ b/src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue
@@ -121,7 +121,7 @@ export default {
this.loading = true
var file = await this.fileToBlob(param.file)
const res = await this.OSSclient.put(
- `/${this.$route.query.trialId}/DocumentToSign/${param.file.name}${new Date().getTime()}`,
+ `/${this.$route.query.trialId}/DocumentToSign/${param.file.name}`,
file
)
this.fileList.push({
diff --git a/src/views/trials/trials-panel/setting/attachment/components/templateForm.vue b/src/views/trials/trials-panel/setting/attachment/components/templateForm.vue
index 03ce252e..3e5b38b0 100644
--- a/src/views/trials/trials-panel/setting/attachment/components/templateForm.vue
+++ b/src/views/trials/trials-panel/setting/attachment/components/templateForm.vue
@@ -201,7 +201,7 @@ export default {
this.loading = true
var file = await this.fileToBlob(param.file)
const trialId = this.$route.query.trialId
- const res = await this.OSSclient.put(`/${trialId}/DocumentToSign/${param.file.name}${new Date().getTime()}`, file)
+ const res = await this.OSSclient.put(`/${trialId}/DocumentToSign/${param.file.name}`, file)
this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
this.form.Path = this.$getObjectName(res.url)
this.form.Name = param.file.name
diff --git a/src/views/trials/trials-panel/trial-summary/data-sync/components/FileList.vue b/src/views/trials/trials-panel/trial-summary/data-sync/components/FileList.vue
index e4ffbf13..6730bbca 100644
--- a/src/views/trials/trials-panel/trial-summary/data-sync/components/FileList.vue
+++ b/src/views/trials/trials-panel/trial-summary/data-sync/components/FileList.vue
@@ -99,11 +99,11 @@
-
+
-
+
-
+
{{ $fd('YesOrNo', scope.row.IsNeedSync) }}
@@ -113,10 +113,10 @@
-
-
-
-
+
+
+
+
{{ $fd('YesOrNo', scope.row.IsSync) }}
@@ -126,7 +126,7 @@
-
+
@@ -244,7 +244,9 @@ export default {
props: {
rowInfo: {
type: Object,
- required: true,
+ default() {
+ return {}
+ }
},
dataFileType: {
type: Number,
@@ -298,9 +300,12 @@ export default {
try {
this.loading = true
this.searchData.TrialId = this.$route.query.trialId
- this.searchData.SubjectCode = this.rowInfo.SubjectCode
- this.searchData.VisitName = this.rowInfo.VisitName
- this.searchData.StudyCode = this.rowInfo.StudyCode
+ if (Object.keys(this.rowInfo).length !== 0) {
+ this.searchData.SubjectCode = this.rowInfo.SubjectCode
+ this.searchData.VisitName = this.rowInfo.VisitName
+ this.searchData.StudyCode = this.rowInfo.StudyCode
+ }
+
this.searchData.DataFileType = this.dataFileType
let res = await getFileUploadRecordList(this.searchData)
this.loading = false
diff --git a/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue b/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue
index b8277cf1..35768346 100644
--- a/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue
+++ b/src/views/trials/trials-panel/trial-summary/data-sync/components/StudyList.vue
@@ -148,7 +148,7 @@
/>
-
+
@@ -24,15 +86,62 @@ export default {
.data-sync-tabs{
height: 100%;
background-color: #fff;
- .el-tabs__header {
+ > .el-tabs__header {
height: 100%;
}
- .el-tabs__content {
+ > .el-tabs__content {
height: 100%;
+ padding: 0px;
overflow: auto;
}
- .el-tab-pane {
+ > .el-tabs__content > .el-tab-pane {
height: 100%;
}
}
-
\ No newline at end of file
+.detail-dialog {
+ margin: 0;
+ height: 100vh;
+ display: flex;
+ flex-direction: column;
+
+ .el-dialog__header {
+ flex: 0 0 auto;
+ padding-bottom: 0px;
+ }
+
+ .el-dialog__body {
+ padding-top: 10px;
+ flex: 1 1 auto;
+ overflow: hidden;
+ }
+
+ &.is-fullscreen {
+ .el-dialog__body {
+ margin-top: 10px;
+ height: calc(100% - 80px);
+ }
+ }
+}
+.detail-tabs {
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ min-height: 0;
+ .el-tabs__header {
+ flex: 0 0 auto;
+ margin: 0 0 8px;
+ }
+ .el-tabs__content {
+ flex: 1 1 auto;
+ min-height: 0;
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ }
+ .el-tab-pane {
+ flex: 1 1 auto;
+ min-height: 0;
+ height: 100%;
+ }
+}
+
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 e18b8eab..1de2ad1a 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
@@ -3,31 +3,48 @@
-
- {{ $t('trials:uploadedDicoms:title:dicomUploaded') }}
-
+ }}-->
+ {{ $t('trials:uploadedDicoms:title:dicomUploaded') }}
-
- {{ $t('trials:uploadedDicoms:action:delete') }}
-
+ {{ $t('trials:uploadedDicoms:action:delete') }}
-
- {{ $t('trials:uploadedDicoms:action:preview') }}
-
+ {{ $t('trials:uploadedDicoms:action:preview') }}
-
+
-
+
-
-
- {{ $t('trials:uploadDicomList:table:status4') }}
-
-
+ "
+ >
+ {{ $t('trials:uploadDicomList:table:status4') }}
+
-
- {{ $t('trials:crc-upload:confirm:message') }}
-
+ {{ $t('trials:crc-upload:confirm:message') }}
{{ scope.row.StudyCode }}
-
+
-
-
- {{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}
-
+
+ {{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}
-
+
-
+
-
+
{{
- scope.row.StudyTime
- ? moment(scope.row.StudyTime).format('YYYY-MM-DD')
- : ''
+ scope.row.StudyTime
+ ? moment(scope.row.StudyTime).format('YYYY-MM-DD')
+ : ''
}}
-
+
-
+
-
+
-
+ "
+ :disabled="!isAfresh && data.SubmitState === 2 && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
+ :title="$t('trials:workbench:title:UploadClinicalData')"
+ circle
+ @click="handleUploadPetData(scope.row)"
+ />
-
+ circle
+ @click="handleEditStudy(scope.row)"
+ />
-
+ @click="handleDeleteStudy(scope.row)"
+ />
@@ -128,36 +198,51 @@
-
- {{ $t('trials:uploadedDicoms:title:dicomFilesOnly') }}
-
+ }}-->
+ {{ $t('trials:uploadedDicoms:title:dicomFilesOnly') }}
-
+
- {{ $t('trials:uploadDicomList:table:studyDetail1') }}
- {{ $t('trials:uploadDicomList:table:studyDetail2') }}
+ {{ $t('trials:uploadDicomList:table:studyDetail1') }}
+
+ {{ $t('trials:uploadDicomList:table:studyDetail2') }}
+
{{ $t('trials:uploadedDicoms:table:studyDate') }}
{{ $t('trials:uploadDicomList:table:studyInfo') }}
@@ -167,41 +252,45 @@
- Acc:
- {{ scope.row.dicomInfo.accNumber }}
+
+ Acc:
+ {{ scope.row.dicomInfo.accNumber }}
+
N/A
-
- {{ scope.row.dicomInfo.modality.join('、') }},
+ {{ scope.row.dicomInfo.modality.join('、') }},
N/A,
- {{ scope.row.seriesList.length }} Series,
+ {{ scope.row.seriesList.length }} Series,
N/A,
- {{ scope.row.fileList.length }} Instances
+ {{ scope.row.fileList.length }} Instances
N/A
-
- {{ scope.row.dicomInfo.bodyPart }},
-
- N/A,
+ {{ scope.row.dicomInfo.bodyPart }},
+ N/A,
-
- {{ scope.row.dicomInfo.description }}
+ {{ scope.row.dicomInfo.description }}
N/A
-
- {{ scope.row.dicomInfo.studyTime }}
-
+
{{ scope.row.dicomInfo.studyTime }}
@@ -209,168 +298,221 @@
- {{ $t('trials:uploadDicomList:table:pId') }}
- {{ $t('trials:uploadDicomList:table:patientName') }}
+ {{ $t('trials:uploadDicomList:table:pId') }}
+
+ {{ $t('trials:uploadDicomList:table:patientName') }}
+
{{ $t('trials:uploadDicomList:table:pInfo') }}
- {{
+
+ {{
$t('trials:uploadDicomList:table:patientInfo')
- }}
+ }}
+
- PID: {{
- scope.row.dicomInfo.patientId }}
+
+ PID:
+ {{
+ scope.row.dicomInfo.patientId }}
+
N/A
-
+ ]"
+ >
{{
- scope.row.dicomInfo.patientName
- ? scope.row.dicomInfo.patientName
- : 'N/A'
+ scope.row.dicomInfo.patientName
+ ? scope.row.dicomInfo.patientName
+ : 'N/A'
}}
-
+ ]"
+ >
{{
- scope.row.dicomInfo.patientSex
- ? scope.row.dicomInfo.patientSex
- : 'N/A'
+ scope.row.dicomInfo.patientSex
+ ? scope.row.dicomInfo.patientSex
+ : 'N/A'
}},
-
+ ]"
+ >
{{
- scope.row.dicomInfo.patientAge
- ? scope.row.dicomInfo.patientAge
- : 'N/A'
+ scope.row.dicomInfo.patientAge
+ ? scope.row.dicomInfo.patientAge
+ : 'N/A'
}},
-
+ ]"
+ >
{{
- scope.row.dicomInfo.patientBirthDate
- ? scope.row.dicomInfo.patientBirthDate
- : 'N/A'
+ scope.row.dicomInfo.patientBirthDate
+ ? scope.row.dicomInfo.patientBirthDate
+ : 'N/A'
}}
-
+
+ :show-text="false"--->
-
+ "
+ />
{{ $t('trials:uploadDicomList:table:uploadNow')
}}{{ scope.row.dicomInfo.failedFileCount }}/{{
- scope.row.dicomInfo.fileCount
+ scope.row.dicomInfo.fileCount
}}
({{
- (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(3)
+ (scope.row.dicomInfo.uploadFileSize / 1024 / 1024).toFixed(3)
}}MB/{{
- (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(3)
+ (scope.row.dicomInfo.fileSize / 1024 / 1024).toFixed(3)
}}MB)
-
+
-
- {{ $t('trials:uploadDicomList:table:status1') }}
- {{ $t('trials:uploadDicomList:table:status1') }}
+ {{ $t('trials:uploadDicomList:table:status2') }}
- {{ $t('trials:uploadDicomList:table:status2') }}
+ {{ $t('trials:uploadDicomList:table:status2') }}
- {{ $t('trials:uploadDicomList:table:status2') }}
+ {{ $t('trials:uploadDicomList:table:status3') }}
- {{ $t('trials:uploadDicomList:table:status3') }}
+ {{ $t('trials:uploadDicomList:table:status5') }}
- {{
+ "
+ >{{ $t('trials:uploadDicomList:table:status5') }}
+
+ {{
$t('trials:uploadDicomList:table:Failed')
- }}
+ }}
+
-
+
{{ $t('trials:uploadDicomList:table:Existed') }}:
-
- {{ item }}
-
+
{{ item }}
{{ $t('trials:uploadDicomList:table:Uploaded') }}:
-
- {{ item }}
-
+
{{ item }}
{{ $t('trials:uploadDicomList:table:Failed') }}:
-
- {{ item }}
-
+
{{ item }}
- {{
+
+ {{
scope.row.uploadState.record.Existed.length
- }}
+ }}
+
/
- {{
+
+ {{
scope.row.uploadState.record.Uploaded.length
- }}
+ }}
+
/
- {{
+
+ {{
scope.row.uploadState.record.Failed.length
- }}
+ }}
+
@@ -379,21 +521,33 @@
-
+ "
+ :title="$t('trials:uploadedDicoms:action:preview')"
+ size="small"
+ @click="handlePreview(scope.row.dicomInfo.studyUid)"
+ />
-
+ "
+ @click="handleDelete(scope.$index, scope.row)"
+ />
@@ -403,45 +557,83 @@
- {{
+ -->
+
+ {{
$store.state.trials.uploadTip
- }}
+ }}
+
-
- {{ $t('trials:uploadDicomList:button:upload') }}
-
+ {{ $t('trials:uploadDicomList:button:upload') }}
-
- {{ $t('trials:uploadDicomList:message:informationConsistent') }}:
-
+
{{ $t('trials:uploadDicomList:message:informationConsistent') }}:
{{ `(${i + 1}). ACC: ${item.accNumber}` }}
-
-
-
+
+ "
+ >
-
+ ]"
+ >
-
+
@@ -491,31 +704,51 @@
-
+ ]"
+ >
-
+
-
+ ]"
+ >
- {{
+
+ {{
$fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
- }}
-
+ }}
+
+
@@ -523,23 +756,38 @@
-
+
-
+
-
-
+
+
@@ -222,6 +224,96 @@
:open-type="'add'" @close="getClinicalData" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('trials:ptData:button:submit') }}
+
+
+
@@ -269,6 +361,8 @@ import {
deletePreviousSurgery,
getCRCClinicalData,
addOrUpdateReadingClinicalData,
+ getPatientInfo,
+ editPatientInfo
} from '@/api/trials'
import PreviousRadiotherapy from './previousRadiotherapy'
import PreviousSurgery from './previousSurgery'
@@ -313,6 +407,10 @@ export default {
type: Boolean,
default: false,
},
+ isPatientFormAllowEdit: {
+ type: Boolean,
+ default: false,
+ }
},
data() {
return {
@@ -336,9 +434,50 @@ export default {
downloadLoading: false,
clinicalDatas: [],
previewObj: { visible: false, filePath: '', fileType: '' },
+ activeName: '',
+ formData: {
+ Id: '',
+ PatientSex: '',
+ PatientWeight: null,
+ RadionuclideTotalDose: null,
+ RadionuclideHalfLife: null,
+ RadiopharmaceuticalStartTime: null,
+ AcquisitionTime: null,
+ TimeCheck: ''
+ },
+ rules: {
+ PatientSex: [
+ { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'change' }
+ ],
+ PatientWeight: [
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+ { type: 'number', min: 0, message: this.$t('trials:ptData:ruleMessage:number1'), trigger: 'blur' }//数值必须大于0
+ ],
+ RadionuclideTotalDose: [
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+ { type: 'number', min: 0, message: this.$t('trials:ptData:ruleMessage:number1'), trigger: 'blur' }//数值必须大于0
+ ],
+ RadionuclideHalfLife: [
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+ { type: 'number', min: 0, message: this.$t('trials:ptData:ruleMessage:number1'), trigger: 'blur' }
+ ],
+ RadiopharmaceuticalStartTime: [
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+ { type: 'number', message: this.$t('trials:ptData:ruleMessage:number2'), trigger: 'blur' }//请输入数字
+ ],
+ AcquisitionTime: [
+ { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+ { type: 'number', message: this.$t('trials:ptData:ruleMessage:number2'), trigger: 'blur' },//请输入数字
+ // 自定义校验：确保成像时间不早于注射时间
+ { validator: this.validateTime, trigger: 'blur' }
+ ]
+ },
+ formLoading: false,
+ isPatientFormCanEdit: false
}
},
mounted() {
+ this.isPatientFormCanEdit = this.allowAddOrEdit || this.isPatientFormAllowEdit
this.getClinicalData()
},
methods: {
@@ -452,6 +591,7 @@ export default {
getCRCClinicalData(param)
.then((res) => {
this.clinicalDatas = res.Result
+ this.activeName = res.Result.length > 0 ? res.Result[0].ClinicalDataTrialSetId : ''
this.loading = false
})
.catch(() => {
@@ -636,6 +776,70 @@ export default {
handleDownloadTpl(cd) {
window.open(this.OSSclientConfig.basePath + cd.Path)
},
+ // 时间一致性校验
+ validateTime(rule, value, callback) {
+ const { RadiopharmaceuticalStartTime } = this.formData
+ if (value && RadiopharmaceuticalStartTime !== null && value < RadiopharmaceuticalStartTime) {
+ callback(new Error(this.$t('trials:ptData:ruleMessage:number3')))//成像时间不能早于注射时间
+ } else {
+ callback()
+ }
+ },
+ computeTimeRelation() {
+ const startTime = this.formData.RadiopharmaceuticalStartTime
+ const acquireTime = this.formData.AcquisitionTime
+
+ if (!startTime || !acquireTime) {
+ this.formData.TimeCheck = ''
+ return
+ }
+
+ if (startTime <= acquireTime) {
+ this.formData.TimeCheck = this.$t('trials:ptData:timeCheck:val1') //注射时间 ≤ 成像时间
+ } else {
+ this.formData.TimeCheck = this.$t('trials:ptData:timeCheck:val2') //注射时间 > 成像时间
+ }
+ },
+ async tabClick(tab) {
+ try {
+ const name = tab.name
+ if (name === 'patientForm' && !this.formData.Id) {
+ this.formLoading = true
+ let res = await getPatientInfo({studyId: this.studyData.StudyId})
+ this.formData = {
+ Id: res.Result.Id || '',
+ PatientSex: res.Result.PatientSex || '',
+ PatientWeight: parseFloat(res.Result.PatientWeight) || null,
+ RadionuclideTotalDose: parseFloat(res.Result.RadionuclideTotalDose) || null,
+ RadionuclideHalfLife: parseFloat(res.Result.RadionuclideHalfLife) || null,
+ RadiopharmaceuticalStartTime: parseFloat(res.Result.RadiopharmaceuticalStartTime) || '',
+ AcquisitionTime: parseFloat(res.Result.AcquisitionTime) || '',
+ TimeCheck: ''
+ }
+ this.computeTimeRelation()
+ this.formLoading = false
+ }
+ } catch(e) {
+ this.formLoading = false
+ console.log(e)
+ }
+ },
+ async submitForm() {
+ try {
+ let valid = await this.$refs.patientForm.validate()
+ if (!valid) return
+ this.formLoading = true
+ let res = await editPatientInfo(this.formData)
+ this.formLoading = false
+ if (res.IsSuccess) {
+ this.$message.success(this.$t('common:message:savedSuccessfully'))
+ }
+ } catch(e) {
+ this.formLoading = false
+ console.log(e)
+ }
+
+ }
},
}
@@ -646,5 +850,16 @@ export default {
margin-bottom: 10px;
background-color: #dcdfe6;
}
+ .form-row {
+ display: flex;
+ gap: 20px;
+ margin-bottom: 0px;
+ .el-form-item {
+ margin-bottom: 15px;
+ }
+ }
+ .form-item-half {
+ flex: 1;
+ }
}
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 0cff08e3..81a801ae 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -1022,8 +1022,9 @@ export default {
methods: {
// 申请影像退回
async imageBack(row) {
- try {
- this.$prompt(`*${this.$t("trials:crcUpload:confirmMessage:ApplyReason")}`, this.$t("trials:crcUpload:confirmMessage:imageBack"), {
+ try {
+ let title = `${this.$t('trials:crcUpload:confirmMessage:imageBackTitle').replace('xxx', row.SubjectCode).replace('yyy', row.VisitName)}`
+ this.$prompt(`${title}
*${this.$t("trials:crcUpload:confirmMessage:ApplyReason")}`, this.$t("trials:crcUpload:confirmMessage:imageBack"), {
confirmButtonText: this.$t("common:button:save"),
cancelButtonText: this.$t("common:button:cancel"),
dangerouslyUseHTMLString: true,
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index b07a7700..be5dce29 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -76,7 +76,18 @@
-
+
+
+
+ {{ $t('trials:audit:message:ptDataValid') }}
+
+
+ {{ scope.row.StudyCode }}
+
+
@@ -149,7 +160,7 @@
@@ -898,6 +909,11 @@
@click="handleQCState(8)">
{{ $t('trials:audit:button:auditPassed') }}
+
+
+ {{ $t('trials:audit:button:skipTask') }}
+
@@ -905,7 +921,7 @@
@@ -2129,6 +2145,43 @@ export default {
this.$refs['signForm'].btnLoading = false
})
},
+ async skipTask() {
+ try {
+ let res = await getNextIQCQuality({
+ trialId: this.trialId,
+ SubjectId: this.data.SubjectId,
+ SubjectVisitId: this.data.Id,
+ IsSkipCurrentVisit: true
+ })
+
+ if (res.Result && res.Result.VisitId) {
+ let confirm = await this.$confirm(
+ this.$t('trials:qcQuality:title:title2', '', {
+ showCancelButton: false,
+ })
+ )
+ if (confirm !== 'confirm') return
+ await collectNextIQCQuality({
+ trialId: this.trialId,
+ SubjectId: this.data.SubjectId,
+ SubjectVisitId: this.data.Id,
+ IsSkipCurrentVisit: true
+ })
+ this.$emit('getList')
+ this.$emit('nextTask', res.Result.VisitId)
+ } else {
+ // 没有后续质控任务
+ this.$emit('getList')
+ let confirm = await this.$confirm(this.$t('trials:qcQuality:title:closeQCDialog'))
+ if (confirm !== 'confirm') return
+ this.$emit('close')
+ }
+ } catch(e) {
+ console.log(e)
+ this.$emit('getList')
+ }
+
+ },
getNextQCInfo() {
// '是否确认进入下一个质控任务？'
var message = this.$t('trials:qcQuality:title:title2')
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 1e95f066..61990df9 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -732,7 +732,8 @@ export default {
// 申请影像退回
async imageBack(row) {
try {
- this.$prompt(`
*${this.$t("trials:crcUpload:confirmMessage:ApplyReason")}`, this.$t("trials:crcUpload:confirmMessage:imageBack"), {
+ let title = `${this.$t('trials:crcUpload:confirmMessage:imageBackTitle').replace('xxx', row.SubjectCode).replace('yyy', row.VisitName)}`
+ this.$prompt(`
${title}
*${this.$t("trials:crcUpload:confirmMessage:ApplyReason")}`, this.$t("trials:crcUpload:confirmMessage:imageBack"), {
confirmButtonText: this.$t("common:button:save"),
cancelButtonText: this.$t("common:button:cancel"),
dangerouslyUseHTMLString: true,