2025-03-05

zhaowenxuan

2025-03-05 538212f590c6274ae72ee0ba0cc36170d4fa8a6a

2025-03-05

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

@@ -994,16 +994,20 @@
//        List<Map<String, Object>> jiancha = new ArrayList<>();


        paragraph = PdfUtils.setParagraph(defaultTitleFont, "检查综述：");
        paragraph.setSpacingBefore(3f);
        paragraph.setSpacingAfter(2f);
        document2.add(paragraph);

        int xmXh = 1;
        Map<Long, List<TjOrderDetail>> collect = orderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProId));
        LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
        wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
        List<TjOrderYcxm> ycxms = ycxmService.list(wq);
        boolean isBr = false;
        if (null != ycxms && !ycxms.isEmpty()) {

            paragraph = PdfUtils.setParagraph(defaultTitleFont, "检查综述：");
            paragraph.setSpacingBefore(3f);
            paragraph.setSpacingAfter(2f);
            document2.add(paragraph);
            isBr = true;

            Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));

@@ -1045,6 +1049,14 @@
                }
            }
        }else {
            if (!collect.isEmpty() && !map.isEmpty()){
                paragraph = PdfUtils.setParagraph(defaultTitleFont, "检查综述：");
                paragraph.setSpacingBefore(3f);
                paragraph.setSpacingAfter(2f);
                document2.add(paragraph);
                isBr = true;
            }

            for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
                List<CsProVo> proVos = deptEntry.getValue();
                if (proVos.size() > 1) {
@@ -1133,20 +1145,25 @@
            }
        }

        paragraph = PdfUtils.setParagraph(defaultFont, "");
        paragraph.setLeading(0f);
        paragraph.setSpacingBefore(10f);
        paragraph.setSpacingAfter(10f);
        document2.add(paragraph);
        paragraph = PdfUtils.setParagraph(defaultTitleFont, "医生建议：");
        paragraph.setSpacingBefore(3f);
        paragraph.setSpacingAfter(2f);
        document2.add(paragraph);
        if(isBr) {
            paragraph = PdfUtils.setParagraph(defaultFont, "");
            paragraph.setLeading(0f);
            paragraph.setSpacingBefore(10f);
            paragraph.setSpacingAfter(10f);
            document2.add(paragraph);
        }


        xmXh = 0;
//        LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
//        wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber());
//        List<TjOrderYcxm> ycxms = ycxmService.list(wq);
        if (null != ycxms && !ycxms.isEmpty()) {

            paragraph = PdfUtils.setParagraph(defaultTitleFont, "医生建议：");
            paragraph.setSpacingBefore(3f);
            paragraph.setSpacingAfter(2f);
            document2.add(paragraph);

            Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));

@@ -1372,6 +1389,14 @@
                }
            }*/
        } else {

            if (!collect.isEmpty() && !map.isEmpty()){
                paragraph = PdfUtils.setParagraph(defaultTitleFont, "医生建议：");
                paragraph.setSpacingBefore(3f);
                paragraph.setSpacingAfter(2f);
                document2.add(paragraph);
            }

            for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) {
                List<CsProVo> proVos = deptEntry.getValue();
                if (proVos.size() > 1) {

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java

@@ -755,6 +755,7 @@
                        List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
                        List<String> jianChaBaoGaoDan = ltkjHybgdService.getJianChaBaoGaoDan(order.getCardId());
                        //同步检验
                        String resultMsg = "";
                        if (null != baoGaoDans && !baoGaoDans.isEmpty()) {
                            Date dates = new Date();
                            Map<String, Object> map = new HashMap<>();
@@ -769,43 +770,47 @@
                            String result1 = getAjaxResult(result);
                            JSONObject object = getJSONObject(result1);
                            String code = object.getStr("ResultCode");
                            if (null == code || !code.equals("0")) {
                                return AjaxResult.error("化验项目暂时未出结果,请稍后同步!!!");
                            }
                            JSONArray data = object.getJSONArray("ResultData");
                            for (Object datum : data) {
                                JSONObject jsonObject = (JSONObject) datum;
                                LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
                                if (null != jybgid) {
                                    ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
                                    ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jybgid.getTmh());
//                            if (null == code || !code.equals("0")) {
//                                return AjaxResult.error("化验项目暂时未出结果,请稍后同步!!!");
//                            }
                            if(null != code && code.equals("0")) {
                                JSONArray data = object.getJSONArray("ResultData");
                                for (Object datum : data) {
                                    JSONObject jsonObject = (JSONObject) datum;
                                    LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
                                    if (null != jybgid) {
                                        ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
                                        ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jybgid.getTmh());
                                    }
                                    boolean isInsertHysqd = false;
                                    LtkjHysqd hysqd = new LtkjHysqd();
                                    hysqd.setTjh(order.getCardId());
                                    hysqd.setTmh(jsonObject.getStr("JYBGID"));
                                    hysqd.setBbbh(jsonObject.getStr("BBDM"));
                                    hysqd.setBbmc(jsonObject.getStr("BBMC"));
                                    hysqd.setXmid(jsonObject.getStr("JYXMDM"));
                                    hysqd.setXmmc(jsonObject.getStr("JYXMMC"));
                                    hysqd.setSqsj(jsonObject.getStr("SQRQ"));
                                    hysqd.setSqys(jsonObject.getStr("SQRBH"));
                                    hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
                                    hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
                                    hysqd.setSqdh(jsonObject.getStr("SQDBH"));
                                    hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
                                    hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
                                    hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
                                    hysqd.setCreateTime(new Date());
                                    QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
                                    List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
                                    if (list.isEmpty())
                                        isInsertHysqd = true;
                                    if (isInsertHysqd) {
                                        saveHysqd(hysqd);
                                    } else {
                                        saveHybgd(hysqd);
                                    }
                                }
                                boolean isInsertHysqd = false;
                                LtkjHysqd hysqd = new LtkjHysqd();
                                hysqd.setTjh(order.getCardId());
                                hysqd.setTmh(jsonObject.getStr("JYBGID"));
                                hysqd.setBbbh(jsonObject.getStr("BBDM"));
                                hysqd.setBbmc(jsonObject.getStr("BBMC"));
                                hysqd.setXmid(jsonObject.getStr("JYXMDM"));
                                hysqd.setXmmc(jsonObject.getStr("JYXMMC"));
                                hysqd.setSqsj(jsonObject.getStr("SQRQ"));
                                hysqd.setSqys(jsonObject.getStr("SQRBH"));
                                hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
                                hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
                                hysqd.setSqdh(jsonObject.getStr("SQDBH"));
                                hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
                                hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
                                hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
                                hysqd.setCreateTime(new Date());
                                QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
                                List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
                                if (list.isEmpty())
                                    isInsertHysqd = true;
                                if (isInsertHysqd){
                                    saveHysqd(hysqd);
                                }else {
                                    saveHybgd(hysqd);
                                }
                            }else{
                                resultMsg = "化验项目暂时未出结果,请稍后同步!!!";
                            }
                            //同步化验项目
//                            testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
@@ -869,17 +874,20 @@
                                            jcbgd.setJcbw(objectMap.get("JCBW").toString());
                                        if (null != objectMap.get("SQRQSJ") || !objectMap.get("SQRQSJ").equals(""))
                                            jcbgd.setSqsj(objectMap.get("SQRQSJ").toString());
                                            jcbgd.setCreateTime(new Date());
                                        jcbgd.setCreateTime(new Date());
                                        jcbgdService.save(jcbgd);
                                    }
                                    jcsqdService.saveLtkjExamJcsqd(order.getCardId());
                                    testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
                                }else {
                                    return AjaxResult.error("检查项目暂时未出结果,请稍后同步!!!");
//                                    return AjaxResult.error("检查项目暂时未出结果,请稍后同步!!!");
                                    resultMsg+="\n检查项目暂时未出结果,请稍后同步!!!";
                                }
                            }
                        }
                        return AjaxResult.success("同步成功");
                        if (StrUtil.isBlank(resultMsg))
                            return AjaxResult.success("同步成功");
                        else return AjaxResult.error(resultMsg);
                    }
                    //化验
                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);

 ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java

@@ -310,12 +310,13 @@


    private DruidDataSource creatSqlServer(String enabled, String ip,String port,String db,String user,String password) throws SQLException {
        // -Djdk.tls.client.protocols=TLSv1.2 JVM启动参数
        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
        Properties properties = new Properties();
        properties.setProperty("druid.enabled", enabled);
        properties.setProperty("druid.driverClassName","com.microsoft.sqlserver.jdbc.SQLServerDriver");
        properties.setProperty("druid.url","jdbc:sqlserver://"+ ip+":"+ port+";DatabaseName="+ db+
                ";&characterEncoding=utf8;encrypt=false");
                ";trustServerCertificate=true;encrypt=false;characterEncoding=utf8");
        properties.setProperty("druid.username", user);
        properties.setProperty("druid.password", password);
        dataSource.restart(properties);