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

src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue

@@ -263,7 +263,6 @@ export default {
   mounted() {
     this.trialId = this.$route.query.trialId
     this.initForm()
-    console.log(this.getQuestionVal(7))
   },
   beforeDestroy() {
 

src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/convertMultiframeImageIds.js

@@ -4,11 +4,18 @@ import cornerstoneDICOMImageLoader from '@cornerstonejs/dicom-image-loader'
  * preloads imageIds metadata in memory
  **/
 async function prefetchMetadataInformation(imageIdsToPrefetch) {
+  return new Promise(async(resolve, reject) =>{
+    var taskPromises = []
     for (let i = 0; i < imageIdsToPrefetch.length; i++) {
-    await cornerstoneDICOMImageLoader.wadouri.loadImage(imageIdsToPrefetch[i])
+      taskPromises.push(cornerstoneDICOMImageLoader.wadouri.loadImage(imageIdsToPrefetch[i]).promise)
-      .promise
+      if (taskPromises.length >= 6 || i === imageIdsToPrefetch.length - 1) {
+        await Promise.all(taskPromises)
+        taskPromises = []
       }
     }
+    resolve()
+  })  
+}
 
 function getFrameInformation(imageId) {
   if (imageId.includes('wadors:')) {

src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/getModalityUnit.js

@@ -15,7 +15,6 @@ function getModalityUnit(
 }
 
 function _handlePTModality(imageId, options) {
-  console.log(imageId, options)
   if (!options.isPreScaled) {
     return 'raw'
   }

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

@@ -66,8 +66,8 @@
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
 
                         <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1'" class="item" effect="dark" :content="`融向${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
+                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'" class="item" effect="dark" :content="`融向${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
-                            <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1'">
+                            <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
                               <span class="login-cycle" />
                             </div>
                           </el-tooltip>

src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue

@@ -18,7 +18,8 @@
       >
         <el-radio-group
           v-model="form.IsHaveQuestion"
-          :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
+          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
+          @change="isHaveQuestionChange"
         >
           <el-radio
             v-for="item of $d.YesOrNo"
@@ -44,7 +45,7 @@
         <el-input
           v-model="form.Questioning"
           type="textarea"
-          :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
+          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
         />
       </el-form-item>
       <!-- 审核建议 -->
@@ -58,7 +59,7 @@
       >
         <el-radio-group
           v-model="form.AuditAdviceEnum"
-          :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
+          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
         >
           <el-radio
             v-for="item of $d.AuditAdvice"
@@ -84,7 +85,7 @@
           :on-remove="handleRemove"
           :file-list="fileList"
 
-          :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
+          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
           style="width:300px"
         >
           <i slot="default" class="el-icon-plus" />
@@ -247,7 +248,6 @@ export default {
           if (!valid) {
             reject()
           } else {
-            this.loading = true
             this.form.IsSendDialog = this.form.IsHaveQuestion
             var files = []
             this.fileList.map(file => {
@@ -260,10 +260,8 @@ export default {
                 this.$emit('getMedicalAuditList')
               }
               this.isSendMessage = this.form.IsHaveQuestion
-              this.loading = false
               resolve()
             }).catch(() => {
-              this.loading = false
               reject()
             })
           }
@@ -296,16 +294,27 @@ export default {
         })
       })
     },
+    validForm() {
+      return new Promise((resolve) => {
+        this.$refs['conclusionsForm'].validate((valid) => {
+          resolve(valid)
+        })
+      })
+    },
     handleReply() {
       this.chatVisible = true
     },
     handleCloseReply() {
       this.closeQuestionVisible = true
     },
+    isHaveQuestionChange(val) {
+      this.$emit('setIsHaveQuestion', val)
+    },
     refresh() {
       this.isClosedDialog = true
       this.$emit('getMedicalAuditList')
       this.$refs['chatForm'].getMessageList()
+      this.$emit('handleSign')
     },
     convertBase64ToBlob(imageEditorBase64) {
       var base64Arr = imageEditorBase64.split(',')
@@ -340,7 +349,6 @@ export default {
         var file = await this.fileToBlob(param.file)
         var trialId = this.$route.query.trialId
         const res = await this.OSSclient.put(`/${trialId}/MedicalReview/${param.file.name}`, file)
-        console.log(res)
         this.fileList.push({ name: param.file.name, url: this.$getObjectName(res.url) })
         this.loading = false
       } catch (e) {

src/views/trials/trials-panel/reading/mim-medical-audit/components/FormItem.vue

@@ -21,7 +21,7 @@
       <el-input
         v-if="question.Type==='input'"
         v-model="questionForm[question.Id]"
-        :disabled="auditState >= 2"
+        :disabled="auditState >= 2 || isSendMessage || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
       />
       <!-- 多行文本输入框 -->
       <el-input
@@ -29,13 +29,13 @@
         v-model="questionForm[question.Id]"
         type="textarea"
         :autosize="{ minRows: 2, maxRows: 4}"
-        :disabled="auditState >= 2"
+        :disabled="auditState >= 2 || isSendMessage || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
       />
       <!-- 下拉框 -->
       <el-select
         v-if="question.Type==='select'"
         v-model="questionForm[question.Id]"
-        :disabled="auditState >= 2"
+        :disabled="auditState >= 2 || isSendMessage || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
         clearable
         @change="((val)=>{formItemChange(val, question)})"
       >
@@ -50,7 +50,7 @@
       <el-radio-group
         v-if="question.Type==='radio'"
         v-model="questionForm[question.Id]"
-        :disabled="auditState >= 2"
+        :disabled="auditState >= 2 || isSendMessage || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
         @change="((val)=>{formItemChange(val, question)})"
       >
         <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">{{ val }}</el-radio>
@@ -59,7 +59,7 @@
       <el-checkbox-group
         v-if="question.Type==='checkbox'"
         v-model="questionForm[question.Id]"
-        :disabled="auditState >= 2"
+        :disabled="auditState >= 2 || isSendMessage || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
       >
         <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">{{ val }}</el-checkbox>
       </el-checkbox-group>
@@ -71,6 +71,7 @@
       :question="item"
       :audit-state="auditState"
       :question-form="questionForm"
+      :is-send-message="isSendMessage"
       @resetFormItemData="resetFormItemData"
     />
   </div>
@@ -94,6 +95,10 @@ export default {
     auditState: {
       type: Number,
       required: true
+    },
+    isSendMessage: {
+      type: Boolean,
+      required: true
     }
   },
   data() {

src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue

@@ -13,7 +13,8 @@
         :key="question.Id"
         :question="question"
         :question-form="questionForm"
-        :audit-state="state"
+        :audit-state="auditState"
+        :is-send-message="isSendMessage"
         @resetFormItemData="resetFormItemData"
       />
 
@@ -43,6 +44,10 @@ export default {
     auditState: {
       type: Number,
       required: true
+    },
+    isSendMessage: {
+      type: Boolean,
+      required: true
     }
   },
   data() {
@@ -52,8 +57,7 @@ export default {
       isRender: false,
       trialId: '',
       readingTaskState: 0,
-      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
+      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1
-      state: [14, 30].includes(zzSessionStorage.getItem('userTypeEnumInt') * 1) ? this.auditState : 2
     }
   },
   mounted() {
@@ -67,7 +71,6 @@ export default {
           if (!valid) {
             reject()
           } else {
-            this.loading = true
             var answers = []
             for (const k in this.questionForm) {
               answers.push({ id: k, answer: this.questionForm[k] })
@@ -82,10 +85,8 @@ export default {
               if (isPrompt) {
                 this.$message.success(this.$t('common:message:savedSuccessfully'))
               }
-              this.loading = false
               resolve()
             }).catch(() => {
-              this.loading = false
               reject()
             })
           }
@@ -120,6 +121,13 @@ export default {
         })
       })
     },
+    validForm() {
+      return new Promise((resolve) => {
+        this.$refs['questions'].validate((valid) => {
+          resolve(valid)
+        })
+      })
+    },
     getQuestions() {
       this.loading = true
       var questions = []

src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue

@@ -20,6 +20,7 @@
           :question-answer-list="auditInfo.QuestionAnswerList"
           :task-medical-review-id="taskMedicalReviewId"
           :audit-state="auditInfo.AuditState"
+          :is-send-message="isSendMessage"
         />
       </div>
       <div>
@@ -34,29 +35,36 @@
           :subject-code="auditInfo.SubjectCode"
           :task-blind-name="auditInfo.TaskBlindName"
           @getMedicalAuditList="getMedicalAuditList"
+          @setIsHaveQuestion="setIsHaveQuestion"
+          @handleSign="handleSign"
         />
       </div>
     </div>
     <div class="medical-audit-bottom-btn">
       <el-divider />
       <!-- 取消 -->
-      <el-button v-if="auditInfo.MedicalReviewInfo" @click="handleCancel">
+      <!-- <el-button v-if="auditInfo.MedicalReviewInfo" @click="handleCancel">
         {{ $t('common:button:cancel') }}
-      </el-button>
+      </el-button> -->
       <!-- 保存 -->
-      <el-button v-if="auditInfo.MedicalReviewInfo && [14, 30].includes(userTypeEnumInt) && auditInfo.AuditState !== 2" type="primary" @click="handleSave">
+      <!-- <el-button v-if="auditInfo.MedicalReviewInfo && [14, 30].includes(userTypeEnumInt) && auditInfo.AuditState !== 2" type="primary" @click="handleSave">
         {{ $t('common:button:save') }}
+      </el-button> -->
+      <!-- 发起质询 -->
+      <!-- hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit']) -->
+      <el-button v-if="hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit']) && !isSendMessage && isHaveQuestion" type="primary" @click="handleLaunch">
+        {{ $t('trials:medicalFeedback:title:launch') }}
       </el-button>
-      <!-- 质询 -->
+      <!-- 质询记录 -->
-      <el-button v-if="auditInfo.MedicalReviewInfo && isSendMessage" type="primary" @click="handleQc">
+      <el-button v-if="isSendMessage" type="primary" @click="handleQc">
         {{ $t('trials:medicalFeedback:title:qaRecord') }}
       </el-button>
       <!-- 审核完成 -->
-      <el-button v-if="auditInfo.MedicalReviewInfo && [14, 30].includes(userTypeEnumInt) && auditInfo.AuditState !== 2" type="primary" @click="handleAudit">
+      <el-button v-if="hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit']) && (isHaveQuestion === false || (auditInfo.IsClosedDialog && isSendMessage)) && auditInfo.AuditState !== 2" type="primary" @click="handleAudit">
         {{ $t('trials:medicalFeedback:button:auditCompleted') }}
       </el-button>
-
+      <!-- 跳过 -->
-      <el-button v-if="auditInfo.MedicalReviewInfo && [14, 30].includes(userTypeEnumInt) && auditInfo.AuditState !== 2" type="primary" @click="getNextTask">
+      <el-button v-if="hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit']) && auditInfo.AuditState !== 2" type="primary" @click="getNextTask">
         {{ $t('trials:medicalFeedback:button:nextTask') }}
       </el-button>
     </div>
@@ -130,7 +138,8 @@ export default {
       currentUser: zzSessionStorage.getItem('userName'),
       signVisible: false,
       userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
-      isSendMessage: false
+      isSendMessage: false,
+      isHaveQuestion: false
     }
   },
   mounted() {
@@ -146,59 +155,69 @@ export default {
       getMedicalReviewReadingTask(params).then(res => {
         this.auditInfo = { ...res.Result }
         this.isSendMessage = res.Result.IsSendMessage
+        this.isHaveQuestion = res.Result.MedicalReviewInfo.IsHaveQuestion
         this.loading = false
       }).catch(() => {
         this.loading = false
       })
     },
     handleAudit() {
-      if (!this.$refs['auditConclusions'].isClosedDialog && this.$refs['auditConclusions'].form.IsHaveQuestion) {
+      if (this.$refs['auditConclusions'].isClosedDialog && this.$refs['auditConclusions'].form.IsHaveQuestion) {
-        // 请先关闭质询！
+        this.isSendMessage = this.$refs['auditConclusions'].form.IsHaveQuestion
-        this.$alert(this.$t('trials:medicalFeedback:message:closeQC'), {
+        this.handleSign()
-          callback: action => {}
+      } else if (!this.$refs['auditConclusions'].form.IsHaveQuestion) {
-        })
+        const loading = this.$loading({ fullscreen: true })
-        return
-      }
-      this.loading = true
         this.$refs['auditIssues'].handleSave(false).then(() => {
           this.$refs['auditConclusions'].handleSave(false).then(() => {
-          this.loading = false
             this.isSendMessage = this.$refs['auditConclusions'].form.IsHaveQuestion
+            this.handleSign()
+            loading.close()
+          }).catch(() => {
+            loading.close()
+          })
+        }).catch(() => {
+          loading.close()
+        })
+      }
+    },
+    handleSign() {
       const { MedicalAudit } = const_.processSignature
       this.signCode = MedicalAudit
       this.signVisible = true
-        }).catch(() => {
-          this.loading = false
-        })
-      }).catch(() => {
-        this.loading = false
-      })
-      // Promise.all([this.$refs['auditIssues'].handleSave(false), this.$refs['auditConclusions'].handleSave(false)])
-      //   .then(() => {
-      //     this.loading = false
-      //     const { MedicalAudit } = const_.processSignature
-      //     this.signCode = MedicalAudit
-      //     this.signVisible = true
-      //   }).catch(() => {
-      //     this.loading = false
-      //   })
     },
     handleSave() {
-      this.loading = true
+      const loading = this.$loading({ fullscreen: true })
       this.$refs['auditIssues'].handleSave(false).then(() => {
         this.$refs['auditConclusions'].handleSave(false).then(() => {
-          this.loading = false
           this.isSendMessage = this.$refs['auditConclusions'].form.IsHaveQuestion
+          this.$emit('getList')
+          loading.close()
         }).catch(() => {
-          this.loading = false
+          loading.close()
         })
       }).catch(() => {
-        this.loading = false
+        loading.close()
       })
     },
+    async handleLaunch() {
+      var auditIssuesValid = await this.$refs['auditIssues'].validForm()
+      var auditConclusionsValid = await this.$refs['auditConclusions'].validForm()
+      if (auditIssuesValid && auditConclusionsValid) {
+        this.$confirm('当前审核结论为“有问题”，是否发起质询？', {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        })
+          .then(() => {
+            this.handleSave()
+          }).catch(() => {})
+      }
+    },
     handleQc() {
       this.$refs['auditConclusions'].handleReply()
     },
+    setIsHaveQuestion(isHaveQuestion) {
+      this.isHaveQuestion = isHaveQuestion
+    },
     // 获取下一任务
     getNextTask() {
       this.loading = true

src/views/trials/trials-panel/reading/mim-medical-audit/index.vue

@@ -504,10 +504,37 @@
         @refresh="refresh"
       />
     </el-dialog>
+    <!--签名框 -->
+    <el-dialog
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+      append-to-body
+    >
+      <div slot="title">
+        <span
+          style="font-size:18px;"
+        >
+          {{ $t('common:dialogTitle:sign') }}
+        </span>
+        <span
+          style="font-size:12px;margin-left:5px"
+        >
+          {{ `(${$t('common:label:sign')}${ currentUser })` }}
+        </span>
+      </div>
+      <SignForm
+        ref="signForm"
+        :sign-code-enum="signCode"
+        @closeDialog="closeSignDialog"
+      />
+    </el-dialog>
   </BaseContainer>
 </template>
 <script>
-import { getTrialSiteSelect, getMIMMedicalReviewTaskList, getNextMedicalReviewTask } from '@/api/trials'
+import { getTrialSiteSelect, getMIMMedicalReviewTaskList, getNextMedicalReviewTask, FinishMedicalReview } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import { getDoctorUserSelectList } from '@/api/trials/reading'
 import { getToken } from '@/utils/auth'
@@ -516,7 +543,8 @@ import Pagination from '@/components/Pagination'
 import MedicalAudit from './components/MedicalAudit'
 import ChatForm from './components/ChatForm'
 import CloseQC from './components/CloseQC'
-
+import SignForm from '@/views/trials/components/newSignForm'
+import const_ from '@/const/sign-code'
 const searchDataDefault = () => {
   return {
     PageIndex: 1,
@@ -537,7 +565,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'MIMMedicalAudit',
-  components: { BaseContainer, Pagination, MedicalAudit, ChatForm, CloseQC },
+  components: { BaseContainer, Pagination, MedicalAudit, ChatForm, CloseQC, SignForm },
   data() {
     return {
       list: [],
@@ -555,7 +583,11 @@ export default {
       TrialReadingCriterionId: '0',
       trialCriterionList: [],
       closeQuestionVisible: false,
-      readingWindow: null
+      readingWindow: null,
+      signText: '',
+      signCode: null,
+      currentUser: zzSessionStorage.getItem('userName'),
+      signVisible: false
     }
   },
   watch: {
@@ -583,6 +615,9 @@ export default {
     refresh() {
       this.isClosedDialog = true
       this.$refs['chatForm'].getMessageList()
+      const { MedicalAudit } = const_.processSignature
+      this.signCode = MedicalAudit
+      this.signVisible = true
     },
     handleCloseReply() {
       this.closeQuestionVisible = true
@@ -604,6 +639,46 @@ export default {
         this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
       }).catch(() => {})
     },
+    // 关闭签名框并设置确认状态
+    closeSignDialog(isSign, signInfo) {
+      if (isSign) {
+        this.signConfirm(signInfo)
+      } else {
+        this.signVisible = false
+      }
+    },
+    // 签名确认
+    signConfirm(signInfo) {
+      this.loading = true
+      const params = {
+        data: {
+          taskMedicalReviewId: this.currentRow.Id
+        },
+        signInfo: signInfo
+      }
+      FinishMedicalReview(params).then(res => {
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.$refs['signForm'].btnLoading = false
+          this.signVisible = false
+          this.chatForm.visible = false
+        }
+        this.loading = false
+        this.getList()
+          .then(() => {
+            this.loading = true
+            this.$emit('nextTask', this.taskMedicalReviewId)
+          })
+          .catch(action => {
+
+          })
+      }).catch(_ => {
+        this.loading = false
+        if (this.$refs['signForm']) {
+          this.$refs['signForm'].btnLoading = false
+        }
+      })
+    },
     handleView(row) {
       this.currentRow = { ...row }
       this.auditVisible = true
@@ -622,9 +697,9 @@ export default {
         this.currentRow = { ...row }
         this.auditVisible = true
         // 访视任务，打开阅片页面
-        if (row.ReadingCategory === 1) {
+        // if (row.ReadingCategory === 1) {
-          this.handleViewReadingPage(row)
+        //   this.handleViewReadingPage(row)
-        }
+        // }
       } else {
         // '请先确认医学审核问题模板配置！'
         this.$alert(this.$t('trials:medicalFeedback:message:confirmTemplate'), {

src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue

@@ -346,7 +346,7 @@
             <el-button
               circle
               :title="$t('trials:pmMedicalReview:action:view')"
-              :disabled="scope.row.IsInvalid || scope.row.AuditState !== 2"
+              :disabled="scope.row.IsInvalid "
               icon="el-icon-view"
               @click="handleReadMecialAudit(scope.row)"
             />

src/views/trials/trials-panel/subject/reading-period/index.vue

@@ -176,7 +176,7 @@
                           <div>
                             {{ $t('trials:readingPeriod:table:clinicalInfo2') }}
                           </div>
-                          <el-link type="danger" v-if="(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsSubjectClinicalData && scope.row.Data[i-1].IsBaseLine) ||(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsVisitClinicalData) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsReadingClinicalData) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsOncologyReadClinicalData)" @click="handleView(scope.row,scope.row.Data[i-1])">
+                          <el-link type="danger" v-if="(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsSubjectClinicalData && scope.row.Data[i-1].IsBaseLine) ||(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsVisitClinicalData) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsReadingClinicalData && scope.row.Data[i-1].ModuleType === 3) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsOncologyReadClinicalData && scope.row.Data[i-1].ModuleType === 5)" @click="handleView(scope.row,scope.row.Data[i-1])">
                             {{ $t('trials:readingPeriod:button:view') }}
                           </el-link>
                           <span v-else>{{ $t('trials:readingPeriod:table:noCD') }}</span>