+
-
+ :ise-c-r-f-show-in-dicom-reading="IseCRFShowInDicomReading" :is-exists-clinical-data="isExistsClinicalData"
+ :is-exists-no-dicom-file="isExistsNoDicomFile" :is-exists-manual="isExistsManual" @previewCD="previewCD" />
@@ -60,70 +47,40 @@
-
+ :is-exists-clinical-data="isExistsClinicalData" />
-
+ :is-exists-clinical-data="isExistsClinicalData" />
-
+ :is-exists-clinical-data="isExistsClinicalData" />
-
+
-
+
{{ $t('trials:reading:button:confirm') }}
@@ -131,12 +88,7 @@
-
+
-
+
+
+
+
{{ Array.isArray(this.BodyPartForEdit) ? this.BodyPartForEdit.join("|") : '' }}
+
+
+ {{ $t('trials:reading:button:confirm')
+ }}
+
+
+
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 ccf53df8..a7033203 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
@@ -70,7 +70,7 @@
- {{ getBodyPart(scope.row.BodyPartForEdit) }}
+ {{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}
@@ -499,7 +499,7 @@
{{
$fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
}}
+
@@ -604,6 +606,7 @@ export default {
BodyPartForEdit: [],
SeriesCount: null,
StudyTime: '',
+ BodyPartForEditOther: ''
},
uploadQueues: dicomStore.studyList, // 上传队列
selectArr: [], // 已勾选待上传文件
@@ -709,6 +712,7 @@ export default {
modality: this.studyForm.Modality,
bodyPart: this.studyForm.BodyPart,
StudyName: this.studyForm.StudyName,
+ BodyPartForEditOther: this.studyForm.BodyPartForEditOther,
}
updateModality(this.trialId, params)
.then((res) => {
@@ -1441,7 +1445,7 @@ export default {
seriesInstanceUid: v.seriesUid,
SOPClassUID: o.SOPClassUID,
TransferSytaxUID: o.TransferSytaxUID,
- MediaStorageSOPInstanceUID:o.MediaStorageSOPInstanceUID,
+ MediaStorageSOPInstanceUID: o.MediaStorageSOPInstanceUID,
MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
sopInstanceUid: o.instanceUid,
instanceNumber: o.instanceNumber,
@@ -1530,7 +1534,7 @@ export default {
seriesInstanceUid: v.seriesUid,
SOPClassUID: o.SOPClassUID,
TransferSytaxUID: o.TransferSytaxUID,
- MediaStorageSOPInstanceUID:o.MediaStorageSOPInstanceUID,
+ MediaStorageSOPInstanceUID: o.MediaStorageSOPInstanceUID,
MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
sopInstanceUid: o.instanceUid,
instanceNumber: o.instanceNumber,
@@ -1867,8 +1871,8 @@ export default {
return ''
}
},
- getBodyPart(bodyPart) {
- if (!bodyPart) return ''
+ getBodyPart(bodyPart, other) {
+ if (!bodyPart && !other) return ''
var separator = ','
if (bodyPart.indexOf('|') > -1) {
separator = '|'
@@ -1881,6 +1885,10 @@ export default {
var newArr = arr.map((i) => {
return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
})
+ if (other) {
+ newArr.push(other)
+ }
+ newArr = newArr.filter(Boolean)
return newArr.join(' | ')
},
},
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index 6dc6592e..bb3219f0 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -24,7 +24,7 @@
- {{ getBodyPart(scope.row.BodyPart) }}
+ {{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}
@@ -163,7 +163,7 @@
{{
$fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
}}
+
@@ -381,6 +383,7 @@ export default {
Modality: '',
ImageDate: '',
StudyName: '',
+ BodyPartForEditOther: ""
},
pickerOption: {
disabledDate: (time) => {
@@ -484,12 +487,13 @@ export default {
this.form.StudyName = ''
this.form.ImageDate = ''
this.form.BodyParts = []
+ this.form.BodyPartForEditOther = ''
this.dialogVisible = true
},
// 打开比编辑弹框,并初始化数据
handleEdit(row) {
this.title = this.$t('trials:uploadNonDicoms:dialogTitle:edit')
- const { CodeView, Id, BodyPart, Modality, ImageDate, StudyName } = {
+ const { CodeView, Id, BodyPart, Modality, ImageDate, StudyName, BodyPartForEditOther } = {
...row,
}
this.form.CodeView = CodeView
@@ -499,6 +503,7 @@ export default {
this.form.StudyName = StudyName
this.form.ImageDate = ImageDate
this.form.BodyParts = this.form.BodyPart.split(', ')
+ this.form.BodyPartForEditOther = BodyPartForEditOther
this.dialogVisible = true
},
// 保存非Dicom检查信息
@@ -1018,8 +1023,8 @@ export default {
})
window.open(routeData.href, '_blank')
},
- getBodyPart(bodyPart) {
- if (!bodyPart) return ''
+ getBodyPart(bodyPart, other) {
+ if (!bodyPart && !other) return ''
var separator = ','
if (bodyPart.indexOf('|') > -1) {
separator = '|'
@@ -1032,6 +1037,10 @@ export default {
var newArr = arr.map((i) => {
return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
})
+ if (other) {
+ newArr.push(other)
+ }
+ newArr = newArr.filter(Boolean)
return newArr.join(' | ')
},
// 设置已删除序列行样式
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 fdb12e56..6c2378eb 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
@@ -100,7 +100,7 @@
{{
- getBodyPart(scope.row.BodyPartForEdit)
+ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther)
}}
@@ -284,7 +284,7 @@
- {{ getBodyPart(scope.row.BodyPart) }}
+ {{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}
@@ -635,7 +635,7 @@
{{
$fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
}}
+
@@ -742,7 +744,7 @@
{{
$fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
}}
+
@@ -1018,7 +1022,8 @@ export default {
BodyPartForEdit: [],
SeriesCount: null,
StudyTime: '',
- ModifyReason: ''
+ ModifyReason: '',
+ BodyPartForEditOther: ''
},
currentQCRow: {},
isAudit: false, // 审核过之后功能按钮禁用标识
@@ -1037,7 +1042,8 @@ export default {
Modality: '',
ImageDate: '',
StudyName: '',
- ModifyReason: ''
+ ModifyReason: '',
+ BodyPartForEditOther: ''
},
subjectClinicalData: {},
moment,
@@ -2155,7 +2161,9 @@ export default {
this.$set(this.studyForm, 'Modality', row.ModalityForEdit)
// this.studyForm.Modality = row.ModalityForEdit
this.studyForm.BodyPartForEdit = bodyPart
+ // this.studyForm.BodyPartForEditOther = BodyPartForEditOther
this.$set(this.studyForm, 'ModifyReason', '')
+ console.log(this.studyForm, 'this.studyForm')
},
// 更新拍片部位/拍片类型信息
handleUpdateStudyInfo() {
@@ -2171,6 +2179,7 @@ export default {
modality: this.studyForm.Modality,
bodyPart: this.studyForm.BodyPart,
StudyName: this.studyForm.StudyName,
+ BodyPartForEditOther: this.studyForm.BodyPartForEditOther,
}
if (this.isAuditToEdit) {
this.btnLoading = false
@@ -2206,6 +2215,7 @@ export default {
ModifyReason: this.studyForm.ModifyReason,
Modality: this.studyForm.Modality,
BodyPart: this.studyForm.BodyPart,
+ BodyPartForEditOther: this.studyForm.BodyPartForEditOther,
},
signInfo
}
@@ -2241,7 +2251,7 @@ export default {
// 打开非Dicom信息编辑框
handleEditNoneDicomInfo(row) {
- const { CodeView, Id, BodyPart, Modality, ImageDate, StudyName } = {
+ const { CodeView, Id, BodyPart, Modality, ImageDate, StudyName, BodyPartForEditOther } = {
...row,
}
this.noneDicomForm.StudyName = StudyName
@@ -2252,6 +2262,7 @@ export default {
this.noneDicomForm.ImageDate = ImageDate
this.noneDicomForm.BodyParts = BodyPart.split(', ')
this.noneDicomForm.ModifyReason = null
+ this.noneDicomForm.BodyPartForEditOther = BodyPartForEditOther
this.editNoneDicomVisible = true
},
// 更新非Dicom部位/拍片类型信息
@@ -2434,8 +2445,8 @@ export default {
})
this.open = window.open(routeData.href, '_blank')
},
- getBodyPart(bodyPart) {
- if (!bodyPart) return ''
+ getBodyPart(bodyPart, other) {
+ if (!bodyPart && !other) return ''
var separator = ','
if (bodyPart.indexOf('|') > -1) {
separator = '|'
@@ -2448,6 +2459,10 @@ export default {
var newArr = arr.map((i) => {
return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
})
+ if (other) {
+ newArr.push(other)
+ }
+ newArr = newArr.filter(Boolean)
return newArr.join(' | ')
},
openManuals() {