From b2dc406a72896dadd631a4844a6a2fe381e2f4a1 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 14 Jun 2024 11:09:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=E5=8C=BA=E5=88=86=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E8=A7=A3=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MFA/index.vue | 8 +++++++-
 src/main.js                  | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue
index 02a9edd7..71f92718 100644
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@@ -153,7 +153,13 @@ export default {
           clearInterval(this.timer);
           this.timer = null;
         }
-        let res = await sendMFAEmail(this.form);
+        let data = {
+          UserId: this.form.UserId,
+        };
+        if (this.status === "lock") {
+          data.MfaType = 1;
+        }
+        let res = await sendMFAEmail(data);
         this.sendFlag = false;
         if (res.IsSuccess) {
           this.flag = true;
diff --git a/src/main.js b/src/main.js
index 2befb6bf..e6053109 100644
--- a/src/main.js
+++ b/src/main.js
@@ -432,7 +432,7 @@ async function VueInit() {
                 }, 500)
               }
               if (process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa') {
-                sendMFAEmail({ UserId: my_userid }).then((res) => {
+                sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => {
                   done();
                   Vue.prototype.$MFA({
                     status: "lock",

From b5b0d24c97eac49671e63d3e5511d3eb46a00dac Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 14 Jun 2024 13:04:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D?=
 =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-config/components/logicalConfig.vue | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index d725446a..3ca7f2ff 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -904,9 +904,9 @@ export default {
       },
     };
   },
-  created() {
-    this.getTrialBodyPartList();
-  },
+  // created() {
+  //   this.getTrialBodyPartList();
+  // },
   methods: {
     handleConfirmModality() {
       this.form.ModalityList = Object.assign(
@@ -961,14 +961,16 @@ export default {
                 let obj = this.trialBodyPartList.filter(
                   (item) => item.Code === data.Code
                 );
-                console.log(obj);
                 this.$refs.bodyPartTable.toggleRowSelection(obj[0]);
               });
             }
           }
+          return true;
         }
+        return false;
       } catch (err) {
         console.log(err);
+        return false;
       }
     },
     // 添加检查部位
@@ -1006,7 +1008,7 @@ export default {
       this.$nextTick(() => {
         var a = this.trialBodyPartList.filter((v) => {
           return !!this.form.BodyPartTypeList.find((v1) => {
-            return v1 === v.Name;
+            return v1 === v.Code;
           });
         });
         this.toggleBodyPartSelection(a);
@@ -1024,9 +1026,11 @@ export default {
     handleConfirmBodyParts() {
       this.form.BodyPartTypeList = Object.assign(
         [],
-        this.selectedBodyParts.map((v) => v.Name)
+        this.selectedBodyParts.map((v) => v.Code)
       );
-      var bodyPartTypes = this.form.BodyPartTypeList;
+      var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {
+        return this.changeBodyPart(i.trim());
+      });
       this.form.BodyPartTypes = bodyPartTypes.join(" | ");
       this.bodyPartListVisible = false;
     },
@@ -1257,13 +1261,27 @@ export default {
         " | "
       );
       this.form.BodyPartTypeList = this.form.BodyPartTypes.split("|");
-      var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {
-        return i.trim();
-      });
-      this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(",", " | ");
-      // this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
-      this.initialForm = { ...this.form };
-      this.loading = false;
+      let r = await this.getTrialBodyPartList();
+      if (r) {
+        var bodyPartTypes = this.form.BodyPartTypeList.map((i) => {
+          return this.changeBodyPart(i.trim());
+        });
+        this.form.BodyPartTypes = bodyPartTypes
+          .toString()
+          .replaceAll(",", " | ");
+        // this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
+        this.initialForm = { ...this.form };
+        this.loading = false;
+      }
+    },
+    // bodyPart中英文转换
+    changeBodyPart(code) {
+      let arr = this.trialBodyPartList.filter((item) => item.Code === code);
+      if (arr[0]) {
+        return arr[0].Name;
+      } else {
+        return null;
+      }
     },
     // 获取临床数据模板信息
     getClinicalDataList(isSelect = false) {