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
continuous-integration/drone/push Build is passing Details

main
wangxiaoshuang 2026-07-09 13:29:51 +08:00
parent c633fbcf87 1cc57ad1d6
commit 447b74fa55
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
View File

@ -505,15 +505,23 @@ export default {
var idx = item.Childrens.findIndex(i => i.QuestionMark === 8) var idx = item.Childrens.findIndex(i => i.QuestionMark === 8)
var idxLoc = item.Childrens.findIndex(i => i.QuestionMark === 10) var idxLoc = item.Childrens.findIndex(i => i.QuestionMark === 10)
var state = item.Childrens.findIndex(i => i.QuestionMark === 7) var state = item.Childrens.findIndex(i => i.QuestionMark === 7)
if (this.CriterionType === 22) {
idx = item.Childrens.findIndex(i => i.QuestionMark === 1106)
}
if (idx > -1) { if (idx > -1) {
if (item.Childrens[idx].Answer.length > 0) { if (item.Childrens[idx].Answer.length > 0) {
var k = item.Childrens[idx].Answer.findIndex(v => v.Answer !== '') var k = item.Childrens[idx].Answer.findIndex(v => v.Answer !== '')
var part = '' var part = ''
if (this.CriterionType === 22) {
part = item.Childrens[idx].Answer[k].Answer ? this.$fd('Liver4Segmentation', parseInt(item.Childrens[idx].Answer[k].Answer)) : ''
} else {
if (obj.IsCanEditPosition) { if (obj.IsCanEditPosition) {
part = `${item.Childrens[idx].Answer[k].Answer}--${item.Childrens[idxLoc].Answer[k].Answer}` part = `${item.Childrens[idx].Answer[k].Answer}--${item.Childrens[idxLoc].Answer[k].Answer}`
} else { } else {
part = `${item.Childrens[idx].Answer[k].Answer}` part = `${item.Childrens[idx].Answer[k].Answer}`
} }
}
if (item.SplitOrMergeLesionName && k > -1) { if (item.SplitOrMergeLesionName && k > -1) {
// obj.QuestionName = `${obj.QuestionName} --${part} (Split from ${item.SplitOrMergeLesionName})` // obj.QuestionName = `${obj.QuestionName} --${part} (Split from ${item.SplitOrMergeLesionName})`
obj.QuestionName = `${obj.QuestionName} --${part}` obj.QuestionName = `${obj.QuestionName} --${part}`
@ -531,6 +539,7 @@ export default {
this.$set(obj, 'Answers', Answers) this.$set(obj, 'Answers', Answers)
// obj.QuestionName = `${obj.QuestionName} ` // obj.QuestionName = `${obj.QuestionName} `
} else if (!item.SplitOrMergeLesionName && k > -1) { } else if (!item.SplitOrMergeLesionName && k > -1) {
console.log(part)
obj.QuestionName = `${obj.QuestionName}--${part}` obj.QuestionName = `${obj.QuestionName}--${part}`
const Answers = {} const Answers = {}
if (state >= 0) { if (state >= 0) {

8
src/views/trials/trials-panel/reading/read-task/index.vue
View File

@ -209,7 +209,7 @@
</el-form-item> </el-form-item>
<!-- 是否复制阅片表单 --> <!-- 是否复制阅片表单 -->
<el-form-item :label="$t('trials:readTask:title:IsCopyLesionAnswer')" <el-form-item :label="$t('trials:readTask:title:IsCopyLesionAnswer')"
v-if="ApplyforReasonForm.IsCopyOrigenalForms && isTumor && rowData.ReadingCategory === 1" prop="IsCopyFollowForms" :rules="[ v-if="ApplyforReasonForm.IsCopyOrigenalForms && rowData.ReadingCategory === 1" prop="IsCopyFollowForms" :rules="[
{ required: true, message: $t('common:ruleMessage:select') }, { required: true, message: $t('common:ruleMessage:select') },
]"> ]">
<el-radio-group v-model="ApplyforReasonForm.IsCopyFollowForms"> <el-radio-group v-model="ApplyforReasonForm.IsCopyFollowForms">
@ -482,9 +482,9 @@ export default {
if (!valid) return if (!valid) return
this.loading = true this.loading = true
this.btnLoading = true this.btnLoading = true
if (!this.ApplyforReasonForm.IsCopyOrigenalForms || !this.isTumor) { // if (!this.ApplyforReasonForm.IsCopyOrigenalForms || !this.isTumor) {
this.ApplyforReasonForm.IsCopyFollowForms = false // this.ApplyforReasonForm.IsCopyFollowForms = false
} // }
var params = { var params = {
TaskIdList: [ TaskIdList: [
this.rowData.Id this.rowData.Id