-
- {{ language==='en'?question.QuestionEnName:question.QuestionName }}
+
+ v-if="(question.ClinicalQuestionShowEnum === 1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum === 0"
+ :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
+ {
+ required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && (question.RelevanceValue === questionForm[question.RelevanceId].toString()))) && question.ClinicalQuestionType !== 'summary' && question.ClinicalQuestionType !== 'group' && question.ClinicalQuestionType !== 'table',
+ message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+ }
+ ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
-
+ @change="((val) => { formItemChange(val, question) })">
-
-
+
-
+
{{ item.label }}
-
+
{{ val }}
-
-
+
+
{{ val }}
-
+
{{ question.Unit }}
-
- {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
+
+ {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{
+ questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
-
- {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm.CreateTime ? questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
+
+ {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm.CreateTime ?
+ questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
-
+
{{ $t('trials:components:clinicalDataQS:msg:birthDay') }}
-
-
+
-
-
-
+
+
-
+
{{ $t('common:button:cancel') }}
@@ -251,7 +159,6 @@
import { getTrialClinicalQuestionCalculateRelation } from '@/api/dictionary'
import QuestionTableFormItem from './QuestionTableFormItem'
import { mapGetters } from 'vuex'
-import DicomEvent from "../../../views/trials/trials-panel/reading/dicoms/components/DicomEvent";
export default {
name: 'QuestionFormItem',
@@ -263,6 +170,10 @@ export default {
return ''
}
},
+ SecondReviewState: {
+ type: Number,
+ default: 0
+ },
questionForm: {
type: Object,
default() {
@@ -282,7 +193,7 @@ export default {
},
data() {
return {
- addOrEdit: { visible: false, title: '', id: null, index: 0},
+ addOrEdit: { visible: false, title: '', id: null, index: 0 },
fileList: [],
accept: '.png,.jpg,.jpeg',
imgVisible: false,
@@ -591,40 +502,47 @@ export default {
}
diff --git a/src/components/clinicalDataQuestions/index.vue b/src/components/clinicalDataQuestions/index.vue
index 7c35c329..e210fb4b 100644
--- a/src/components/clinicalDataQuestions/index.vue
+++ b/src/components/clinicalDataQuestions/index.vue
@@ -1,42 +1,30 @@
-
+
+
{{ $fd('QcType', scope.row.Type) }}
-
+
{{ $fd('YesOrNo', scope.row.IsRequired) }}
-
+
{{ $fd('YesOrNo', scope.row.IsEnable) }}
-
+ v-if="hasPermi(['trials:trials-panel:setting:qc-question:edit', 'trials:trials-panel:setting:qc-question:delete']) && !isConfirm"
+ :label="$t('common:action:action')" min-width="150">
-
-
+
-
+
-
+
-
+
-
-
+ {{ language === 'en' ? question.QuestionEnName : question.QuestionName }}
+
+
+ {{ language === 'en' ? question.QuestionEnName : question.QuestionName }}
- {{ language==='en'?question.QuestionEnName:question.QuestionName }}
-
-
+ v-else-if="question.ClinicalQuestionType === 'table' && ((question.ClinicalQuestionShowEnum === 1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum === 0)"
+ style="font-weight: bold;font-size: 14px;margin: 5px 0px;">
-
+
+
{{ $t('common:button:edit') }}
-
+
{{ $t('common:button:delete') }}
@@ -54,187 +40,109 @@
{{ question.QuestionName }}
-
+
{{ $t('trials:readingUnit:qsList:title:add') }}
-
-
+
-
@@ -49,7 +37,7 @@ import uploadClinicalData from './components/uploadClinicalData'
import const_ from '@/const/sign-code'
export default {
-name: "index",
+ name: "index",
components: { QuestionsForm, uploadClinicalData, SignForm },
methods: {
submitClinicalForm() {
@@ -83,7 +71,7 @@ name: "index",
this.close()
}).catch((res) => {
this.$refs['signForm'].btnLoading = false
- })
+ })
},
},
data() {
@@ -106,6 +94,10 @@ name: "index",
type: String,
default: () => ''
},
+ SecondReviewState: {
+ type: Number,
+ default: 0
+ },
clinicalUploadType: {
type: Number,
default: () => {
@@ -148,7 +140,7 @@ name: "index",
},
data: {
type: Object,
- default: () => {}
+ default: () => { }
},
trialClinicalId: {
type: String,
@@ -166,6 +158,4 @@ name: "index",
}
-
+
diff --git a/src/const/sign-code.vue b/src/const/sign-code.vue
index ecdd3d81..d0cb15cc 100644
--- a/src/const/sign-code.vue
+++ b/src/const/sign-code.vue
@@ -29,6 +29,10 @@ export default {
MedicalAudit: 215, // 医学审核
HeavyReadingApproval: 216, // 重阅审批
ResetAndAsyncCriterion: 218, //同步签名
+ ResetImageQualityControlQuestion: 112, // 重置影像质控问题
+ CreateReviewTask: 113, // 生成复核任务
+ ReviewImageQualityControlQuestion: 219, // 复核质控问题
+
},
};
diff --git a/src/views/trials/trials-panel/setting/qc-question/index.vue b/src/views/trials/trials-panel/setting/qc-question/index.vue
index 65f82fef..eb85bbb8 100644
--- a/src/views/trials/trials-panel/setting/qc-question/index.vue
+++ b/src/views/trials/trials-panel/setting/qc-question/index.vue
@@ -8,23 +8,23 @@
@@ -38,228 +38,139 @@
-
-
+
{{ $t('common:button:search') }}
{{ $t('common:button:reset') }}
-
+
{{ $t('trials:qcCfg:button:preview') }}
-
+
{{ $t('trials:qcCfg:button:default') }}
-
+
{{ $t('common:button:batchDelete') }}
-
+
{{ $t('trials:qcCfg:button:custom') }}
-
+
{{ $t('trials:qcCfg:button:confirm') }}
+
+ {{ $t('trials:qcCfg:button:resetQuestion') }}
+
+
+ {{ $t('trials:qcCfg:button:reviewTask') }}
+
-
-
+
+
-
{{ $t('common:dialogTitle:sign') }}
- {{ `(${$t('common:label:sign')}${ currentUser })` }}
+ {{ `(${$t('common:label:sign')}${currentUser})` }}
+
+
-
+
+
- {{ scope.row.StartTime?moment(scope.row.StartTime).format('YYYY-MM-DD'):'' }}
+ {{ scope.row.StartTime ? moment(scope.row.StartTime).format('YYYY-MM-DD') : '' }}
-
+
- {{ scope.row.EndTime?moment(scope.row.EndTime).format('YYYY-MM-DD'):'' }}
+ {{ scope.row.EndTime ? moment(scope.row.EndTime).format('YYYY-MM-DD') : '' }}
-
+
{{ $fd('IsPdEnum', scope.row.IsPD) }}
@@ -57,133 +31,71 @@
-
+
+
- {{ scope.row.OperationTime?moment(scope.row.OperationTime).format('YYYY-MM-DD'):'' }}
+ {{ scope.row.OperationTime ? moment(scope.row.OperationTime).format('YYYY-MM-DD') : '' }}
-
+
+
- {{ scope.row.StartTime?moment(scope.row.StartTime).format('YYYY-MM-DD'):'' }}
+ {{ scope.row.StartTime ? moment(scope.row.StartTime).format('YYYY-MM-DD') : '' }}
-
+
- {{ scope.row.EndTime?moment(scope.row.EndTime).format('YYYY-MM-DD'):'' }}
+ {{ scope.row.EndTime ? moment(scope.row.EndTime).format('YYYY-MM-DD') : '' }}
-
{{ $t('trials:uploadClinicalData:title:pastTreatment') }}
-{{ $t('trials:uploadClinicalData:title:pastSurgery') }}
-{{ $t('trials:uploadClinicalData:title:others') }}
-
-
-
+
+
+
-
+
{{ $t('trials:uploadClinicalData:action:preview') }}
-
-
+
+
-
-
+
{{
$t('trials:reading:button:handbooks')
}}
@@ -13,21 +10,14 @@
-
+
-
+ :default-sort="{ prop: 'UploadedTime', order: 'ascending' }">
-
+
-
-
+
+
{{ scope.row.StudyName }}
-
+
-
-
+
+
{{
getBodyPart(scope.row.BodyPartForEdit)
@@ -167,43 +96,23 @@
-
+
-
-
+
+
{{
@@ -214,95 +123,46 @@
-
-
+
-
+
{{
scope.row.StudyTime
@@ -312,81 +172,46 @@
-
+
-
-
+
-
-
-
+
-
-
+
-
+
{{ getBodyPart(scope.row.BodyPart) }}
-
+
-
-
+
+
-
+
{{
scope.row.FileSize && scope.row.FileSize > 0
? `${(scope.row.FileSize / 1024 / 1024).toFixed(
- 2
- )}MB`
+ 2
+ )}MB`
: 0
}}
-
+
-
-
+
+
{{ $t('trials:audit:button:nonDicomsPreview') }}
- ![Image]()
+ ![Image]()
@@ -572,117 +320,64 @@
-
+
-
+
{{
moment(scope.row.ImageDate).format('YYYY-MM-DD')
}}
-
+
-
-
+
-
-
-
-
+
@@ -693,45 +388,46 @@
+
+
+
+
+
+
+
+
+
-
-
{{ $t('trials:audit:title:dicoms') }}
+
-->
-
+
-
+
{{ $t('trials:audit:button:downLoadAllDiocms') }}
-
+
{{ $t('trials:audit:button:previewAllDiocms') }}
-
+
{{ $t('trials:audit:button:previewReadingDiocms') }}
- {{ $t('trials:audit:tip:visitWindow') }}: @@ -49,117 +39,56 @@ > {{ $store.state.trials.uploadTip }}
{{ $t('trials:audit:title:series') }}
-{{ $t('trials:audit:title:nonDicomsTitle') }}
+
+
-->
-
+
-
+
{{ $t('trials:audit:button:downLoadAllNonDiocms') }}
-
-
+
+
{{ $t('trials:audit:tip:nonDicomsPreviewAll') }}
-
+
{{ $t('trials:audit:tip:nonDicomsPreviewAllReading') }}
- {{ $t('trials:audit:title:nonDicomsTitle') }}
+ +{{ $t('trials:audit:tip:nonDicomsVisitWindow') }}: @@ -408,156 +233,79 @@ > {{ $store.state.trials.uploadTip }}
{{ $t('trials:audit:title:questions') }}
-
{{ $t('trials:audit:message:noData') }}
- + +{{ $t('trials:audit:title:resetQuestions') }}
+
+
+ {{ $t('trials:audit:title:resetQuestions') }}
+
+
+
+
+
+
-
+
- {{ scope.row.ChallengeCode }}
+ {{ scope.row.ChallengeCode }}
-
+
{{ $fd('IsClosed', scope.row.IsClosed) }}
-
+
--
{{
@@ -913,58 +528,29 @@
-
+
{{ $fd('YesOrNo', scope.row.IsOverTime) }}
-
+
-
+
{{ $t('trials:qcQuality:action:reply') }}
-
+
{{ $t('trials:qcQuality:action:close') }}
@@ -973,125 +559,75 @@
-
-
-
-
-
+ ">
+
@@ -746,159 +442,78 @@
-
+
-
-
+
-
-
-
-
-
+
+
-
-
+ ">
-
+ ]">
-
-
+
-
+
-
-
+
- {{
- $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
- }}
+ {{
+ $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
+ }}
@@ -1099,54 +635,29 @@
-
+
-
-
{{
$t('common:dialogTitle:sign')
@@ -1155,177 +666,98 @@
`(${$t('common:label:sign')}${currentUser})`
}}
-
+
-
${this.$t('trials:consistencyCheck:label:closereason')}:${ - this.closeQuestionForm.Remake - }` + )}
${this.$t('trials:consistencyCheck:label:closereason')}:${this.closeQuestionForm.Remake + }` } var params = { TrialId: this.data.TrialId, @@ -2224,7 +1617,7 @@ export default { this.loading = false }) }) - .catch(() => {}) + .catch(() => { }) }, changeDeleteStatus(callback, row, isNoDicom = false) { let statusStr = '' @@ -2287,7 +1680,7 @@ export default { this.loading = false }) }) - .catch(() => {}) + .catch(() => { }) }, receiveMsg(event) { if (event.data.type === 'refreshSeriesList') { @@ -2307,6 +1700,22 @@ export default { this.loading = false }) }, + // 复核通过 + async handleResetSave() { + try { + this.loading = true + var isVerify = await this.handleSave(true) + if (!isVerify) { + return this.loading = false + } + this.IsSecondPass = true + const { ReviewImageQualityControlQuestion } = const_.processSignature + this.signCode = ReviewImageQualityControlQuestion + this.signVisible = true + } catch (err) { + this.loading = false + } + }, // 设置qc通过/不通过 async handleQCState(auditState) { if (auditState === 7) { @@ -2321,11 +1730,11 @@ export default { hasStudyNameList = [] var isgoList = [] this.studyList.forEach((v) => { - if (!v.BodyPartForEdit) { + if (!v.BodyPartForEdit && !v.IsDeleted) { isgo = false isgoList.push(v.StudyCode) } - if (this.relationInfo.IsShowStudyName && !v.StudyName) { + if (this.relationInfo.IsShowStudyName && !v.StudyName && !v.IsDeleted) { hasStudyName = false hasStudyNameList.push(v.StudyCode) } @@ -2362,7 +1771,7 @@ export default { this.loading = true var isVerify = await this.handleSave(true) if (!isVerify) { - return + return this.loading = false } // 验证是否关闭所有质疑 verifyCanQCPassedOrFailed(this.trialId, this.data.Id) @@ -2440,6 +1849,7 @@ export default { TrialId: this.trialId, SubjectVisitId: this.data.Id, AuditState: this.auditState, + IsSecondPass: this.signCode === 219 ? this.IsSecondPass : null }, signInfo: signInfo, } @@ -2482,7 +1892,7 @@ export default { .then(() => { this.$emit('close') }) - .catch(() => {}) + .catch(() => { }) } }) } @@ -2645,11 +2055,9 @@ export default { } var token = getToken() const routeData = this.$router.resolve({ - path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${ - this.data.VisitName - }(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&showDelete=${ - this.isAudit ? 0 : 1 - }&TokenKey=${token}`, + path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName + }(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&showDelete=${this.isAudit ? 0 : 1 + }&TokenKey=${token}`, }) this.open = window.open(routeData.href, '_blank') }, @@ -2676,11 +2084,9 @@ export default { } var token = getToken() const routeData = this.$router.resolve({ - path: `/showdicom?trialId=${this.trialId}&subjectVisitId=${ - this.data.Id - }&studyId=${row.StudyId}&showDelete=${ - this.isAudit ? 0 : 1 - }&TokenKey=${token}&type=Study`, + path: `/showdicom?trialId=${this.trialId}&subjectVisitId=${this.data.Id + }&studyId=${row.StudyId}&showDelete=${this.isAudit ? 0 : 1 + }&TokenKey=${token}&type=Study`, }) this.open = window.open(routeData.href, '_blank') }, @@ -2692,15 +2098,11 @@ export default { } var token = getToken() const routeData = this.$router.resolve({ - path: `/showdicom?trialId=${this.trialId}&studyId=${ - row.StudyId - }&studyCode=${row.StudyCode}&modality=${row.Modality}&seriesId=${ - row.Id - }&seriesNumber=${row.SeriesNumber}&showDelete=${ - this.isAudit ? 0 : 1 - }&subjectVisitId=${ - this.data.Id - }&type=Series&TokenKey=${token}&description=${row.Description}`, + path: `/showdicom?trialId=${this.trialId}&studyId=${row.StudyId + }&studyCode=${row.StudyCode}&modality=${row.Modality}&seriesId=${row.Id + }&seriesNumber=${row.SeriesNumber}&showDelete=${this.isAudit ? 0 : 1 + }&subjectVisitId=${this.data.Id + }&type=Series&TokenKey=${token}&description=${row.Description}`, }) this.open = window.open(routeData.href, '_blank') } catch (e) { @@ -2717,11 +2119,11 @@ export default { var token = getToken() const routeData = isReading ? this.$router.resolve({ - path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isReading=1`, - }) + path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isReading=1`, + }) : this.$router.resolve({ - path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isQcCheck=1`, - }) + path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isQcCheck=1`, + }) this.open = window.open(routeData.href, '_blank') }, // 预览单个检查下非Dicom文件 @@ -2766,22 +2168,27 @@ export default { border: 1px solid #fff; padding: 10px; box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); + .function-wrapper { text-align: right; } + .qa-content { flex: 1; margin-top: 10px; overflow-y: auto; } + ::v-deep .delete-row { text-decoration-line: line-through; color: #c0c4cc; } + ::v-deep .el-card { padding: 10px; } } + ::v-deep .tip-i { &::before { color: #fff !important; diff --git a/src/views/trials/trials-panel/visit/qc-check/components/questions.vue b/src/views/trials/trials-panel/visit/qc-check/components/questions.vue index 457d913f..cdf7b5e2 100644 --- a/src/views/trials/trials-panel/visit/qc-check/components/questions.vue +++ b/src/views/trials/trials-panel/visit/qc-check/components/questions.vue @@ -1,20 +1,8 @@
-
+ ">
+
-
+ ]">
-
-
+
-
-
+
- {{
- $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
- }}
+ {{
+ $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
+ }}
-
-
+
-
+
-
-
+
@@ -1522,6 +897,10 @@ export default {
type: Number,
default: 1,
},
+ SecondReviewState: {
+ type: Number,
+ default: 0,
+ }
},
computed: {
isEN() {
@@ -1581,7 +960,7 @@ export default {
},
subjectClinicalData: {},
moment,
- currentQCType: null,
+ currentQCType: 0,
currentUser: zzSessionStorage.getItem('userName'),
pickerOption: {
disabledDate: (time) => {
@@ -1620,6 +999,11 @@ export default {
selectTableDicom: [], // 选中的dicom数据
selectTableNonedicom: [], // 选中的非dicom数据
downloadId: null,
+
+ secondReviewList: [],
+ secondReviewActiveName: null,
+ SecondReviewTime: '',
+ IsSecondPass: false
}
},
async mounted() {
@@ -1631,7 +1015,7 @@ export default {
this.currentQCType = this.data.AuditState < 6 ? 1 : 2
}
window.addEventListener('message', this.receiveMsg)
-
+ console.log(this.SecondReviewState, 'SecondReviewState')
this.trialId = this.$route.query.trialId
this.getQCInfo()
this.getDicData()
@@ -1722,9 +1106,8 @@ export default {
name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
'IsDicom',
true
- )}/${study.StudyCode}_${study.StudyTime.split(' ')[0]}_${
- series.Modality
- }/${fileName}`,
+ )}/${study.StudyCode}_${study.StudyTime.split(' ')[0]}_${series.Modality
+ }/${fileName}`,
url: this.OSSclientConfig.basePath + instance.Path,
}
files.push(obj)
@@ -1759,9 +1142,8 @@ export default {
name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
'IsDicom',
false
- )}/${study.StudyCode}_${study.ImageDate.split(' ')[0]}_${
- study.Modality
- }/${item.FileName}`,
+ )}/${study.StudyCode}_${study.ImageDate.split(' ')[0]}_${study.Modality
+ }/${item.FileName}`,
url: this.OSSclientConfig.basePath + item.Path,
}
files.push(obj)
@@ -1787,6 +1169,13 @@ export default {
this.loading = true
getVisitQCInfo(this.data.Id, this.data.QCProcessEnum, this.currentQCType)
.then((res) => {
+ this.secondReviewList = res.Result.SecondReviewTimeList
+ if (this.secondReviewList.length > 0) {
+ this.secondReviewActiveName = this.secondReviewList[0].SecondReviewTime
+ if (!this.isAudit) {
+ this.SecondReviewTime = this.secondReviewList[0].SecondReviewTime
+ }
+ }
this.existsManual = res.Result.ExistsManual
this.qCQuestionAnswerList = res.Result.QCQuestionAnswerList
this.IsHaveStudyClinicalData = res.Result.IsHaveStudyClinicalData
@@ -1845,53 +1234,59 @@ export default {
})
},
// 保存审核问题
- handleSave(isMessage) {
- return new Promise((resolve) => {
- this.$refs['questions']
- .submit()
- .then((res) => {
- var answerList = []
- res.forEach((item) => {
- var index = this.qCQuestionAnswerList.findIndex(
- (v) => v.TrialQCQuestionConfigureId === item.Id
- )
- if (index > -1) {
- answerList.push({
- id: this.qCQuestionAnswerList[index].Id,
- answer: item.answer,
- trialQCQuestionConfigureId: item.Id,
- })
+ handleSave(isMessage = false) {
+ return new Promise(async (resolve) => {
+ try {
+ let res = null, refKey = 'questions'
+ if (this.SecondReviewState > 0) {
+ refKey += `_${this.SecondReviewTime}`
+ }
+ if (isMessage) {
+ res = await this.$refs[refKey].submit()
+ } else {
+ res = await this.$refs[refKey].save()
+ }
+ var answerList = []
+ res.forEach((item) => {
+ var index = this.qCQuestionAnswerList.findIndex(
+ (v) => v.TrialQCQuestionConfigureId === item.Id
+ )
+ if (index > -1) {
+ answerList.push({
+ id: this.qCQuestionAnswerList[index].Id,
+ answer: item.answer,
+ trialQCQuestionConfigureId: item.Id,
+ })
+ }
+ })
+ this.loading = true
+ addOrUpdateQCQuestionAnswerList(
+ this.trialId,
+ this.data.Id,
+ this.data.QCProcessEnum,
+ this.SecondReviewState > 0 ? 3 : this.currentQCType,
+ answerList
+ )
+ .then((res) => {
+ this.loading = false
+ if (res.IsSuccess) {
+ if (isMessage !== true) {
+ this.$message.success(
+ this.$t('common:message:savedSuccessfully')
+ )
+ }
+ this.getCheckList()
+ resolve(true)
}
})
- this.loading = true
- addOrUpdateQCQuestionAnswerList(
- this.trialId,
- this.data.Id,
- this.data.QCProcessEnum,
- this.currentQCType,
- answerList
- )
- .then((res) => {
- this.loading = false
- if (res.IsSuccess) {
- if (isMessage !== true) {
- this.$message.success(
- this.$t('common:message:savedSuccessfully')
- )
- }
- this.getCheckList()
- resolve(true)
- }
- })
- .catch(() => {
- this.loading = false
- resolve(false)
- })
- })
- .catch(() => {
- this.loading = false
- resolve(false)
- })
+ .catch(() => {
+ this.loading = false
+ resolve(false)
+ })
+ } catch (err) {
+ console.log(err)
+ resolve(false)
+ }
})
},
// 保存质疑
@@ -2008,15 +1403,14 @@ export default {
if (isHyperwindow) {
contents.push({
keyName: this.$t('trials:audit:message:qsOverWindow'),
- keyValue: `${this.$t('trials:audit:message:qsOverWindow1')}：${
- this.upperLimit
- }~${this.lowerLimit}，${this.$t(
- 'trials:audit:message:qsOverWindow2'
- )}：${moment(this.relationInfo.EarliestScanDate).format(
- 'YYYY-MM-DD'
- )}~${moment(this.relationInfo.LatestScanDate).format(
- 'YYYY-MM-DD'
- )},${this.$t('trials:audit:message:qsOverWindow3')}`,
+ keyValue: `${this.$t('trials:audit:message:qsOverWindow1')}：${this.upperLimit
+ }~${this.lowerLimit}，${this.$t(
+ 'trials:audit:message:qsOverWindow2'
+ )}：${moment(this.relationInfo.EarliestScanDate).format(
+ 'YYYY-MM-DD'
+ )}~${moment(this.relationInfo.LatestScanDate).format(
+ 'YYYY-MM-DD'
+ )},${this.$t('trials:audit:message:qsOverWindow3')}`,
isSelect: false,
actionContent: this.$t('trials:audit:message:qsOverWindow4'),
})
@@ -2119,9 +1513,8 @@ export default {
// 问题无法解决强制关闭质疑，已提醒中心下次注意
this.closeQuestionForm.Reason = `${this.$t(
'trials:qcQuality:message:problemNotSolved'
- )}
-
-
+ ">
+
+
{{
@@ -1339,109 +771,62 @@
-
-
-
-
+
+
+
+
+ {{ $t('trials:audit:button:reviewTask') }}
+
-
+
{{ $t('trials:audit:button:save') }}
-
+
{{ $t('trials:audit:button:question') }}
{{
- `${$t('trials:audit:button:historicalQuestions')}(${
- relationInfo.TotalChallengeCount !== undefined
- ? relationInfo.TotalChallengeCount
- : 0
- }, ${
- relationInfo.NotClosedChallengeCount !== undefined
- ? relationInfo.NotClosedChallengeCount
- : 0
+ `${$t('trials:audit:button:historicalQuestions')}(${relationInfo.TotalChallengeCount !== undefined
+ ? relationInfo.TotalChallengeCount
+ : 0
+ }, ${relationInfo.NotClosedChallengeCount !== undefined
+ ? relationInfo.NotClosedChallengeCount
+ : 0
})`
}}
-
+
{{ $t('trials:audit:button:auditPassed') }}
@@ -1449,19 +834,9 @@
-
- ${this.$t('trials:consistencyCheck:label:closereason')}:${ - this.closeQuestionForm.Remake - }` + )}
${this.$t('trials:consistencyCheck:label:closereason')}:${this.closeQuestionForm.Remake + }` } var params = { TrialId: this.data.TrialId, @@ -2224,7 +1617,7 @@ export default { this.loading = false }) }) - .catch(() => {}) + .catch(() => { }) }, changeDeleteStatus(callback, row, isNoDicom = false) { let statusStr = '' @@ -2287,7 +1680,7 @@ export default { this.loading = false }) }) - .catch(() => {}) + .catch(() => { }) }, receiveMsg(event) { if (event.data.type === 'refreshSeriesList') { @@ -2307,6 +1700,22 @@ export default { this.loading = false }) }, + // 复核通过 + async handleResetSave() { + try { + this.loading = true + var isVerify = await this.handleSave(true) + if (!isVerify) { + return this.loading = false + } + this.IsSecondPass = true + const { ReviewImageQualityControlQuestion } = const_.processSignature + this.signCode = ReviewImageQualityControlQuestion + this.signVisible = true + } catch (err) { + this.loading = false + } + }, // 设置qc通过/不通过 async handleQCState(auditState) { if (auditState === 7) { @@ -2321,11 +1730,11 @@ export default { hasStudyNameList = [] var isgoList = [] this.studyList.forEach((v) => { - if (!v.BodyPartForEdit) { + if (!v.BodyPartForEdit && !v.IsDeleted) { isgo = false isgoList.push(v.StudyCode) } - if (this.relationInfo.IsShowStudyName && !v.StudyName) { + if (this.relationInfo.IsShowStudyName && !v.StudyName && !v.IsDeleted) { hasStudyName = false hasStudyNameList.push(v.StudyCode) } @@ -2362,7 +1771,7 @@ export default { this.loading = true var isVerify = await this.handleSave(true) if (!isVerify) { - return + return this.loading = false } // 验证是否关闭所有质疑 verifyCanQCPassedOrFailed(this.trialId, this.data.Id) @@ -2440,6 +1849,7 @@ export default { TrialId: this.trialId, SubjectVisitId: this.data.Id, AuditState: this.auditState, + IsSecondPass: this.signCode === 219 ? this.IsSecondPass : null }, signInfo: signInfo, } @@ -2482,7 +1892,7 @@ export default { .then(() => { this.$emit('close') }) - .catch(() => {}) + .catch(() => { }) } }) } @@ -2645,11 +2055,9 @@ export default { } var token = getToken() const routeData = this.$router.resolve({ - path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${ - this.data.VisitName - }(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&showDelete=${ - this.isAudit ? 0 : 1 - }&TokenKey=${token}`, + path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName + }(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&showDelete=${this.isAudit ? 0 : 1 + }&TokenKey=${token}`, }) this.open = window.open(routeData.href, '_blank') }, @@ -2676,11 +2084,9 @@ export default { } var token = getToken() const routeData = this.$router.resolve({ - path: `/showdicom?trialId=${this.trialId}&subjectVisitId=${ - this.data.Id - }&studyId=${row.StudyId}&showDelete=${ - this.isAudit ? 0 : 1 - }&TokenKey=${token}&type=Study`, + path: `/showdicom?trialId=${this.trialId}&subjectVisitId=${this.data.Id + }&studyId=${row.StudyId}&showDelete=${this.isAudit ? 0 : 1 + }&TokenKey=${token}&type=Study`, }) this.open = window.open(routeData.href, '_blank') }, @@ -2692,15 +2098,11 @@ export default { } var token = getToken() const routeData = this.$router.resolve({ - path: `/showdicom?trialId=${this.trialId}&studyId=${ - row.StudyId - }&studyCode=${row.StudyCode}&modality=${row.Modality}&seriesId=${ - row.Id - }&seriesNumber=${row.SeriesNumber}&showDelete=${ - this.isAudit ? 0 : 1 - }&subjectVisitId=${ - this.data.Id - }&type=Series&TokenKey=${token}&description=${row.Description}`, + path: `/showdicom?trialId=${this.trialId}&studyId=${row.StudyId + }&studyCode=${row.StudyCode}&modality=${row.Modality}&seriesId=${row.Id + }&seriesNumber=${row.SeriesNumber}&showDelete=${this.isAudit ? 0 : 1 + }&subjectVisitId=${this.data.Id + }&type=Series&TokenKey=${token}&description=${row.Description}`, }) this.open = window.open(routeData.href, '_blank') } catch (e) { @@ -2717,11 +2119,11 @@ export default { var token = getToken() const routeData = isReading ? this.$router.resolve({ - path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isReading=1`, - }) + path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isReading=1`, + }) : this.$router.resolve({ - path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isQcCheck=1`, - }) + path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isQcCheck=1`, + }) this.open = window.open(routeData.href, '_blank') }, // 预览单个检查下非Dicom文件 @@ -2766,22 +2168,27 @@ export default { border: 1px solid #fff; padding: 10px; box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); + .function-wrapper { text-align: right; } + .qa-content { flex: 1; margin-top: 10px; overflow-y: auto; } + ::v-deep .delete-row { text-decoration-line: line-through; color: #c0c4cc; } + ::v-deep .el-card { padding: 10px; } } + ::v-deep .tip-i { &::before { color: #fff !important; diff --git a/src/views/trials/trials-panel/visit/qc-check/components/questions.vue b/src/views/trials/trials-panel/visit/qc-check/components/questions.vue index 457d913f..cdf7b5e2 100644 --- a/src/views/trials/trials-panel/visit/qc-check/components/questions.vue +++ b/src/views/trials/trials-panel/visit/qc-check/components/questions.vue @@ -1,20 +1,8 @@
-
-
+
@@ -49,6 +37,10 @@ export default {
isAudit: {
type: Boolean,
default: false
+ },
+ SecondReviewTime: {
+ type: String,
+ default: ''
}
},
data() {
@@ -59,6 +51,13 @@ export default {
isRender: false
}
},
+ watch: {
+ SecondReviewTime() {
+ if (this.SecondReviewTime) {
+ this.getQuestions()
+ }
+ }
+ },
mounted() {
this.getQuestions()
},
@@ -66,11 +65,14 @@ export default {
getQuestions() {
this.loading = true
var param = {
- trialId: this.trialId,
+ trialId: this.trialId || this.$route.query.trialId,
subjectVisitId: this.subjectVisitId,
qcProcessEnum: this.qcProcessEnum,
currentQCEnum: this.currentQCEnum
}
+ if (this.SecondReviewTime) {
+ param.SecondReviewTime = this.SecondReviewTime
+ }
getQCQuestionAnswer(param).then(res => {
res.Result.map((v) => {
this.$set(this.questionForm, v.Id, v.Answer)
@@ -99,10 +101,14 @@ export default {
return new Promise((resolve, reject) => {
this.$refs['questionForm'].validate(valid => {
if (!valid) {
- this.$confirm(this.$t('trials:audit:message:specifyQuestions'), {
+ let message = this.$t('trials:audit:message:specifyQuestions')
+ if (this.SecondReviewTime) {
+ message = this.$t('trials:audit:message:specifyResetQuestions')
+ }
+ this.$confirm(message, {
type: 'warning',
showCancelButton: false,
- callback: action => {}
+ callback: action => { }
})
reject()
} else {
@@ -111,7 +117,7 @@ export default {
answers.push({ Id: k, answer: this.questionForm[k] })
}
resolve(answers)
- // 设置当前节点的Answer
+ // 设置当前节点的Answer
// this.answers.forEach((item, index) => {
// if (item.IsShow) {
// this.$set(this.answers[index], 'Answer', this.questionForm[item.TrialQCQuestionConfigureId])
@@ -121,8 +127,16 @@ export default {
}
})
})
+ },
+ save() {
+ return new Promise((resolve, reject) => {
+ var answers = []
+ for (const k in this.questionForm) {
+ answers.push({ Id: k, answer: this.questionForm[k] })
+ }
+ resolve(answers)
+ })
}
}
}
-
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 f1fea869..287e3502 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -337,9 +337,14 @@
'trials:trials-panel:visit:qc-check:audit',
'trials:trials-panel:visit:qc-check:back'
])
- " :label="$t('common:action:action')" width="240" fixed="right">
+ " :label="$t('common:action:action')" width="280" fixed="right">
+
+
+
@@ -171,66 +171,69 @@
{{ $t('trials:audit:message:noData') }}
-{{ $t('trials:audit:title:resetQuestions') }}
@@ -407,13 +407,13 @@
-
-
+
+
@@ -800,7 +800,7 @@
+ v-if="SecondReviewState > 0" @click="handleResetSave">
{{ $t('trials:audit:button:reviewTask') }}
@@ -1052,7 +1052,6 @@ export default {
)
}
if (type === 'noneDicom') {
- console.log(this.selectTableNonedicom)
data.NoneDicomStudyIdList = this.selectTableNonedicom.map(
(item) => item.Id
)
@@ -1169,7 +1168,7 @@ export default {
this.loading = true
getVisitQCInfo(this.data.Id, this.data.QCProcessEnum, this.currentQCType)
.then((res) => {
- this.secondReviewList = res.Result.SecondReviewTimeList
+ this.secondReviewList = res.Result.SecondReviewList
if (this.secondReviewList.length > 0) {
this.secondReviewActiveName = this.secondReviewList[0].SecondReviewTime
if (!this.isAudit) {
@@ -1209,7 +1208,8 @@ export default {
res.Result.RelationInfo.IsHaveFirstGiveMedicineDate
this.loading = false
})
- .catch(() => {
+ .catch((err) => {
+ console.log(err)
this.loading = false
})
},
@@ -1220,7 +1220,7 @@ export default {
this.trialId,
this.data.Id,
this.data.QCProcessEnum,
- this.currentQCType
+ this.SecondReviewState > 0 ? 3 : this.currentQCType
)
.then((res) => {
this.loading = false
@@ -1248,12 +1248,20 @@ export default {
}
var answerList = []
res.forEach((item) => {
- var index = this.qCQuestionAnswerList.findIndex(
- (v) => v.TrialQCQuestionConfigureId === item.Id
- )
- if (index > -1) {
+ if (this.SecondReviewState <= 0) {
+ var index = this.qCQuestionAnswerList.findIndex(
+ (v) => v.TrialQCQuestionConfigureId === item.Id
+ )
+ if (index > -1) {
+ answerList.push({
+ id: this.qCQuestionAnswerList[index].Id,
+ answer: item.answer,
+ trialQCQuestionConfigureId: item.Id,
+ })
+ }
+ } else {
answerList.push({
- id: this.qCQuestionAnswerList[index].Id,
+ id: item.AnswerId,
answer: item.answer,
trialQCQuestionConfigureId: item.Id,
})
@@ -1275,7 +1283,12 @@ export default {
this.$t('common:message:savedSuccessfully')
)
}
- this.getCheckList()
+ if (this.SecondReviewState <= 0) {
+ this.getCheckList()
+ } else {
+ this.$refs[refKey].getQuestions()
+ }
+
resolve(true)
}
})
@@ -1848,7 +1861,7 @@ export default {
data: {
TrialId: this.trialId,
SubjectVisitId: this.data.Id,
- AuditState: this.auditState,
+ AuditState: this.signCode === 219 ? 1 : this.auditState,
IsSecondPass: this.signCode === 219 ? this.IsSecondPass : null
},
signInfo: signInfo,
@@ -1862,6 +1875,10 @@ export default {
this.$message.success(this.$t('common:message:savedSuccessfully'))
// this.getQCInfo()
this.isAudit = true
+ if (this.signCode === 219) {
+ this.$emit('getList')
+ return this.getQCInfo()
+ }
this.$forceUpdate()
getNextIQCQuality({
trialId: this.trialId,
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/questions.vue b/src/views/trials/trials-panel/visit/qc-check/components/questions.vue
index cdf7b5e2..c6840abd 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/questions.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/questions.vue
@@ -48,6 +48,7 @@ export default {
loading: false,
questions: [],
questionForm: {},
+ AnswerIdObj: {},
isRender: false
}
},
@@ -68,7 +69,7 @@ export default {
trialId: this.trialId || this.$route.query.trialId,
subjectVisitId: this.subjectVisitId,
qcProcessEnum: this.qcProcessEnum,
- currentQCEnum: this.currentQCEnum
+ currentQCEnum: this.SecondReviewTime ? 3 : this.currentQCEnum
}
if (this.SecondReviewTime) {
param.SecondReviewTime = this.SecondReviewTime
@@ -76,6 +77,7 @@ export default {
getQCQuestionAnswer(param).then(res => {
res.Result.map((v) => {
this.$set(this.questionForm, v.Id, v.Answer)
+ this.$set(this.AnswerIdObj, v.Id, v.AnswerId)
if (v.Childrens.length > 0) {
this.setChild(v.Childrens)
}
@@ -84,11 +86,12 @@ export default {
this.isRender = true
this.loading = false
- }).catch(() => { this.loading = false })
+ }).catch((err) => { console.log(err); this.loading = false })
},
setChild(obj) {
obj.forEach(i => {
this.$set(this.questionForm, i.Id, i.Answer)
+ this.$set(this.AnswerIdObj, i.Id, i.AnswerId)
if (i.Childrens && i.Childrens.length > 0) {
this.setChild(i.Childrens)
}
@@ -114,7 +117,7 @@ export default {
} else {
var answers = []
for (const k in this.questionForm) {
- answers.push({ Id: k, answer: this.questionForm[k] })
+ answers.push({ Id: k, answer: this.questionForm[k], AnswerId: this.AnswerIdObj[k] })
}
resolve(answers)
// 设置当前节点的Answer
@@ -132,7 +135,7 @@ export default {
return new Promise((resolve, reject) => {
var answers = []
for (const k in this.questionForm) {
- answers.push({ Id: k, answer: this.questionForm[k] })
+ answers.push({ Id: k, answer: this.questionForm[k], AnswerId: this.AnswerIdObj[k] })
}
resolve(answers)
})
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 287e3502..5e605743 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -341,7 +341,7 @@
+
+
+
+
+
+
+
+
- {{ $t('trials:audit:title:resetQuestions') }}
-
+
+
@@ -803,6 +819,10 @@
v-if="SecondReviewState > 0" @click="handleResetSave">
{{ $t('trials:audit:button:reviewTask') }}
+
+
+ {{ $t('trials:audit:button:assign') }}
+
{{ $t('trials:audit:button:save') }}
@@ -859,6 +879,8 @@ import {
closeQCChallenge,
updateModality,
getQCChallengeDialogList,
+ replaceQCTaskActionUser,
+ getTrialUserRoleList
} from '@/api/trials'
import { qCPassedOrFailed } from '@/api/trials/visit'
import { getBasicDataSelects } from '@/api/dictionary/dictionary'
@@ -985,6 +1007,14 @@ export default {
currentSeriesIsReading: false,
currentSeriesIsDeleted: false,
imgObj: { url: '', visible: false, loading: false },
+ userRoleList: [],
+ assignObj: { visible: false, loading: false },
+ assignForm: { ReplaceUserRoleId: null },
+ assignRules: {
+ ReplaceUserRoleId: [
+ { required: true, message: this.$t("common:ruleMessage:select"), trigger: 'change' }
+ ]
+ },
open: null,
existsManual: false,
@@ -1233,6 +1263,36 @@ export default {
this.loading = false
})
},
+ // 指派
+ async handleAssign() {
+ try {
+ let params = {
+ TrialId: this.data.TrialId,
+ UserTypeEnum: 3
+ }
+ let res = await getTrialUserRoleList(params)
+ if (res.IsSuccess) {
+ this.userRoleList = res.Result
+ this.assignObj.visible = true
+ }
+ } catch (err) {
+ console.log(err)
+ }
+ },
+ async assign() {
+ try {
+ let validate = await this.$refs.assignForm.validate()
+ if (!validate) return false
+ let res = await replaceQCTaskActionUser(this.data.TrialId, this.data.Id, this.assignForm)
+ if (res.IsSuccess) {
+ this.$emit('getList')
+ this.assignObj.visible = true
+ this.$emit("close")
+ }
+ } catch (err) {
+ console.log(err)
+ }
+ },
// 保存审核问题
handleSave(isMessage = false) {
return new Promise(async (resolve) => {
From f8b4dd70c8a4638a54091c218e7359d6e0e28974 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 16 Jul 2025 16:58:38 +0800
Subject: [PATCH 06/23] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../uploadDicomAndNonedicom/study-view.vue | 4 +-
src/utils/index.js | 7 +-
src/views/dicom-show/dicom-study.vue | 9 +-
src/views/dicom-show/dicom-visit.vue | 140 ++++++++------
.../setting/qc-question/components/QsForm.vue | 173 +++++-------------
.../setting/qc-question/index.vue | 3 +-
.../qc-check/components/qualityAssurance.vue | 10 +-
vue.config.js | 3 +-
8 files changed, 148 insertions(+), 201 deletions(-)
diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue
index 96ca2559..edaf8971 100644
--- a/src/components/uploadDicomAndNonedicom/study-view.vue
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@@ -245,13 +245,13 @@ export default {
if (this.IsDicom) {
var token = getToken()
routeData = this.$router.resolve({
- path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study&visitTaskId=${this.visitTaskId}`,
+ path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study&visitTaskId=${this.visitTaskId}&isReading=true`,
})
} else {
let trialId = this.$route.query.trialId
var token = getToken()
routeData = this.$router.resolve({
- path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}`,
+ path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}&isReading=true`,
})
}
window.open(routeData.href, '_blank')
diff --git a/src/utils/index.js b/src/utils/index.js
index 78bdbf9d..a6db6712 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -110,7 +110,8 @@ let timer = null, // 网速定时器
// 获取网速
export function getNetWorkSpeed() {
if (timer) return false;
- if (lastPercentage < 100) return false;
+ // if (lastPercentage < 100) return false;
+ if (imageId && imageId !== Id) return false
imageId = null
timer = setInterval(() => {
let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
@@ -135,8 +136,9 @@ export function setNetWorkSpeedSize(totalPercentage, total, Id) {
if (imageId && imageId !== Id) return false
imageId = Id
let percentage = totalPercentage - lastPercentage
+ percentage = percentage / 100
lastPercentage = totalPercentage
- console.log(percentage, totalPercentage, total)
+ // console.log(percentage, totalPercentage, total)
let time = new Date().getTime();
let timeList = Object.keys(bytesReceivedPerSecond).sort((a, b) => a - b);
let bytesTime = timeList.find(item => time - item < 1000);
@@ -156,6 +158,7 @@ export function workSpeedclose(isForce = false) {
if (!isForce && lastPercentage < 100) {
return false
}
+ console.log('workSpeedclose')
if (timer) {
clearInterval(timer);
timer = null;
diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index e8f5b708..c893076e 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -192,7 +192,8 @@ export default {
imageList: [],
showSeriesList: [],
currentLoadIns: [],
- isFromCRCUpload: false
+ isFromCRCUpload: false,
+ isReading: null
}
},
created: function () {
@@ -206,6 +207,9 @@ export default {
store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
changeURLStatic('TokenKey', '')
}
+ if (this.$router.currentRoute.query.isReading) {
+ this.isReading = this.$router.currentRoute.query.isReading
+ }
this.studyId = this.$router.currentRoute.query.studyId
this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
if (this.type === 'Series') {
@@ -244,7 +248,8 @@ export default {
this.seriesCount = data.Result.SeriesCount
this.description = data.Result.Description
}
- const url = `/series/list/${this.studyId}`
+ let isReading = !!this.isReading ? `?IsReading=true` : ''
+ const url = `/series/list/${this.studyId}${isReading}`
this.getSeriesList(url)
}
},
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index 7aa373ff..b06d13c8 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -149,7 +149,7 @@
{{ study.Description }}
-
+
-
+
+
@@ -303,7 +306,8 @@ export default {
currentLoadIns: [],
isFromCRCUpload: false,
visitTaskId: null,
- page: ''
+ page: '',
+ activeSeriesId: null
}
},
mounted() {
@@ -435,6 +439,8 @@ export default {
}
},
showSeriesImage(e, studyIndex, seriesIndex, series) {
+ this.activeSeriesId = series.seriesId
+ workSpeedclose(true)
const element = e.currentTarget
const elements = document.querySelectorAll('[series-type]')
Array.from(elements).forEach((e) => {
@@ -725,9 +731,15 @@ export default {
item.InstanceInfoList.forEach(i => {
if (i.NumberOfFrames && i.NumberOfFrames > 1) {
for (let j = 0; j < i.NumberOfFrames; j++) {
+ if (!i.ImageId) {
+ i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`
+ }
imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?frame=${j}&instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`)
}
} else {
+ if (!i.ImageId) {
+ i.ImageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`
+ }
imageIds.push(`wadouri:${localStorage.getItem('location') !== 'USA' ? scope.OSSclientConfig.basePath : scope.OSSclientConfig.basePath}${i.Path}?instanceId=${i.Id}&idx=${index}|${seriesIndex}&isRelation=1`)
}
})
@@ -751,9 +763,12 @@ export default {
isShowPopper: false
})
})
- scope.relationStudyList[index].seriesCount = seriesList.length
- scope.relationStudyList[index].seriesList = seriesList
- scope.relationStudyList[index].showSeries = true
+ // scope.relationStudyList[index].seriesCount = seriesList.length
+ // scope.relationStudyList[index].seriesList = seriesList
+ // scope.relationStudyList[index].showSeries = true
+ scope.$set(scope.relationStudyList[index], 'seriesCount', seriesList.length)
+ scope.$set(scope.relationStudyList[index], 'seriesList', seriesList)
+ scope.$set(scope.relationStudyList[index], 'showSeries', true)
scope.$forceUpdate()
}
} catch (e) {
@@ -762,6 +777,8 @@ export default {
}
},
showRelationSeriesImage(e, series, studyIndex, index) {
+ this.activeSeriesId = series.seriesId
+ workSpeedclose(true)
this.currentRelationIndex = index
const element = e.currentTarget
const elements = document.querySelectorAll('[series-type]')
@@ -840,8 +857,11 @@ export default {
}
const studyIndex = params.idx.split('|')[0]
const seriesIndex = params.idx.split('|')[1]
- var series = !params.isRelation ? this.studyList[studyIndex].SeriesList[seriesIndex] : null
+ var series = !params.isRelation ? this.studyList[studyIndex].SeriesList[seriesIndex] : this.relationStudyList[studyIndex].seriesList[seriesIndex]
if (!series) return
+ if (!this.activeSeriesId) {
+ this.activeSeriesId = series.seriesId
+ }
var prefetchInstanceCount = series.prefetchInstanceCount
var instanceCount = series.instanceCount
if (series.imageloadedArr.indexOf(imageId) < 0) {
@@ -863,8 +883,8 @@ export default {
series.imageloadedArr.push(imageId)
}
}
- let file = this.studyList[studyIndex].SeriesList[seriesIndex].instanceInfoList.find(item => item.ImageId === imageId)
- if (file) {
+ let file = series.instanceInfoList.find(item => item.ImageId === imageId)
+ if (file && this.activeSeriesId === series.seriesId) {
getNetWorkSpeed()
setNetWorkSpeedSize(percentComplete, file.FileSize, imageId)
}
diff --git a/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue b/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue
index df5d19b2..3de4a697 100644
--- a/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue
+++ b/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue
@@ -1,139 +1,68 @@
-
+ ![]()
-
-
+ ![]()
+
+
-
+
+
+
+
+
+
+
+ Key Images
+
+ #{{ seriesItem.seriesNumber }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ instance.InstanceNumber }}
+ {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame`
+ }}
+
+ {{ seriesItem.modality }}: {{ seriesItem.instanceCount }} image
+
+
+ T: {{ seriesItem.sliceThickness }}
+
+
-
-
-
+
-
-
- Key Images
-
- #{{ seriesItem.seriesNumber }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ instance.InstanceNumber }}
- {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame`
- }}
-
- {{ seriesItem.modality }}: {{ seriesItem.instanceCount }} image
-
-
- T: {{ seriesItem.sliceThickness }}
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
-
+
-
-
-
+
+
-
-
-
+
+
-
-
+
-
-
-
+
+
+
{{ item.label }}
-
-
-
+
+
+
{{ item.label }}
@@ -143,19 +72,11 @@
-
+
{{ $t('common:button:cancel') }}
-
+
{{ $t('common:button:save') }}
@@ -202,7 +123,7 @@ export default {
},
rules: {
QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
- { max: 300, message: `${this.$t('common:ruleMessage:maxLength')} 300` }],
+ { max: 300, message: `${this.$t('common:ruleMessage:maxLength')} 300` }],
TypeValue: [
{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
{ validator: validateTypeVal, trigger: 'blur' },
@@ -308,6 +229,4 @@ export default {
}
-
+
diff --git a/src/views/trials/trials-panel/setting/qc-question/index.vue b/src/views/trials/trials-panel/setting/qc-question/index.vue
index eb85bbb8..e5e79cee 100644
--- a/src/views/trials/trials-panel/setting/qc-question/index.vue
+++ b/src/views/trials/trials-panel/setting/qc-question/index.vue
@@ -135,8 +135,7 @@
:label="$t('common:action:action')" min-width="150">
-
-
-
+
+
+
+
+
From 10b8cc6a5ee3e7b8f232a64ad7973d4e22ce40a7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 16 Jul 2025 17:39:33 +0800
Subject: [PATCH 08/23] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trials/trials-panel/visit/qc-check/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 5e605743..f36f335d 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -341,10 +341,10 @@
+ sortable>
{{ $fd('IsDicom', scope.row.IsDicom) }}
From 17737d901c93be83cb6f965a8fa84c69ddbd7d7b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 18 Jul 2025 11:43:29 +0800
Subject: [PATCH 20/23] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E6=B5=8F=E8=A7=88?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2-=E5=85=B3=E8=81=94=E8=AE=BF=E8=A7=86?=
=?UTF-8?q?=EF=BC=8C=E5=B7=A6=E4=BE=A7=E7=9A=84=E5=BD=B1=E5=83=8F=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=8C=89=E7=85=A7=E8=AE=BF=E8=A7=86-=E6=A3=80?=
=?UTF-8?q?=E6=9F=A5-=E5=BA=8F=E5=88=97=E7=9A=84=E5=B1=82=E7=BA=A7?=
=?UTF-8?q?=E5=B1=95=E7=A4=BA=EF=BC=9B=E7=82=B9=E5=87=BB=E5=8D=95=E4=B8=AA?=
=?UTF-8?q?=E5=BA=8F=E5=88=97=E6=97=B6=EF=BC=8C=E8=87=AA=E5=8A=A8=E4=B8=8B?=
=?UTF-8?q?=E8=BD=BD=E5=BD=93=E5=89=8D=E5=BA=8F=E5=88=97=E5=BD=B1=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dicom-show/dicom-visit.vue | 175 ++++++++++++++++-----------
1 file changed, 103 insertions(+), 72 deletions(-)
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index b06d13c8..b30ca52c 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -152,92 +152,106 @@
{{ $t('trials:audit:title:resetQuestions') }}
-
-
- {{ $t('trials:audit:title:resetQuestions') }}
+
+
+
-
Date: Thu, 17 Jul 2025 10:12:35 +0800
Subject: [PATCH 09/23] 1
---
src/views/trials/trials-panel/visit/qc-check/index.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 f36f335d..200b0618 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -335,7 +335,8 @@
'trials:trials-panel:visit:qc-check:receive',
'trials:trials-panel:visit:qc-check:release',
'trials:trials-panel:visit:qc-check:audit',
- 'trials:trials-panel:visit:qc-check:back'
+ 'trials:trials-panel:visit:qc-check:back',
+ 'trials:trials-panel:visit:qc-check:reviewTask'
])
" :label="$t('common:action:action')" width="280" fixed="right">
From 4d27cbfe419f78c24837ba800c912a811026988b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 17 Jul 2025 11:12:59 +0800
Subject: [PATCH 10/23] =?UTF-8?q?=E3=80=90=E8=B4=A8=E6=8E=A7=E5=A4=8D?=
=?UTF-8?q?=E6=A0=B8=E3=80=91=E5=8E=86=E5=8F=B2=E5=AE=A1=E6=A0=B8=E4=BA=BA?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=A4=8D=E6=A0=B8=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E9=9C=80=E8=A6=81=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../trials-panel/visit/qc-check/components/qualityAssurance.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 5d4d8c61..c99b77ed 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
@@ -1204,7 +1204,7 @@ export default {
.then((res) => {
this.secondReviewList = res.Result.SecondReviewList
if (this.secondReviewList.length > 0) {
- this.secondReviewActiveName = this.secondReviewList[0].SecondReviewTime
+ this.secondReviewActiveName = this.secondReviewList.find(item => item.SignTime).SecondReviewTime
if (!this.isAudit) {
this.SecondReviewTime = this.secondReviewList[0].SecondReviewTime
}
From e9dd669d48b88cb09ce667582fa844a8b6a5066b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 17 Jul 2025 11:40:29 +0800
Subject: [PATCH 11/23] 1
---
.../visit/qc-check/components/qualityAssurance.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 c99b77ed..89c3b1b6 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
@@ -1204,7 +1204,8 @@ export default {
.then((res) => {
this.secondReviewList = res.Result.SecondReviewList
if (this.secondReviewList.length > 0) {
- this.secondReviewActiveName = this.secondReviewList.find(item => item.SignTime).SecondReviewTime
+ let data = this.secondReviewList.find(item => item.SignTime) || {}
+ this.secondReviewActiveName = data.SecondReviewTime
if (!this.isAudit) {
this.SecondReviewTime = this.secondReviewList[0].SecondReviewTime
}
From 36ea56722917b133d8b3a810201e91a69e7ad179 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 17 Jul 2025 14:20:03 +0800
Subject: [PATCH 12/23] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E6=8E=A7?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E9=85=8D=E7=BD=AE=E6=9C=AA=E7=A1=AE=E8=AE=A4?=
=?UTF-8?q?=E6=97=B6=E7=A6=81=E6=AD=A2=E8=B4=A8=E6=8E=A7=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trials/trials-panel/visit/qc-check/index.vue | 3 +++
1 file changed, 3 insertions(+)
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 200b0618..f82f0d1e 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -813,11 +813,13 @@ export default {
},
// 复审
reviewTask(row) {
+ if (!row.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
this.rowData = { ...row }
this.qcVisible = true
},
// 初审
handlePrimaryQC(row) {
+ if (!row.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
this.loading = true
isQCCanOpt(row.Id)
.then((res) => {
@@ -836,6 +838,7 @@ export default {
},
// 复审
handleSecondaryQC(row) {
+ if (!row.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
this.loading = true
isQCCanOpt(row.Id)
.then((res) => {
From 57bec076b7196347ef38f3673f51b297de7aa43b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 17 Jul 2025 14:41:44 +0800
Subject: [PATCH 13/23] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E6=8E=A7?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E9=85=8D=E7=BD=AE=E6=9C=AA=E7=A1=AE=E8=AE=A4?=
=?UTF-8?q?=E6=97=B6=E7=A6=81=E6=AD=A2=E8=B4=A8=E6=8E=A7=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/trials/trials-panel/visit/qc-check/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
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 f82f0d1e..40998e2c 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -813,13 +813,13 @@ export default {
},
// 复审
reviewTask(row) {
- if (!row.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
+ if (!this.OtherInfo.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
this.rowData = { ...row }
this.qcVisible = true
},
// 初审
handlePrimaryQC(row) {
- if (!row.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
+ if (!this.OtherInfo.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
this.loading = true
isQCCanOpt(row.Id)
.then((res) => {
@@ -838,7 +838,7 @@ export default {
},
// 复审
handleSecondaryQC(row) {
- if (!row.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
+ if (!this.OtherInfo.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
this.loading = true
isQCCanOpt(row.Id)
.then((res) => {
From d91a9170deababfd95b7bf72e4f38fb607ef2800 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 17 Jul 2025 16:22:45 +0800
Subject: [PATCH 14/23] =?UTF-8?q?=E3=80=90=E7=B3=BB=E7=BB=9F=E6=96=87?=
=?UTF-8?q?=E6=A1=A3=E3=80=91=E6=96=B0=E5=A2=9E=E5=8F=AF=E4=B8=8A=E4=BC=A0?=
=?UTF-8?q?=E7=9A=84mp4=E6=A0=BC=E5=BC=8F=E7=BC=BA=E5=B0=91=E6=A0=BC?=
=?UTF-8?q?=E5=BC=8Ficon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/assets/file_icon/mp4.png | Bin 0 -> 6245 bytes
.../SignatureTemplate/attachmentPreview.vue | 2 ++
2 files changed, 2 insertions(+)
create mode 100644 src/assets/file_icon/mp4.png
diff --git a/src/assets/file_icon/mp4.png b/src/assets/file_icon/mp4.png
new file mode 100644
index 0000000000000000000000000000000000000000..fae2f8f246f1db571a0d7d5b236497121cac0ea1
GIT binary patch
literal 6245
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
T;ZWRv13*zuO}0YDBK-dWIC!r;
literal 0
HcmV?d00001
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue b/src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue
index 0dd78fc9..9a671d4c 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue
@@ -70,6 +70,7 @@ import ppt from '@/assets/file_icon/ppt.png'
import pptx from '@/assets/file_icon/pptx.png'
import xls from '@/assets/file_icon/xls.png'
import xlsx from '@/assets/file_icon/xlsx.png'
+import mp4 from '@/assets/file_icon/xlsx.png'
import PreviewFile from '@/components/PreviewFile'
import imageViewer from './image-viewer'
import { getSystemDocumentAttachmentList } from '@/api/dictionary'
@@ -112,6 +113,7 @@ export default {
pptx,
xls,
xlsx,
+ mp4,
rowData: {},
list: [],
searchData: defaultSearchData(),
From 7493c1a98af9d1d508e73e1f6d929a6552149cc0 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 17 Jul 2025 16:23:17 +0800
Subject: [PATCH 15/23] =?UTF-8?q?=E3=80=90=E8=B4=A8=E6=8E=A7=E5=A4=8D?=
=?UTF-8?q?=E6=A0=B8=E3=80=91=E5=90=8C=E4=B8=80=E4=B8=AA=E5=A4=8D=E6=A0=B8?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8F=AF=E4=BB=A5=E5=90=8C=E6=97=B6=E8=A2=AB?=
=?UTF-8?q?2=E4=B8=AAiqc=E6=89=93=E5=BC=80=EF=BC=8C=E5=BD=93=E4=B8=80?=
=?UTF-8?q?=E4=B8=AAiqc=E5=A4=8D=E6=A0=B8=E5=AE=8C=E6=88=90=E5=90=8E?=
=?UTF-8?q?=EF=BC=8C=E5=8F=A6=E4=B8=80=E4=B8=AAiqc=E4=B9=9F=E5=8F=AF?=
=?UTF-8?q?=E4=BB=A5=E5=A4=8D=E6=A0=B8=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../trials-panel/visit/qc-check/index.vue | 21 ++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
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 40998e2c..d63381b7 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -812,10 +812,25 @@ export default {
.catch(() => { })
},
// 复审
- reviewTask(row) {
+ async reviewTask(row) {
if (!this.OtherInfo.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
- this.rowData = { ...row }
- this.qcVisible = true
+ this.loading = true
+ let res = await takeOrReleaseQCTask(row.TrialId, row.Id, true)
+ this.loading = false
+ if (res.IsSuccess) {
+ this.rowData = { ...row }
+ this.qcVisible = true
+ } else {
+ if (res.Code === 5 && res.ErrorMessage) {
+ this.$confirm(res.ErrorMessage, {
+ type: 'warning',
+ showCancelButton: false,
+ callback: (action) => { },
+ })
+ this.getList()
+ }
+ }
+
},
// 初审
handlePrimaryQC(row) {
From 6218b536f9413ad2ce466b37f8acb9ba241446e5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 17 Jul 2025 16:23:44 +0800
Subject: [PATCH 16/23] =?UTF-8?q?=E3=80=90=E8=B4=A8=E6=8E=A7=E5=A4=8D?=
=?UTF-8?q?=E6=A0=B8=E3=80=91A=E9=A2=86=E5=8F=96=E8=B4=A8=E6=8E=A7?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=8E=E6=8C=87=E6=B4=BE=E7=BB=99B?=
=?UTF-8?q?=EF=BC=8CA=E7=82=B9=E5=87=BB=E6=9B=BF=E6=8D=A2=E6=8C=89?=
=?UTF-8?q?=E9=92=AE=E5=B0=86=E6=AD=A4=E4=BB=BB=E5=8A=A1=E5=AE=8C=E6=88=90?=
=?UTF-8?q?=EF=BC=8CB=E5=B7=B2=E8=BF=9B=E5=85=A5=E8=B4=A8=E6=8E=A7?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=8C=87=E6=B4=BE=E6=97=B6?=
=?UTF-8?q?=E6=97=A0=E5=93=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../visit/qc-check/components/qualityAssurance.vue | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
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 89c3b1b6..be5bff93 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
@@ -1291,8 +1291,17 @@ export default {
let res = await replaceQCTaskActionUser(this.data.TrialId, this.data.Id, this.assignForm)
if (res.IsSuccess) {
this.$emit('getList')
- this.assignObj.visible = true
+ this.assignObj.visible = false
this.$emit("close")
+ } else {
+ if (res.Code === 5 && res.ErrorMessage) {
+ this.$confirm(res.ErrorMessage, {
+ type: 'warning',
+ showCancelButton: false,
+ callback: (action) => { },
+ })
+ this.$emit('getList')
+ }
}
} catch (err) {
console.log(err)
From 5e67f8b65f3c6cad693a20b252230ff78cc13a91 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 17 Jul 2025 16:50:32 +0800
Subject: [PATCH 17/23] 1
---
.../trials-panel/visit/qc-check/index.vue | 33 +++++++++++--------
1 file changed, 19 insertions(+), 14 deletions(-)
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 d63381b7..f16990b5 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -814,21 +814,26 @@ export default {
// 复审
async reviewTask(row) {
if (!this.OtherInfo.IsQCQuestionConfirmed) return this.$alert(this.$t("trials:qcCheck:alert:questionNoConfirm"))
- this.loading = true
- let res = await takeOrReleaseQCTask(row.TrialId, row.Id, true)
- this.loading = false
- if (res.IsSuccess) {
- this.rowData = { ...row }
- this.qcVisible = true
- } else {
- if (res.Code === 5 && res.ErrorMessage) {
- this.$confirm(res.ErrorMessage, {
- type: 'warning',
- showCancelButton: false,
- callback: (action) => { },
- })
- this.getList()
+ try {
+ this.loading = true
+ let res = await takeOrReleaseQCTask(row.TrialId, row.Id, true)
+ this.loading = false
+ if (res.IsSuccess) {
+ this.rowData = { ...row }
+ this.qcVisible = true
+ } else {
+ if (res.Code === 5 && res.ErrorMessage) {
+ this.$confirm(res.ErrorMessage, {
+ type: 'warning',
+ showCancelButton: false,
+ callback: (action) => { },
+ })
+ this.getList()
+ }
}
+ } catch (err) {
+ console.log(err)
+ this.loading = false
}
},
From 9187c9db8c7d3ad46b0dce928d7e2ab18bfc08c4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 18 Jul 2025 09:40:41 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../qc-check/components/qualityAssurance.vue | 20 +++++++++----------
.../trials-panel/visit/qc-check/index.vue | 17 ++++++++--------
2 files changed, 18 insertions(+), 19 deletions(-)
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 be5bff93..973620b3 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
@@ -1273,7 +1273,8 @@ export default {
try {
let params = {
TrialId: this.data.TrialId,
- UserTypeEnum: 3
+ UserTypeEnum: 3,
+ SubjectVisitId: this.data.Id
}
let res = await getTrialUserRoleList(params)
if (res.IsSuccess) {
@@ -1293,18 +1294,17 @@ export default {
this.$emit('getList')
this.assignObj.visible = false
this.$emit("close")
- } else {
- if (res.Code === 5 && res.ErrorMessage) {
- this.$confirm(res.ErrorMessage, {
- type: 'warning',
- showCancelButton: false,
- callback: (action) => { },
- })
- this.$emit('getList')
- }
}
} catch (err) {
console.log(err)
+ if (err.Code === 5 && err.ErrorMessage) {
+ this.$confirm(err.ErrorMessage, {
+ type: 'warning',
+ showCancelButton: false,
+ callback: (action) => { },
+ })
+ this.$emit('getList')
+ }
}
},
// 保存审核问题
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 f16990b5..69866e32 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -821,19 +821,18 @@ export default {
if (res.IsSuccess) {
this.rowData = { ...row }
this.qcVisible = true
- } else {
- if (res.Code === 5 && res.ErrorMessage) {
- this.$confirm(res.ErrorMessage, {
- type: 'warning',
- showCancelButton: false,
- callback: (action) => { },
- })
- this.getList()
- }
}
} catch (err) {
console.log(err)
this.loading = false
+ if (err.Code === 5 && err.ErrorMessage) {
+ this.$confirm(err.ErrorMessage, {
+ type: 'warning',
+ showCancelButton: false,
+ callback: (action) => { },
+ })
+ this.getList()
+ }
}
},
From 51a94ad89ee46b73adfe3689394dfa3a48b25fa1 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 18 Jul 2025 11:43:16 +0800
Subject: [PATCH 19/23] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/downloadDicomAndNonedicom/index.vue | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index be3012de..84c744cc 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -24,7 +24,7 @@
-
-
-
-
- {{ study.StudyCode }}
+
+
+
+
{{ $t('trials:audit:button:assign') }}
From 26914c2b2b1350e275e5b5d3181f3cb25b27e8be Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 18 Jul 2025 17:08:18 +0800
Subject: [PATCH 23/23] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E4=B8=BA=E5=8A=A0?=
=?UTF-8?q?=E8=BD=BD=E5=89=8D=E7=BD=91=E9=80=9F=E8=AE=A1=E7=AE=97=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=E5=A4=A7=E5=B0=8F=E5=8F=96=E5=80=BC=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Dicom/DicomCanvas.vue | 2 +-
src/store/modules/reading.js | 2 +-
src/views/dicom-show/dicom-study.vue | 2 +-
src/views/dicom-show/dicom-visit.vue | 2 +-
.../trials-panel/reading/dicoms/components/ReadPage.vue | 5 +++--
.../reading/dicoms/customize/CustomizeReadPage.vue | 1 +
.../trials-panel/reading/dicoms3D/components/ReadPage.vue | 2 +-
7 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue
index df5fa473..e07b92a9 100644
--- a/src/components/Dicom/DicomCanvas.vue
+++ b/src/components/Dicom/DicomCanvas.vue
@@ -123,7 +123,7 @@ export default {
components: { DicomTags },
computed: {
NSTip() {
- return `${this.$store.state.trials.uploadSize},NS: ${this.$store.state.trials.uploadTip}`
+ return `${this.$store.state.trials.uploadSize}, NS: ${this.$store.state.trials.uploadTip}`
}
},
data() {
diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index b1874ec5..c4d547d4 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -1076,7 +1076,7 @@ const actions = {
let file = series.instanceInfoList.find(item => item.ImageId === obj.imageId)
if (file) {
getNetWorkSpeed()
- setNetWorkSpeedSizeAll(obj.percentComplete, file.FileSize, obj.imageId)
+ setNetWorkSpeedSizeAll(obj.percentComplete, obj.FileTotal, obj.imageId)
}
if (prefetchInstanceCount >= instanceCount * 100) {
series.prefetchInstanceCount = instanceCount * 100
diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index 24ced2b6..c6aaa622 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -861,7 +861,7 @@ export default {
let file = this.seriesList[seriesIndex].instanceInfoList.find(item => item.ImageId === imageId)
if (file && this.activeSeriesId === this.seriesList[seriesIndex].seriesId) {
getNetWorkSpeed()
- setNetWorkSpeedSize(percentComplete, file.FileSize, imageId)
+ setNetWorkSpeedSize(percentComplete, e.detail.total, imageId)
}
if (prefetchInstanceCount >= instanceCount * 100) {
this.seriesList[seriesIndex].prefetchInstanceCount = instanceCount * 100
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index 6fe076ff..78ba2223 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -921,7 +921,7 @@ export default {
let file = series.instanceInfoList.find(item => item.ImageId === imageId)
if (file && this.activeSeriesId === series.seriesId) {
getNetWorkSpeed()
- setNetWorkSpeedSize(percentComplete, file.FileSize, imageId)
+ setNetWorkSpeedSize(percentComplete, e.detail.total, imageId)
}
if (prefetchInstanceCount >= instanceCount * 100) {
series.prefetchInstanceCount = instanceCount * 100
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
index 216123a0..5016e2ea 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
@@ -8,7 +8,8 @@
@@ -510,13 +511,13 @@ export default {
},
cornerstoneimageloadprogress(e) {
const imageId = e.detail.imageId
- console.log(imageId,'imageId')
const params = {}
const searchParams = new URLSearchParams(imageId.split('?')[1])
for (const [key, value] of searchParams.entries()) {
params[key] = value
}
params.percentComplete = e.detail.percentComplete
+ params.FileTotal = e.detail.total
params.imageId = imageId
store.dispatch('reading/setImageLoadedProgress', params)
}
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
index c098ca0f..f51d3978 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue
@@ -663,6 +663,7 @@ export default {
params[key] = value
}
params.percentComplete = e.detail.percentComplete
+ params.FileTotal = e.detail.total
params.imageId = imageId
store.dispatch('reading/setImageLoadedProgress', params)
}
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 c4ad8b1a..ba925186 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -1326,7 +1326,7 @@ export default {
let file = series.find(item => item.ImageId === imageId)
if (file) {
getNetWorkSpeed()
- setNetWorkSpeedSizeAll(percentComplete, file.FileSize, imageId)
+ setNetWorkSpeedSizeAll(percentComplete, detail.total, imageId)
}
if (percentComplete === 100) {
workSpeedclose()
+
@@ -293,6 +307,7 @@ export default {
visitInfo: '',
activeName: 'current-study',
relationStudyList: [],
+ relationStudyListByVisitName: [],
cachedImages: [],
isReading: null,
isStartLoad: false,
@@ -692,7 +707,20 @@ export default {
const res = await getAllRelationStudyList(this.subjectVisitId)
loading.close()
this.relationStudyList = res.Result
+ this.relationStudyListByVisitName = []
+ res.Result.forEach(item => {
+ let index = this.relationStudyListByVisitName.findIndex(d => d.VisitName === item.VisitName)
+ if (index < 0) {
+ this.relationStudyListByVisitName.push({
+ VisitName: item.VisitName,
+ series: [item]
+ })
+ } else {
+ this.relationStudyListByVisitName[index].series.push(item)
+ }
+ })
} catch (e) {
+ console.log(e)
loading.close()
}
}
@@ -798,6 +826,9 @@ export default {
this.imageList.push({ imageId: imageId, seriesId: series.seriesId, priority })
})
}
+ if (this.imageList.length > 0) {
+ this.loopLoad()
+ }
}
},
loadAllImages() {
From 5805ea077843374f48f5e328b61594e0e39466a3 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 18 Jul 2025 13:23:16 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=AE=BF=E8=A7=86?=
=?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=BF=87=E6=BB=A4=E5=88=A0=E9=99=A4=E5=92=8C?=
=?UTF-8?q?=E4=B8=8D=E9=98=85=E7=89=87=E5=BD=B1=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/reading.js | 7 ++++---
src/views/dicom-show/dicom-visit.vue | 8 ++++++--
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/api/reading.js b/src/api/reading.js
index 85717221..9202af20 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -75,10 +75,11 @@ export function getRelationVisitList(visitNum, tpCode) {
method: 'get'
})
}
-export function getAllRelationStudyList(studyId) {
+export function getAllRelationStudyList(studyId, params) {
return request({
url: `/study/getAllRelationStudyList/${studyId}`,
- method: 'get'
+ method: 'get',
+ params
})
}
export function getTrialListByReviewer(param) {
@@ -134,7 +135,7 @@ export function AddAdjudicationReport(param) {
}
export function getVisitStudyList(trialId, subjectVisitId, isReading, visitTaskId) {
- let url = `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}`
+ let url = `/SubjectVisit/getVisitStudyList/${trialId}/${subjectVisitId}/${isReading}`
url = visitTaskId ? `${url}?visitTaskId=${visitTaskId}` : url
return request({
url: url,
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index b30ca52c..6fe076ff 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -704,7 +704,10 @@ export default {
spinner: 'el-icon-loading'
})
try {
- const res = await getAllRelationStudyList(this.subjectVisitId)
+ let params = {
+ IsReading: !!this.isReading
+ }
+ const res = await getAllRelationStudyList(this.subjectVisitId, params)
loading.close()
this.relationStudyList = res.Result
this.relationStudyListByVisitName = []
@@ -749,7 +752,8 @@ export default {
spinner: 'el-icon-loading'
})
try {
- const data = await getSeriesList(`/series/list/${studyId}`)
+ let isReading = !!this.isReading ? `?IsReading=true` : ''
+ const data = await getSeriesList(`/series/list/${studyId}${isReading}`)
loading.close()
if (data.Result != null && data.Result.length > 0) {
var seriesList = []
From 98ce2b27da7b495a588e731bca0d2b18c6a351e5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 18 Jul 2025 15:28:32 +0800
Subject: [PATCH 22/23] =?UTF-8?q?=E3=80=90=E8=B4=A8=E6=8E=A7=E5=A4=8D?=
=?UTF-8?q?=E6=A0=B8=E3=80=91=E5=A4=8D=E6=A0=B8=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
=?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=8C=87=E6=B4=BE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../visit/qc-check/components/qualityAssurance.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 973620b3..b37883c8 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
@@ -824,7 +824,8 @@
{{ $t('trials:audit:button:reviewTask') }}
-
+ {{ item.VisitName }}
-
-
- {{ study.Modalities }} : {{ study.SeriesCount }} Series
-
-
-
- {{ study.Description }}
-
-
-
-
+
+
-
+
+
+
-
-
- ![]()
-
-
-
-
-
-
+
-
-
- Key Images
-
- #{{ seriesItem.seriesNumber }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ instance.InstanceNumber }}
- {{ `${instance.NumberOfFrames > 0 ? instance.NumberOfFrames : 1} frame`
- }}
-
- {{ seriesItem.modality }}: {{ seriesItem.instanceCount }} image
-
-
- T: {{ seriesItem.sliceThickness }}
-
-
+ {{ study.Modalities }} : {{ study.SeriesCount }} Series
+
+
+ {{ study.Description }}
-
-
-
+
+
+ {{
+ :class="{ 'visit-item-active': activeTaskVisitId == s.VisitTaskId }" @click.prevent="handleClick(s)">
+ {{
s.TaskBlindName }}