Merge remote-tracking branch 'origin/master'

zhaowenxuan

2025-03-13 32eaa934c44a484ad22378501ecb6e96214f34b5

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java

 ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java

@@ -139,7 +139,7 @@
                    if (null != jy && !jy.isEmpty()) {
                        log.info("同步检验人员 执行数量->{}", jy.size());
                        for (String s : jy) {
                            extractedjianyan(s,dictHosp.getCode());
                            extractedjianyan(s);
                        }
                    }

@@ -147,7 +147,7 @@
                    if (null != jc && !jc.isEmpty()) {
                        log.info("同步检查人员 执行数量->{}", jc.size());
                        for (String s : jc) {
                            extractedjiancha(s,dictHosp.getCode());
                            extractedjiancha(s);
                        }
                    }
                    Map<String, Object> map = new HashMap<>();
@@ -223,7 +223,7 @@
        taskScheduler.schedule(this::checkAndAddNewTasks, Instant.now().plus(2, ChronoUnit.MINUTES));
    }

    private void extractedjianyan(String s,String hosp) {
    private void extractedjianyan(String s) {
        try {
            List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
            if(null !=awsList && !awsList.isEmpty()){
@@ -233,9 +233,22 @@
                awsService.saveBatch(awsList);
                log.info("保存外送项目成功");
            }
            List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,hosp);
            List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
            if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq);
            if(null !=wssq && !wssq.isEmpty()){
                for (LtkjHysqd hysqd : wssq) {
                    LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
                    if (null != jybgid) {
                        ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
                        ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(hysqd.getTmh());
                    }
                    if (ltkjHysqdService.save(hysqd)) {
                        List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
                        ltkjHybgdService.saveBatch(wsbg);
                    }
                }
            }

            List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
            if (null != hysqdList && !hysqdList.isEmpty()) {
                for (LtkjHysqd hysqd : hysqdList) {
                    LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
@@ -245,8 +258,8 @@
                    }
                    if (ltkjHysqdService.save(hysqd)) {
                        List<LtkjHybgd> hybgdList = testMapper.getCcXZxYyLtkjHybgdByLisVi(hysqd.getTmh());
                        List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
                        if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
//                        List<LtkjHybgd> wsbg = testMapper.getWsxmLtkjHybgdByLisVi(s);
//                        if(null !=wsbg && !wsbg.isEmpty())hybgdList.addAll(wsbg);
                        ltkjHybgdService.saveBatch(hybgdList);
                    }
                }
@@ -261,16 +274,16 @@
    }


    private void extractedjiancha(String s,String hosp) {
    private void extractedjiancha(String s) {

        try {
            List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hosp);
            List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
            if (null != jcsqdList && !jcsqdList.isEmpty()) {
                DynamicDataSourceContextHolder.clearDataSourceType();
                jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
                jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
                jcsqdService.saveBatch(jcsqdList);
                List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hosp);
                List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s);
                DynamicDataSourceContextHolder.clearDataSourceType();
                if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
                DynamicDataSourceContextHolder.clearDataSourceType();

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java

@@ -2616,9 +2616,10 @@
        List<LtkjHysqd> list = ltkjHysqdService.list(ltkjHysqdLambdaQueryWrapper);
        HashMap<String, Object> data = new HashMap<>();
        for (LtkjHysqd hysqd : list) {
            LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
            ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
            List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
//            LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
//            ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
//            List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
            List<LtkjHybgd> hybgds = ltkjHybgdService.getReportJianYanBaoGaoDanList(hysqd.getTmh());
            if(null !=hybgds && !hybgds.isEmpty()){
//                hybgds = hybgds.stream().distinct().collect(Collectors.toList());
                hybgds = new ArrayList<>(hybgds.stream()

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java

@@ -33,4 +33,7 @@

    @Select("SELECT  a.sqdh FROM ltkj_jianchajianyan_tree a WHERE a.card_id =#{cardId} AND a.type='检查' GROUP BY a.sqdh")
    List<String> getJianChaBaoGaoDan(String cardId);

    @Select("SELECT * FROM ltkj_hybgd WHERE tmh=#{tmh}  GROUP BY jcxmid HAVING MAX(shsj) ")
    List<LtkjHybgd> getReportJianYanBaoGaoDanList(String tmh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java

@@ -20,4 +20,6 @@
    List<LtkjHybgd> getJianYanBaoGaoDanList(String tmh);

    List<String> getJianChaBaoGaoDan(String cardId);

    List<LtkjHybgd> getReportJianYanBaoGaoDanList(String tmh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java

@@ -42,4 +42,9 @@
    public List<String> getJianChaBaoGaoDan(String cardId) {
        return mapper.getJianChaBaoGaoDan(cardId);
    }

    @Override
    public List<LtkjHybgd> getReportJianYanBaoGaoDanList(String tmh) {
        return mapper.getReportJianYanBaoGaoDanList(tmh);
    }
}