XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

uat_us
熊飞 2024-02-21 15:43:37 +08:00
parent 9033119fb1 59b36aee8b
commit 734e574713
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
View File

@ -88,7 +88,7 @@
v-model="questionForm[qs.Id]"
filterable
:placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $t('common:placeholder:select')"
:disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1'"
:disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')"
:popper-append-to-body="lesionType === 0 ? false :true"
@change="((val)=>{formItemChange(val, qs)})"
>
@ -234,7 +234,7 @@
</el-form-item>
</div>
<div
v-if="isCurrentTask && readingTaskState<2 && answers.SplitOrMergeType !== '1'"
v-if="isCurrentTask && readingTaskState<2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
class="base-dialog-footer"
style="text-align:right;margin-top:10px;"
>
@ -1706,7 +1706,6 @@ export default {
this.$set(this.questionForm, lengId, '')
var shortId = this.getQuestionId(1)
this.$set(this.questionForm, shortId, '')
var stateId = this.getQuestionId(7)
this.$set(this.questionForm, stateId, '')
// saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
@ -1841,8 +1840,10 @@ export default {
if (this.isCurrentTask && this.readingTaskState < 2) {
var lesionState = this.getQuestionVal(7)
if (isNaN(parseInt(lesionState)) && this.answers.IsFristAdd === 'False') {
if (this.answers.SplitOrMergeType !== '3') {
const stateId = this.getQuestionId(7)
this.$set(this.questionForm, stateId, 2)
}
var isLymphLesion = this.getQuestionVal(2)
isLymphLesion = !isNaN(parseInt(isLymphLesion)) ? parseInt(isLymphLesion) : null
const lesionPart = this.getQuestionVal(8)

7
src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
View File

@ -968,7 +968,8 @@ export default {
this.$nextTick(() => {
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
var markTool = this.$refs[refName][0].currentMarkTool
var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType
var markTool = splitOrMergeType !== '3' ? this.$refs[refName][0].currentMarkTool : ''
var readingTaskState = this.readingTaskState
var isMarked = !!this.$refs[refName][0].questionForm.MeasureData
DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked })
@ -1137,7 +1138,11 @@ export default {
this.$nextTick(() => {
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
if (!this.$refs[refName][0].questionForm.MeasureData || (this.$refs[refName][0].questionForm && this.$refs[refName][0].questionForm.MeasureData && measureData.data.uuid === this.$refs[refName][0].questionForm.MeasureData.data.uuid)) {
if (!this.$refs[refName][0].questionForm.MeasureData && this.$refs[refName][0].answers.SplitOrMergeType === '3') {
this.createNLTarget(measureData)
} else {
this.$refs[refName][0].setMeasureData(measureData)
}
} else {
if (this.isBaseLineTask) {
var idx = this.tableQuestions.findIndex(item => item.LesionType === 0)