diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index ac9e0ebf..b204102b 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -5,56 +5,9 @@
ref="conclusionsForm"
v-loading="loading"
:model="form"
- label-width="100px"
- style="width:500px"
+ label-position="left"
+ label-width="800px"
>
-
-
-
-
-
-
-
-
-
@@ -106,6 +61,7 @@
-
-
-
-
!item.EvaluationResult && !item.IsBaseLine)
- var isDiffer = this.checkDifferResult()
- if (isDiffer) {
- this.loading = false
- // '肿瘤学阅片结论不能为空!' this.$t('trials:oncologyReview:message:msg1'
- // '肿瘤学阅片结果与影像学整体肿瘤评估不一致,请填写原因!'
- this.$confirm(this.$t('trials:oncologyReview:message:msg2'), {
- type: 'warning',
- distinguishCancelAndClose: true
- })
- .then(() => {
- return Promise.reject(false)
- })
- .catch(action => {
- return Promise.reject(false)
- })
- } else {
+ return new Promise((resolve, reject) => {
this.loading = true
- var oncologyQuestionList = []
- this.oncologyInfo.OncologyVisits.map(item => {
- if (item.EvaluationResult && !item.IsBaseLine) {
- oncologyQuestionList.push(
- {
- visitTaskId: item.VisitTaskId,
- evaluationResult: item.EvaluationResult,
- evaluationReason: item.EvaluationReason
- }
- )
+ // 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'
+ // '肿瘤学阅片结果与影像学整体肿瘤评估不一致,请填写原因!'
+ // 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
+ })
+ .then(() => {
+ reject(false)
+ })
+ } else {
+ this.loading = true
+ var oncologyQuestionList = []
+ this.oncologyInfo.OncologyVisits.map(item => {
+ if (item.EvaluationResult && !item.IsBaseLine) {
+ oncologyQuestionList.push(
+ {
+ visitTaskId: item.VisitTaskId,
+ evaluationResult: item.EvaluationResult,
+ evaluationReason: item.EvaluationReason
+ }
+ )
+ }
+ })
+ var params = {
+ oncologyTaskId: this.visitTaskId,
+ oncologyQuestionList: oncologyQuestionList,
+ globalTaskId: this.oncologyInfo.GlobalTaskId,
+ relatedTaskId: this.oncologyInfo.RelatedTaskId
}
- })
- var params = {
- oncologyTaskId: this.visitTaskId,
- oncologyQuestionList: oncologyQuestionList,
- globalTaskId: this.oncologyInfo.GlobalTaskId,
- relatedTaskId: this.oncologyInfo.RelatedTaskId
- }
- return new Promise((resolve, reject) => {
+
setOncologyReadingInfo(params).then(res => {
this.loading = false
this.getList()
@@ -411,8 +416,8 @@ export default {
this.loading = false
reject(false)
})
- })
- }
+ }
+ })
},
checkDifferResult() {
var isDiffer = false
@@ -424,7 +429,11 @@ export default {
var idx = this.oncologyInfo.OncologyVisits[i].QuestionList.findIndex(v => v.DictionaryCode === 'ImagingOverallAssessment_Lugano')
if (idx > -1) {
tumorAssessment = this.oncologyInfo.OncologyVisits[i].QuestionList[idx].Answer
- if (tumorAssessment !== this.oncologyInfo.OncologyVisits[i].EvaluationResult) {
+ console.log(tumorAssessment === this.oncologyInfo.OncologyVisits[i].EvaluationResult)
+ if (tumorAssessment === this.oncologyInfo.OncologyVisits[i].EvaluationResult || (tumorAssessment !== this.oncologyInfo.OncologyVisits[i].EvaluationResult && this.oncologyInfo.OncologyVisits[i].EvaluationReason)) {
+ isDiffer = false
+ break
+ } else {
isDiffer = true
break
}