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

src/views/dicom-show/dicom-study.vue

@@ -251,9 +251,9 @@ export default {
         let res = await getPatientSeriesList(this.studyId);
         if (res.IsSuccess && res.Result.length > 0) {
           console.log(res.Result)
-          this.modality = res.Result[0].Modality
+          this.modality = res.OtherInfo.Modalities
           this.seriesCount = res.Result.length
-          this.description = res.Result[0].Description
+          this.description = res.OtherInfo.Description
           this.seriesList = []
           res.Result.map(item=>{
             var imageIds = []
@@ -266,8 +266,8 @@ export default {
               seriesUid: item.SeriesInstanceUid,
               seriesNumber:item.SeriesNumber,
               sliceThickness: item.SliceThickness,
-              modality: this.modality,
+              modality: item.Modality,
-              description: this.description,
+              description: item.Description,
               previewImageUrl: item.ImageResizePath ? this.OSSclientConfig.basePath + item.ImageResizePath : item.ImageResizePath,
               instanceCount: item.InstanceCount,
               prefetchInstanceCount: 0,

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

@@ -96,7 +96,7 @@
             </template>
             <template slot-scope="scope">
               <span :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) ? '#f66' : '#fff'}">
-                <template v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13,14,15,21,42].includes(scope.row.QuestionType)">
+                <template v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13,14,15,21,22,42].includes(scope.row.QuestionType)">
                   <!-- 是否存在疾病（基线时可修改） -->
                   <template v-if="task.IsBaseLine && scope.row.QuestionType=== 15">
                     <el-select
@@ -169,6 +169,13 @@
                       </template>
                     </el-select>
                   </template>
+                  <template v-else-if="!task.IsBaseLine && scope.row.QuestionType=== 22">
+                    <el-input v-model="intervalDays" size="mini" @change="handleIntervalDaysChange" 
+                    @input="handleNumberInput" maxlength="3"></el-input>
+                  </template>
+                  <template v-else-if="task.IsBaseLine && scope.row.QuestionType=== 22">
+                    {{ scope.row.Answers[task.VisitTaskId] }}
+                  </template>
                   <!-- <template v-else-if="task.IsBaseLine && scope.row.QuestionType=== 13">
                     {{ $fd(scope.row.DictionaryCode, currentEvaluateResult) }}
                   </template> -->
@@ -193,7 +200,7 @@
                         @change="evaluateReasonChange"
                       />
                       <!-- 系统评估结果为：xxx,与当前调整的结果不一致，请填写调整原因 -->
-                      <p v-if="currentEvaluateResult !== tumorEvaluate" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:message:msg6') }}<span v-if="CriterionType === 2" style="color:red">{{ $fd('ImagingOverallAssessment_Lugano',tumorEvaluate) }}</span><span v-else style="color:red">{{ $fd('OverallAssessment',tumorEvaluate) }}</span>{{ $t('trials:readingReport:message:msg7') }}<span v-if="CriterionType === 2" style="color:red">{{ $fd('ImagingOverallAssessment_Lugano',currentEvaluateResult) }}</span><span v-else style="color:red">{{ $fd('OverallAssessment',currentEvaluateResult) }}</span>{{ $t('trials:readingReport:message:msg8') }}</p>
+                      <p v-if="tumorEvaluate && currentEvaluateResult && parseInt(currentEvaluateResult) !== parseInt(tumorEvaluate)" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:message:msg6').replace('***', $fd('CriterionType', CriterionType)) }}<span v-if="CriterionType === 2" style="color:red">{{ $fd('ImagingOverallAssessment_Lugano',tumorEvaluate) }}</span><span v-else-if="CriterionType === 10" style="color:red">{{ $fd('VisitTumorEvaluation',tumorEvaluate) }}</span><span v-else style="color:red">{{ $fd('OverallAssessment',tumorEvaluate) }}</span>{{ $t('trials:readingReport:message:msg7') }}<span v-if="CriterionType === 2" style="color:red">{{ $fd('ImagingOverallAssessment_Lugano',currentEvaluateResult) }}</span><span v-else-if="CriterionType === 10" style="color:red">{{ $fd('VisitTumorEvaluation',tumorEvaluate) }}</span><span v-else style="color:red">{{ $fd('OverallAssessment',currentEvaluateResult) }}</span>{{ $t('trials:readingReport:message:msg8') }}</p>
                       <p v-else-if="currentExistDisease !== isExistDisease" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:title:sysEvaluationRes') }}<span style="color:red">{{ $fd('ExistDisease',isExistDisease) }}</span>{{ $t('trials:readingReport:message:msg1') }}</p>
                     </template>
                     <!-- <template v-else>
@@ -341,7 +348,8 @@ export default {
       // 评估报告
       previewFileVisible: false,
       fileData: {},
-      reportBtnLoading:false
+      reportBtnLoading:false,
+      intervalDays: null
     }
   },
   computed: {
@@ -611,6 +619,10 @@ export default {
               this.currentTaskReason = obj.Answers[this.visitTaskId]
               this.answerArr.push({ id: item.QuestionId, answer: obj.Answers[this.visitTaskId], questionType: 14 })
             }
+            if (item.QuestionType === 22) {
+              this.intervalDays = obj.Answers[this.visitTaskId]
+              this.answerArr.push({ id: item.QuestionId, answer: obj.Answers[this.visitTaskId]?obj.Answers[this.visitTaskId]:null, questionType: 22 })
+            }
             if (item.Childrens.length >= 1) {
               obj.Childrens = this.getQuestions(item.Childrens, isNTFilterLength, lesionType, isLymphNodes)
             }
@@ -658,6 +670,20 @@ export default {
         this.answerArr[idx].answer = val
       }
     },
+    handleIntervalDaysChange(v) {
+      var idx = this.answerArr.findIndex(i => i.questionType === 22)
+      if (idx > -1) {
+        this.answerArr[idx].answer = v
+      }
+    },
+    handleNumberInput(value) {
+      var reg = /^(?!0)\d{1,3}$/
+      if(reg.test(value)==false){
+        this.intervalDays = ""
+      }else{
+        this.intervalDays = value
+      }
+    },
     async handleConfirm() {
       await this.handleSave(false)
       await this.verifyVisitTaskQuestions()