diff --git a/src/request/ruquset.js b/src/request/ruquset.js
index 3086f45..9445e0b 100644
--- a/src/request/ruquset.js
+++ b/src/request/ruquset.js
@@ -21,9 +21,10 @@ export const getbook = (data) => {
   });
 };
 //权限查找
-export const limitsofauthority = (data) => {
+export const limitsofauthority = (user,data) => {
   return request({
-    url: "/api/permission-management/permissions",
+    // url: "/api/permission-management/permissions",
+    url:`/api/permissionmanagement/get?providerName=R&providerKey=${user}`,
     method: "get",
     headers: {
       "Accept-Language": "zh-Hans",
@@ -35,7 +36,7 @@ export const limitsofauthority = (data) => {
 //获取用户列表
 export const usreslist = (data) => {
   return request({
-    url: "/api/identity/users",
+    url: "/api/identity/users/getlist",
     method: "get",
     params: data,
   });
@@ -43,15 +44,17 @@ export const usreslist = (data) => {
 //用户绑定
 export const userbind = (id, data) => {
   return request({
-    url: `/api/identity/users/${id}/roles`,
-    method: "put",
+    // url: `/api/identity/users/${id}/roles`,
+    ///api/identity/users/updateroles?id=3a0c6597-75df-bc78-8173-ef4a59930832
+    url:`/api/identity/users/updateroles?id=${id}`,
+    method: "post",
     data,
   });
 };
 //用户列表新增
 export const newlists = (data) => {
   return request({
-    url: "/api/identity/users",
+    url: "/api/identity/users/create",
     method: "post",
     data,
   });
@@ -59,15 +62,15 @@ export const newlists = (data) => {
 //用户列表删除
 export const delestsid = (id) => {
   return request({
-    url: `/api/identity/users/${id}`,
-    method: "delete",
+    url: `/api/identity/users/delete/${id}`,
+    method: "post",
   });
 };
 //用户列表编辑修改
 export const editmodify = (id, data) => {
   return request({
-    url: `/api/identity/users/${id}`,
-    method: "put",
+    url: `/api/identity/users/update?id=${id}`,
+    method: "post",
     headers: {
       "Content-Type": "application/json",
     },
@@ -154,15 +157,18 @@ export const roledelention = (id) => {
 //权限控制编辑
 export const permissionconntro = (name, peodekey, data) => {
   return request({
-    url: `/api/permission-management/permissions?providerName=${name}&providerKey=${peodekey}`,
-    method: "put",
+    url: `/api/permissionmanagement/update?providerName=${name}&providerKey=${peodekey}`,
+    // url: `/api/permission-management/permissions?providerName=${name}&providerKey=${peodekey}`,
+    // /api/permissionmanagement/update?providerName=R&providerKey=users
+    method: "post",
     data,
   });
 };
 //用户管理所属用户查询
 export const useraffiliation = (id) => {
   return request({
-    url: `/api/identity/users/${id}/roles`,
+    // url: `/api/identity/users/${id}/roles`,
+    url:`/api/identity/users/getroles?id=${id}`,
     method: "get",
   });
 };
diff --git a/src/store/index.js b/src/store/index.js
index 68e8cbe..2de3168 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -38,8 +38,14 @@ export default new Vuex.Store({
       patientRegisterRd: { id: "" }, //体检人员记录
       patientRegisterTimes: 0, //体检人员登记窗口显示次数(弃用)
       addTimes: 0, //用于触发新增时初始化赋值
+<<<<<<< HEAD
       saveTimes:0,  //用于体检登记时，触发分组调整保存
       photo:"https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //单独抽出，拍照时会更新
+=======
+      saveTimes: 0,  //用于体检登记时，触发分组调整保存
+      photo:
+        "https://cube.elemecdn.com/6/94/4d3ea53c084bad6931a56d5158a48jpeg.jpeg", //单独抽出，拍照时会更新
+>>>>>>> 8707ad6b3bfb1a5f5e84b63517a75bd718db5ab1
       cameraVisble: false, //拍照控件显示
       patientRegisterRdInit: {
         id: "", //id
@@ -86,38 +92,37 @@ export default new Vuex.Store({
       }, //体检人员记录（初始值）一般创建用
       customerOrgGroupAsb: [], //选中分组所包含的组合项目
       medicalPackageAsb: [], //选中套餐所包含的组合项目
-      customerOrgGroupChange:0,   //控制体检列表记录切换时，0 无需触发更换分组操作
-      medicalPackageChange:0,     //控制体检列表记录切换时，0 无需触发更换套餐操作
+      customerOrgGroupChange: 0,   //控制体检列表记录切换时，0 无需触发更换分组操作
+      medicalPackageChange: 0,     //控制体检列表记录切换时，0 无需触发更换套餐操作
       query: {
         times: 0, //触发查询次数
         customerOrgId: "", //体检单位ID
         CustomerOrgParentId: "", //单位父级ID
-        customerOrgFlag:true,    //单位作为查询条件
+        customerOrgFlag: true,    //单位作为查询条件
       }, //查询条件
       customerOrgGroup: [], //分组（针对单位）
       patientRegisterAbs: [], //人员已选组合项目
-      
+
     },
 
     //体检医生诊台
-    doctorCheck:{
-      prBase:{
-        id:'', //体检登记ID
+    doctorCheck: {
+      prBase: {
+        id: '', //体检登记ID
       },   //人员体检登记显示基本信息
 
-      RegisterCheckEdit:{
-        id:'',
-        checkDoctorId:null,
-        checkDate:'',
-        completeFlag:'0',
-        LastModificationTime:'',
-        LastModifierId:null,
-        isLock:'N',
-        isAudit:'N',
-        auditorUserId:null,
-        auditTime:'',
+      RegisterCheckEdit: {
+        id: '',
+        checkDoctorId: null,
+        checkDate: '',
+        completeFlag: '0',
+        LastModificationTime: '',
+        LastModifierId: null,
+        isLock: 'N',
+        isAudit: 'N',
+        auditorUserId: null,
+        auditTime: '',
       },                          //组合项目详情
-      doctorCheckDialogVisible:false, //人员列表
       RegisterCheckList:[],       //人员体检 组合项目列表
       RegisterCheck:{},           //单组合项目记录
       RegisterCheckId:'',         //
@@ -139,7 +144,7 @@ export default new Vuex.Store({
       personOrgId: "00000000-0000-0000-0000-000000000000", //个人体检单位ID
       organization: [], //体检中心
       sex: [], //性别(人员档案用)
-      forSex:[],  //适用性别
+      forSex: [],  //适用性别
       medicalType: [], //体检类别
       personnelType: [], //人员类别
       maritalStatus: [], //婚姻状况
@@ -159,7 +164,7 @@ export default new Vuex.Store({
         { id: "1", displayName: "已检" },
         { id: "2", displayName: "弃检" },
       ],
-      sumAudit:[
+      sumAudit: [
         //总检审核
         { id: "Y", displayName: "已审核" },
         { id: "N", displayName: "未审核" }
@@ -170,7 +175,7 @@ export default new Vuex.Store({
         { id: "1", displayName: "单位支付" },
         { id: "2", displayName: "赠送" },
       ],
-      checkTypeFlag:[
+      checkTypeFlag: [
         { id: "0", displayName: "检验" },
         { id: "1", displayName: "功能检查" },
       ],
@@ -206,27 +211,28 @@ export default new Vuex.Store({
       }
     },
 
-    doctorCheckPrBaseInit(state){
+    doctorCheckPrBaseInit(state) {
       state.doctorCheck.prBase = {
-        id:'', //体检登记ID
-        patientRegisterNo:'', //条码号
-        patientNo:'', //档案号
-        patientName:'', //姓名
-        sexId:'', //性别
-        medicalTimes:'', //体检次数
-        maritalStatusId:'', //婚姻
-        creationTime:'', //体检日期
-        customerOrgParentName:'', //单位
-        customerOrgName:'', //部门
-        medicalTypeId:'', //体检类别
-        personnelTypeId:'', //人员类别
-        nationId:'', //民族
-        mobileTelephone:'', //手机
+        id: '', //体检登记ID
+        patientRegisterNo: '', //条码号
+        patientNo: '', //档案号
+        patientName: '', //姓名
+        sexId: '', //性别
+        medicalTimes: '', //体检次数
+        maritalStatusId: '', //婚姻
+        creationTime: '', //体检日期
+        customerOrgParentName: '', //单位
+        customerOrgName: '', //部门
+        medicalTypeId: '', //体检类别
+        personnelTypeId: '', //人员类别
+        nationId: '', //民族
+        mobileTelephone: '', //手机
       }   //人员体检登记显示基本信息
     },
 
-    sumPREditInit(state){
+    sumPREditInit(state) {
       state.sumDoctorCheck.sumPREdit = {
+<<<<<<< HEAD
         id:'', //体检登记ID
         completeFlag:'',   //完成状态
         summaryDoctor:'', //总检医生
@@ -235,13 +241,22 @@ export default new Vuex.Store({
         auditDoctor:'', //审核医生
         auditDate:'',   //审核日期
         isLock:'',      //锁定状态
+=======
+        id: '', //体检登记ID
+        completeFlag: '',   //完成状态
+        summaryDoctor: '', //总检医生
+        summaryDate: '',   //总检日期
+        isAudit: '',       //审核状态
+        auditDoctor: '', //审核医生
+        auditDate: '',   //审核日期
+>>>>>>> 8707ad6b3bfb1a5f5e84b63517a75bd718db5ab1
       }   //人员体检登记显示基本信息
     },
   },
 
   actions: {
     //获取体检人员所选组合项目
-    getPatientRegisterAbs(context, id){
+    getPatientRegisterAbs(context, id) {
       //console.log(`vuex getPatientRegisterAbs /api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`, context.state.dict.asbItemAll)
       getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`).then(
         (res) => {
@@ -251,7 +266,7 @@ export default new Vuex.Store({
               key: "patientRegister.patientRegisterAbs",
               value: res.data,
             });
-            
+
             context.commit("setData", {
               key: "dict.asbItem",
               value: arrayReduce(
@@ -270,16 +285,16 @@ export default new Vuex.Store({
     getCustomerOrgGroup(context, customerOrgld) {
       console.log(`vuex /api/app/customer-org-group/in-customer-org-id/${customerOrgld}`);
       getapi(`/api/app/customer-org-group/in-customer-org-id/${customerOrgld}`)
-      .then((res) => {
-        console.log("vuex getCustomerOrgGroup", res.data);
-        if (res.code == 1) {
-          //this.patientRegister.customerOrgGroup = res.data
-          context.commit("setData", {
-            key: "patientRegister.customerOrgGroup",
-            value: res.data,
-          });
-        }
-      });
+        .then((res) => {
+          console.log("vuex getCustomerOrgGroup", res.data);
+          if (res.code == 1) {
+            //this.patientRegister.customerOrgGroup = res.data
+            context.commit("setData", {
+              key: "patientRegister.customerOrgGroup",
+              value: res.data,
+            });
+          }
+        });
     },
   },
   modules: {},
diff --git a/src/views/basic-dictionary/CommonChar.vue b/src/views/basic-dictionary/CommonChar.vue
index 268c853..a1a7b7d 100644
--- a/src/views/basic-dictionary/CommonChar.vue
+++ b/src/views/basic-dictionary/CommonChar.vue
@@ -92,7 +92,7 @@
               <el-col :span="7">
                 类别
                 <el-select
-                  v-model="value"
+                  v-model="form.commonCharName"
                   placeholder="请选择"
                   @change="change"
                 >
@@ -177,7 +177,7 @@
   </div>
 </template>
 <script>
-import Sortable from "sortablejs";
+import Sortable, { get } from "sortablejs";
 import {
   frequentlyusedlist,
   categorytype,
@@ -188,6 +188,7 @@ import {
   sortcommonwords,
   commondelt,
 } from "../../request/systemapi";
+import { getapi } from "@/api/api";
 export default {
   data() {
     return {
@@ -199,6 +200,7 @@ export default {
       },
       form: {
         displayName: "",
+        ars: "",
       },
       ars: [],
       tableData: [],
@@ -242,6 +244,7 @@ export default {
     },
     change(v) {
       this.form.ids = v;
+      console.log(v);
     },
     //取消排序
     cancellation() {
@@ -335,9 +338,10 @@ export default {
     },
     //确定新增或者编辑
     addoredit() {
+      console.log(this.form.ids);
       if (this.form.displayName == undefined) {
         this.$message.warning("请输入名称");
-      } else if (this.value == "") {
+      } else if (this.form.ars == "") {
         this.$message.warning("请选择项目"); //测试时校验选择项目不为空
       } else {
         if (this.title == 1) {
@@ -385,6 +389,11 @@ export default {
         console.log(res);
         this.form = res.data;
       });
+      // //获取类别
+      // getapi("/api/app/common-char-type/in-filter").then((res) => {
+      //   console.log(res, "类别");
+      //   this.ars = res.data.items;
+      // });
       console.log(row);
     },
   },
diff --git a/src/views/basic-dictionary/GuideType.vue b/src/views/basic-dictionary/GuideType.vue
index ca3c555..682d786 100644
--- a/src/views/basic-dictionary/GuideType.vue
+++ b/src/views/basic-dictionary/GuideType.vue
@@ -52,6 +52,7 @@
             border:stripe="true"
             @row-click="rowick"
             highlight-current-row
+             :row-class-name="getRowClassName"
           >
             <el-table-column
               prop="id"
@@ -755,10 +756,17 @@ export default {
         console.log(res);
       });
     },
+    getRowClassName(row, rowIndex) {
+      // 根据需要确定每一行的 CSS 类名
+      return 'fixed-height-row';
+    }
   },
 };
 </script>
 <style scoped>
+.fixed-height-row {
+  height: 30px; 
+}
 ::v-depp .el-input.is-disabled .el-input__inner {
   width: 90%;
 }
diff --git a/src/views/fee-settings/Asbitem.vue b/src/views/fee-settings/Asbitem.vue
index ad05dd3..0a7003b 100644
--- a/src/views/fee-settings/Asbitem.vue
+++ b/src/views/fee-settings/Asbitem.vue
@@ -99,7 +99,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="价格" prop="price">
-                  <el-input v-model="form.price"></el-input>
+                  <el-input v-model="form.price" type="number"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -176,7 +176,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="候诊时间" prop="queueTime">
-                  <el-input v-model="form.queueTime"></el-input>
+                  <el-input v-model="form.queueTime" type="nember"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -675,6 +675,7 @@ export default {
         this.rightdata.splice(this.num, 1);
         this.leftdata.push(this.leftobj);
         this.isdislob = true;
+        // this.isdislob=false
         this.updatedate();
       }
     },
@@ -832,7 +833,11 @@ export default {
           this.form = res.data;
         });
         //性别
-        examinationgender().then((res) => {
+        // examinationgender().then((res) => {
+        //   this.forSexId = res.data;
+        // });
+        //适用性别
+        getapi("/api/app/for-sex").then((res) => {
           this.forSexId = res.data;
         });
         //项目类别
diff --git a/src/views/fee-settings/Item.vue b/src/views/fee-settings/Item.vue
index b5f99a6..e03940a 100644
--- a/src/views/fee-settings/Item.vue
+++ b/src/views/fee-settings/Item.vue
@@ -1304,7 +1304,7 @@ export default {
         this.itemTypeId = res.data.items;
       });
       //性别
-      getapi("/api/app/sex").then((res) => {
+      getapi("/api/app/for-sex").then((res) => {
         this.forSexId = res.data;
       });
       //诊断级别
diff --git a/src/views/user-list/Role.vue b/src/views/user-list/Role.vue
index bc684d1..f348028 100644
--- a/src/views/user-list/Role.vue
+++ b/src/views/user-list/Role.vue
@@ -135,6 +135,7 @@ import {
   roledelention,
   permissionconntro,
 } from "@/request/ruquset";
+import { getapi } from '@/api/api';
 export default {
   data() {
     return {
@@ -368,7 +369,8 @@ export default {
       };
       this.title = "用户权限-" + row.name;
       this.userobj = obj;
-      limitsofauthority(obj).then((res) => {
+      // limitsofauthority
+      getapi(`/api/permissionmanagement/get?providerName=R&providerKey=${row.name}`).then((res) => {
         this.defaultKeys = [];
         this.currenItem = [];
         this.allCheckedLength = 0;
diff --git a/src/views/user-list/UserList.vue b/src/views/user-list/UserList.vue
index 103556e..d7c50c6 100644
--- a/src/views/user-list/UserList.vue
+++ b/src/views/user-list/UserList.vue
@@ -77,7 +77,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
+      <!-- <el-pagination
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
         :page-sizes="[2, 10, 20, 30]"
@@ -85,7 +85,7 @@
         layout="total, sizes, prev, pager, next, jumper"
         :total="total - 1"
       >
-      </el-pagination>
+      </el-pagination> -->
       <!-- 编辑 -->
       <el-dialog
         :title="title == 1 ? '新增用户' : '修改用户'"
@@ -176,7 +176,7 @@
               </el-checkbox>
             </el-checkbox-group>
           </el-tab-pane>
-          <el-tab-pane label="组织机构">
+          <el-tab-pane label="组织架构">
             <!-- :default-checked-keys="defaultKeys" -->
 
             <el-tree
@@ -475,8 +475,8 @@ export default {
       are: [],
       checkList: [], //多选框
       pages: {
-        SkipCount: 1,
-        MaxResultCount: 2,
+        SkipCount: 0,
+        MaxResultCount: 5,
         Filter: "",
         // Filter:{
         //   userName:this.form.userName,
@@ -489,7 +489,7 @@ export default {
       rowid: "",
       userid: "",
       bingdusers: [], //s所属用户角色
-      organizationalstructure: [], //组织机构
+      organizationalstructure: [], //组织架构
       defaultKeys: [], //选中的
       newachitecture: [], //新增弹框获取组织数据
       // customer:[]
@@ -583,7 +583,7 @@ export default {
       this.userid = row.id;
       usersroles().then((res) => {
         this.useroptions = res.data.items;
-        // console.log(res);
+        console.log(res);
       });
       useraffiliation(row.id).then((res) => {
         res.data.items.forEach((element) => {