ruoyi-admin/src/main/resources/application-druid.yml
@@ -18,16 +18,16 @@ # password: Smartor.2023 # driverClassName: com.mysql.cj.jdbc.Driver # # 新华 url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: smartor password: Smartor.2023 driverClassName: com.mysql.cj.jdbc.Driver # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: smartor # password: Smartor.2023 # driverClassName: com.mysql.cj.jdbc.Driver # # 公司云 # url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: hxsoft # password: Hxerp2000 # driverClassName: com.mysql.cj.jdbc.Driver url: jdbc:mysql://116.62.18.175:6002/smartor_lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: hxsoft password: Hxerp2000 driverClassName: com.mysql.cj.jdbc.Driver # 从库数据源 smartor/src/main/java/com/smartor/mapper/PatMedInhospMapper.java
@@ -24,6 +24,8 @@ */ public PatMedInhosp selectPatMedInhospByInhospid(Long inhospid); public String getTagnameBypatid(Long patid); /** * 查询患者住院记录列表 * smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -83,7 +83,12 @@ */ @Override public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp) { return patMedInhospMapper.selectPatMedInhospList(patMedInhosp); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } return patMedInhospList; } /** @@ -206,6 +211,10 @@ patMedInhosp.setInhospstate("1"); List<PatMedInhosp> patMedInhosps = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); log.error("dealOutHospInfo需要处理的出院患者信息：{}", patMedInhosps); for (PatMedInhosp patMedInhosp1 : patMedInhosps) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } for (PatMedInhosp patMedInhosp1 : patMedInhosps) { //先根据科室去service_check查询check_visit_flag是根据“科室”随访，还是根据“第一诊断”随访 @@ -284,6 +293,10 @@ patMedInhosp.setCheckFlag("0"); patMedInhosp.setInhospstate("0"); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhosps) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } if (CollectionUtils.isNotEmpty(patMedInhospList) && patMedInhospList.size() > 0) { dealInHospInfo(patMedInhospList); } @@ -305,6 +318,10 @@ @Override public List<PatMedInhosp> getDocAndPat(PatMedInhosp patMedInhosp) { List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } if (StringUtils.isNotEmpty(patMedInhosp.getPatname()) || StringUtils.isNotEmpty(patMedInhosp.getNurseName()) || StringUtils.isNotEmpty(patMedInhosp.getDrname())) { //获取外部导入信息,并将外部患者放到patMedInhospList中 PatArchiveImport patArchiveImport = new PatArchiveImport(); smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -246,6 +246,10 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getZhuYuanHao()); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } if (CollectionUtils.isNotEmpty(patMedInhospList)) { Map<String, Object> JiuZhenXX = (Map<String, Object>) yeWuXX.get("JiuZhenXX"); PatMedInhosp patMedInhosp1 = patMedInhospList.get(0); @@ -309,7 +313,10 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getZhuYuanHao()); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } Map<String, Object> JiuZhenXX = (Map<String, Object>) yeWuXX.get("JiuZhenXX"); PatMedInhosp patMedInhosp1 = new PatMedInhosp(); if (CollectionUtils.isNotEmpty(patMedInhospList)) patMedInhosp1 = patMedInhospList.get(0); @@ -373,6 +380,10 @@ PatMedInhosp patMedInhosp = new PatMedInhosp(); patMedInhosp.setInhospno(externalInHospPatientInfo.getZhuYuanHao()); List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); for (PatMedInhosp patMedInhosp1 : patMedInhospList) { String tagname = patMedInhospMapper.getTagnameBypatid(patMedInhosp1.getPatid()); patMedInhosp1.setTagname(tagname); } if (CollectionUtils.isNotEmpty(patMedInhospList)) { Map<String, Object> JiuZhenXX = (Map<String, Object>) yeWuXX.get("JiuZhenXX"); PatMedInhosp patMedInhosp1 = patMedInhospList.get(0); smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java
@@ -155,7 +155,12 @@ for (String key : allKeys) { String[] split = key.split("-"); //先判断，是不是当前提交人的，不是当前提交人的，跳过 if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && Long.valueOf(split[0]) != pid && Long.valueOf(split[1]) != tid) { try { if (ObjectUtils.isNotEmpty(split[0]) && ObjectUtils.isNotEmpty(split[1]) && Long.valueOf(split[0]) != pid && Long.valueOf(split[1]) != tid) { continue; } } catch (Exception e) { //这里之所以要处理异常，是因为有的KEY就不是我们要的KEY,没有去截取；有异常不处理，直接下一个 continue; } if (key.contains("-WJscriptCache")) { smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskDetailServiceImpl.java
@@ -246,7 +246,6 @@ Long totalCount = serviceSubtaskDetailTargets.stream().filter(target -> target.getMatchedtext() == null || target.getMatchedtext().isEmpty()).mapToLong(target -> target.getCount() != null ? target.getCount() : 0) // 确保 count 为 0 如果为 null .sum(); Long allShowCount = 0L; // 遍历列表，将 matchedText 为""赋值给 null @@ -272,7 +271,8 @@ target.setTargetShowCount(allShowCount.toString()); BigDecimal count = new BigDecimal(target.getCount() != null ? target.getCount().toString() : "0"); BigDecimal allCount = new BigDecimal(allShowCount.toString()); target.setPercentage(count.divide(allCount, 2, RoundingMode.HALF_UP).toString()); if (allCount.compareTo(BigDecimal.ZERO) == 0) target.setPercentage(count.divide(allCount, 2, RoundingMode.HALF_UP).toString()); } }
@@ -170,14 +170,14 @@ b.deptid, b.leaveldeptid, b.long_task_reason, b.schemetime, COALESCE ( ( SELECT string_agg(d.tagname, ', ') FROM pat_archivetag d WHERE d.patid = a.id AND d.del_flag = 0 ), '') AS tagname b.schemetime -- COALESCE ( -- ( -- SELECT GROUP_CONCAT(d.tagname, ', ') -- FROM pat_archivetag d -- WHERE d.patid = a.id -- AND d.del_flag = 0 -- ), '') AS tagname FROM pat_med_inhosp b JOIN @@ -359,6 +359,13 @@ order by b.inhospid desc </select> <select id="getTagnameBypatid" parameterType="Long" resultType="string"> SELECT GROUP_CONCAT(d.tagname, ', ') FROM pat_archivetag d WHERE d.patid = #{patid} AND d.del_flag = 0 </select> <select id="selectPatMedInhospByInhospid" parameterType="Long" resultMap="PatMedInhospResult"> <include refid="selectPatMedInhospVo"/>
