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 1c29ed65..6fc865e8 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 d372b29e..b2568d45 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 114a84f7..7caaa429 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 54d0e34e..bfdaae7d 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 2fb42d24..b24434a1 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 e4825301..b97f7b35 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 66ed1651..bd8bafcf 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 4db65ba9..b7e356b0 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 08030301..0febe91e 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 e765fdbe..b1777ead 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());