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 5137852e..d251be94 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,23 +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) { - UmsDataSource umsDataSource = umsDataSourceMapper.selectByPrimaryKey(dmsTenant.getDataSourceId()); - if (umsDataSource != null) { - try { - DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey()); - }finally { - DynamicDataSourceContextHolder.clearDataSourceType(); - } - } - } - } - -======= ->>>>>>> new /** * 删除用户 */ 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 49ff9e4c..004271a1 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 @@ -94,14 +94,8 @@ public class AdminDmsUserController { adminTenantUserService.insert(dto); //切换至从库 -<<<<<<< HEAD - changeDataSource(umsDataSource.getDataSourceKey()); - - DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey()); -======= DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey()); ->>>>>>> new //新增从库数据 SysUser user = BeanUtil.copyProperties(dto, SysUser.class); if (!userService.checkUserNameUnique(user)) { @@ -121,10 +115,6 @@ public class AdminDmsUserController { int insert = userService.insertUser(user); //销毁切换数据源 -<<<<<<< HEAD - removeDataSource(); -======= ->>>>>>> new DynamicDataSourceContextHolder.clearDataSourceType(); return JsonResponse.ok(insert); @@ -200,12 +190,9 @@ public class AdminDmsUserController { return JsonResponse.ok(new PageInfo<>(adminTenantUserService.query(dto.getParam()))); } -<<<<<<< HEAD private static void changeDataSource(String key) { DynamicDataSourceContextHolder.setDataSourceType(key); } -======= ->>>>>>> new /** * 重置密码 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 87b265ce..8746c076 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 @@ -95,17 +95,7 @@ public class AdminPmsTreatmentController { // } // -<<<<<<< HEAD - private static void changeDataSource(String dataSourceKey) { - try { - DynamicDataSourceContextHolder.setDataSourceType(dataSourceKey); - }finally { - DynamicDataSourceContextHolder.clearDataSourceType(); - } - } -======= ->>>>>>> new // @ApiOperation("导出诊疗档案评估报告") // @PostMapping("/exportTreatmentPg") // public JsonResponse exportTreatmentPg(HttpServletResponse response, @RequestBody @Validated PmsTreatmentDto.ExportVO dto){ 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 ec812898..f41ca4a1 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 @@ -66,7 +66,6 @@ public class DmsLoginController { * @param loginBody 登录信息 * @return 结果 */ - @DataSource(DataSourceType.MASTER) @PostMapping("/login") @DataSource(DataSourceType.MASTER) public AjaxResult login(@RequestBody LoginBody loginBody) { @@ -79,7 +78,6 @@ public class DmsLoginController { } /** -<<<<<<< HEAD * 登录方法 * * @param loginBody 登录信息 @@ -100,7 +98,6 @@ public class DmsLoginController { /** * 获取用户信息 * -======= * 重置密码 */ @Log(title = "个人信息", businessType = BusinessType.UPDATE) @@ -145,7 +142,6 @@ public class DmsLoginController { /** * 获取用户信息，暂时先从主库获取 ->>>>>>> new * @return 用户信息 */ @ApiOperation("用户信息") 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 cbd38466..635f1390 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 @@ -97,17 +97,6 @@ public class ExternalController { } -<<<<<<< HEAD - private static void changeDataSource(String key) { - try { - DynamicDataSourceContextHolder.setDataSourceType(key); - }finally { - DynamicDataSourceContextHolder.clearDataSourceType(); - } - } - -======= ->>>>>>> new // @Anonymous // @ApiOperation("上传数据") // @PostMapping("/http/uploadMemberInfo") 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 3416b6ca..924b0c66 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 @@ -51,8 +51,8 @@ import java.util.List; public class FmsFollowupController { @Resource private FmsFollowupService fmsFollowupService; - -<<<<<<< HEAD + @Resource + private FmsFollowupQueueService fmsFollowupQueueService; @ApiOperation("查询公共队列") @PostMapping("/commonQueue") @@ -65,8 +65,6 @@ public class FmsFollowupController { return JsonResponse.ok(new PageInfo<>(fmsFollowupQueueService.queryCommonQueue(dto.getParam().getName()))); } -======= ->>>>>>> new @ApiOperation("查询随访队列") @PostMapping("/query") public JsonResponse> queryQueue(@RequestBody @Validated BaseDto dto) { 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 e0c25c9a..862759cd 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 @@ -93,23 +93,7 @@ public class ScreeningController { return JsonResponse.ok(detailInfo); } -<<<<<<< HEAD - private void changeDataSource(Long tenantId) { - DmsTenant dmsTenant = dmsTenantMapper.selectByPrimaryKey(tenantId); - if (dmsTenant != null) { - UmsDataSource umsDataSource = umsDataSourceMapper.selectByPrimaryKey(dmsTenant.getDataSourceId()); - if (umsDataSource != null) { - try { - DynamicDataSourceContextHolder.setDataSourceType(umsDataSource.getDataSourceKey()); - }finally { - DynamicDataSourceContextHolder.clearDataSourceType(); - } - } - } - } -======= ->>>>>>> new @ApiOperation(value = "提交筛查", notes = "") @RequestMapping(value = "/submit", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse submitQuestionnaire(@ApiParam @Validated @RequestBody BaseDto params) throws Exception { 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 5136b864..33a8bf5c 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,349 +1,3 @@ -<<<<<<< HEAD -//package com.acupuncture.web.controller.web; -// -//import cn.hutool.core.bean.BeanUtil; -//import cn.hutool.core.collection.CollectionUtil; -//import cn.hutool.core.date.DateUtil; -//import cn.hutool.core.util.IdUtil; -//import com.acupuncture.common.annotation.Anonymous; -//import com.acupuncture.common.core.redis.RedisCache; -//import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder; -//import com.acupuncture.system.domain.dto.FmsFollowupDto; -//import com.acupuncture.system.domain.po.FmsFollowupTask; -//import com.acupuncture.system.domain.po.FmsFollowupTaskExample; -//import com.acupuncture.system.domain.po.FmsPatientQueueRelation; -//import com.acupuncture.system.domain.vo.FmsFollowupVo; -//import com.acupuncture.system.domain.vo.UmsDataSourceVo; -//import com.acupuncture.system.persist.dao.FmsFollowupDao; -//import com.acupuncture.system.persist.dao.UmsDataSourceDao; -//import com.acupuncture.system.persist.mapper.FmsFollowupTaskMapper; -//import com.acupuncture.system.persist.mapper.FmsPatientQueueRelationMapper; -//import com.acupuncture.system.service.FmsFollowupQueueService; -//import com.acupuncture.system.service.FmsFollowupService; -//import io.swagger.annotations.Api; -//import io.swagger.annotations.ApiOperation; -//import lombok.Data; -//import lombok.extern.slf4j.Slf4j; -//import org.apache.catalina.connector.Response; -//import org.quartz.TriggerUtils; -//import org.quartz.impl.triggers.CronTriggerImpl; -//import org.quartz.spi.OperableTrigger; -//import org.springframework.scheduling.annotation.Scheduled; -//import org.springframework.transaction.annotation.Propagation; -//import org.springframework.transaction.annotation.Transactional; -//import org.springframework.web.bind.annotation.PostMapping; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//import javax.annotation.Resource; -//import javax.servlet.http.HttpServletRequest; -//import javax.servlet.http.HttpServletResponse; -//import java.util.*; -//import java.util.regex.Matcher; -//import java.util.regex.Pattern; -// -///** -// * @Author zzc -// * @Package com.acupuncture.web.controller.web -// * @Date 2025/2/13 8:50 -// * @description: -// */ -//@Slf4j -//@Api(tags = "定时任务相关") -//@RestController -//@RequestMapping("/task") -//@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) -//public class TaskController { -// -// @Resource -// private FmsFollowupDao fmsFollowupDao; -// @Resource -// private FmsFollowupService fmsFollowupService; -// @Resource -// private FmsFollowupTaskMapper fmsFollowupTaskMapper; -// @Resource -// private UmsDataSourceDao umsDataSourceDao; -// @Resource -// private RedisCache redisCache; -// @Resource -// private FmsFollowupQueueService fmsFollowupQueueService; -// -// @ApiOperation("定时任务添加随访工单") -// @PostMapping("/task") -// @Scheduled(fixedDelay = 10000) -// @Anonymous -// public void task() { -// // TODO 生成工单第一次生成之后2周的，往后只生成之后一周。第一次随访时间： （ 患者的出院时间 - 7 + 轮次时间） 到 （患者的出院时间 + 7 + 轮次时间 ） -// //查询租户，根据租户循环切换数据源，定时处理所有医院的随访工单 -//// UmsDataSourceVo.Result result1 = new UmsDataSourceVo.Result(); -//// result1.setDataSourceKey("MASTER"); -//// changeDataSource(result1); -//// List query = umsDataSourceDao.query(null); -//// if (CollectionUtil.isEmpty(query)) { -//// return; -//// } -// //查询公共队列 -// List queueResults = redisCache.getCacheList("common_followup_queue"); -// List followupQueueVOS = new ArrayList<>(); -// if (CollectionUtil.isEmpty(queueResults)) { -// -// followupQueueVOS = fmsFollowupQueueService.queryCommonQueue(null); -// } -//// List queueResults = fmsFollowupDao.queryCommonQueue(null); -// //切换数据源 -//// for (UmsDataSourceVo.Result result : query) { -//// if ("MASTER".equals(result.getDataSourceKey()) || "PROD_YY".equals(result.getDataSourceKey())) { -//// continue; -//// } -//// changeDataSource(result); -// { -// //获取随访患者列表，根据患者出院日时间和队列添加工单 -// //1. 查询队列 -// List queueList = fmsFollowupDao.selectQueueList(null, null, null, null); -// -// if (CollectionUtil.isEmpty(queueList)) { -// if (CollectionUtil.isEmpty(queueResults)) { -// queueList = followupQueueVOS; -// } -// } else { -// if (CollectionUtil.isEmpty(queueResults)) { -// queueList.addAll(followupQueueVOS); -// } -// } -// for (FmsFollowupVo.FollowupQueueVO followupQueueVO : queueList) { -// Integer followWindowAdys = followupQueueVO.getFollowWindowAdys(); -// -// //2. 查询队列随访患者列表 -//// changeDataSource(result); -// FmsFollowupDto.FollowupPatientQueryDTO followupPatientQueryDTO = new FmsFollowupDto.FollowupPatientQueryDTO(); -// followupPatientQueryDTO.setQueueId(followupQueueVO.getId()); -// followupPatientQueryDTO.setTenantId(followupQueueVO.getTenantId()); -//// changeDataSource(result); -// List patientList = fmsFollowupService.queryTaskPatient(followupPatientQueryDTO); -//// List patientList = fmsFollowupDao.queryPatient(followupQueueVO.getId(), null, null); -// if (CollectionUtil.isEmpty(patientList)) { -// continue; -// } -// //随访总月数 -// Integer followupMonth = followupQueueVO.getFollowupMonth(); -// for (FmsFollowupVo.FollowupPatient followupPatient : patientList) { -// //获取随访到期时间 出院时间+随访总月数 = 到期时间 -// Calendar calendar = Calendar.getInstance(); -// calendar.setTime(followupPatient.getDischargeTime()); -// calendar.set(Calendar.MONTH, followupMonth); -// Date time = calendar.getTime(); -// -// //获取队列信息 -// String frequency = followupQueueVO.getFrequency(); -// List dateList = new ArrayList<>(); -// try { -// CronTriggerImpl cronTrigger = new CronTriggerImpl(); -// cronTrigger.setCronExpression(frequency); -// //TriggerUtils.computeFireTimesBetween(要计算触发时间的触发器对象, 用于计算触发时间的日历对象, 计算触发时间的起始时间点, 计算触发时间的结束时间点); -// dateList = TriggerUtils.computeFireTimesBetween(cronTrigger, null, followupPatient.getDischargeTime(), time); -// if (CollectionUtil.isEmpty(dateList)) { -// continue; -// } -// } catch (Exception e) { -// e.printStackTrace(); -// } -// //3. 判断随访类型 -// if (followupQueueVO.getFollowupType() == 0) { -// //单次 -// //判断是否已有该次随访 -// FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample(); -// fmsFollowupTaskExample.createCriteria().andTimesEqualTo(1).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId()); -// List fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample); -// if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) { -// continue; -// } -// FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); -// BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); -// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); -// fmsFollowupTask.setName(followupPatient.getName()); -// fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); -// fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); -// fmsFollowupTask.setGender(followupPatient.getGender()); -// if (followupPatient.getBirthDate() != null) { -// fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); -// } -// fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); -// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); -// fmsFollowupTask.setPhone(followupPatient.getPhone()); -// fmsFollowupTask.setTenantId(followupPatient.getTenantId()); -// fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); -// fmsFollowupTask.setIdCard(followupPatient.getIdCard()); -// fmsFollowupTask.setTimes(1); -// fmsFollowupTask.setQueueId(followupQueueVO.getId()); -// fmsFollowupTask.setPatientId(followupPatient.getId()); -// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); -// fmsFollowupTask.setDelFlag((byte) 0); -// fmsFollowupTask.setCreateTime(new Date()); -// fmsFollowupTask.setStatus((byte) 0); -// -// //计算第一次随访的时间 -// DateComparator dateComparator = getDate(dateList); -// if (dateComparator.getDate() != null) { -// fmsFollowupTask.setStartTime(dateComparator.getDate()); -// } else { -// Calendar instance = Calendar.getInstance(); -// instance.setTime(dateList.get(0)); -// instance.add(Calendar.DATE, -followWindowAdys / 2); -// fmsFollowupTask.setStartTime(instance.getTime()); -// } -// Calendar instance1 = Calendar.getInstance(); -// instance1.setTime(dateList.get(0)); -// instance1.add(Calendar.DATE, followWindowAdys / 2); -// fmsFollowupTask.setEndTime(instance1.getTime()); -// fmsFollowupTask.setFollowuper(followupQueueVO.getPersonInCharge()); -// fmsFollowupTask.setFollowupTime(dateList.get(0)); -//// changeDataSource(result); -// fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); -// -// } else { -// //周期 -// //4. 根据频次和总月数添加 -// DateComparator dateComparator = getDate(dateList); -// if (dateComparator.getDate() == null || dateComparator.getIndex() == null) { -// continue; -// } -// Date date = dateComparator.getDate(); -// Integer index = dateComparator.getIndex(); -// -// //判断是否已有该次随访 -// FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample(); -// fmsFollowupTaskExample.createCriteria().andTimesEqualTo(index).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId()); -// List fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample); -// if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) { -// continue; -// } -// -// FmsFollowupTask fmsFollowupTask = new FmsFollowupTask(); -// BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask); -// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); -// fmsFollowupTask.setName(followupPatient.getName()); -// fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull()); -// fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple()); -// fmsFollowupTask.setGender(followupPatient.getGender()); -// if (followupPatient.getBirthDate() != null) { -// fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date())); -// } -// fmsFollowupTask.setEthnicity(followupPatient.getEthnicity()); -// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); -// fmsFollowupTask.setTimes(index); -// fmsFollowupTask.setPhone(followupPatient.getPhone()); -// fmsFollowupTask.setTenantId(followupPatient.getTenantId()); -// fmsFollowupTask.setIdCardType(followupPatient.getIdCardType()); -// fmsFollowupTask.setIdCard(followupPatient.getIdCard()); -// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId()); -// fmsFollowupTask.setQueueId(followupQueueVO.getId()); -// fmsFollowupTask.setDelFlag((byte) 0); -// fmsFollowupTask.setCreateTime(new Date()); -// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears()); -// fmsFollowupTask.setStatus((byte) 0); -// -// fmsFollowupTask.setStartTime(date); -// Calendar instance = Calendar.getInstance(); -// instance.setTime(date); -// instance.add(Calendar.DATE, followWindowAdys / 2); -// -// fmsFollowupTask.setEndTime(instance.getTime()); -//// changeDataSource(result); -// fmsFollowupTask.setPatientId(followupPatient.getId()); -// fmsFollowupTaskMapper.insertSelective(fmsFollowupTask); -// } -// } -// } -// } -// } -// -// private static void changeDataSource(UmsDataSourceVo.Result result) { -// try { -// DynamicDataSourceContextHolder.setDataSourceType(result.getDataSourceKey()); -// } finally { -// DynamicDataSourceContextHolder.clearDataSourceType(); -// } -// } -// -// public String getName(String url) { -// Pattern pattern = Pattern.compile("jdbc:mysql://[^/]+/([^?]+)"); -// Matcher matcher = pattern.matcher(url); -// if (matcher.find()) { -// String dbName = matcher.group(1); // 输出 acupuncture_yfyy -// System.out.println("数据库名称: " + dbName); -// return dbName; -// } -// return ""; -// } -// -// /** -// * 法用于计算在指定时间范围内触发器的触发时间点。具体步骤如下： -// * 初始化一个空列表 lst 存储触发时间点。 -// * 克隆传入的触发器 trigg，并检查其下一个触发时间是否为空。如果为空，则设置开始时间和结束时间，并计算首次触发时间。 -// * 使用 while 循环遍历触发器的触发时间点，直到没有更多触发时间或超出指定范围。 -// * 如果触发时间在指定范围内，则将其添加到列表中，并更新触发器状态。 -// * -// * @param trigg cron表达式 -// * @param from 患者出院时间 -// * @param to 患者出院时间 + 随访总月数 -// * @return -// */ -// public static List computeFireTimesBetween(OperableTrigger trigg, org.quartz.Calendar cal, Date from, Date to) { -// LinkedList lst = new LinkedList(); -// OperableTrigger t = (OperableTrigger) trigg.clone(); -// if (t.getNextFireTime() == null) { -// t.setStartTime(from); -// t.setEndTime(to); -// t.computeFirstFireTime(cal); -// } -// -// while (true) { -// Date d = t.getNextFireTime(); -// if (d == null) { -// break; -// } -// -// if (d.before(from)) { -// t.triggered(cal); -// } else { -// if (d.after(to)) { -// break; -// } -// lst.add(d); -// t.triggered(cal); -// } -// } -// return Collections.unmodifiableList(lst); -// } -// -// /** -// * 返回当前时间之后的第一个date及对应顺序 -// * -// * @param dateList key 为顺序，value 为时间 -// * @return -// */ -// public static DateComparator getDate(List dateList) { -// Date today = new Date(); -// DateComparator dateComparator = new DateComparator(); -// for (int i = 0; i < dateList.size(); i++) { -// Date date = dateList.get(i); -// if (date.after(today)) { -// dateComparator.setDate(date); -// dateComparator.setIndex(i + 1); -// return dateComparator; -// } -// } -// return dateComparator; -// } -// -// @Data -// public static class DateComparator { -// private Date date; -// private Integer index; -// } -//} -======= ->>>>>>> new package com.acupuncture.web.task; import cn.hutool.core.bean.BeanUtil; 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 c08cf8a3..697a56b5 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,7 @@ public class SysUser extends BaseEntity @ApiModelProperty("是否具有审核权限(0不具有； 1具有)") private Byte slaverAdmin; -<<<<<<< HEAD -======= ->>>>>>> new 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 62d3c566..143d89c8 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 @@ -72,7 +72,6 @@ public class AdminGlobalDataSourceAspect { */ public String getDataSource(ProceedingJoinPoint point) { // 获取请求携带的令牌 -<<<<<<< HEAD ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); HttpServletRequest request; @@ -82,12 +81,7 @@ public class AdminGlobalDataSourceAspect { } request = requestAttributes.getRequest(); //token为空 - Long tenantId; -======= - HttpServletRequest request = ((ServletRequestAttributes) - RequestContextHolder.getRequestAttributes()).getRequest(); Long tenantId = null; ->>>>>>> new String header = request.getHeader(UserConstants.DEPT); if(StrUtil.isNotEmpty(header)){ tenantId = Long.parseLong(header); @@ -96,15 +90,11 @@ public class AdminGlobalDataSourceAspect { tenantId = SecurityUtils.getTenantId(); } } -<<<<<<< HEAD - //设置所属医院和数据源l // LoginUser loginUser = SecurityUtils.getLoginUser(); // if(ObjectUtil.isNull(loginUser) || loginUser.getUser().isAdmin()){ // return null; // } -======= ->>>>>>> new //根据组织ID查询数据源 if(tenantId !=null) { UmsDataSource dataSource = dmsLoginService.getDataSourceByTenantId(tenantId); 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 9828c552..3184d6f1 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,11 +114,7 @@ public class SecurityConfig .authorizeHttpRequests((requests) -> { permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll()); // 对于登录login 注册register 验证码captchaImage 允许匿名访问 -<<<<<<< HEAD - requests.antMatchers("/login", "/register", "/captchaImage", "/web/login", "/web/queryTenantById", "/api/http/getUserInfo", "/api/http/addReportImage", "/api/http/uploadMemberInfo", "/task/task", "/loginSimple").permitAll() -======= requests.antMatchers("/login", "/register", "/captchaImage", "/web/login", "/web/queryTenantById", "/api/http/getUserInfo", "/api/http/addReportImage", "/api/http/uploadMemberInfo", "/task/task", "/loginSimple", "/screening/queryDetailNoToken").permitAll() ->>>>>>> new // 静态资源，可匿名访问 .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 cb8a9bb7..097e82ac 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 @@ -147,10 +147,7 @@ public class SysLoginService // 生成token return tokenService.createToken(loginUser); } -<<<<<<< HEAD -======= ->>>>>>> new /** * 登录验证 * 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 db73c149..480e2473 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 @@ -40,10 +40,7 @@ public class AdminTenantUserDto { private String status; private String contactPhone; -<<<<<<< HEAD -======= ->>>>>>> new @ApiModelProperty("是否具有审核权限(0不具有； 1具有)") private Byte slaverAdmin = 0; } @@ -67,10 +64,7 @@ public class AdminTenantUserDto { private String status; private String contactPhone; -<<<<<<< HEAD -======= ->>>>>>> new @ApiModelProperty("是否具有审核权限(0不具有； 1具有)") private Byte slaverAdmin; } diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java index a90567af..9b31709b 100644 --- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/ExternalServiceImpl.java @@ -26,11 +26,10 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; /** * @Author zzc @@ -309,7 +308,51 @@ public class ExternalServiceImpl implements ExternalService { header.add("姓名"); header.add("编号"); + + List uplRtcfInfos1 = uplRtcfInfoMapper.selectByExample(new UplRtcfInfoExample()); + Map> map = new HashMap<>(); + if (CollectionUtil.isNotEmpty(uplRtcfInfos1)) { + map = uplRtcfInfos1.stream().collect(Collectors.groupingBy(UplRtcfInfo::getMemberid)); + } + int b = 0; + if (CollectionUtil.isNotEmpty(pmsTreatments)) { + int row = 0; + for (int i = 0; i < pmsTreatments.size(); i++) { + if (pmsTreatments.get(i).getMemberId() == null) { + continue; + } + UplRtcfInfoExample uplRtcfInfoExample = new UplRtcfInfoExample(); + uplRtcfInfoExample.createCriteria().andMemberidEqualTo(pmsTreatments.get(i).getMemberId() + ""); + List uplRtcfInfos = map.get(pmsTreatments.get(i).getMemberId() + ""); + if (CollectionUtil.isNotEmpty(uplRtcfInfos) && b < uplRtcfInfos.size()) { + b = uplRtcfInfos.size(); + } + } + } + for (int i = 0; i <= b; i++) { + header.add("创建时间"); + header.add("身高"); + header.add("体重"); + header.add("脂肪"); + header.add("骨质"); + header.add("蛋白质"); + header.add("水分"); + header.add("肌肉"); + header.add("骨骼肌"); + header.add("体脂百分比"); + header.add("体质指数"); + header.add("腰臀比"); + header.add("内脏脂肪指数"); + header.add("身体年龄"); + header.add("健康评分"); + header.add("体型判定"); + header.add("瘦体重"); + header.add("诊断结论"); + header.add(""); + } + writer.writeHeadRow(header); + if (CollectionUtil.isNotEmpty(pmsTreatments)) { int row = 0; for (int i = 0; i < pmsTreatments.size(); i++) { @@ -318,13 +361,10 @@ public class ExternalServiceImpl implements ExternalService { } row += 1; -// writer.writeCellValue(0, row, DateUtil.format(pmsTreatments.get(i).getCreateTime(), "yyyy-MM-dd HH:mm:ss")); writer.writeCellValue(0, row, pmsTreatments.get(i).getName()); writer.writeCellValue(1, row, pmsTreatments.get(i).getMemberId()); - UplRtcfInfoExample uplRtcfInfoExample = new UplRtcfInfoExample(); - uplRtcfInfoExample.createCriteria().andMemberidEqualTo(pmsTreatments.get(i).getMemberId() + ""); - List uplRtcfInfos = uplRtcfInfoMapper.selectByExample(uplRtcfInfoExample); + List uplRtcfInfos = map.get(pmsTreatments.get(i).getMemberId() + ""); if (CollectionUtil.isNotEmpty(uplRtcfInfos)) { int n = 1; for (int j = 0; j < uplRtcfInfos.size(); j++) { @@ -355,29 +395,7 @@ public class ExternalServiceImpl implements ExternalService { } } - for (int i = 0; i <= b; i++) { - header.add("创建时间"); - header.add("身高"); - header.add("体重"); - header.add("脂肪"); - header.add("骨质"); - header.add("蛋白质"); - header.add("水分"); - header.add("肌肉"); - header.add("骨骼肌"); - header.add("体脂百分比"); - header.add("体质指数"); - header.add("腰臀比"); - header.add("内脏脂肪指数"); - header.add("身体年龄"); - header.add("健康评分"); - header.add("体型判定"); - header.add("瘦体重"); -// header.add("细胞 - header.add("诊断结论"); - header.add(""); - } - writer.writeHeadRow(header); + String filename = StrUtil.format("患者身高体重信息-{}.xlsx", DateUtil.date().toString("yyyyMMdd")); //response为HttpServletResponse对象 diff --git a/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml b/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml index 6cfa1924..38bed438 100644 --- a/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml +++ b/acupuncture-system/src/main/resources/mapper/dao/PmsTreatmentDao.xml @@ -77,10 +77,10 @@ - and visit_time >= #{query.startTime} + and create_time >= #{query.startTime} - and visit_time <= #{query.endTime} + and create_time <= #{query.endTime} order by t.update_time desc diff --git a/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml b/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml index 74d042af..76f6b017 100644 --- a/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/acupuncture-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -25,11 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -<<<<<<< HEAD -======= ->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666 @@ -54,11 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -<<<<<<< HEAD - 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, ->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666 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 @@ -177,17 +170,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status, create_by, remark, -<<<<<<< HEAD -<<<<<<< HEAD - slaver_admin, -======= - slaver_admin, tenant_name, tenant_phone, ->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666 -======= slaver_admin, ->>>>>>> new create_time )values( #{userId}, @@ -203,17 +188,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{createBy}, #{remark}, -<<<<<<< HEAD -<<<<<<< HEAD - #{slaverAdmin}, -======= - #{slaverAdmin}, #{tenantName}, #{tenantPhone}, ->>>>>>> 93181b5fbb436385d1d312300e8dcc61b43d1666 -======= #{slaverAdmin}, ->>>>>>> new sysdate() ) @@ -236,7 +213,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" login_date = #{loginDate}, update_by = #{updateBy}, remark = #{remark}, - slaver_admin = #{slaverAdmin}, update_time = sysdate() where user_id = #{userId}