ruoyi-admin/src/main/resources/application-hzszlyy.yml
@@ -194,8 +194,8 @@ FTP_USERNAME: voice FTP_PASSWORD: xh@2023 #语音地址访问前缀(新华) voicePathPrefix: http://192.168.191.181:8095/profile/upload/vadio/ #语音地址访问前缀(市一) voicePathPrefix: http://192.168.129.198/profile/upload/vadio/ #语音地址访问前缀(公司) #voicePathPrefix: http://192.168.2.13:8095/profile/upload/vadio/ ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -258,6 +258,18 @@ @ApiModelProperty("满意度分类(问卷/语音)") private Map<String, Object> satisfactionCategories = new HashMap<>(); /** * HIS增量同步开始时间(对应 healthy_user.last_Update_Time) */ @ApiModelProperty("同步开始时间,格式:yyyy-MM-dd HH:mm:ss") private String lastStartTime; /** * HIS增量同步结束时间(对应 healthy_user.last_Update_Time) */ @ApiModelProperty("同步结束时间,格式:yyyy-MM-dd HH:mm:ss") private String lastEndTime; public SysUser() { ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/CollectHISController.java
@@ -51,13 +51,16 @@ } /** * 用户信息集合信息数据采集 * 用户信息集合信息数据采集(异步执行,接口立即返回) */ @PostMapping("/collectUser") @ApiOperation("同步用户信息") public AjaxResult selectUserList(@RequestBody SysUser sysUser) { Integer integer = ichService.selectUserList(sysUser); return AjaxResult.success(integer); boolean submitted = ichService.selectUserListAsync(sysUser); if (!submitted) { return AjaxResult.warn("用户信息同步任务正在执行中,请勿重复提交"); } return AjaxResult.success("用户信息同步任务已提交,后台执行中,请通过日志查看进度"); } /** ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ICollectHISService.java
@@ -66,6 +66,14 @@ public Integer selectUserList(SysUser sysUser); /** * 异步同步用户信息(提交后立即返回,由后台线程执行) * * @param sysUser 用户信息 * @return true=已提交;false=已有同步任务在执行 */ public boolean selectUserListAsync(SysUser sysUser); /** * 查询部门管理数据 * * @param dept 部门信息 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -26,6 +26,7 @@ import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -76,6 +77,11 @@ @Autowired private RedisCache redisCache; /** * 用户同步任务运行标记,避免重复点击/重复调用并发跑全量同步 */ private final AtomicBoolean userSyncRunning = new AtomicBoolean(false); private static final long SHARDING_THRESHOLD = 5_000_000L; private static final String PAT_ARCHIVE_TABLE = "pat_archive"; @@ -703,6 +709,39 @@ return size; } /** * 异步同步用户信息:接口立即返回,实际同步交给线程池后台执行。 * 使用 AtomicBoolean 防止重复提交导致多个全量同步任务并发执行。 */ @Override public boolean selectUserListAsync(SysUser sysUser) { if (!userSyncRunning.compareAndSet(false, true)) { log.warn("用户信息同步任务正在执行中,忽略本次提交"); return false; } try { taskExecutor.execute(() -> { long start = System.currentTimeMillis(); log.info("用户信息异步同步任务开始执行"); try { Integer count = selectUserList(sysUser); log.info("用户信息异步同步任务执行完成,处理数量:{},耗时:{}ms", count, System.currentTimeMillis() - start); } catch (Throwable e) { log.error("用户信息异步同步任务执行失败,耗时:{}ms", System.currentTimeMillis() - start, e); } finally { userSyncRunning.set(false); } }); return true; } catch (RuntimeException e) { userSyncRunning.set(false); log.error("用户信息异步同步任务提交失败", e); return false; } } @Override public Integer selectUserList(SysUser sysUser) { List<SysUser> sysUserList = chMapper.selectUserList(sysUser); @@ -817,7 +856,12 @@ log.info("selectDeptList的采集到的数量为:{}", sysDepts.size()); // count = sysDept2Mapper.batchDept(sysDepts); for (SysDept row : sysDepts) { SysDept sysDeptTemp = sysDept2Mapper.selectDeptByCode(row.getDeptCode(), null); // 科室和病区可能共用同一个 dept_code,必须按 dept_type + orgid 精确定位,否则 selectOne 会返回多条 if (StringUtils.isEmpty(row.getDeptCode())) { log.warn("selectDeptList跳过deptCode为空的记录:{}", row); continue; } SysDept sysDeptTemp = sysDept2Mapper.selectDeptByCodeAndType(row.getDeptCode(), row.getOrgid(), row.getDeptType()); if (sysDeptTemp != null && sysDeptTemp.getDeptName() != null) { row.setDeptId(sysDeptTemp.getDeptId()); count += sysDept2Mapper.updateDept(row); ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -1909,7 +1909,7 @@ * 处理超时随访任务 * <p> * 扫描「出院满 deadlineDay 天仍未完成」的首次随访任务(sendstate=7 + visit_count=1), * 按当前任务的 nexttaskid 生成再次随访任务,科室按源任务 visitType 选择。 * 按当前任务的 nexttaskid 生成再次随访任务,科室固定为随访中心科室。 * <p> * 注意:截止时间必须在循环外计算一次。历史实现把 {@code deadlineDay = -deadlineDay} * 写在循环体内,每轮取反一次,导致偶数轮用「今天 + deadlineDay」做截止时间, ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml
@@ -488,27 +488,41 @@ </select> <select id="yhyksxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult"> select user_id , user_code , dept_type ,dept_code,dept_name,deptparent,del_flag,orgid FROM healthy_user_dept select ud.user_id , ud.user_code , ud.dept_type ,ud.dept_code,ud.dept_name,ud.deptparent,ud.del_flag,ud.orgid FROM healthy_user_dept ud where 1=1 and user_id != 'admin' and dept_type = '1' and ud.user_id != 'admin' and ud.dept_type = '1' <if test="orgid != null and orgid != ''"> AND orgid = #{orgid} AND ud.orgid = #{orgid} </if> <if test="hisUserId != null ">and user_id = #{hisUserId}</if> <if test="hisUserId != null ">and ud.user_id = #{hisUserId}</if> <if test="campusid != null and campusid != ''"> AND EXISTS ( SELECT 1 FROM healthy_dept d WHERE d.his_dept_id = ud.dept_code AND d.orgid = #{campusid} ) </if> </select> <select id="yhybfxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult"> select user_id , user_code , dept_type ,dept_code,dept_name,deptparent,del_flag,orgid FROM healthy_user_dept select ud.user_id , ud.user_code , ud.dept_type ,ud.dept_code,ud.dept_name,ud.deptparent,ud.del_flag,ud.orgid FROM healthy_user_dept ud where 1=1 and user_id != 'admin' and dept_type = '2' and ud.user_id != 'admin' and ud.dept_type = '2' <if test="orgid != null and orgid != ''"> AND orgid = #{orgid} AND ud.orgid = #{orgid} </if> <if test="hisUserId != null ">and user_id = #{hisUserId}</if> <if test="hisUserId != null ">and ud.user_id = #{hisUserId}</if> <if test="campusid != null and campusid != ''"> AND EXISTS ( SELECT 1 FROM healthy_dept d WHERE d.his_dept_id = ud.dept_code AND d.orgid = #{campusid} ) </if> </select> <select id="yhyyqxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserOrgResult"> @@ -526,7 +540,7 @@ <if test="hisUserId != null "> AND ud.user_id = #{hisUserId} </if> <if test="campusid != null"> <if test="campusid != null and campusid != ''"> AND d.orgid = #{campusid} </if> union all @@ -544,7 +558,7 @@ <if test="hisUserId != null "> AND udb.user_id = #{hisUserId} </if> <if test="campusid != null"> <if test="campusid != null and campusid != ''"> AND d.orgid = #{campusid} </if> </select> @@ -769,6 +783,30 @@ <if test="orgid != null and orgid != ''"> AND u.orgid = #{orgid} </if> <if test="lastStartTime != null and lastStartTime != ''"> AND u.last_Update_Time >= to_date(#{lastStartTime}, 'YYYY-MM-DD HH24:MI:SS') </if> <if test="lastEndTime != null and lastEndTime != ''"> AND u.last_Update_Time <= to_date(#{lastEndTime}, 'YYYY-MM-DD HH24:MI:SS') </if> <if test="campusid != null and campusid != ''"> AND ( EXISTS ( SELECT 1 FROM healthy_user_dept ud JOIN healthy_dept d ON d.his_dept_id = ud.dept_code WHERE ud.user_id = u.his_user_id AND d.orgid = #{campusid} ) OR EXISTS ( SELECT 1 FROM healthy_user_dept_bf udb JOIN healthy_dept d2 ON d2.his_dept_id = udb.dept_code WHERE udb.user_id = u.his_user_id AND d2.orgid = #{campusid} ) ) </if> <if test="userId != null and userId != 0"> AND u.user_id = #{userId} </if> smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -640,7 +640,7 @@ /** * 随访方式 */ @ApiModelProperty(value = "随访方式 1-本科室随访 2-随访中心随访") @ApiModelProperty(value = "随访方式") private String visitType; @@ -766,4 +766,10 @@ @Excel(name = " 人工电话标记 ") @ApiModelProperty(value = "是否人工打过电话 0-没打过 1-打过") private Long isManuallyCalled; /** * 再次随访方式(仅接口请求参数,不落库) */ @ApiModelProperty(value = "再次随访方式 1-本科室随访 2-随访中心随访(仅请求参数,不落库)") private String resource; } smartor/src/main/java/com/smartor/mapper/SysDept2Mapper.java
@@ -40,6 +40,11 @@ public SysDept selectDeptByCode(@Param("deptCode")String deptCode,@Param("orgid")String orgid); /** * 按科室编码、机构、科室类型查询(科室和病区可能使用相同编码,必须带 deptType 精确定位) */ public SysDept selectDeptByCodeAndType(@Param("deptCode")String deptCode,@Param("orgid")String orgid,@Param("deptType")String deptType); public SysDept selectDeptByCodeAndCampus(@Param("deptCode")String deptCode,@Param("orgid")String orgid,@Param("campusid")String campusid); /** smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -708,6 +708,29 @@ //记录insertServiceSubtask语句返回状态 Integer i = 0; try { // 兜底:任务模板修改会重置 pat_med_inhosp 的处理标记,但已完成的首访不会删除。 // 同一 inhospid + taskid 已存在未删除的首次随访(upid 为空)时,不再插入,避免出现两条首次随访。 if (check && ("2".equals(serviceTask.getServiceType()) || "13".equals(serviceTask.getServiceType())) && (type == 1 || type == 2 || type == 3)) { ServiceSubtaskEntity firstQuery = new ServiceSubtaskEntity(); firstQuery.setInhospid(patMedInhosp1.getInhospid()); firstQuery.setTaskid(taskid); List<ServiceSubtask> firstList = serviceSubtaskMapper.selectServiceSubtaskList(firstQuery); boolean firstExists = CollectionUtils.isNotEmpty(firstList) && firstList.stream().anyMatch(item -> item.getUpid() == null); if (firstExists) { log.info("患者{}已存在首次随访任务,跳过重复生成, taskid={}, type={}", patMedInhosp1.getInhospid(), taskid, type); PatMedInhosp flagUpdate = new PatMedInhosp(); flagUpdate.setInhospid(patMedInhosp1.getInhospid()); if (type == 1) flagUpdate.setDeptcheckFlag("1"); if (type == 2) flagUpdate.setWardcheckFlag("1"); if (type == 3) flagUpdate.setDiagcheckFlag("1"); patMedInhospMapper.updatePatMedInhosp(flagUpdate); return; } } //先判断一下,是否需要校验 if (check && (Objects.isNull(serviceSubtask.getTaskSituation()) || serviceSubtask.getTaskSituation() != 6)) { //在新增之前,先通过患者ID,sendstate=2查询一下,在所有长期任务中,是不是还有该患者待执行的任务,有的话,比较之前的endtime是否小于当前的endtaime,如果之前的小于现在的,则直接将之前的停掉(原因再入院) smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -908,25 +908,21 @@ } String config = configService.selectConfigByKey("visit.early.day"); Integer type = 1; String visitType = resolveAgainVisitType(request, serviceSubtask); if (StringUtils.isEmpty(visitType)) { String requestVisitType = request == null ? null : request.getVisitType(); log.error("再次随访任务创建失败,随访方式不合法, visitType = {}, subTaskId = {}", requestVisitType, serviceSubtask.getId()); return "再次随访任务创建失败,随访方式不合法, visitType = " + requestVisitType + ", 再请次重试"; String resource = resolveAgainResource(request); if (StringUtils.isEmpty(resource)) { String requestResource = request == null ? null : request.getResource(); log.error("再次随访任务创建失败,再次随访方式不合法, resource = {}, subTaskId = {}", requestResource, serviceSubtask.getId()); return "再次随访任务创建失败,再次随访方式不合法, resource = " + requestResource + ", 再请次重试"; } String visitDeptCode; String visitDeptName; if ("1".equals(visitType)) { // 本科室随访:请求值 > 原任务本科室随访科室 > 原任务出院科室 String requestDeptCode = request == null ? null : request.getVisitDeptCode(); String requestDeptName = request == null ? null : request.getVisitDeptName(); String oldVisitType = serviceSubtask.getVisitType(); String oldOwnDeptCode = "1".equals(oldVisitType) ? serviceSubtask.getVisitDeptCode() : null; String oldOwnDeptName = "1".equals(oldVisitType) ? serviceSubtask.getVisitDeptName() : null; String preferredDeptCode = firstNonBlank(requestDeptCode, oldOwnDeptCode); if (StringUtils.isNotEmpty(preferredDeptCode)) { visitDeptCode = preferredDeptCode; visitDeptName = firstNonBlank(requestDeptName, oldOwnDeptName); if ("1".equals(resource)) { // 本科室随访:请求科室优先,未传时使用原任务出院科室;不依赖原任务 visitType String requestDeptCode = firstNonBlank(request == null ? null : request.getVisitDeptCode()); String requestDeptName = firstNonBlank(request == null ? null : request.getVisitDeptName()); if (StringUtils.isNotEmpty(requestDeptCode)) { visitDeptCode = requestDeptCode; visitDeptName = requestDeptName; } else { visitDeptCode = serviceSubtask.getDeptcode(); visitDeptName = serviceSubtask.getDeptname(); @@ -985,7 +981,8 @@ // 二次随访时间:上次随访完成时间(未完成则当前时间)+ 下一任务发送天数;过去时间兜底为当前时间 applyAgainVisitTime(serviceSubtaskAgain, serviceSubtask, nextServiceTask, config, now); serviceSubtaskAgain.setVisitType(visitType); // 新任务的随访方式记录本次选择的再次随访方式;resource 本身不落库 serviceSubtaskAgain.setVisitType(resource); serviceSubtaskAgain.setVisitDeptCode(visitDeptCode); serviceSubtaskAgain.setVisitDeptName(visitDeptName); int i = serviceSubtaskMapper.insertServiceSubtask(serviceSubtaskAgain); @@ -1006,20 +1003,17 @@ } /** * 解析再次随访方式:请求参数优先,原任务兜底,未配置时默认随访中心。 * 解析再次随访方式:仅取请求参数 resource,不使用原任务 visitType;未传时默认随访中心。 * * @return 1-本科室随访;2-随访中心随访;null-非法值 */ private String resolveAgainVisitType(ServiceSubtask request, ServiceSubtask old) { String visitType = request == null ? null : request.getVisitType(); if (StringUtils.isEmpty(visitType) || StringUtils.isEmpty(visitType.trim())) { visitType = old == null ? null : old.getVisitType(); } if (StringUtils.isEmpty(visitType) || StringUtils.isEmpty(visitType.trim())) { private String resolveAgainResource(ServiceSubtask request) { String resource = request == null ? null : request.getResource(); if (StringUtils.isEmpty(resource) || StringUtils.isEmpty(resource.trim())) { return "2"; } visitType = visitType.trim(); return ("1".equals(visitType) || "2".equals(visitType)) ? visitType : null; resource = resource.trim(); return ("1".equals(resource) || "2".equals(resource)) ? resource : null; } private String firstNonBlank(String... values) { @@ -1091,8 +1085,8 @@ * 首次随访任务超时后,按下一任务自动生成再次随访任务。 * <p> * 定时任务入口 {@code RyTask#dealSubtaskDeadline} 使用。与手动入口一致的部分: * 表单/发送方式取下一任务、链路 upid + visit_count、发送方式明细初始化、按 visitType 选择随访科室; * 差异:随访中心科室未配置时回退原任务科室,原任务置为发送失败(sendstate=5)。 * 表单/发送方式取下一任务、链路 upid + visit_count、发送方式明细初始化; * 差异:超时再次随访固定走随访中心科室(随访中心未配置时回退原任务科室),原任务置为发送失败(sendstate=5)。 * <p> * 幂等:同一原任务只允许生成一条再次随访(Redis 锁 + upid 校验 + 原任务条件更新), * 多节点/多线程同时扫描时,后到的事务会在条件更新处拿到 0 行并回滚本次插入。 @@ -1144,47 +1138,21 @@ return "再次随访任务创建失败,未找到患者档案, subTaskId = " + serviceSubtask.getId(); } String config = configService.selectConfigByKey("visit.early.day"); String visitType = resolveAgainVisitType(null, serviceSubtask); if (StringUtils.isEmpty(visitType)) { return "再次随访任务创建失败,随访方式不合法, visitType = " + serviceSubtask.getVisitType(); } String visitDeptCode; String visitDeptName; if ("1".equals(visitType)) { // 本科室随访:原任务随访科室 > 原任务出院科室 String ownDeptCode = firstNonBlank(serviceSubtask.getVisitDeptCode()); if (StringUtils.isNotEmpty(ownDeptCode)) { visitDeptCode = ownDeptCode; // 随访中心科室:未配置(或科室不存在)时回退原任务科室,保持超时入口原有行为 SysDept centerDept = selectCenterDept(serviceSubtask.getOrgid()); if (ObjectUtils.isNotEmpty(centerDept)) { visitDeptCode = centerDept.getDeptCode(); visitDeptName = centerDept.getDeptName(); } else { String fallbackDeptCode = firstNonBlank(serviceSubtask.getVisitDeptCode()); if (StringUtils.isNotEmpty(fallbackDeptCode)) { visitDeptCode = fallbackDeptCode; visitDeptName = serviceSubtask.getVisitDeptName(); } else { visitDeptCode = serviceSubtask.getDeptcode(); visitDeptName = serviceSubtask.getDeptname(); } if (StringUtils.isEmpty(visitDeptCode)) { return "再次随访任务创建失败,本科室随访未找到随访科室, subTaskId = " + serviceSubtask.getId(); } SysDept ownDept = selectDeptByCode(serviceSubtask.getOrgid(), visitDeptCode); if (ObjectUtils.isNotEmpty(ownDept)) { visitDeptCode = ownDept.getDeptCode(); visitDeptName = ownDept.getDeptName(); } else if (StringUtils.isEmpty(visitDeptName)) { return "再次随访任务创建失败,本科室随访科室不存在, deptCode = " + visitDeptCode + ", subTaskId = " + serviceSubtask.getId(); } } else { // 随访中心科室:未配置(或科室不存在)时回退原任务科室,保持超时入口原有行为 SysDept centerDept = selectCenterDept(serviceSubtask.getOrgid()); if (ObjectUtils.isNotEmpty(centerDept)) { visitDeptCode = centerDept.getDeptCode(); visitDeptName = centerDept.getDeptName(); } else { String fallbackDeptCode = firstNonBlank(serviceSubtask.getVisitDeptCode()); if (StringUtils.isNotEmpty(fallbackDeptCode)) { visitDeptCode = fallbackDeptCode; visitDeptName = serviceSubtask.getVisitDeptName(); } else { visitDeptCode = serviceSubtask.getDeptcode(); visitDeptName = serviceSubtask.getDeptname(); } } } ServiceSubtask serviceSubtaskAgain = patMedInhospService.boxedServiceSubtask(nextServiceTask, @@ -1201,7 +1169,8 @@ serviceSubtaskAgain.setIsVisitAgain(1); serviceSubtaskAgain.setCreateTime(now); serviceSubtaskAgain.setUpdateTime(now); serviceSubtaskAgain.setVisitType(visitType); // 超时再次随访固定为随访中心随访 serviceSubtaskAgain.setVisitType("2"); serviceSubtaskAgain.setVisitDeptCode(visitDeptCode); serviceSubtaskAgain.setVisitDeptName(visitDeptName); if (serviceSubtaskMapper.insertServiceSubtask(serviceSubtaskAgain) != 1) { @@ -1661,6 +1630,8 @@ ServiceTask serviceTask1 = serviceTaskService.selectServiceTaskByTaskid(serviceTask.getTaskid()); ServiceSubtaskEntity serviceSubtaskVO = new ServiceSubtaskEntity(); serviceSubtaskVO.setTaskid(serviceTask1.getTaskid()); //只删除首次随访未完成的 serviceSubtaskVO.setVisitCount(1); serviceSubtaskVO.setSendstate(2L); List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO); serviceSubtaskVO.setSendstate(1L); smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -405,6 +405,7 @@ <if test="managementDoctorCode != null ">and management_doctor_code = #{managementDoctorCode}</if> <if test="submit != null ">and submit = #{submit}</if> <if test="upid != null ">and upid = #{upid}</if> <if test="visitCount != null ">and visit_count = #{visitCount}</if> <if test="patfrom != null ">and patfrom = #{patfrom}</if> <if test="serviceType != null ">and service_type = #{serviceType}</if> <if test="patid != null ">and patid = #{patid}</if> smartor/src/main/resources/mapper/smartor/SysDeptMapper.xml
@@ -152,6 +152,22 @@ <if test="orgid != null and orgid != ''"> AND orgid = #{orgid} </if> order by d.dept_id limit 1 </select> <select id="selectDeptByCodeAndType" resultMap="SysDeptResult"> <include refid="selectDeptVo"/> where d.del_flag = '0' and d.dept_code = #{deptCode} <if test="orgid != null and orgid != ''"> AND d.orgid = #{orgid} </if> <if test="deptType != null and deptType != ''"> AND d.dept_type = #{deptType} </if> order by d.dept_id limit 1 </select> <select id="selectDeptByCodeAndCampus" parameterType="string" resultMap="SysDeptResult">