From 93181b5fbb436385d1d312300e8dcc61b43d1666 Mon Sep 17 00:00:00 2001
From: zzc <Zhengzhic18@163.com>
Date: Fri, 28 Mar 2025 18:13:11 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/system/SysLoginController.java | 71 ++++++++++++++++---
 .../web/AdminDmsUserController.java           |  2 +
 .../controller/web/DmsLoginController.java    | 21 ++++++
 .../controller/web/FmsFollowupController.java |  3 +
 .../framework/config/SecurityConfig.java      |  2 +-
 .../web/service/SysLoginService.java          | 48 +++++++++++++
 .../web/service/WebDmsLoginService.java       | 48 +++++++++++++
 .../service/FmsFollowupQueueService.java      |  1 -
 .../resources/mapper/system/SysUserMapper.xml | 12 +++-
 9 files changed, 194 insertions(+), 14 deletions(-)

diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysLoginController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysLoginController.java
index 9f9672e44..99e9c1267 100644
--- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysLoginController.java
+++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysLoginController.java
@@ -3,6 +3,8 @@ package com.acupuncture.web.controller.system;
 import java.util.List;
 import java.util.Set;
 
+import com.acupuncture.common.annotation.DataSource;
+import com.acupuncture.common.enums.DataSourceType;
 import com.acupuncture.system.domain.po.DmsTenant;
 import com.acupuncture.system.persist.mapper.DmsTenantMapper;
 import com.acupuncture.system.service.ISysUserService;
@@ -66,23 +68,41 @@ public class SysLoginController
         return ajax;
     }
 
+    /**
+     * 登录方法
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @PostMapping("/loginSimple")
+    public AjaxResult loginSimple(@RequestBody LoginBody loginBody)
+    {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = loginService.loginSimple(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+
     /**
      * 获取用户信息
-     * 
+     *
      * @return 用户信息
      */
     @GetMapping("getInfo")
     public AjaxResult getInfo()
     {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        SysUser user = sysUserService.selectUserByTenantId(null, loginUser.getUsername());
-        if (user.getTenantId() != null) {
-            DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(user.getTenantId());
-            if (dmsTenant != null) {
-                user.setTenantName(dmsTenant.getName());
-                user.setTenantPhone(dmsTenant.getContactPhone());
-            }
-        }
+        SysUser user = sysUserService.selectUserById(loginUser.getUser().getUserId());
+//        SysUser user = sysUserService.selectUserByTenantId(null, loginUser.getUsername());
+//        if (user.getTenantId() != null) {
+//            DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(user.getTenantId());
+//            if (dmsTenant != null) {
+//                user.setTenantName(dmsTenant.getName());
+//                user.setTenantPhone(dmsTenant.getContactPhone());
+//            }
+//        }
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
@@ -99,6 +119,39 @@ public class SysLoginController
         return ajax;
     }
 
+//    /**
+//     * 获取用户信息
+//     *
+//     * @return 用户信息
+//     */
+//    @GetMapping("getInfo")
+//    public AjaxResult getInfo()
+//    {
+//        LoginUser loginUser = SecurityUtils.getLoginUser();
+//        SysUser user = sysUserService.selectUserByTenantId(null, loginUser.getUsername());
+//        if (user.getTenantId() != null) {
+//            DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(user.getTenantId());
+//            if (dmsTenant != null) {
+//                user.setTenantName(dmsTenant.getName());
+//                user.setTenantPhone(dmsTenant.getContactPhone());
+//            }
+//        }
+//        // 角色集合
+//        Set<String> roles = permissionService.getRolePermission(user);
+//        // 权限集合
+//        Set<String> permissions = permissionService.getMenuPermission(user);
+//        if (!loginUser.getPermissions().equals(permissions))
+//        {
+//            loginUser.setPermissions(permissions);
+//            tokenService.refreshToken(loginUser);
+//        }
+//        AjaxResult ajax = AjaxResult.success();
+//        ajax.put("user", user);
+//        ajax.put("roles", roles);
+//        ajax.put("permissions", permissions);
+//        return ajax;
+//    }
+
     /**
      * 获取路由信息
      * 
diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java
index 580e64d11..6b2f073b1 100644
--- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java
+++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java
@@ -103,6 +103,8 @@ public class AdminDmsUserController {
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPhonenumber(dto.getContactPhone());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setTenantName(dmsTenant.getName());
+        user.setTenantPhone(dmsTenant.getContactPhone());
         int insert = userService.insertUser(user);
 
         //销毁切换数据源
diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java
index 91360ec31..73782849c 100644
--- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java
+++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java
@@ -1,5 +1,6 @@
 package com.acupuncture.web.controller.web;
 
+import com.acupuncture.common.annotation.DataSource;
 import com.acupuncture.common.annotation.Log;
 import com.acupuncture.common.constant.Constants;
 import com.acupuncture.common.core.domain.AjaxResult;
@@ -8,6 +9,7 @@ import com.acupuncture.common.core.domain.entity.SysUser;
 import com.acupuncture.common.core.domain.model.LoginBody;
 import com.acupuncture.common.core.domain.model.LoginUser;
 import com.acupuncture.common.enums.BusinessType;
+import com.acupuncture.common.enums.DataSourceType;
 import com.acupuncture.common.utils.SecurityUtils;
 import com.acupuncture.framework.web.service.SysPermissionService;
 import com.acupuncture.framework.web.service.TokenService;
@@ -52,6 +54,7 @@ public class DmsLoginController {
      * @param loginBody 登录信息
      * @return 结果
      */
+    @DataSource(DataSourceType.MASTER)
     @PostMapping("/login")
     public AjaxResult login(@RequestBody LoginBody loginBody) {
         AjaxResult ajax = AjaxResult.success();
@@ -62,6 +65,24 @@ public class DmsLoginController {
         return ajax;
     }
 
+    /**
+     * 登录方法
+     *
+     * @param loginBody 登录信息
+     * @return 结果
+     */
+    @DataSource(DataSourceType.MASTER)
+    @PostMapping("/loginSimple")
+    public AjaxResult loginSimple(@RequestBody LoginBody loginBody) {
+        AjaxResult ajax = AjaxResult.success();
+        // 生成令牌
+        String token = webDmsLoginService.loginSimple(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+                loginBody.getUuid());
+        ajax.put(Constants.TOKEN, token);
+        return ajax;
+    }
+
+
     /**
      * 获取用户信息
      *
diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java
index 9cfdff86e..ac4e67c38 100644
--- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java
+++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupController.java
@@ -4,8 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
 import com.acupuncture.common.annotation.Anonymous;
+import com.acupuncture.common.annotation.DataSource;
 import com.acupuncture.common.core.domain.BaseDto;
 import com.acupuncture.common.core.domain.JsonResponse;
+import com.acupuncture.common.enums.DataSourceType;
 import com.acupuncture.common.utils.SecurityUtils;
 import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder;
 import com.acupuncture.system.domain.dto.FmsFollowupDto;
@@ -56,6 +58,7 @@ public class FmsFollowupController {
     @ApiOperation("查询公共队列")
     @PostMapping("/commonQueue")
     @Anonymous
+    @DataSource(DataSourceType.MASTER)
     public JsonResponse<PageInfo<FmsFollowupVo.FollowupQueueVO>> queryCommonQueue(@RequestBody @Validated BaseDto<FmsFollowupDto.QueueQuery> dto) {
         if (dto.getPageNum() > 0) {
             PageHelper.startPage(dto.getPageNum(), dto.getPageSize());
diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/config/SecurityConfig.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/config/SecurityConfig.java
index aeb17097c..8bc43feac 100644
--- a/acupuncture-framework/src/main/java/com/acupuncture/framework/config/SecurityConfig.java
+++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/config/SecurityConfig.java
@@ -114,7 +114,7 @@ public class SecurityConfig
             .authorizeHttpRequests((requests) -> {
                 permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                requests.antMatchers("/login", "/register", "/captchaImage", "/web/login", "/web/queryTenantById", "/api/http/getUserInfo", "/api/http/addReportImage", "/api/http/uploadMemberInfo", "/task/task").permitAll()
+                requests.antMatchers("/login", "/register", "/captchaImage", "/web/login", "/web/queryTenantById", "/api/http/getUserInfo", "/api/http/addReportImage", "/api/http/uploadMemberInfo", "/task/task", "/loginSimple").permitAll()
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**", "/static/**").permitAll()
                     .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/SysLoginService.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/SysLoginService.java
index 8efafe155..097e82ac8 100644
--- a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/SysLoginService.java
+++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/SysLoginService.java
@@ -100,6 +100,54 @@ public class SysLoginService
         return tokenService.createToken(loginUser);
     }
 
+    /**
+     * 登录验证
+     *
+     * @param username 用户名
+     * @param password 密码
+     * @param code 验证码
+     * @param uuid 唯一标识
+     * @return 结果
+     */
+    public String loginSimple(String username, String password, String code, String uuid)
+    {
+        // 验证码校验
+//        validateCaptcha(username, code, uuid);
+        // 登录前置校验
+        loginPreCheck(username, password);
+        // 用户验证
+        Authentication authentication = null;
+        try
+        {
+            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);
+            AuthenticationContextHolder.setContext(authenticationToken);
+            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
+            authentication = authenticationManager.authenticate(authenticationToken);
+        }
+        catch (Exception e)
+        {
+            if (e instanceof BadCredentialsException)
+            {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+                throw new UserPasswordNotMatchException();
+            }
+            else
+            {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
+                throw new ServiceException(e.getMessage());
+            }
+        }
+        finally
+        {
+            AuthenticationContextHolder.clearContext();
+        }
+        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+        recordLoginInfo(loginUser.getUserId());
+        // 生成token
+        return tokenService.createToken(loginUser);
+    }
+
     /**
      * 登录验证
      *
diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java
index f5a40b40d..b1817e212 100644
--- a/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java
+++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/web/service/WebDmsLoginService.java
@@ -98,6 +98,54 @@ public class WebDmsLoginService
         return tokenService.createToken(loginUser);
     }
 
+    /**
+     * 登录验证
+     *
+     * @param username 用户名
+     * @param password 密码
+     * @param code 验证码
+     * @param uuid 唯一标识
+     * @return 结果
+     */
+    public String loginSimple(String username, String password, String code, String uuid)
+    {
+        // 验证码校验
+        validateCaptcha(username, code, uuid);
+        // 登录前置校验
+        loginPreCheck(username, password);
+        // 用户验证
+        Authentication authentication = null;
+        try
+        {
+            DmsUserAuthenticationToken authenticationToken = new DmsUserAuthenticationToken(username, password);
+            AuthenticationContextHolder.setContext(authenticationToken);
+            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername
+            authentication = authenticationManager.authenticate(authenticationToken);
+        }
+        catch (Exception e)
+        {
+            if (e instanceof BadCredentialsException)
+            {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
+                throw new UserPasswordNotMatchException();
+            }
+            else
+            {
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));
+                throw new ServiceException(e.getMessage());
+            }
+        }
+        finally
+        {
+            AuthenticationContextHolder.clearContext();
+        }
+        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+        recordLoginInfo(loginUser.getUserId());
+        // 生成token
+        return tokenService.createToken(loginUser);
+    }
+
     /**
      * 登录验证
      *
diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java
index 5c4000c67..326b4c74a 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java
@@ -19,7 +19,6 @@ public interface FmsFollowupQueueService {
      * 查询公共队列
      * @return
      */
-    @DataSource(DataSourceType.MASTER)
     List<FmsFollowupVo.FollowupQueueVO> queryCommonQueue(String name);
 
 }
diff --git a/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml b/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml
index 322dfd547..1755a8c00 100644
--- a/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -25,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
 		<result property="slaverAdmin"       column="slaver_admin"       />
+		<result property="tenantName"       column="tenant_name"       />
+		<result property="tenantPhone"       column="tenant_phone"       />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
@@ -49,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.tenant_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.slaver_admin,
+        select u.user_id, u.tenant_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.slaver_admin, u.tenant_name, u.tenant_phone,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -168,7 +170,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
-		<if test="slaverAdmin != null">slaver_admin,</if>
+			<if test="slaverAdmin != null">slaver_admin,</if>
+			<if test="tenantName != null and tenantName != ''">tenant_name,</if>
+			<if test="tenantPhone != null and tenantPhone != ''">tenant_phone,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -184,7 +188,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
-		<if test="slaverAdmin != null">#{slaverAdmin},</if>
+			<if test="slaverAdmin != null">#{slaverAdmin},</if>
+			<if test="tenantName != null and tenantName != ''">#{tenantName},</if>
+			<if test="tenantPhone != null and tenantPhone != ''">#{tenantPhone},</if>
  			sysdate()
  		)
 	</insert>

From c35871f0a3af4c8ca7607b0e5f4df2c901a2c12a Mon Sep 17 00:00:00 2001
From: "1747191978@qq.com" <1942943850@qq.com>
Date: Fri, 28 Mar 2025 20:17:04 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E3=80=81=E5=85=AC=E5=91=8A=E9=98=9F=E5=88=97=E3=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81=E6=8E=A5=E5=8F=A3=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acupuncture-前台/src/api/followupFile.js |   4 +-
 acupuncture-前台/src/api/login.js        |   2 +-
 acupuncture-前台/src/api/system/user.js  | 118 +++++++++++------------
 acupuncture-前台/vue.config.js           |   2 +-
 4 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/acupuncture-前台/src/api/followupFile.js b/acupuncture-前台/src/api/followupFile.js
index 63ebb4891..e402997e7 100644
--- a/acupuncture-前台/src/api/followupFile.js
+++ b/acupuncture-前台/src/api/followupFile.js
@@ -2,7 +2,7 @@ import request from "@/utils/request";
 // 公共队列
 export function commonQueue(data) {
   return request({
-    url: "/followup/commonQueue",
+    url: "/web/commonQueue",
     method: "post",
     data: data,
   });
@@ -87,4 +87,4 @@ export function followStatus(data) {
     method: "post",
     data: data,
   });
-}
\ No newline at end of file
+}
diff --git a/acupuncture-前台/src/api/login.js b/acupuncture-前台/src/api/login.js
index dc87eebbd..74a920894 100644
--- a/acupuncture-前台/src/api/login.js
+++ b/acupuncture-前台/src/api/login.js
@@ -34,7 +34,7 @@ export function register(data) {
 // 获取用户详细信息
 export function getInfo() {
   return request({
-    url: "/getInfo",
+    url: "/web/getInfo",
     method: "get",
   });
 }
diff --git a/acupuncture-前台/src/api/system/user.js b/acupuncture-前台/src/api/system/user.js
index b5e3edd81..1e56d970c 100644
--- a/acupuncture-前台/src/api/system/user.js
+++ b/acupuncture-前台/src/api/system/user.js
@@ -1,136 +1,136 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 import { parseStrEmpty } from "@/utils/ruoyi";
 
 // 查询用户列表
 export function listUser(query) {
   return request({
-    url: '/system/user/list',
-    method: 'get',
-    params: query
-  })
+    url: "/system/user/list",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查询用户详细
 export function getUser(userId) {
   return request({
-    url: '/system/user/' + parseStrEmpty(userId),
-    method: 'get'
-  })
+    url: "/system/user/" + parseStrEmpty(userId),
+    method: "get",
+  });
 }
 
 // 新增用户
 export function addUser(data) {
   return request({
-    url: '/system/user',
-    method: 'post',
-    data: data
-  })
+    url: "/system/user",
+    method: "post",
+    data: data,
+  });
 }
 
 // 修改用户
 export function updateUser(data) {
   return request({
-    url: '/system/user',
-    method: 'put',
-    data: data
-  })
+    url: "/system/user",
+    method: "put",
+    data: data,
+  });
 }
 
 // 删除用户
 export function delUser(userId) {
   return request({
-    url: '/system/user/' + userId,
-    method: 'delete'
-  })
+    url: "/system/user/" + userId,
+    method: "delete",
+  });
 }
 
 // 用户密码重置
 export function resetUserPwd(userId, password) {
   const data = {
     userId,
-    password
-  }
+    password,
+  };
   return request({
-    url: '/system/user/resetPwd',
-    method: 'put',
-    data: data
-  })
+    url: "/system/user/resetPwd",
+    method: "put",
+    data: data,
+  });
 }
 
 // 用户状态修改
 export function changeUserStatus(userId, status) {
   const data = {
     userId,
-    status
-  }
+    status,
+  };
   return request({
-    url: '/system/user/changeStatus',
-    method: 'put',
-    data: data
-  })
+    url: "/system/user/changeStatus",
+    method: "put",
+    data: data,
+  });
 }
 
 // 查询用户个人信息
 export function getUserProfile() {
   return request({
-    url: '/system/user/profile',
-    method: 'get'
-  })
+    url: "/system/user/profile",
+    method: "get",
+  });
 }
 
 // 修改用户个人信息
 export function updateUserProfile(data) {
   return request({
-    url: '/system/user/profile',
-    method: 'put',
-    data: data
-  })
+    url: "/system/user/profile",
+    method: "put",
+    data: data,
+  });
 }
 
 // 用户密码重置
 export function updateUserPwd(oldPassword, newPassword) {
   const data = {
     oldPassword,
-    newPassword
-  }
+    newPassword,
+  };
   return request({
-    url: '/system/user/profile/updatePwd',
-    method: 'put',
-    data: data
-  })
+    url: "/web/updatePwd",
+    method: "put",
+    data: data,
+  });
 }
 
 // 用户头像上传
 export function uploadAvatar(data) {
   return request({
-    url: '/system/user/profile/avatar',
-    method: 'post',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    data: data
-  })
+    url: "/system/user/profile/avatar",
+    method: "post",
+    headers: { "Content-Type": "application/x-www-form-urlencoded" },
+    data: data,
+  });
 }
 
 // 查询授权角色
 export function getAuthRole(userId) {
   return request({
-    url: '/system/user/authRole/' + userId,
-    method: 'get'
-  })
+    url: "/system/user/authRole/" + userId,
+    method: "get",
+  });
 }
 
 // 保存授权角色
 export function updateAuthRole(data) {
   return request({
-    url: '/system/user/authRole',
-    method: 'put',
-    params: data
-  })
+    url: "/system/user/authRole",
+    method: "put",
+    params: data,
+  });
 }
 
 // 查询部门下拉树结构
 export function deptTreeSelect() {
   return request({
-    url: '/system/user/deptTree',
-    method: 'get'
-  })
+    url: "/system/user/deptTree",
+    method: "get",
+  });
 }
diff --git a/acupuncture-前台/vue.config.js b/acupuncture-前台/vue.config.js
index ccd794ee7..a14f79529 100644
--- a/acupuncture-前台/vue.config.js
+++ b/acupuncture-前台/vue.config.js
@@ -39,7 +39,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `https://test.tall.wiki/acupuncture/api/`,
+        target: `http://192.168.1.3:20001`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From fb5ce457a9a01dad0d1c77c74ab4b6e5131d18fe Mon Sep 17 00:00:00 2001
From: "1747191978@qq.com" <1942943850@qq.com>
Date: Fri, 28 Mar 2025 20:24:50 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=8C=E9=9D=A2=E7=9A=84=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=9C=89=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/medicalFile/index.vue           | 52 ++++++++-----------
 1 file changed, 21 insertions(+), 31 deletions(-)

diff --git a/acupuncture-前台/src/views/medicalFile/index.vue b/acupuncture-前台/src/views/medicalFile/index.vue
index 85049d827..c5a5b1a67 100644
--- a/acupuncture-前台/src/views/medicalFile/index.vue
+++ b/acupuncture-前台/src/views/medicalFile/index.vue
@@ -109,7 +109,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['medicalFile:index:add']"
           >新增</el-button
         >
       </el-col>
@@ -121,7 +120,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['medicalFile:index:del']"
           >删除</el-button
         >
       </el-col>
@@ -132,7 +130,6 @@
           icon="el-icon-bottom"
           size="mini"
           @click="handleDownload"
-          v-hasPermi="['medicalFile:index:download']"
         >
           下载模版
         </el-button>
@@ -144,7 +141,6 @@
           icon="el-icon-upload2"
           size="mini"
           @click="handleImport"
-          v-hasPermi="['medicalFile:index:import']"
           >导入</el-button
         >
       </el-col> -->
@@ -155,7 +151,6 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['medicalFile:index:export']"
           >导出</el-button
         >
       </el-col>
@@ -376,7 +371,6 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['medicalFile:index:edit']"
             >修改</el-button
           >
           <el-button
@@ -385,7 +379,6 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['medicalFile:index:del']"
             >删除</el-button
           >
           <el-button
@@ -393,7 +386,6 @@
             type="text"
             icon="el-icon-tickets"
             @click="handleDetails(scope.row)"
-            v-hasPermi="['medicalFile:index:details']"
             >档案详情</el-button
           >
           <el-button
@@ -401,7 +393,6 @@
             type="text"
             icon="el-icon-notebook-2"
             @click="handleEecorde(scope.row)"
-            v-hasPermi="['medicalFile:index:ecorde']"
             >随访记录</el-button
           >
           <el-button
@@ -409,7 +400,6 @@
             type="text"
             icon="el-icon-document-copy"
             @click="handleReport(scope.row)"
-            v-hasPermi="['medicalFile:index:report']"
             >评估报告</el-button
           >
           <el-button
@@ -418,31 +408,30 @@
             type="text"
             icon="el-icon-s-promotion"
             @click="handleExamine(scope.row, 1)"
-            v-hasPermi="['medicalFile:index:examine']"
           >
             提交审核
           </el-button>
           <!-- 审核 -->
-          <el-button
-            :disabled="scope.row.status != 1"
-            size="mini"
-            type="text"
-            icon="el-icon-s-check"
-            @click="handleExamine(scope.row, 2)"
-            v-hasPermi="['medicalFile:index:pass']"
-          >
-            通过
-          </el-button>
-          <el-button
-            :disabled="scope.row.status != 1"
-            size="mini"
-            type="text"
-            icon="el-icon-s-check"
-            @click="handleExamine(scope.row, 3)"
-            v-hasPermi="['medicalFile:index:reject']"
-          >
-            驳回
-          </el-button>
+          <div v-if="userInfo.slaverAdmin">
+            <el-button
+              :disabled="scope.row.status != 1"
+              size="mini"
+              type="text"
+              icon="el-icon-s-check"
+              @click="handleExamine(scope.row, 2)"
+            >
+              通过
+            </el-button>
+            <el-button
+              :disabled="scope.row.status != 1"
+              size="mini"
+              type="text"
+              icon="el-icon-s-check"
+              @click="handleExamine(scope.row, 3)"
+            >
+              驳回
+            </el-button>
+          </div>
         </template>
       </el-table-column>
     </el-table>
@@ -643,6 +632,7 @@ export default {
   data() {
     return {
       qzUrl: process.env.VUE_APP_API_QZURL, // 二维码路径
+      userInfo: localStorage.getItem("user"),
       // 受教育程度，年限
       educationYears: [
         { label: "文盲", value: 0 },

From 3cd8e90aa5014d9649025e390810fa6103c1c7ae Mon Sep 17 00:00:00 2001
From: "1747191978@qq.com" <1942943850@qq.com>
Date: Fri, 28 Mar 2025 21:34:25 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8C=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E7=BB=84=E7=BB=87=E7=94=A8=E6=88=B7=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=BB=84=E7=BB=87=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6=E6=9C=89=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acupuncture-后台/src/api/login.js             |  2 +-
 acupuncture-后台/src/api/member.js            | 12 +++----
 acupuncture-后台/src/views/member/account.vue | 35 ++++++++++++++++---
 acupuncture-后台/vue.config.js                |  2 +-
 4 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/acupuncture-后台/src/api/login.js b/acupuncture-后台/src/api/login.js
index dc87eebbd..ed1c38acc 100644
--- a/acupuncture-后台/src/api/login.js
+++ b/acupuncture-后台/src/api/login.js
@@ -9,7 +9,7 @@ export function login(username, password, code, uuid) {
     uuid,
   };
   return request({
-    url: "/web/login",
+    url: "/login",
     headers: {
       isToken: false,
       repeatSubmit: false,
diff --git a/acupuncture-后台/src/api/member.js b/acupuncture-后台/src/api/member.js
index 1233b5c30..039347703 100644
--- a/acupuncture-后台/src/api/member.js
+++ b/acupuncture-后台/src/api/member.js
@@ -41,7 +41,7 @@ export function dataSourcesList(data) {
     method: "post",
     data: data,
   });
-}// 新增数据源
+} // 新增数据源
 export function dataSourcesAdd(data) {
   return request({
     url: "/dataSources/add",
@@ -72,7 +72,7 @@ export function tenantUsersList(data) {
     method: "post",
     data: data,
   });
-}// 新增数据源
+} // 新增数据源
 export function tenantUsersAdd(data) {
   return request({
     url: "/tenantUsers/add",
@@ -96,11 +96,11 @@ export function tenantUsersDel(data) {
     data: data,
   });
 }
-// 
+//
 export function resetPwd(data) {
   return request({
-    url: "/web/resetPwd",
-    method: "put",
+    url: "/tenantUsers/resetPwd",
+    method: "post",
     data: data,
   });
-}
\ No newline at end of file
+}
diff --git a/acupuncture-后台/src/views/member/account.vue b/acupuncture-后台/src/views/member/account.vue
index 0f6abe9db..2c6c52589 100644
--- a/acupuncture-后台/src/views/member/account.vue
+++ b/acupuncture-后台/src/views/member/account.vue
@@ -88,18 +88,24 @@
         show-overflow-tooltip
         min-width="80"
       />
+      <el-table-column label="审核权限" align="center" width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.slaverAdmin - 0 == 1">是</span>
+          <span v-else>否</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="状态"
         align="center"
         show-overflow-tooltip
-        min-width="100"
+        width="100"
       >
         <template slot-scope="scope" v-if="scope.row.status != null">
           <span v-if="scope.row.status == 0" style="color: #67c23a">启用</span>
           <span v-if="scope.row.status == 1" style="color: #f56c6c">禁用</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建人/创建时间" align="center" min-width="140">
+      <el-table-column label="创建人/创建时间" align="center" width="140">
         <template slot-scope="scope">
           <div>{{ scope.row.createBy }}</div>
           <span>
@@ -167,7 +173,11 @@
           <el-input v-model="form.nickName" placeholder="请输入" />
         </el-form-item>
         <el-form-item label="用户名" prop="userName">
-          <el-input v-model="form.userName" placeholder="请输入" />
+          <el-input
+            v-model="form.userName"
+            placeholder="请输入"
+            :disabled="form.id ? true : false"
+          />
         </el-form-item>
         <el-form-item label="密码" prop="password" v-if="!form.id">
           <el-input v-model="form.password" placeholder="请输入" />
@@ -183,6 +193,10 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="审核权限" prop="slaverAdmin">
+          <el-radio v-model="form.slaverAdmin" :label="1">是</el-radio>
+          <el-radio v-model="form.slaverAdmin" :label="0">否</el-radio>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -272,6 +286,13 @@ export default {
             trigger: "blur",
           },
         ],
+        slaverAdmin: [
+          {
+            required: true,
+            message: "审核权限",
+            trigger: "blur",
+          },
+        ],
         password: [
           {
             required: true,
@@ -323,6 +344,7 @@ export default {
         nickName: "",
         userName: "",
         status: "0",
+        slaverAdmin: 0,
       };
       this.resetForm("form");
     },
@@ -355,6 +377,7 @@ export default {
       this.open = true;
       this.title = "修改用户";
       this.form = JSON.parse(JSON.stringify(row));
+      this.form.slaverAdmin = this.form.slaverAdmin || 0;
     },
     /** 诊疗档案 */
     submitForm: function () {
@@ -376,10 +399,14 @@ export default {
         }
       });
     },
+    // 重置密码
     handleResetPwd(row) {
       this.resetOpen = true;
       this.form = JSON.parse(JSON.stringify(row));
-      this.form.password = "";
+      this.form = {
+        id: this.form.id,
+        password: "",
+      };
     },
     submitPasForm(row) {
       this.$refs["pasForm"].validate((valid) => {
diff --git a/acupuncture-后台/vue.config.js b/acupuncture-后台/vue.config.js
index ccd794ee7..60b4bd0ea 100644
--- a/acupuncture-后台/vue.config.js
+++ b/acupuncture-后台/vue.config.js
@@ -39,7 +39,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `https://test.tall.wiki/acupuncture/api/`,
+        target: `http://192.168.1.3:20001/`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",

From 28c556c5ffaa2c64a1427ac954302965a69423b4 Mon Sep 17 00:00:00 2001
From: "1747191978@qq.com" <1942943850@qq.com>
Date: Fri, 28 Mar 2025 21:53:08 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/medicalFile/index.vue           |  3 ++-
 acupuncture-后台/src/views/member/account.vue | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/acupuncture-前台/src/views/medicalFile/index.vue b/acupuncture-前台/src/views/medicalFile/index.vue
index c5a5b1a67..d494d0452 100644
--- a/acupuncture-前台/src/views/medicalFile/index.vue
+++ b/acupuncture-前台/src/views/medicalFile/index.vue
@@ -632,7 +632,7 @@ export default {
   data() {
     return {
       qzUrl: process.env.VUE_APP_API_QZURL, // 二维码路径
-      userInfo: localStorage.getItem("user"),
+      userInfo: {},
       // 受教育程度，年限
       educationYears: [
         { label: "文盲", value: 0 },
@@ -957,6 +957,7 @@ export default {
     let idCard = this.$route.query.idCard;
     this.queryParams.param.keywords = idCard || "";
     this.getList();
+    this.userInfo = JSON.parse(localStorage.getItem("user"));
     // this.getFollowupQuery();
   },
   methods: {
diff --git a/acupuncture-后台/src/views/member/account.vue b/acupuncture-后台/src/views/member/account.vue
index 2c6c52589..2cf698816 100644
--- a/acupuncture-后台/src/views/member/account.vue
+++ b/acupuncture-后台/src/views/member/account.vue
@@ -8,13 +8,21 @@
       v-show="showSearch"
       label-width="80px"
     >
-      <el-form-item label="组织名称" prop="tenantName">
-        <el-input
-          v-model="queryParams.param.tenantName"
-          placeholder="请输入"
+      <el-form-item label="组织" prop="tenantId">
+        <el-select
+          v-model="queryParams.param.tenantId"
+          placeholder="请选择"
+          filterable
           clearable
-          @keyup.enter.native="handleQuery"
-        />
+        >
+          <el-option
+            v-for="item in tenantsDataList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button

From 00e6bb8b43b21904a7a29e1e25d46f6466ed59f0 Mon Sep 17 00:00:00 2001
From: zzc <Zhengzhic18@163.com>
Date: Wed, 14 May 2025 09:18:50 +0800
Subject: [PATCH 6/6] 1

---
 .../web/controller/system/SysUserController.java         | 3 ---
 .../web/controller/web/AdminDmsUserController.java       | 9 ---------
 .../web/controller/web/AdminPmsTreatmentController.java  | 3 ---
 .../web/controller/web/ExternalController.java           | 3 ---
 .../web/controller/web/ScreeningController.java          | 3 ---
 .../java/com/acupuncture/web/task/TaskController.java    | 3 ---
 .../acupuncture/common/core/domain/entity/SysUser.java   | 4 ----
 .../framework/aspectj/AdminGlobalDataSourceAspect.java   | 8 --------
 .../system/domain/dto/AdminTenantUserDto.java            | 8 --------
 .../system/service/impl/PmsPatientServiceImpl.java       | 7 ++++++-
 10 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java
index 1c29ed657..6fc865e8a 100644
--- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java
+++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/system/SysUserController.java
@@ -185,7 +185,6 @@ public class SysUserController extends BaseController
         return toAjax(userService.updateUser(user));
     }
 
-<<<<<<< HEAD
     private void changeDataSource(Long tenantId) {
         DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(tenantId);
         if (dmsTenant != null) {
@@ -200,8 +199,6 @@ public class SysUserController extends BaseController
         }
     }
 
-=======
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
     /**
      * 删除用户
      */
diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java
index d372b29ed..b2568d458 100644
--- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java
+++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminDmsUserController.java
@@ -89,12 +89,9 @@ public class AdminDmsUserController {
         adminTenantUserService.insert(dto);
 
         //切换至从库
-<<<<<<< HEAD
         changeDataSource(umsDataSource.getDataSourceKey());
 
-=======
         DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey());
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
         //新增从库数据
         SysUser user = BeanUtil.copyProperties(dto, SysUser.class);
         if (!userService.checkUserNameUnique(user)) {
@@ -113,11 +110,8 @@ public class AdminDmsUserController {
         int insert = userService.insertUser(user);
 
         //销毁切换数据源
-<<<<<<< HEAD
         removeDataSource();
-=======
         DynamicDataSourceContextHolder.clearDataSourceType();
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
 
         return JsonResponse.ok(insert);
     }
@@ -192,7 +186,6 @@ public class AdminDmsUserController {
         return JsonResponse.ok(new PageInfo<>(adminTenantUserService.query(dto.getParam())));
     }
 
-<<<<<<< HEAD
     private static void changeDataSource(String key) {
         DynamicDataSourceContextHolder.setDataSourceType(key);
     }
@@ -200,6 +193,4 @@ public class AdminDmsUserController {
     private static void removeDataSource() {
         DynamicDataSourceContextHolder.clearDataSourceType();
     }
-=======
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
 }
diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java
index 114a84f7f..7caaa429c 100644
--- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java
+++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/AdminPmsTreatmentController.java
@@ -75,7 +75,6 @@ public class AdminPmsTreatmentController {
 //    }
 //
 
-<<<<<<< HEAD
     private static void changeDataSource(String dataSourceKey) {
         try {
             DynamicDataSourceContextHolder.setDataSourceType(dataSourceKey);
@@ -83,8 +82,6 @@ public class AdminPmsTreatmentController {
             DynamicDataSourceContextHolder.clearDataSourceType();
         }
     }
-=======
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
 
 //    @ApiOperation("导出诊疗档案评估报告")
 //    @PostMapping("/exportTreatmentPg")
diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java
index 54d0e34ed..bfdaae7d8 100644
--- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java
+++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java
@@ -87,7 +87,6 @@ public class ExternalController {
 
     }
 
-<<<<<<< HEAD
     private static void changeDataSource(String key) {
         try {
             DynamicDataSourceContextHolder.setDataSourceType(key);
@@ -96,8 +95,6 @@ public class ExternalController {
         }
     }
 
-=======
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
 //    @Anonymous
 //    @ApiOperation("上传数据")
 //    @PostMapping("/http/uploadMemberInfo")
diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java
index 2fb42d240..b24434a14 100644
--- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java
+++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ScreeningController.java
@@ -87,7 +87,6 @@ public class ScreeningController {
         return JsonResponse.ok(detailInfo);
     }
 
-<<<<<<< HEAD
     private void changeDataSource(Long tenantId) {
         DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(tenantId);
         if (dmsTenant != null) {
@@ -101,8 +100,6 @@ public class ScreeningController {
             }
         }
     }
-=======
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
 
     @ApiOperation(value = "提交筛查", notes = "")
     @RequestMapping(value = "/submit", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java
index e4825301c..b97f7b353 100644
--- a/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java
+++ b/acupuncture-admin/src/main/java/com/acupuncture/web/task/TaskController.java
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 //package com.acupuncture.web.controller.web;
 //
 //import cn.hutool.core.bean.BeanUtil;
@@ -342,7 +341,6 @@
 //        private Integer index;
 //    }
 //}
-=======
 package com.acupuncture.web.task;
 
 import cn.hutool.core.bean.BeanUtil;
@@ -708,4 +706,3 @@ public class TaskController {
         private Integer index;
     }
 }
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
diff --git a/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java b/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java
index 66ed16518..bd8bafcfe 100644
--- a/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java
+++ b/acupuncture-common/src/main/java/com/acupuncture/common/core/domain/entity/SysUser.java
@@ -100,10 +100,6 @@ public class SysUser extends BaseEntity
 
     @ApiModelProperty("是否具有审核权限(0不具有； 1具有)")
     private Byte slaverAdmin;
-<<<<<<< HEAD
-
-=======
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
     public SysUser()
     {
 
diff --git a/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java b/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java
index 4db65ba9b..b7e356b06 100644
--- a/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java
+++ b/acupuncture-framework/src/main/java/com/acupuncture/framework/aspectj/AdminGlobalDataSourceAspect.java
@@ -70,7 +70,6 @@ public class AdminGlobalDataSourceAspect {
      */
     public String getDataSource(ProceedingJoinPoint point) {
         // 获取请求携带的令牌
-<<<<<<< HEAD
         ServletRequestAttributes requestAttributes = (ServletRequestAttributes)
                 RequestContextHolder.getRequestAttributes();
         HttpServletRequest request;
@@ -80,10 +79,6 @@ public class AdminGlobalDataSourceAspect {
         }
         request = requestAttributes.getRequest();
         //token为空
-=======
-        HttpServletRequest request = ((ServletRequestAttributes)
-                RequestContextHolder.getRequestAttributes()).getRequest();
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
         Long tenantId;
         String header = request.getHeader(UserConstants.DEPT);
         if(StrUtil.isNotEmpty(header)){
@@ -98,15 +93,12 @@ public class AdminGlobalDataSourceAspect {
                 return null;
             }
         }
-<<<<<<< HEAD
 
         //设置所属医院和数据源l
 //        LoginUser loginUser = SecurityUtils.getLoginUser();
 //        if(ObjectUtil.isNull(loginUser) || loginUser.getUser().isAdmin()){
 //            return null;
 //        }
-=======
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
         //根据组织ID查询数据源
         UmsDataSource dataSource = dmsLoginService.getDataSourceByTenantId(tenantId);
         if (dataSource == null) {
diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java
index 080303012..0febe91e5 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/dto/AdminTenantUserDto.java
@@ -37,10 +37,6 @@ public class AdminTenantUserDto {
         private String status;
 
         private String contactPhone;
-<<<<<<< HEAD
-=======
-
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
         @ApiModelProperty("是否具有审核权限(0不具有； 1具有)")
         private Byte slaverAdmin;
 //
@@ -68,10 +64,6 @@ public class AdminTenantUserDto {
         private String status;
 
         private String contactPhone;
-<<<<<<< HEAD
-
-=======
->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666
         @ApiModelProperty("是否具有审核权限(0不具有； 1具有)")
         private Byte slaverAdmin;
     }
diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java
index e765fdbec..b1777ead6 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/PmsPatientServiceImpl.java
@@ -282,7 +282,12 @@ public class PmsPatientServiceImpl implements PmsPatientService {
             writer.writeCellValue(0, row, DateUtil.format(patientList.get(i).getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
             writer.writeCellValue(1, row, patientList.get(i).getName());
             writer.writeCellValue(2, row, patientList.get(i).getGender() == null ? "未知" : patientList.get(i).getGender() == 0 ? "男" : "女");
-            writer.writeCellValue(3, row, DateUtil.format(patientList.get(i).getBirthDate(), "yyyy-MM-dd"));
+            try {
+
+                writer.writeCellValue(3, row, DateUtil.format(patientList.get(i).getBirthDate(), "yyyy-MM-dd"));
+            }catch (Exception e) {
+                e.printStackTrace();
+            }
             writer.writeCellValue(4, row, patientList.get(i).getEthnicity());
             writer.writeCellValue(5, row, patientList.get(i).getEducationYears());
             writer.writeCellValue(6, row, patientList.get(i).getPhone());