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

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue

@@ -666,8 +666,10 @@ export default {
               }
             } else {
               num = parseFloat(this.questionForm[o.TableQuestionId])
+              if (!isNaN(num)) {
                 dataArr.push(num)
               }
+            }
           } else {
             switch (rules.CustomCalculateMark) {
               case 1:
@@ -709,8 +711,10 @@ export default {
               case 13:
                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  dataArr.push(0)
                 }
-                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr, 0)  ? 1 : 0;
+                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
                 break;
               case 14:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {

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

@@ -595,8 +595,10 @@ export default {
               }
             } else {
               num = parseFloat(this.questionForm[o.TableQuestionId]);
+              if (!isNaN(num)) {
                 dataArr.push(num)
               }
+            }
           } else {
             switch (rules.CustomCalculateMark) {
               case 1:
@@ -634,8 +636,10 @@ export default {
               case 13:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                   dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                } else {
+                  dataArr.push(0)
                 }
-                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr, 0)  ? 1 : 0;
+                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
                 break;
               case 14:
                 if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {