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

.env.production

@@ -10,7 +10,7 @@ VUE_APP_IS_TEST = true
 VUE_APP_LOGIN_FOR_PERMISSION = false
 
 # 是否开启长时间无操作锁定弹框 true:是 false:否
-VUE_APP_LOCK_FOR_PERMISSION = true
+VUE_APP_LOCK_FOR_PERMISSION = false
 
 # 无操作锁定弹框判断时间 单位:秒
 VUE_APP_LOCK_FOR_TIME = 360

.eslintignore

@@ -4,7 +4,8 @@ src/utils/*
 public
 dist
 
-src/*
+# src/*
+src/views/trials/trials-panel/reading/global-review/*
 src/views/dictionary/checkConfig/*
 src/views/trials/trials-panel/trial-summary/*
 src/main.js

.gitignore

@@ -14,3 +14,4 @@ tests/**/coverage/
 *.ntvs*
 *.njsproj
 *.sln
+.eslintignore

src/views/research/components/HistoricalParticipantForm.vue

@@ -3,19 +3,11 @@
     <div class="base-dialog-body">
       <!-- 姓 -->
       <el-form-item :label="$t('trials:staffResearch:form:lastName')" prop="LastName">
-        <el-input
+        <el-input v-model="form.LastName" disabled style="width: 200px" />
-          v-model="form.LastName"
-          disabled
-          style="width:200px;"
-        />
       </el-form-item>
       <!-- 名 -->
       <el-form-item :label="$t('trials:staffResearch:form:firstName')" prop="FirstName">
-        <el-input
+        <el-input v-model="form.FirstName" disabled style="width: 200px" />
-          v-model="form.FirstName"
-          disabled
-          style="width:200px;"
-        />
       </el-form-item>
       <!-- 角色 -->
       <!-- <el-form-item :label="$t('trials:staffResearch:form:role')" prop="TrialRoleCode">
@@ -34,27 +26,15 @@
       </el-form-item> -->
       <!-- 电话号码 -->
       <el-form-item :label="$t('trials:staffResearch:form:phone')" prop="Phone">
-        <el-input
+        <el-input v-model="form.Phone" disabled style="width: 200px" />
-          v-model="form.Phone"
-          disabled
-          style="width:200px;"
-        />
       </el-form-item>
       <!-- 邮箱 -->
       <el-form-item :label="$t('trials:staffResearch:form:email')" prop="Email">
-        <el-input
+        <el-input v-model="form.Email" disabled style="width: 200px" />
-          v-model="form.Email"
-          disabled
-          style="width:200px;"
-        />
       </el-form-item>
       <!-- 单位 -->
       <el-form-item :label="$t('trials:staffResearch:form:organization')" prop="OrganizationName">
-        <el-input
+        <el-input v-model="form.OrganizationName" disabled style="width: 200px" />
-          v-model="form.OrganizationName"
-          disabled
-          style="width:200px;"
-        />
       </el-form-item>
       <!-- 是否生成账号 -->
       <!-- <el-form-item
@@ -69,51 +49,35 @@
           </el-radio-group>
         </el-form-item> -->
       <!-- 用户类型 -->
-      <el-form-item
+      <el-form-item v-if="form.IsGenerateAccount" :label="$t('trials:staffResearch:form:userType')" prop="UserTypeId">
-        v-if="form.IsGenerateAccount"
+        <el-select v-model="form.UserTypeId" style="width: 200px" disabled>
-        :label="$t('trials:staffResearch:form:userType')"
+          <el-option v-for="item of userTypeOptions" :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
-        prop="UserTypeId"
-      >
-        <el-select
-          v-model="form.UserTypeId"
-          style="width:200px;"
-          disabled
-        >
-          <el-option
-            v-for="item of userTypeOptions"
-            :key="item.Id"
-            :label="item.UserTypeShortName"
-            :value="item.Id"
-          >
             <span>{{ item.UserType }}</span>
           </el-option>
         </el-select>
       </el-form-item>
       <!-- 更新状态 -->
-      <el-form-item
+      <el-form-item :label="$t('trials:staffResearch:form:updateState')">
-        :label="$t('trials:staffResearch:form:updateState')"
+        <el-radio-group v-model="form.IsHistoryUserDeleted" style="width: 200px">
-      >
+          <el-radio v-for="item of $d.IsUserExitTrial" :key="`IsHistoryUserDeleted${item.value}`" :label="item.value">{{
-        <el-radio-group
+            item.label }}</el-radio>
-          v-model="form.IsHistoryUserDeleted"
-          style="width:200px;"
-        >
-          <el-radio v-for="item of $d.IsUserExitTrial" :key="`IsHistoryUserDeleted${item.value}`" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item v-if="errorMsg" label="">
-        <span v-if="errorMsg" style="font-size: 12px;color: #f66;">{{ errorMsg }}</span>
+        <span v-if="errorMsg" style="font-size: 12px; color: #f66">{{
+          errorMsg
+        }}</span>
       </el-form-item>
-
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <!-- 取消 -->
         <el-button size="small" type="primary" :disabled="btnLoading" @click="handleCancel">
-          {{ $t('common:button:cancel') }}
+          {{ $t("common:button:cancel") }}
         </el-button>
         <!-- 保存 -->
         <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
-          {{ $t('common:button:save') }}
+          {{ $t("common:button:save") }}
         </el-button>
       </el-form-item>
     </div>
@@ -142,7 +106,8 @@ export default {
       if (value === '') {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
-        var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        var reg =
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
         if (this.form.Email && reg.test(this.form.Email)) {
           this.sendDisabled = false
           callback()
@@ -164,29 +129,64 @@ export default {
         OrganizationName: '',
         IsGenerateAccount: false,
         IsHistoryUserDeleted: ''
-
       },
       rules: {
         LastName: [
-          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' },
+          {
-          { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: 'blur' }
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
         ],
         FirstName: [
-          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' },
+          {
-          { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: 'blur' }
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
         ],
         TrialRoleCode: [
-          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
+        ],
+        UserTypeId: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur']
+          }
         ],
-        UserTypeId: [{ required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur'] }],
         Phone: [
-          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50', trigger: 'blur' }
+          {
+            max: 50,
+            message: this.$t('common:ruleMessage:maxLength') + ' 50',
+            trigger: 'blur'
+          }
         ],
         Email: [
           { required: true, validator: validateEmail, trigger: ['blur'] }
         ],
         IsHistoryUserDeleted: [
-          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
         ]
       },
       btnLoading: false,
@@ -202,7 +202,7 @@ export default {
   methods: {
     async initForm() {
       await this.getUserType()
-      Object.keys(this.data).forEach(key => {
+      Object.keys(this.data).forEach((key) => {
         this.form[key] = this.data[key]
       })
       if (zzSessionStorage.getItem('userTypeEnumInt')) {
@@ -211,24 +211,31 @@ export default {
     },
     // 保存参与者信息
     handleSave() {
-      this.$refs['participantForm'].validate(valid => {
+      this.$refs['participantForm'].validate((valid) => {
         if (!valid) return
         this.btnLoading = true
         if (!this.form.TrialSiteSurveyId) {
           this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId')
         }
         const trialId = getQueryString('trialId')
-        addOrUpdateTrialSiteUserSurvey(trialId, this.form).then(res => {
+        addOrUpdateTrialSiteUserSurvey(trialId, this.form)
+          .then((res) => {
             this.btnLoading = false
             if (res.IsSuccess) {
               // 保存成功
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
+              this.$message.success(
+                this.$t('common:message:savedSuccessfully')
+              )
 
               this.$emit('close', { id: res.Result, errorMessage: '' })
             }
-        }).catch((res) => {
+          })
+          .catch((res) => {
             if (res.Result && res.Result.Id && res.ErrorMessage) {
-            this.$emit('close', { id: res.Result.Id, errorMessage: res.ErrorMessage })
+              this.$emit('close', {
+                id: res.Result.Id,
+                errorMessage: res.ErrorMessage
+              })
               // this.$confirm(res.ErrorMessage, '', {
               //   type: 'warning'
               // }).then(() => {
@@ -250,8 +257,15 @@ export default {
     },
     // 获取系统用户类型
     getUserType() {
-      getUserTypeList(3).then(res => {
+      return new Promise((resolve) => {
+        getUserTypeList(3).then((res) => {
           this.userTypeOptions = res.Result
+          var crcObj = res.Result.find((i) => i.UserTypeEnum === 2)
+          this.crcId = crcObj ? crcObj.Id : ''
+          var craObj = res.Result.find((i) => i.UserTypeEnum === 9)
+          this.craId = craObj ? craObj.Id : ''
+        })
+        resolve()
       })
     }
   }

src/views/research/components/ParticipantForm.vue

@@ -1,27 +1,19 @@
 <template>
-  <el-form ref="participantForm" :model="form" :rules="rules" label-width="200px" :inline="true">
+  <el-form ref="participantForm" v-loading="loading" :model="form" :rules="rules" label-width="200px" :inline="true">
     <div class="base-dialog-body">
       <!-- 姓 -->
       <el-form-item :label="$t('trials:staffResearch:form:lastName')" prop="LastName">
-        <el-input
+        <el-input v-model="form.LastName" :disabled="!(state === 0 && userTypeEnumInt === 0)" style="width: 200px" />
-          v-model="form.LastName"
-          :disabled="!(state === 0 && userTypeEnumInt === 0)"
-          style="width:200px;"
-        />
       </el-form-item>
       <!-- 名 -->
       <el-form-item :label="$t('trials:staffResearch:form:firstName')" prop="FirstName">
-        <el-input
+        <el-input v-model="form.FirstName" :disabled="!(state === 0 && userTypeEnumInt === 0)" style="width: 200px" />
-          v-model="form.FirstName"
-          :disabled="!(state === 0 && userTypeEnumInt === 0)"
-          style="width:200px;"
-        />
       </el-form-item>
       <!-- 角色 -->
       <el-form-item :label="$t('trials:staffResearch:form:role')" prop="TrialRoleCode">
         <el-select
           v-model="form.TrialRoleCode"
-          style="width:200px;"
+          style="width: 200px"
           :disabled="!(state === 0 && userTypeEnumInt === 0)"
           @change="handleTrialRoleChange"
         >
@@ -35,26 +27,18 @@
       </el-form-item>
       <!-- 电话号码 -->
       <el-form-item :label="$t('trials:staffResearch:form:phone')" prop="Phone">
-        <el-input
+        <el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0)" style="width: 200px" />
-          v-model="form.Phone"
-          :disabled="!(state === 0 && userTypeEnumInt === 0)"
-          style="width:200px;"
-        />
       </el-form-item>
       <!-- 邮箱 -->
       <el-form-item :label="$t('trials:staffResearch:form:email')" prop="Email">
-        <el-input
+        <el-input v-model="form.Email" :disabled="!(state === 0 && userTypeEnumInt === 0)" style="width: 200px" />
-          v-model="form.Email"
-          :disabled="!(state === 0 && userTypeEnumInt === 0)"
-          style="width:200px;"
-        />
       </el-form-item>
       <!-- 单位 -->
       <el-form-item :label="$t('trials:staffResearch:form:organization')" prop="OrganizationName">
         <el-input
           v-model="form.OrganizationName"
           :disabled="!(state === 0 && userTypeEnumInt === 0)"
-          style="width:200px;"
+          style="width: 200px"
         />
       </el-form-item>
       <!--      <el-row>
@@ -93,19 +77,20 @@
         </el-form-item>
       </el-row>-->
       <el-form-item v-if="errorMsg" label="">
-        <span v-if="errorMsg" style="font-size: 12px;color: #f66;">{{ errorMsg }}</span>
+        <span v-if="errorMsg" style="font-size: 12px; color: #f66">{{
+          errorMsg
+        }}</span>
       </el-form-item>
-
     </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
       <el-form-item>
         <!-- 取消 -->
         <el-button size="small" type="primary" :disabled="btnLoading" @click="handleCancel">
-          {{ $t('common:button:cancel') }}
+          {{ $t("common:button:cancel") }}
         </el-button>
         <!-- 保存 -->
         <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
-          {{ $t('common:button:save') }}
+          {{ $t("common:button:save") }}
         </el-button>
       </el-form-item>
     </div>
@@ -152,7 +137,8 @@ export default {
       if (value === '') {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
-        var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        var reg =
+          /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
         if (this.form.Email && reg.test(this.form.Email)) {
           this.sendDisabled = false
           callback()
@@ -175,23 +161,54 @@ export default {
         // IsCorrect: false,
         IsGenerateAccount: false,
         IsDisable: false
-
       },
       rules: {
         LastName: [
-          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' },
+          {
-          { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: 'blur' }
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
         ],
         FirstName: [
-          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' },
+          {
-          { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: 'blur' }
+            required: true,
+            message: this.$t('trials:researchForm:formRule:specify'),
+            trigger: 'blur'
+          },
+          {
+            min: 0,
+            max: 50,
+            message: this.$t('trials:researchForm:formRule:maxLength'),
+            trigger: 'blur'
+          }
         ],
         TrialRoleCode: [
-          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur', 'change']
+          }
+        ],
+        UserTypeId: [
+          {
+            required: true,
+            message: this.$t('trials:researchForm:formRule:select'),
+            trigger: ['blur']
+          }
         ],
-        UserTypeId: [{ required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur'] }],
         Phone: [
-          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50', trigger: 'blur' }
+          {
+            max: 50,
+            message: this.$t('common:ruleMessage:maxLength') + ' 50',
+            trigger: 'blur'
+          }
         ],
         Email: [
           { required: true, validator: validateEmail, trigger: ['blur'] }
@@ -203,7 +220,8 @@ export default {
       userTypeEnumInt: 0,
       errorMsg: '',
       crcId: '',
-      craId: ''
+      craId: '',
+      loading: false
     }
   },
   mounted() {
@@ -211,34 +229,43 @@ export default {
   },
   methods: {
     async initForm() {
-      Object.keys(this.data).forEach(key => {
+      this.loading = true
+      await this.getUserType()
+      Object.keys(this.data).forEach((key) => {
         this.form[key] = this.data[key]
       })
       if (zzSessionStorage.getItem('userTypeEnumInt')) {
         this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
       }
-      this.getUserType()
+      this.loading = false
     },
     // 保存参与者信息
     handleSave() {
-      this.$refs['participantForm'].validate(valid => {
+      this.$refs['participantForm'].validate((valid) => {
         if (!valid) return
         this.btnLoading = true
         if (!this.form.TrialSiteSurveyId) {
           this.form.TrialSiteSurveyId = getQueryString('trialSiteSurveyId')
         }
         const trialId = getQueryString('trialId')
-        addOrUpdateTrialSiteUserSurvey(trialId, this.form).then(res => {
+        addOrUpdateTrialSiteUserSurvey(trialId, this.form)
+          .then((res) => {
             this.btnLoading = false
             if (res.IsSuccess) {
               // 保存成功
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
+              this.$message.success(
+                this.$t('common:message:savedSuccessfully')
+              )
 
               this.$emit('close', { id: res.Result, errorMessage: '' })
             }
-        }).catch((res) => {
+          })
+          .catch((res) => {
             if (res.Result && res.Result.Id && res.ErrorMessage) {
-            this.$emit('close', { id: res.Result.Id, errorMessage: res.ErrorMessage })
+              this.$emit('close', {
+                id: res.Result.Id,
+                errorMessage: res.ErrorMessage
+              })
               // this.$confirm(res.ErrorMessage, '', {
               //   type: 'warning'
               // }).then(() => {
@@ -275,13 +302,16 @@ export default {
     },
     // 获取系统用户类型
     getUserType() {
-      getUserTypeList(3).then(res => {
+      return new Promise((resolve) => {
+        getUserTypeList(3).then((res) => {
           this.userTypeOptions = res.Result
-        var crcObj = res.Result.find(i => i.UserTypeEnum === 2)
+          var crcObj = res.Result.find((i) => i.UserTypeEnum === 2)
           this.crcId = crcObj ? crcObj.Id : ''
-        var craObj = res.Result.find(i => i.UserTypeEnum === 9)
+          var craObj = res.Result.find((i) => i.UserTypeEnum === 9)
           this.craId = craObj ? craObj.Id : ''
         })
+        resolve()
+      })
     },
     handleIsCorrectChange(val) {
       if (!val) {

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

@@ -295,6 +295,9 @@ export default {
   },
   methods: {
     formItemChange(v, question) {
+      if(question.QuestionType === 55){
+        this.$emit('setFormItemData', {key:question.Id,val:v})
+      }
       if (question.Childrens.length > 0) {
         this.resetChild(question.Childrens)
       }

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

@@ -53,6 +53,8 @@ export default {
       measurements: [],
       currentQsId: '',
       pet5PSId: '',
+      pet5PSCommentsId:'',
+      calculatePet5PS:null,
       liverSuvmaxId: '',
       lungSuvmaxId: '',
       suvmaxId: '',
@@ -146,6 +148,8 @@ export default {
           }
         })
         this.questions = questions
+        this.calculatePet5PS = this.setpet5PS()
+        this.setPet5PSCommentDisplay()
         this.measurements = []
         res.OtherInfo.QuestionMarkInfoList.forEach(i => {
           if (i.OtherMeasureData) {
@@ -179,6 +183,10 @@ export default {
             // PET 5PS评分
             this.pet5PSId = i.Id
           }
+          if (i.QuestionType === 59) {
+            // 修改PET 5PS评分备注
+            this.pet5PSCommentsId = i.Id
+          }
           if (i.Childrens && i.Childrens.length > 0) {
             this.setChild(i.Childrens)
           }
@@ -283,11 +291,12 @@ export default {
       var idx = this.measurements.findIndex(i => i.QuestionId === Id)
       if (idx === -1) return
       this.$set(this.questionForm, Id, '')
-      this.setpet5PS()
+      var pet5PS = this.setpet5PS()
+      this.questionForm[this.pet5PSId] = pet5PS
+      this.calculatePet5PS = pet5PS
+      this.setPet5PSCommentDisplay()
       FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.measurements[idx].OtherMeasureData, type: 'clear' })
       this.measurements.splice(idx, 1)
-      console.log( this.measurements)
-      this.questionFormChangeState = true
     },
     locateAnnotation(obj) {
       console.log('locateAnnotation')
@@ -326,7 +335,10 @@ export default {
       if (measurement.type === 'CircleROI') {
         const suvMax = measurement.suvMax
         this.$set(this.questionForm, obj.QuestionId, suvMax || null)
-        this.setpet5PS()
+        var pet5PS = this.setpet5PS()
+        this.questionForm[this.pet5PSId] = pet5PS
+        this.calculatePet5PS = pet5PS
+        this.setPet5PSCommentDisplay()
       }
       FusionEvent.$emit('addOrUpdateAnnotations', { data })
       this.questionFormChangeState = true
@@ -359,7 +371,10 @@ export default {
       if (measurement.metadata.toolName === 'CircleROI') {
         // const suvMax = measurement.suvMax
         this.$set(this.questionForm, obj.QuestionId, null)
-        this.setpet5PS()
+        var pet5PS = this.setpet5PS()
+        this.questionForm[this.pet5PSId] = pet5PS
+        this.calculatePet5PS = pet5PS
+        this.setPet5PSCommentDisplay()
       }
       FusionEvent.$emit('addOrUpdateAnnotations', { data })
       this.questionFormChangeState = true
@@ -368,7 +383,10 @@ export default {
       var idx = this.measurements.findIndex(i => i.OrderMarkName === remark)
       if (idx === -1) return
       this.$set(this.questionForm, this.measurements[idx].QuestionId, '')
-      this.setpet5PS()
+      var pet5PS = this.setpet5PS()
+      this.questionForm[this.pet5PSId] = pet5PS
+      this.calculatePet5PS = pet5PS
+      this.setPet5PSCommentDisplay()
       this.measurements[idx].OtherMeasureData = ''
       this.currentQsId = this.measurements[idx].QuestionId
       // const { QuestionId, QuestionType } = this.measurements[idx]
@@ -379,6 +397,26 @@ export default {
     },
     setFormItemData(obj) {
       this.questionForm[obj.key] = obj.val
+      if(obj.key === this.pet5PSId){
+        this.setPet5PSCommentDisplay()
+      }
+    },
+    setPet5PSCommentDisplay(){
+      if( this.pet5PSCommentsId && this.pet5PSId ){
+        for (let i = 0; i < this.questions[0].Childrens[0].Childrens.length; i++) {
+          if (this.questions[0].Childrens[0].Childrens[i].QuestionType === 59) {
+            if(this.calculatePet5PS && this.calculatePet5PS !== this.questionForm[this.pet5PSId]){
+              this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 0
+              this.questions[0].Childrens[0].Childrens[i].IsRequired = 0
+            }else{
+              this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 2
+              this.questions[0].Childrens[0].Childrens[i].IsRequired = 3
+              this.questionForm[this.pet5PSCommentsId] = ''
+            }
+            break
+          }
+        }
+      }
     },
     setpet5PS() {
       console.log('setpet5PS')
@@ -391,18 +429,23 @@ export default {
       const lungSUVmax = !isNaN(parseFloat(this.questionForm[this.lungSuvmaxId])) ? parseFloat(this.questionForm[this.lungSuvmaxId]) : 0
       if (maxSUVmax > liverSUVmax * 2) {
         // 本访视病灶的 max SUVmax（所有病灶中最大的）>2*肝脏血池SUVmax   5分
-        this.questionForm[this.pet5PSId] = '5'
+        // this.questionForm[this.pet5PSId] = '5'
+        return '5'
       } else if (maxSUVmax > liverSUVmax) {
         // 本访视病灶的SUVmax（所有病灶中最大的）>肝脏血池SUVmax          4分
-        this.questionForm[this.pet5PSId] = '4'
+        // this.questionForm[this.pet5PSId] = '4'
+        return '4'
       } else if (maxSUVmax > lungSUVmax && maxSUVmax <= liverSUVmax) {
         // 纵隔血池SUVmax<本访视点病灶的max SUVmax（所有病灶中最大的）≤1*肝脏血池SUVmax    3分
-        this.questionForm[this.pet5PSId] = '3'
+        // this.questionForm[this.pet5PSId] = '3'
+        return '3'
       } else if (maxSUVmax < lungSUVmax) {
         // 本访视点病灶的SUVmax（所有病灶中最大的）<纵隔血池SUVmax     2分
-        this.questionForm[this.pet5PSId] = '2'
+        // this.questionForm[this.pet5PSId] = '2'
+        return '2'
       }else{
-        this.questionForm[this.pet5PSId] = ''
+        // this.questionForm[this.pet5PSId] = ''
+        return ''
       }
     },
     resetSuvQuestions() {
@@ -422,7 +465,10 @@ export default {
           if (v.Childrens.length > 0) {
             this.setSuvChild(v.Childrens)
           }
-          this.setpet5PS()
+          var pet5PS = this.setpet5PS()
+          this.questionForm[this.pet5PSId] = pet5PS
+          this.calculatePet5PS = pet5PS
+          this.setPet5PSCommentDisplay()
           this.questionFormChangeState = true
         })
 

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

@@ -345,7 +345,6 @@ export default {
       //   return
       // }
       if (question.QuestionType === 49) {
-        console.log(question,v)
         this.$emit('setFormItemData', { key: question.Id, val: v })
       }
       if (question.Childrens.length > 0) {

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

@@ -63,7 +63,7 @@ export default {
     isQulityIssues: {
       type: Boolean,
       default: true
-    },
+    }
   },
   data() {
     return {
@@ -119,7 +119,6 @@ export default {
   },
   methods: {
     async getQuestions(visitTaskId) {
-      console.log('getQuestions')
       this.visitTaskId = visitTaskId
       // const loading = this.$loading({ fullscreen: true })
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
@@ -196,7 +195,6 @@ export default {
           if (i.QuestionType === 48) {
             // 脾脏长度
             this.spleenLengthId = i.Id
-            
           }
           if (i.QuestionType === 58) {
             // 修改脾脏状态备注
@@ -297,7 +295,6 @@ export default {
       })
     },
     setSpleenCommentDisplay() {
-      console.log('setSpleenCommentDisplay')
       if (this.spleenCommentsId && this.spleenStatusId) {
         for (let i = 0; i < this.questions[0].Childrens.length; i++) {
           if (this.questions[0].Childrens[i].QuestionType === 58) {
@@ -488,7 +485,7 @@ export default {
           var diffFromBaseline = length - this.spleenInfo.BaseLineSpleenLength
           var percentFormBaseline = 0
           if (this.spleenInfo.BaseLineSpleenLength) {
-            percentFormBaseline = length * 100 / (this.spleenInfo.BaseLineSpleenLength - 130)
+            percentFormBaseline = diffFromBaseline * 100 / (this.spleenInfo.BaseLineSpleenLength - 130)
           }
           if (this.spleenInfo.BaseLineSpleenLength > 130 && diffFromBaseline >= 10 && percentFormBaseline > 50) {
             // 1、基线 垂直径>130 mm

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

@@ -26,13 +26,24 @@
             show-overflow-tooltip
             width="150"
           >
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer" :style="{color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null}">
                 <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
                   {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
                 </span>
                 <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
               </div>
+            </template> -->
+            <template slot-scope="scope">
+              <template v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===4)">
+                <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer" :style="{color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null}">
+                <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
+                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
+                </span>
+                <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
+              </div>
+              </template>
+              
             </template>
           </el-table-column>
         </template>
@@ -85,20 +96,20 @@
         <template>
           <el-table-column
             v-for="(qs,index) in globalInfo.adjustedQsList"
+            v-if="qs.isShow"
             :key="index"
             prop=""
-            :label="qs"
+            :label="qs.questionName"
             show-overflow-tooltip
             :min-width="index === 3 ? '200' : '200'"
           >
             <template slot-scope="scope">
-              <div v-if="readingTaskState<2">
+              <div v-if="readingTaskState<2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
-                <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
+                <!-- <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
                   {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].VisitAnswer)) }}
-                </span>
+                </span> -->
 
                 <el-form-item
-                  v-else
                   style="margin-bottom: 0;"
                   :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
                   label=""
@@ -255,7 +266,7 @@
                   />
                 </el-form-item>
               </div>
-              <div v-else-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-else>
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}

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

@@ -88,9 +88,10 @@
         <template>
           <el-table-column
             v-for="(qs,index) in globalInfo.adjustedQsList"
+            v-if="qs.isShow"
             :key="index"
             prop=""
-            :label="qs"
+            :label="qs.questionName"
             show-overflow-tooltip
             :min-width="index === 3 ? '200' : '200'"
           >
@@ -331,6 +332,7 @@ export default {
     ...mapGetters(['language'])
   },
   mounted() {
+    console.log(this.globalInfo)
     this.assessTypes = this.globalInfo.assessTypeList.filter(i => i.IsBaseLineUse === this.isBaseline)
   },
   methods: {
@@ -448,7 +450,6 @@ export default {
           }
         })
       }
-      console.log(this.globalForm)
     },
     getAssessType(v) {
       console.log(this.language)

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

@@ -26,6 +26,7 @@
             width="200"
           >
             <template slot-scope="scope">
+              <template v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===4)">
                 <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer">
                   <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
                     {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
@@ -34,6 +35,7 @@
                   <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
                 </div>
               </template>
+          </template>
           </el-table-column>
         </template>
       </el-table-column>
@@ -47,18 +49,18 @@
         <template>
           <el-table-column
             v-for="(qs,index) in globalInfo.adjustedQsList"
+            v-if="qs.isShow"
             :key="index"
             prop=""
-            :label="qs"
+            :label="qs.questionName"
             :width="index > 0 ? '300' : '200'"
           >
             <template slot-scope="scope">
-              <div v-if="readingTaskState<2 ">
+              <div v-if="readingTaskState<2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
-                <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
+                <!-- <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
                   {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].VisitAnswer)) }}
-                </span>
+                </span> -->
                 <el-form-item
-                  v-else
                   :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
                   label=""
                   :rules="[
@@ -107,7 +109,7 @@
                   />
                 </el-form-item>
               </div>
-              <div v-else-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-else>
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
@@ -181,7 +183,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.globalInfo.adjustedQsList)
   },
   methods: {
     selectChange(v, row, index) {

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

@@ -26,13 +26,24 @@
             show-overflow-tooltip
             width="150"
           >
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer" :style="{color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null}">
                 <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
                   {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
                 </span>
                 <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
               </div>
+            </template> -->
+            <template slot-scope="scope">
+              <template v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===4)">
+                <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer" :style="{color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null}">
+                <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
+                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
+                </span>
+                <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
+              </div>
+              </template>
+              
             </template>
           </el-table-column>
         </template>
@@ -85,20 +96,20 @@
         <template>
           <el-table-column
             v-for="(qs,index) in globalInfo.adjustedQsList"
+            v-if="qs.isShow"
             :key="index"
             prop=""
-            :label="qs"
+            :label="qs.questionName"
             show-overflow-tooltip
             :min-width="index === 3 ? '200' : '200'"
           >
             <template slot-scope="scope">
-              <div v-if="readingTaskState<2">
+              <div v-if="readingTaskState<2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
-                <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
+                <!-- <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
                   {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].VisitAnswer)) }}
-                </span>
+                </span> -->
 
                 <el-form-item
-                  v-else
                   style="margin-bottom: 0;"
                   :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
                   label=""
@@ -253,7 +264,7 @@
                   />
                 </el-form-item>
               </div>
-              <div v-else-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-else>
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}

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

@@ -26,13 +26,24 @@
             show-overflow-tooltip
             width="150"
           >
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer" :style="{color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null}">
                 <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
                   {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
                 </span>
                 <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
               </div>
+            </template> -->
+            <template slot-scope="scope">
+              <template v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===4)">
+                <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer" :style="{color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null}">
+                <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
+                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
+                </span>
+                <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
+              </div>
+              </template>
+              
             </template>
           </el-table-column>
         </template>
@@ -85,19 +96,19 @@
         <template>
           <el-table-column
             v-for="(qs,index) in globalInfo.adjustedQsList"
+            v-if="qs.isShow"
             :key="index"
             prop=""
-            :label="qs"
+            :label="qs.questionName"
             show-overflow-tooltip
             :min-width="index === 3 ? '200' : '200'"
           >
             <template slot-scope="scope">
-              <div v-if="readingTaskState<2">
+              <div v-if="readingTaskState<2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
-                <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
+                <!-- <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
                   {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].VisitAnswer)) }}
-                </span>
+                </span> -->
                 <el-form-item
-                  v-else
                   style="margin-bottom: 0;"
                   :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
                   label=""
@@ -246,7 +257,7 @@
                   />
                 </el-form-item>
               </div>
-              <div v-else-if="scope.row.AfterQuestionList.length>index && scope.row.AfterQuestionList[index].Answer">
+              <div v-else>
 
                 <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
                   {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}

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

@@ -257,17 +257,22 @@ export default {
                 evaluationQsList.push(qs.QuestionName)
               })
               qs.AfterQuestionList.map(qs => {
+                console.log(qs)
                 if (qs.GlobalAnswerType === 1 && (this.CriterionType === 10)) {
                   // 访视阅片备注
-                  adjustedQsList.push(this.$t('trials:globalReview:table:visitRemark'))
+                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:visitRemark'),isShow:true})
                 } else if (qs.GlobalAnswerType === 1 && (this.CriterionType !== 10)) {
                   // 全局阅片备注
-                  adjustedQsList.push(this.$t('trials:globalReview:table:globalRemark'))
+                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:globalRemark'),isShow:true})
                 } else if (qs.GlobalAnswerType === 3 && (this.CriterionType !== 10)) {
                   // 评估更新类型
-                  adjustedQsList.push(this.$t('trials:globalReview:table:updateType'))
+                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:updateType'),isShow:true})
                 } else {
-                  adjustedQsList.push(qs.QuestionName)
+                  var isShow = true
+                  if(this.CriterionType === 2 && (qs.QuestionType === 39 || qs.QuestionType === 40 || qs.QuestionType === 41)){
+                    isShow = false
+                  }
+                  adjustedQsList.push({questionName:qs.QuestionName,isShow:isShow})
                 }
               })
               qs.AgreeOrNot.map(qs => {

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

@@ -122,10 +122,15 @@
             <!-- 结论 -->
             <el-table-column
               prop="EvaluationResult"
-              :label="$t('trials:oncologyReview:title:findings')"
               show-overflow-tooltip
               width="150"
             >
+              <template slot="header" slot-scope="scope">
+                <div>
+                    <span>{{ $t('trials:oncologyReview:title:findings') }}</span>
+                    <span style="color:red">*</span>
+                </div>
+              </template>
               <template slot-scope="scope">
                 <el-select
                   v-if="oncologyInfo.ReadingTaskState < 2 && !scope.row.IsBaseLine"
@@ -156,7 +161,7 @@
                   <div>
                     <!-- 原因 -->
                     <span>{{ $t('trials:oncologyReview:title:reason') }}</span>
-                    <span style="color:red">*</span>
+                    <span style="color:red">!</span>
                   </div>
 
                 </el-tooltip>