全局裁判肿瘤学阅片更改

src/views/trials/trials-panel/reading/ad-review/index.vue

@@ -424,9 +424,11 @@ export default {
     }
   },
   methods: {
-    getAdInfo() {
+    async getAdInfo() {
       this.loading = true
-      getJudgeReadingInfo({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
+        const res = await getJudgeReadingInfo({ visitTaskId: this.visitTaskId })
+        if (res.IsSuccess) {
           var judgeQS = []
           if (res.Result.VisitInfoList.length > 0) {
             res.Result.VisitInfoList[0].VisitTaskInfoList.map((v, index) => {
@@ -457,15 +459,23 @@ export default {
             this.adForm.judgeResultImagePathList = res.Result.JudgeResultImagePathList
           }
           this.visitTaskArmList = res.Result.VisitTaskArmList
+        }
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
-    getPriorAdList() {
+    async getPriorAdList() {
       this.priorLoading = true
-      getReadingPastResultList({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
+        const res = await getReadingPastResultList({ visitTaskId: this.visitTaskId })
+        if (res.IsSuccess) {
           this.priorADList = res.Result
+        }
         this.priorLoading = false
-      }).catch(() => { this.priorLoading = false })
+      } catch (e) {
+        this.priorLoading = false
+      }
     },
     handleVisitTaskArmChange(v) {
       var i = this.visitTaskArmList.findIndex(i => i.VisitTaskId === v)
@@ -491,8 +501,8 @@ export default {
       })
       window.open(routeData.href, '_blank')
     },
-    handleSave() {
+    async handleSave() {
-      this.$refs['adForm'].validate((valid) => {
+      const valid = await this.$refs['adForm'].validate()
       if (!valid) return
       this.loading = true
       var paths = []
@@ -503,21 +513,20 @@ export default {
       })
       this.adForm.judgeResultImagePathList = paths
       this.adForm.visitTaskId = this.visitTaskId
-        saveJudgeVisitTaskResult(this.adForm).then(res => {
+      try {
+        await saveJudgeVisitTaskResult(this.adForm)
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         this.loading = false
-        }).catch(() => {
+      } catch (e) {
         this.loading = false
-        })
+      }
-      })
     },
-    handleSubmit() {
+    async handleSubmit() {
-      this.$refs['adForm'].validate((valid) => {
+      const valid = await this.$refs['adForm'].validate()
       if (!valid) return
       const { ImageAssessmentReportConfirmation } = const_.processSignature
       this.signCode = ImageAssessmentReportConfirmation
       this.signVisible = true
-      })
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
@@ -528,7 +537,7 @@ export default {
       }
     },
     // 签名并确认
-    signConfirm(signInfo) {
+    async signConfirm(signInfo) {
       this.loading = true
       var paths = []
       this.fileList.map(file => {
@@ -543,7 +552,8 @@ export default {
         },
         signInfo: signInfo
       }
-      submitJudgeVisitTaskResult(params).then(async res => {
+      try {
+        const res = await submitJudgeVisitTaskResult(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.isEdit = false
@@ -553,38 +563,34 @@ export default {
           // window.opener.postMessage('refreshTaskList', window.location)
           // 设置当前任务阅片状态为已读
           this.adInfo.ReadingTaskState = 2
-          var isAutoTask = await this.getAutoTaskVal()
+          const res = await getAutoCutNextTask()
+          var isAutoTask = res.Result.AutoCutNextTask
           if (isAutoTask) {
             store.dispatch('reading/resetVisitTasks')
             DicomEvent.$emit('getNextTask')
           } else {
           // '当前阅片任务已完成，是否进入下一个阅片任务？'
-            this.$confirm(this.$t('trials:adReview:title:msg2'), {
+            const confirm = await this.$confirm(
+              this.$t('trials:adReview:title:msg2'),
+              {
                 type: 'warning',
                 distinguishCancelAndClose: true
-            })
+              }
-              .then(() => {
+            )
+            if (confirm === 'confirm') {
               store.dispatch('reading/resetVisitTasks')
               DicomEvent.$emit('getNextTask')
-              })
+            } else {
-              .catch(action => {
               changeURLStatic('visitTaskId', this.visitTaskId)
-              })
+            }
           }
           window.opener.postMessage('refreshTaskList', window.location)
         }
         this.loading = false
-      }).catch(_ => {
+      } catch (e) {
         this.loading = false
         this.$refs['signForm'].btnLoading = false
-      })
+      }
-    },
-    getAutoTaskVal() {
-      return new Promise((resolve, reject) => {
-        getAutoCutNextTask().then(res => {
-          resolve(res.Result.AutoCutNextTask)
-        }).catch(() => { reject() })
-      })
     },
     handleViewDetail(visitTaskId) {
       if (this.openWindow) {

src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue

@@ -372,8 +372,9 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
-        this.$refs['globalRuleForm'].validate(valid => {
+        let valid = await this.$refs['globalRuleForm'].validate()
+
         if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
@@ -403,7 +404,8 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            batchSubmitGlobalReadingInfo(params).then(res => {
+            try {
+              await batchSubmitGlobalReadingInfo(params)
               this.loading = false
               if (isPrompt) {
                 console.log(isPrompt)
@@ -411,15 +413,14 @@ export default {
               }
               this.$emit('getGlInfo')
               resolve()
-            }).catch(() => {
+            } catch (e) {
               this.loading = false
               reject()
-            })
+            }
           } else {
             reject()
           }
       })
-      })
     },
     getBeforeAnswer(qsId, row) {
       var i = row.BeforeQuestionList.findIndex(item => item.QuestionName === qsId)

src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue

@@ -376,8 +376,8 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
-        this.$refs['globalRuleForm'].validate(valid => {
+        let valid  = await this.$refs['globalRuleForm'].validate()
         if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
@@ -407,7 +407,8 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            batchSubmitGlobalReadingInfo(params).then(res => {
+            try {
+              await batchSubmitGlobalReadingInfo(params)
               this.loading = false
               if (isPrompt) {
                 console.log(isPrompt)
@@ -415,14 +416,14 @@ export default {
               }
               this.$emit('getGlInfo')
               resolve()
-            }).catch(() => {
+            } catch (e) {
               this.loading = false
               reject()
-            })
+            }
           } else {
             reject()
           }
-        })
+        
       })
     },
     getBeforeAnswer(qsId, row) {

src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue

@@ -219,8 +219,8 @@ export default {
       this.$emit('handleView', row)
     },
     handleSave(isPrompt = true) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
-        this.$refs['globalRuleForm'].validate(valid => {
+        let valid = await this.$refs['globalRuleForm'].validate()
         if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
@@ -247,22 +247,22 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            batchSubmitGlobalReadingInfo(params).then(res => {
+            try {
+              await batchSubmitGlobalReadingInfo(params)
               this.loading = false
               if (isPrompt) {
                 this.$message.success(this.$t('common:message:savedSuccessfully'))
               }
               this.$emit('getGlInfo')
               resolve()
-            }).catch(() => {
+            } catch (e) {
               this.loading = false
               reject()
-            })
+            }
           } else {
             reject()
           }
       })
-      })
     }
   }
 }

src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue

@@ -369,8 +369,8 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async(resolve, reject) => {
-        this.$refs['globalRuleForm'].validate(valid => {
+        let valid = await this.$refs['globalRuleForm'].validate()
         if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
@@ -400,7 +400,8 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            batchSubmitGlobalReadingInfo(params).then(res => {
+            try {
+              await batchSubmitGlobalReadingInfo(params)
               this.loading = false
               if (isPrompt) {
                 console.log(isPrompt)
@@ -408,15 +409,14 @@ export default {
               }
               this.$emit('getGlInfo')
               resolve()
-            }).catch(() => {
+            } catch (e) {
               this.loading = false
               reject()
-            })
+            }
           } else {
             reject()
           }
       })
-      })
     },
     getBeforeAnswer(qsId, row) {
       var i = row.BeforeQuestionList.findIndex(item => item.QuestionName === qsId)

src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue

@@ -363,8 +363,8 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
-        this.$refs['globalRuleForm'].validate(valid => {
+        let valid = await this.$refs['globalRuleForm'].validate()
         if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
@@ -394,7 +394,8 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            batchSubmitGlobalReadingInfo(params).then(res => {
+            try {
+              await batchSubmitGlobalReadingInfo(params)
               this.loading = false
               if (isPrompt) {
                 console.log(isPrompt)
@@ -402,14 +403,14 @@ export default {
               }
               this.$emit('getGlInfo')
               resolve()
-            }).catch(() => {
+            } catch (e) {
               this.loading = false
               reject()
-            })
+            }
           } else {
             reject()
           }
-        })
+        
       })
     },
     getBeforeAnswer(qsId, row) {

src/views/trials/trials-panel/reading/global-review/index.vue

@@ -256,10 +256,10 @@ export default {
     }
   },
   methods: {
-    getGlInfo() {
+    async getGlInfo() {
       this.loading = true
-      getGlobalReadingInfo({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
-        console.log('getGlobalReadingInfo')
+        let res = await getGlobalReadingInfo({ visitTaskId: this.visitTaskId })
         var evaluationQsList = []
         var adjustedQsList = []
         var agreeOrNotList = []
@@ -322,66 +322,20 @@ export default {
           trialId: this.trialId, subjectId: this.subjectId, subjectCode: this.subjectCode, visitTaskId: res.Result.GlobalTaskId, globalForm, globalUpdateType, evaluationQsList, adjustedQsList, agreeOrNotList, readingTaskState: this.readingTaskState, assessTypeList: res.Result.AssessTypeList
         }
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
-    getHistoryGlobalInfo() {
+    async getHistoryGlobalInfo() {
       this.historyLoading = true
-      getReadingPastResultList({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
+        let res = await getReadingPastResultList({ visitTaskId: this.visitTaskId })
         this.historyTaskList = res.Result
         this.historyLoading = false
-      }).catch(() => { this.historyLoading = false })
+      } catch (e) {
+        this.historyLoading = false 
+      }
     },
-    changeAgreeOrNotList(callback, row, visitTaskId) {
-      var message = ''
-      if (parseInt(callback) === 1) {
-        message = '是否确认更改？'
-        row.Answer = '0'
-      } else {
-        message = '是否确认更改？'
-        row.Answer = '1'
-      }
-      this.$confirm(message, {
-        distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        this.loading = true
-        var params = {
-          globalTaskId: this.visitTaskId,
-          subjectId: this.subjectId,
-          trialId: this.trialId,
-          questionList: [
-            {
-              questionId: row.QuestionId ? row.QuestionId : '',
-              visitTaskId: visitTaskId,
-              globalAnswerType: row.GlobalAnswerType,
-              answer: row.Answer === '1' ? '0' : '1'
-            }
-          ]
-        }
-        saveGlobalReadingInfo(params).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.getGlInfo()
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
-    },
-    // handleEdit(row) {
-    //   this.rowData = { ...row }
-    //   if (this.CriterionType === 1) {
-    //     this.rowData.AfterQuestionList.forEach(item => {
-    //       if (item.GlobalAnswerType === 1) {
-    //         // 全局阅片备注
-    //         item.QuestionName = this.$t('trials:globalReview:table:globalRemark')
-    //       } else if (item.GlobalAnswerType === 3) {
-    //         // 评估更新类型
-    //         item.QuestionName = this.$t('trials:globalReview:table:updateType')
-    //       }
-    //     })
-    //   }
-    //   // this.editVisible = true
-    // },
     handleSave() {
       this.$refs['globalTbl'].handleSave(true)
     },
@@ -435,53 +389,49 @@ export default {
       }
     },
     // 签名并确认
-    signConfirm(signInfo) {
+    async signConfirm(signInfo) {
       this.loading = true
-
       var params = {
         data: {
           globalTaskId: this.visitTaskId
         },
         signInfo: signInfo
       }
-      submitGlobalReadingInfo(params).then(async res => {
+      try{
+        let res = await submitGlobalReadingInfo(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.$refs['signForm'].btnLoading = false
           this.signVisible = false
           // 设置当前任务阅片状态为已读
           this.readingTaskState = 2
-          var isAutoTask = await this.getAutoTaskVal()
+          const res = await getAutoCutNextTask()
+          var isAutoTask = res.Result.AutoCutNextTask
           if (isAutoTask) {
             DicomEvent.$emit('getNextTask')
           } else {
             // 当前阅片任务已完成，是否进入下一个阅片任务
-            this.$confirm(this.$t('trials:globalReview:message:msg2'), {
+            const confirm = await this.$confirm(
+              this.$t('trials:globalReview:message:msg2'),
+              {
                 type: 'warning',
                 distinguishCancelAndClose: true
-            })
+              }
-              .then(() => {
+            )
+            if (confirm === 'confirm') {
               store.dispatch('reading/resetVisitTasks')
               DicomEvent.$emit('getNextTask')
-              })
+            } else {
-              .catch(action => {
               changeURLStatic('visitTaskId', this.visitTaskId)
-              })
+            }
           }
           window.opener.postMessage('refreshTaskList', window.location)
         }
         this.loading = false
-      }).catch(_ => {
+      } catch (e) {
         this.loading = false
         this.$refs['signForm'].btnLoading = false
-      })
+      }
-    },
-    getAutoTaskVal() {
-      return new Promise((resolve, reject) => {
-        getAutoCutNextTask().then(res => {
-          resolve(res.Result.AutoCutNextTask)
-        }).catch(() => { reject() })
-      })
     },
     handleView(row) {
       if (this.openWindow) {

src/views/trials/trials-panel/reading/oncology-review/index.vue

@@ -262,8 +262,11 @@
 <script>
 import { getOncologyReadingInfo, getReadingPastResultList, setOncologyReadingInfo, submitOncologyReadingInfo } from '@/api/trials'
 import { setSkipReadingCache } from '@/api/reading'
+import { getAutoCutNextTask } from '@/api/user'
 import const_ from '@/const/sign-code'
 import { getToken } from '@/utils/auth'
+import store from '@/store'
+import { changeURLStatic } from '@/utils/history.js'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 import SignForm from '@/views/trials/components/newSignForm'
 export default {
@@ -352,9 +355,10 @@ export default {
     }
   },
   methods: {
-    getList() {
+    async getList() {
       this.loading = true
-      getOncologyReadingInfo({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
+        const res = getOncologyReadingInfo({ visitTaskId: this.visitTaskId })
         var questions = []
         if (res.Result.OncologyVisits.length > 0) {
           var task = res.Result.OncologyVisits[0]
@@ -366,7 +370,9 @@ export default {
         this.assessTypeList = res.Result.AssessTypeList
         this.oncologyInfo = res.Result
         this.loading = false
-      }).catch(() => { this.loading = false })
+      } catch (e) {
+        this.loading = false
+      }
     },
     getAssessType(val) {
       var idx = this.assessTypeList.findIndex(i => i.Code === val)
@@ -377,28 +383,20 @@ export default {
       }
     },
     handleSave(isPrompt) {
-      return new Promise((resolve, reject) => {
+      return new Promise(async(resolve, reject) => {
         this.loading = true
         // var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult && !item.IsBaseLine)
         var isDiffer = this.checkDifferResult()
         if (isDiffer) {
           this.loading = false
-          // '肿瘤学阅片结论不能为空！' this.$t('trials:oncologyReview:message:msg1'
+          const confirm = await this.$confirm(
-          // '肿瘤学阅片结果与影像学整体肿瘤评估不一致，请填写原因！'
+            this.$t('trials:oncologyReview:message:msg2'),
-          // this.$confirm(this.$t('trials:oncologyReview:message:msg2'), {
+            {
-          //   type: 'warning',
-          //   distinguishCancelAndClose: true,
-          //   showCancelButton: false
-          // }).then(_ => {})
-          //   .catch(_ => {
-          //   })
-          this.$confirm(this.$t('trials:oncologyReview:message:msg2'), {
               type: 'warning',
-            showCancelButton: false
+              distinguishCancelAndClose: true
-          })
+            }
-            .then(() => {
+          )
-              reject(false)
+          if (confirm === 'confirm') reject(false)
-            })
         } else {
           this.loading = true
           var oncologyQuestionList = []
@@ -419,18 +417,18 @@ export default {
             globalTaskId: this.oncologyInfo.GlobalTaskId,
             relatedTaskId: this.oncologyInfo.RelatedTaskId
           }
-
+          try {
-          setOncologyReadingInfo(params).then(res => {
+            await setOncologyReadingInfo(params)
             this.loading = false
             this.getList()
             if (isPrompt) {
               this.$message.success(this.$t('common:message:savedSuccessfully'))
             }
             resolve(true)
-          }).catch(_ => {
+          } catch (e) {
             this.loading = false
             reject(false)
-          })
+          }
         }
       })
     },
@@ -453,13 +451,12 @@ export default {
       }
       return isDiffer
     },
-    handleSubmit() {
+    async handleSubmit() {
-      this.$refs['adForm'].validate((valid) => {
+      const valid = await this.$refs['adForm'].validate()
       if (!valid) return
       const { ImageAssessmentReportConfirmation } = const_.processSignature
       this.signCode = ImageAssessmentReportConfirmation
       this.signVisible = true
-      })
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
@@ -469,17 +466,16 @@ export default {
         this.signVisible = false
       }
     },
-    handleConfirm() {
+    async handleConfirm() {
-      this.handleSave(false).then(res => {
+      const res = await this.handleSave(false)
       if (res) {
         const { ImageAssessmentReportConfirmation } = const_.processSignature
         this.signCode = ImageAssessmentReportConfirmation
         this.signVisible = true
       }
-      })
     },
     // 签名并确认
-    signConfirm(signInfo) {
+    async signConfirm(signInfo) {
       this.loading = true
       var params = {
         data: {
@@ -487,7 +483,8 @@ export default {
         },
         signInfo: signInfo
       }
-      submitOncologyReadingInfo(params).then(res => {
+      try {
+        const res = await submitOncologyReadingInfo(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.isEdit = false
@@ -497,43 +494,45 @@ export default {
           // window.opener.postMessage('refreshTaskList', window.location)
           // 设置当前任务阅片状态为已读
           this.oncologyInfo.ReadingTaskState = 2
-          window.opener.postMessage('refreshTaskList', window.location)
+
+          const res = await getAutoCutNextTask()
+          var isAutoTask = res.Result.AutoCutNextTask
+          if (isAutoTask) {
+            store.dispatch('reading/resetVisitTasks')
+            DicomEvent.$emit('getNextTask')
+          } else {
           // '当前阅片任务已完成，是否进入下一个阅片任务？'
-          this.$confirm(this.$t('trials:oncologyReview:title:msg2'), {
+            const confirm = await this.$confirm(
+              this.$t('trials:oncologyReview:title:msg2'),
+              {
                 type: 'warning',
                 distinguishCancelAndClose: true
-          })
+              }
-            .then(() => {
+            )
-              // var token = getToken()
+            if (confirm === 'confirm') {
-              // var criterionType = this.$router.currentRoute.query.criterionType
+              store.dispatch('reading/resetVisitTasks')
-              // var readingTool = this.$router.currentRoute.query.readingTool
-              // var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
-              // var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
-              // var path = ''
-              // if (readingTool && parseInt(readingTool) === 0) {
-              //   path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
-              // } else {
-              //   path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${this.subjectCode}&subjectId=${this.subjectId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
-              // }
-              // this.$router.push({ path })
               DicomEvent.$emit('getNextTask')
-            })
+            } else {
-            .catch(action => {
+              changeURLStatic('visitTaskId', this.visitTaskId)
-
+            }
-            })
+          }
+          window.opener.postMessage('refreshTaskList', window.location)
         }
         this.loading = false
-      }).catch(_ => {
+      } catch (e) {
         this.loading = false
         this.$refs['signForm'].btnLoading = false
-      })
+      }
     },
-    getPriorList() {
+    async getPriorList() {
       this.priorLoading = true
-      getReadingPastResultList({ visitTaskId: this.visitTaskId }).then(res => {
+      try {
+        const res = await getReadingPastResultList({ visitTaskId: this.visitTaskId })
         this.priorList = res.Result
         this.priorLoading = false
-      }).catch(() => { this.priorLoading = false })
+      } catch (e) {
+        this.priorLoading = false
+      }
     },
     handleViewDetail(visitTaskId) {
       if (this.openWindow) {