src/main.js

@@ -414,7 +414,14 @@ async function VueInit() {
             if (md5(_vm.unlock.my_password) === my_password && my_username === _vm.unlock.my_username) {
               resetReadingRestTime().then(() => {
               })
-              const closeLock = (_vm) => {
+              sendMFAEmail({ UserId: my_userid }).then((res) => {
+                done();
+                Vue.prototype.$MFA({
+                  status: "lock",
+                  UserId: my_userid,
+                  EMail: my_EMail,
+                  username: my_username,
+                  callBack: () => {
                     _vm.$message.success(lang === 'zh' ? '解锁成功，请继续操作' : 'Unlocked successfully. Please continue operation.')
                     _vm.unlock = {
                       my_username: null,
@@ -430,24 +437,9 @@ async function VueInit() {
                     setTimeout(() => {
                       done()
                     }, 500)
-              }
-              if (process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa') {
-                sendMFAEmail({ UserId: my_userid }).then((res) => {
-                  done();
-                  Vue.prototype.$MFA({
-                    status: "lock",
-                    UserId: my_userid,
-                    EMail: my_EMail,
-                    username: my_username,
-                    callBack: () => {
-                      closeLock(_vm)
                   },
                 })
               })
-              } else {
-                closeLock(_vm)
-              }
-
             } else {
               // console.log(111)
               _vm.$message.error(lang === 'zh' ? '请输入正确用户名密码' : 'Please enter the correct password.')

src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue

@@ -71,15 +71,8 @@
                   :label="item.value"
                   v-if="
                     (JudgyInfo.ArbitrationRule === 1 &&
-                      QuestionList[index].Type === 'number' &&
+                      QuestionList[index].Type === 'number') ||
-                      item.value !== 2 &&
+                    (item.value !== 4 && item.value !== 5)
-                      item.value !== 3) ||
-                    (JudgyInfo.ArbitrationRule === 2 &&
-                      QuestionList[index].Type === 'number' &&
-                      item.value === 1) ||
-                    (QuestionList[index].Type !== 'number' &&
-                      item.value !== 4 &&
-                      item.value !== 5)
                   "
                   >{{ item.label }}</el-radio
                 >
@@ -310,6 +303,20 @@
             "
             :rules="JudgeDifferenceValueQRules"
           >
+            <el-form-item
+              :label="
+                $t(
+                  `trials:trials-panel:setting:reading-unit:JudgeDifferenceValue${QuestionList[index].JudgeType}`
+                )
+              "
+              prop="JudgeDifferenceValue"
+            >
+              <el-input
+                v-model="QuestionList[index].JudgeDifferenceValue"
+                clearable
+                :disabled="OtherInfo.IsSign"
+              ></el-input>
+            </el-form-item>
             <el-form-item
               :label="
                 $t(
@@ -332,20 +339,6 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item
-              :label="
-                $t(
-                  `trials:trials-panel:setting:reading-unit:JudgeDifferenceValue${QuestionList[index].JudgeType}`
-                )
-              "
-              prop="JudgeDifferenceValue"
-            >
-              <el-input
-                v-model="QuestionList[index].JudgeDifferenceValue"
-                clearable
-                :disabled="OtherInfo.IsSign"
-              ></el-input>
-            </el-form-item>
           </el-form>
         </div>
       </el-collapse-item>

src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue

@@ -53,25 +53,47 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <!--检查类型筛选-->
+      <!--支持影像下载-->
       <el-form-item
-        :label="$t('trials:processCfg:form:IsImageFilter')"
+        :label="$t('trials:processCfg:form:ImageDownloadEnum')"
-        prop="IsImageFilter"
+        prop="ImageDownloadEnum"
         v-if="CriterionType === 0"
       >
         <el-radio-group
-          v-model="form.IsImageFilter"
+          v-model="form.ImageDownloadEnum"
-          @input="IsImageFilterChange"
           :disabled="
             isConfirm ||
             !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
           "
         >
           <el-radio
-            :label="item.value"
+            v-for="item of $d.ImageDownloadEnum"
-            v-for="item in $d.YesOrNoModality"
             :key="item.id"
-            >{{ item.label }}
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!--支持上传DICOM影像-->
+      <el-form-item
+        :label="$t('trials:processCfg:form:ImageUploadEnum')"
+        prop="ImageUploadEnum"
+        v-if="CriterionType === 0"
+      >
+        <el-radio-group
+          v-model="form.ImageUploadEnum"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            v-for="item of $d.ImageUploadEnum"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
           </el-radio>
         </el-radio-group>
       </el-form-item>
@@ -80,7 +102,6 @@
         :label="$t('trials:readingUnit:readingRules:title:CriterionModalitys')"
         prop="CriterionModalitys"
         style="position: relative"
-        v-if="form.IsImageFilter"
       >
         <el-checkbox-group
           v-model="CriterionModalitys"
@@ -161,7 +182,7 @@
           "
         >
           <el-radio
-            v-for="item of $d.YesOrNoAuto"
+            v-for="item of $d.YesOrNo"
             :key="`IsAutoCreate${item.value}`"
             :label="item.value"
           >
@@ -169,7 +190,6 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <!--阅片模式-->
       <el-form-item
         :label="$t('trials:processCfg:form:readingType')"
         prop="ReadingType"
@@ -195,28 +215,6 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <!--仲裁阅片-->
-      <el-form-item
-        :label="$t('trials:processCfg:form:ad')"
-        prop="IsArbitrationReading"
-      >
-        <el-radio-group
-          v-model="form.IsArbitrationReading"
-          :disabled="
-            isConfirm ||
-            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-            form.ReadingType !== 2
-          "
-        >
-          <el-radio
-            v-for="item of $d.YesOrNo"
-            :key="`IsArbitrationReading${item.value}`"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
       <!-- 是否阅片期 -->
       <el-form-item
         :label="$t('trials:readingUnit:readingRules:title:isReadingPeriod')"
@@ -269,6 +267,27 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item
+        :label="$t('trials:processCfg:form:ad')"
+        prop="IsArbitrationReading"
+      >
+        <el-radio-group
+          v-model="form.IsArbitrationReading"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
+            form.ReadingType !== 2
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`IsArbitrationReading${item.value}`"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item
         :label="$t('trials:processCfg:form:clinical')"
         prop="IsOncologyReading"
@@ -306,8 +325,6 @@
           "
           @change="
             (v) => {
-              form.ImageDownloadEnum = 0;
-              form.ImageUploadEnum = 0;
               if (v) {
                 form.IsReadingShowSubjectInfo = true;
                 form.IsReadingShowPreviousResults = true;
@@ -337,8 +354,8 @@
           v-model="form.ReadingTaskViewEnum"
           :disabled="
             isConfirm ||
-            !!!isReadingTaskViewInOrder ||
+            !isReadingTaskViewInOrder ||
-            !!isReadingTaskViewInOrder ||
+            isReadingTaskViewInOrder ||
             !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
           "
         >
@@ -351,54 +368,6 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <!--支持影像下载-->
-      <el-form-item
-        :label="$t('trials:processCfg:form:ImageDownloadEnum')"
-        prop="ImageDownloadEnum"
-        v-if="CriterionType === 0"
-      >
-        <el-radio-group
-          v-model="form.ImageDownloadEnum"
-          :disabled="
-            isConfirm ||
-            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-            form.IsReadingTaskViewInOrder === 0 ||
-            form.IsReadingTaskViewInOrder === 1
-          "
-        >
-          <el-radio
-            v-for="item of $d.ImageDownloadEnum"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!--支持上传DICOM影像-->
-      <el-form-item
-        :label="$t('trials:processCfg:form:ImageUploadEnum')"
-        prop="ImageUploadEnum"
-        v-if="CriterionType === 0"
-      >
-        <el-radio-group
-          v-model="form.ImageUploadEnum"
-          :disabled="
-            isConfirm ||
-            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-            form.IsReadingTaskViewInOrder === 0 ||
-            form.IsReadingTaskViewInOrder === 1
-          "
-        >
-          <el-radio
-            v-for="item of $d.ImageUploadEnum"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
       <!-- IR阅片页面是否显示受试者信息 -->
       <el-form-item
         :label="
@@ -411,7 +380,7 @@
           :disabled="
             isConfirm ||
             !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-            !!form.IsReadingTaskViewInOrder
+            form.IsReadingTaskViewInOrder
           "
         >
           <el-radio
@@ -437,7 +406,7 @@
           :disabled="
             isConfirm ||
             !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-            !!form.IsReadingTaskViewInOrder
+            form.IsReadingTaskViewInOrder
           "
           @change="
             (v) => {
@@ -618,7 +587,6 @@ export default {
         CriterionModalitys: null,
         ImageDownloadEnum: null,
         ImageUploadEnum: null,
-        IsImageFilter: false,
       },
       rules: {
         IsAutoCreate: [
@@ -663,13 +631,6 @@ export default {
             trigger: ["blur", "change"],
           },
         ],
-        IsImageFilter: [
-          {
-            required: true,
-            message: this.$t("common:ruleMessage:select"),
-            trigger: ["blur", "change"],
-          },
-        ],
         ReadingTaskViewEnum: [
           {
             required: true,
@@ -784,7 +745,6 @@ export default {
 
       modalityList: [],
       CriterionModalitys: [],
-      modalityIsCheck: false, // 是否允许影像筛选
     };
   },
   mounted() {
@@ -799,14 +759,6 @@ export default {
     },
   },
   methods: {
-    // 检查类型筛选值变更
-    IsImageFilterChange(data) {
-      if (data) {
-        this.CriterionModalitys = this.modalityList;
-      } else {
-        this.CriterionModalitys = [];
-      }
-    },
     // 影像模态全选
     handleCheckAllChange() {
       this.CriterionModalitys =