diff --git a/src/views/recompose/index.vue b/src/views/recompose/index.vue
index 794f12f..c4d1bcc 100644
--- a/src/views/recompose/index.vue
+++ b/src/views/recompose/index.vue
@@ -1,163 +1,237 @@
 <template>
-  <div style="display: flex;justify-content: center">
-    <div style="width: 600px;text-align: center;border: 1px solid #e6e6e6;margin-top:40px;padding:10px;">
-      <div class="trial-myinfo-head" style="font-size: 30px;line-height: 120px;">
+  <div style="display: flex; justify-content: center">
+    <div
+      style="
+        width: 600px;
+        text-align: center;
+        border: 1px solid #e6e6e6;
+        margin-top: 40px;
+        padding: 10px;
+      "
+    >
+      <div
+        class="trial-myinfo-head"
+        style="font-size: 30px; line-height: 120px"
+      >
         <!-- 首次登录修改密码 -->
-        {{ $t('recompose:title:init') }}
+        {{ $t("recompose:title:init") }}
       </div>
-      <el-form ref="passwordForm" v-loading="loading" label-position="right" :model="password" :rules="passwordFormRules" label-width="120px">
+      <el-form
+        ref="passwordForm"
+        v-loading="loading"
+        label-position="right"
+        :model="password"
+        :rules="passwordFormRules"
+        label-width="120px"
+      >
         <!-- 用户名 -->
         <el-form-item :label="$t('recompose:form:userName')" prop="NewUserName">
           <el-input v-model="password.NewUserName" />
         </el-form-item>
         <!-- 旧密码 -->
-        <el-form-item :label="$t('recompose:form:oldPassword')" prop="OldPassWord">
-          <el-input v-model="password.OldPassWord" type="password" show-password auto-complete="new-password" />
+        <el-form-item
+          :label="$t('recompose:form:oldPassword')"
+          prop="OldPassWord"
+        >
+          <el-input
+            v-model="password.OldPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
         <!-- 新密码 -->
-        <el-form-item :label="$t('recompose:form:newPassword')" prop="NewPassWord">
-          <el-input v-model="password.NewPassWord" type="password" show-password auto-complete="new-password" />
+        <el-form-item
+          :label="$t('recompose:form:newPassword')"
+          prop="NewPassWord"
+        >
+          <el-input
+            v-model="password.NewPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
         <!-- 确认密码 -->
-        <el-form-item :label="$t('recompose:form:confirmPassword')" prop="ConfirmPassWord">
-          <el-input v-model="password.ConfirmPassWord" type="password" show-password auto-complete="new-password" />
+        <el-form-item
+          :label="$t('recompose:form:confirmPassword')"
+          prop="ConfirmPassWord"
+        >
+          <el-input
+            v-model="password.ConfirmPassWord"
+            type="password"
+            show-password
+            auto-complete="new-password"
+          />
         </el-form-item>
-        <el-form-item style="text-align:right">
+        <!-- 检验码 -->
+        <el-form-item
+          :label="$t('trials:researchForm:form:checkCode')"
+          prop="CheckCode"
+          :maxlength="10"
+        >
+          <el-input v-model="password.CheckCode" type="number" />
+        </el-form-item>
+        <el-form-item style="text-align: right">
           <!-- 取消 -->
-          <el-button
-            size="small"
-            @click="cancel"
-          >
-            {{ $t('recompose:button:cancel') }}
+          <el-button size="small" @click="cancel">
+            {{ $t("recompose:button:cancel") }}
           </el-button>
           <!-- 保存 -->
-          <el-button
-            type="primary"
-            size="small"
-            @click="save"
-          >
-            {{ $t('recompose:button:save') }}
+          <el-button type="primary" size="small" @click="save">
+            {{ $t("recompose:button:save") }}
           </el-button>
         </el-form-item>
       </el-form>
-
     </div>
   </div>
 </template>
 <script>
-import { modifyPassword } from '@/api/admin.js'
-import md5 from 'js-md5'
-import {mapMutations} from "vuex";
+import { modifyPassword } from "@/api/admin.js";
+import md5 from "js-md5";
+import { mapMutations } from "vuex";
 export default {
   data() {
     return {
       password: {
-        NewUserName: null
+        NewUserName: null,
       },
       passwordFormRules: {
-        NewUserName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        OldPassWord: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
-        NewPassWord: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+        NewUserName: [
           {
             required: true,
-            trigger: 'blur',
-            validator: this.$validatePassword
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        OldPassWord: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        NewPassWord: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+          {
+            required: true,
+            trigger: "blur",
+            validator: this.$validatePassword,
           },
         ],
         ConfirmPassWord: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-        ]
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
+        CheckCode: [
+          {
+            required: true,
+            message: this.$t("common:ruleMessage:specify"),
+            trigger: "blur",
+          },
+        ],
       },
       userId: null,
-      loading: false
-    }
+      loading: false,
+    };
   },
   mounted() {
-    this.$set(this.password, 'NewUserName', this.$route.query.userName)
+    this.$set(this.password, "NewUserName", this.$route.query.userName);
     if (!this.password.NewUserName) {
       // 该页面只提供给首次进入系统的用户使用
-      this.$alert(this.$t('recompose:message:warning'))
-
+      this.$alert(this.$t("recompose:message:warning"));
     }
   },
   methods: {
-    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    ...mapMutations({ setLanguage: "lang/setLanguage" }),
     async logout() {
-      var loginType = zzSessionStorage.getItem('loginType')
-      await this.$store.dispatch('user/logout')
+      var loginType = zzSessionStorage.getItem("loginType");
+      await this.$store.dispatch("user/logout");
       if (loginType) {
-        this.$router.push(`/login?loginType=${loginType}`)
+        this.$router.push(`/login?loginType=${loginType}`);
       } else {
-        this.$router.push(`/login`)
+        this.$router.push(`/login`);
       }
-      this.$i18n.locale = 'zh'
-      this.setLanguage('zh')
-      this.$updateDictionary()
+      this.$i18n.locale = "zh";
+      this.setLanguage("zh");
+      this.$updateDictionary();
     },
     save() {
-      this.$refs.passwordForm.validate(valid => {
+      this.$refs.passwordForm.validate((valid) => {
         if (valid) {
           if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
             // 两次密码输入不一致
-            this.$alert(this.$t('recompose:message:passwordDiffer'))
-            return
+            this.$alert(this.$t("recompose:message:passwordDiffer"));
+            return;
           }
           const param = {
             NewUserName: this.password.NewUserName,
             NewPassWord: md5(this.password.NewPassWord),
-            OldPassWord: md5(this.password.OldPassWord)
-          }
-          this.loading = true
-          modifyPassword(param).then(res => {
-            this.loading = false
-            if (res.IsSuccess) {
-              // 修改成功,请重新登录账号
-              this.$message.success(this.$t('recompose:message:updatedSuccessfully'))
-              setTimeout(() => {
-                this.logout()
-              }, 500)
-            }
-          }).catch(() => { this.loading = false })
+            OldPassWord: md5(this.password.OldPassWord),
+          };
+          this.loading = true;
+          modifyPassword(param)
+            .then((res) => {
+              this.loading = false;
+              if (res.IsSuccess) {
+                // 修改成功,请重新登录账号
+                this.$message.success(
+                  this.$t("recompose:message:updatedSuccessfully")
+                );
+                setTimeout(() => {
+                  this.logout();
+                }, 500);
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
         }
-      })
+      });
     },
     cancel() {
-      this.$refs['passwordForm'].resetFields()
-    }
-  }
-}
+      this.$refs["passwordForm"].resetFields();
+    },
+  },
+};
 </script>
 <style>
-  .reset-wrapper {
-    padding: 20px;
-  }
-  .reset-wrapper .el-page-header {
-    line-height: 50px;
-    border: 1px solid #ebeef5;
-    border-radius: 4px;
-    background-color: #fff;
-  }
-  .reset-wrapper .box-wrapper {
-    width: 60%;
-    margin: 20px auto;
-    padding: 10px;
-    color: #303133;
-  }
+.reset-wrapper {
+  padding: 20px;
+}
+.reset-wrapper .el-page-header {
+  line-height: 50px;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+  background-color: #fff;
+}
+.reset-wrapper .box-wrapper {
+  width: 60%;
+  margin: 20px auto;
+  padding: 10px;
+  color: #303133;
+}
 </style>
 <style scoped>
-.is-error{
+.is-error {
   margin-bottom: 40px;
 }
 input:-webkit-autofill {
   -webkit-text-fill-color: #ededed !important;
-  box-shadow: 0 0 0px 1000px transparent  inset !important;
-  background-color:transparent;
+  box-shadow: 0 0 0px 1000px transparent inset !important;
+  background-color: transparent;
   background-image: none;
   transition: background-color 50000s ease-in-out 0s;
 }
 input {
-  background-color:transparent;
+  background-color: transparent;
   caret-color: #fff;
 }
 </style>
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 691a162..49a14a7 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -115,6 +115,7 @@
         <el-radio-group
           v-model="user.IsZhiZhun"
           @change="OrgnizationTypeChanged"
+          :disabled="IsZhiZhunDisabled"
         >
           <el-radio :label="true">{{
             $t("system:userlist:title:Internal")
@@ -124,11 +125,11 @@
           }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item
-        v-show="user.IsZhiZhun === false"
-        :label="$t('system:userlist:table:OrganizationName')"
-      >
-        <el-input v-model="user.OrganizationName" />
+      <el-form-item :label="$t('system:userlist:table:OrganizationName')">
+        <el-input
+          v-model="user.OrganizationName"
+          :disabled="user.IsZhiZhun === true"
+        />
       </el-form-item>
 
       <el-form-item
@@ -276,8 +277,29 @@ export default {
       isDisabled: false,
       type: 0, // 1为编辑，0为新增
       IsCanConnectInternet: true, // 是否连接互联网
+      hospitalName: null, // 医院名称
+      IsZhiZhunDisabled: false,
     };
   },
+  watch: {
+    "user.UserTypeId": {
+      handler() {
+        if (this.user.UserTypeId) {
+          let name = this.getUserType(this.user.UserTypeId);
+          if (["PM", "PI", "SR", "OA"].includes(name)) {
+            this.user.IsZhiZhun = true;
+            this.user.OrganizationName = this.hospitalName;
+            return (this.IsZhiZhunDisabled = true);
+          }
+        }
+        this.user.IsZhiZhun = null;
+        this.user.OrganizationName = null;
+        this.IsZhiZhunDisabled = false;
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
   created() {
     this.getUserTypeList();
     if (this.userId !== "") {
@@ -289,12 +311,17 @@ export default {
     this.getInfo();
   },
   methods: {
+    getUserType(id) {
+      let obj = this.userTypeOptions.find((item) => item.Id === id);
+      return obj.UserTypeShortName;
+    },
     // 获取医院信息
     async getInfo() {
       try {
         let res = await getHospital();
         if (res.IsSuccess) {
           this.IsCanConnectInternet = res.Result.IsCanConnectInternet;
+          this.hospitalName = res.Result.HospitalName;
         }
       } catch (err) {
         console.log(err);
@@ -352,7 +379,11 @@ export default {
       });
     },
     OrgnizationTypeChanged(val) {
-      this.user.OrganizationName = "";
+      if (val) {
+        this.user.OrganizationName = this.hospitalName;
+      } else {
+        this.user.OrganizationName = "";
+      }
     },
   },
 };