zjh20250124

zjh

2025-01-24 2b39b654975aa9cb40254f20e545b9f389a82de7

zjh20250124

 ltkj-admin/pom.xml

@@ -114,6 +114,13 @@
            <version>4.0</version>
        </dependency>

        <dependency>
            <groupId>com.microsoft.sqlserver</groupId>
            <artifactId>mssql-jdbc</artifactId>
            <version>10.2.0.jre8</version> <!-- 使用最新版本 -->
        </dependency>


        <!-- Mysql驱动包 -->
        <dependency>
            <groupId>mysql</groupId>

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

@@ -189,6 +189,8 @@
    private void extractedjianyan(String s) {
        try {
            List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
            List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
            if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq);
            if (null != hysqdList && !hysqdList.isEmpty()) {
                for (LtkjHysqd hysqd : hysqdList) {
                    LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh());
@@ -198,6 +200,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);
                        ltkjHybgdService.saveBatch(hybgdList);
                    }
                }

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

@@ -46,6 +46,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.text.Collator;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.List;
@@ -141,7 +142,7 @@
        return data;
    }

    public void putData(JSONObject jsonObject, AjaxResult result, String key) {
/*    public void putData(JSONObject jsonObject, AjaxResult result, String key) {
        if (Integer.parseInt(result.get("code").toString()) == 200) {
            List<Map<String, Object>> data = (List<Map<String, Object>>) result.get("data");
            jsonObject.putOpt(key, data);
@@ -859,7 +860,7 @@
        String outputFileName1 = customer.getCusId() + tjOrder.getTjNumber() + customer.getCusName() + "_报告.pdf";
        savePDFFile(outputFileName1, tjOrder, customer, finalOutput);
        return AjaxResult.success();
    }
    }*/

    public AjaxResult hisPDFNew2(TjOrder tjOrder, TjCustomer customer, TjReportTemplate tjReportTemplate, TjReportTemplate zongJianYiShiQianMing) throws Exception {
        String s1 = sysConfigService.selectConfigByKey("tjreport_font_size_second_page_info");
@@ -920,7 +921,23 @@
        for (String head : titles) {
            table.addCell(PdfUtils.createCell(head, defaultFont, Rectangle.BOX, Element.ALIGN_CENTER, 5f, 5f));
        }
        Map<String, List<CsProVo>> listMap = list.stream().collect(Collectors.groupingBy(i -> i.getDeptId() + "_" + i.getDeptName()));
//        Map<String, List<CsProVo>> listMap = list.stream()
//                .collect(Collectors.groupingBy(i -> i.getDeptId() + "_" + i.getDeptName()));
        Map<String, List<CsProVo>> listMap = list.stream()
                .collect(Collectors.groupingBy(
                        i -> i.getDeptId() + "_" + i.getDeptName(),
                        TreeMap::new, // 按键排序
                        Collectors.mapping(
                                i -> i,
                                Collectors.collectingAndThen(
                                        Collectors.toList(),
                                        l -> l.stream()
                                                .sorted(Comparator.comparing(CsProVo::getDeptId)) // 对 List 排序
                                                .collect(Collectors.toList())
                                )
                        )
                ));

//        List<CsProVo> sortedList = list.stream()
//                .sorted(Comparator.comparingLong(CsProVo::getProId))
//                .collect(Collectors.toList());
@@ -1101,6 +1118,9 @@
                        if (!entry.getKey().equals(proVo.getProId())) continue;
                        List<TjOrderDetail> details = entry.getValue();
                        if(null !=details && !details.isEmpty()){
                             details= details.stream()
                                     .sorted(Comparator.comparing(TjOrderDetail::getProName))
                                    .collect(Collectors.toList());
                            boolean isXmWrite = false;
                            int index = 1;
                            int index1 = 1;
@@ -2054,7 +2074,7 @@
//                    document1.add(table);

//                    if (dictHosp.getHospName().equals("澄合矿务局中心医院") && !value.isEmpty()){
                    if (true && !value.isEmpty()) {
                    if (!value.isEmpty()) {
                        if (value.size() > 1) {
                            if (value.get(0).getPid().equals("1862852701533012001")) {
                                Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2175,7 +2195,7 @@
                        entry.getKey().setRemark("");
                    }
//                    if (!dictHosp.getHospName().equals("澄合矿务局中心医院")){
                    if (!true) {
                    if (false) {
                        String remark = "备注：" + entry.getKey().getRemark();
                        if (entry.getKey().getRemark().length() > 50) {
                            int j = 0;
@@ -2202,42 +2222,34 @@
                    zhuJianYiShi(document1, entry, orderRemark.getCreateTime(), dictHosp);
                    //分割线
//                    if (!dictHosp.getHospName().equals("澄合矿务局中心医院")) {
                    if (!true) {
                    if (false) {
                        LineSeparator objectName = new LineSeparator();
                        document1.add(objectName);
                    }
                } else {
                    if (null != one11) {
                        if (entry.getValue().get(0).getProName().contains(";"))
                            titleName = entry.getValue().get(0).getProName();
                        else titleName = one11.getProName();
                    } else {
                        titleName = entry.getKey().getProName();
                    }
                    if (entry.getValue().get(0).getProName().contains(";"))
                        titleName = entry.getValue().get(0).getProName();
                    else titleName = one11.getProName();
                    // 设置标题字体样式
                    Font titleFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
                    Paragraph paragraph = PdfUtils.setParagraph(titleFonts, titleName);

//                    if (dictHosp.getHospName().equals("澄合矿务局中心医院")) {
                    if (true) {
                        if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))) {
                            continue;
                        }
                        Font titleFont = PdfUtils.setFont(DEFAULT_TITLE_FONT_SIZE);
                        titleFont.setStyle(Font.BOLD);
                        PdfPCell cellTitle = new PdfPCell(PdfUtils.setParagraph(titleFont, titleName));
                        cellTitle.setBorder(Rectangle.NO_BORDER);
                        Color color = Color.decode("#B4CDCD");
                        cellTitle.setBackgroundColor(new BaseColor(color.getRed(), color.getGreen(), color.getBlue())); // 设置背景颜色（十六进制 RGB）
                        // 创建表格并添加单元格
                        PdfPTable tableTitle = new PdfPTable(1);
                        tableTitle.setWidthPercentage(100);
                        tableTitle.addCell(cellTitle);
                        // 将表格添加到文档中
                        document1.add(tableTitle);
                    } else {
                        document1.add(paragraph);
                    if (StrUtil.isBlank(value.get(0).getProResult()) && (StrUtil.isBlank(value.get(0).getTs()) && StrUtil.isBlank(value.get(0).getSj()))) {
                        continue;
                    }
                    Font titleFont = PdfUtils.setFont(DEFAULT_TITLE_FONT_SIZE);
                    titleFont.setStyle(Font.BOLD);
                    PdfPCell cellTitle = new PdfPCell(PdfUtils.setParagraph(titleFont, titleName));
                    cellTitle.setBorder(Rectangle.NO_BORDER);
                    Color color = Color.decode("#B4CDCD");
                    cellTitle.setBackgroundColor(new BaseColor(color.getRed(), color.getGreen(), color.getBlue())); // 设置背景颜色（十六进制 RGB）
                    // 创建表格并添加单元格
                    PdfPTable tableTitle = new PdfPTable(1);
                    tableTitle.setWidthPercentage(100);
                    tableTitle.addCell(cellTitle);
                    // 将表格添加到文档中
                    document1.add(tableTitle);

//                    String[] titles = {"体检项目", "体检结果", "单位"};
//                    Font headFont = PdfUtils.setFont(9);
@@ -2246,7 +2258,7 @@
//                    document1.add(table);

//                    if (dictHosp.getHospName().equals("澄合矿务局中心医院") && !value.isEmpty()){
                    if (true && !value.isEmpty()) {
                    if (!value.isEmpty()) {
                        if (value.size() > 1) {
                            if (value.get(0).getPid().equals("1862852701533012001")) {
                                Font remarkFonts = PdfUtils.setFont(DEFAULT_FONT_SIZE);
@@ -2493,78 +2505,87 @@
            LambdaQueryWrapper<LtkjHybgd> ltkjHybgdLambdaQueryWrapper = new LambdaQueryWrapper<>();
            ltkjHybgdLambdaQueryWrapper.eq(LtkjHybgd::getTmh, hysqd.getTmh());
            List<LtkjHybgd> hybgds = ltkjHybgdService.list(ltkjHybgdLambdaQueryWrapper);
            // 大类项目名称
            String xmmc = hysqd.getXmmc();
            ArrayList<List<String>> lists = new ArrayList<>();
            HashSet<String> hashSet = new HashSet<>();
            String shsj = "";
            for (LtkjHybgd hybgd : hybgds) {
                shsj = hybgd.getShsj();
                // 检查项目
                String jcxm = hybgd.getJcxm() != null ? hybgd.getJcxm().trim() : null;
                // 检验结果
                String jyjg = hybgd.getJyjg() != null ? hybgd.getJyjg().trim() : null;
                // 结果单位
                String jgdw = hybgd.getJgdw() != null ? hybgd.getJgdw().trim() : null;
                // 范围值
                String fwz = hybgd.getFwz() != null ? hybgd.getFwz().trim() : null;
                // 检验医师
//                String jyys = hybgd.getJyys();
                //审核医生
                String shysmc = hybgd.getShysmc() != null ? hybgd.getShysmc().trim() : null;
                // 审核医师编码
                String shys = hybgd.getShys() != null ? hybgd.getShys().trim() : null;
                String ycbz = "";
            if(null !=hybgds && !hybgds.isEmpty()){
//                hybgds=hybgds.stream().sorted(Comparator.comparing(LtkjHybgd::getJcxm, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
//                hybgds = hybgds.stream()
//                        .sorted(Comparator.comparingInt(
//                                a -> a.getJcxm().length() // 根据名字的长度排序
//                        ))
//                        .collect(Collectors.toList());

                if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)) {
                    try {
                        String[] fwzs = fwz.split("-");
                        BigDecimal min = new BigDecimal(fwzs[0]);
                        BigDecimal max = new BigDecimal(fwzs[1]);
                        BigDecimal jyjgval = new BigDecimal(jyjg);
                        // 比较检验结果和范围值
                        if (jyjgval.compareTo(min) < 0) {
                            // jyjg 小于范围最小值，添加下箭头
                // 大类项目名称
                String xmmc = hysqd.getXmmc();
                ArrayList<List<String>> lists = new ArrayList<>();
                HashSet<String> hashSet = new HashSet<>();
                String shsj = "";
                for (LtkjHybgd hybgd : hybgds) {
                    shsj = hybgd.getShsj();
                    // 检查项目
                    String jcxm = hybgd.getJcxm() != null ? hybgd.getJcxm().trim() : null;
                    // 检验结果
                    String jyjg = hybgd.getJyjg() != null ? hybgd.getJyjg().trim() : null;
                    // 结果单位
                    String jgdw = hybgd.getJgdw() != null ? hybgd.getJgdw().trim() : null;
                    // 范围值
                    String fwz = hybgd.getFwz() != null ? hybgd.getFwz().trim() : null;
                    // 检验医师
//                String jyys = hybgd.getJyys();
                    //审核医生
                    String shysmc = hybgd.getShysmc() != null ? hybgd.getShysmc().trim() : null;
                    // 审核医师编码
                    String shys = hybgd.getShys() != null ? hybgd.getShys().trim() : null;
                    String ycbz = "";

                    if (jyjg != null && StrUtil.isNotBlank(jyjg) && fwz != null && StrUtil.isNotBlank(fwz)) {
                        try {
                            String[] fwzs = fwz.split("-");
                            BigDecimal min = new BigDecimal(fwzs[0]);
                            BigDecimal max = new BigDecimal(fwzs[1]);
                            BigDecimal jyjgval = new BigDecimal(jyjg);
                            // 比较检验结果和范围值
                            if (jyjgval.compareTo(min) < 0) {
                                // jyjg 小于范围最小值，添加下箭头
//                            jyjg = jyjg + "   ↓";
                            ycbz = "↓";
                        } else if (jyjgval.compareTo(max) > 0) {
                            // jyjg 大于范围最大值，添加上箭头
                                ycbz = "↓";
                            } else if (jyjgval.compareTo(max) > 0) {
                                // jyjg 大于范围最大值，添加上箭头
//                            jyjg = jyjg + "   ↑";
                            ycbz = "↑";
                                ycbz = "↑";
                            }
                        } catch (Exception ignored) {
                        }
                    } catch (Exception ignored) {
                    }
                }
//                LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
//                queryWrapper.eq(SysUser::getUserName,jyys);
//                List<SysUser> sysUsers = userService.list(queryWrapper);
//                if (!sysUsers.isEmpty())
//                    hashSet.add(sysUsers.get(0).getNickName());
                String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
                if (null != shys && null != shysmc && key.equals("Y")) {
                    hashSet.add(shysmc + "|" + shys);
                } else {
                    if (null != shysmc) hashSet.add(shysmc);
                    String key = sysConfigService.selectConfigByKey("is_report_pdf_use_ysqm");
                    if (null != shys && null != shysmc && key.equals("Y")) {
                        hashSet.add(shysmc + "|" + shys);
                    } else {
                        if (null != shysmc) hashSet.add(shysmc);
                    }
                    ArrayList<String> strings = new ArrayList<>();
                    strings.add(jcxm);
                    strings.add(jyjg);
                    strings.add(ycbz);
                    strings.add(jgdw);
                    strings.add(fwz);
                    strings.add(hybgd.getJcxmid());
                    strings.add(hysqd.getXmid());
                    lists.add(strings);
                }
                ArrayList<String> strings = new ArrayList<>();
                strings.add(jcxm);
                strings.add(jyjg);
                strings.add(ycbz);
                strings.add(jgdw);
                strings.add(fwz);
                strings.add(hybgd.getJcxmid());
                strings.add(hysqd.getXmid());
                lists.add(strings);
            }
            if (!lists.isEmpty()) {
                HashMap<String, Object> map = new HashMap<>();
                map.put("data", lists);
                map.put("jyys", hashSet);
                if (StrUtil.isNotBlank(shsj)) {
                    shsj = shsj.split(" ")[0];
                if (!lists.isEmpty()) {
                    HashMap<String, Object> map = new HashMap<>();
                    map.put("data", lists);
                    map.put("jyys", hashSet);
                    if (StrUtil.isNotBlank(shsj)) {
                        shsj = shsj.split(" ")[0];
                    }
                    map.put("shsj", shsj);
                    data.put(xmmc, map);
                }
                map.put("shsj", shsj);
                data.put(xmmc, map);
            }
        }
        return data;
@@ -2757,16 +2778,9 @@
        for (Map.Entry<TjOrderRemark, List<TjPdfVO>> entry : printReport.entrySet()) {
            List<TjPdfVO> tjPdfVOS = new ArrayList<>();
            List<TjOrderDetail> tjOrderDetails = tjOrderDetailService.getDetailByOrderIdAndParId(one.getOrderId(), entry.getKey().getProId());
//            tjOrderDetails = new ArrayList<>(tjOrderDetails.stream()
//                    .filter(i -> StrUtil.isNotBlank(i.getProResult()))
//                    .collect(Collectors.toMap(
//                            TjOrderDetail::getProId,
//                            i -> i,
//                            (existing, replacement) -> existing
//                    ))
//                    .values());
            tjOrderDetails = tjOrderDetails.stream().filter(i -> StrUtil.isNotBlank(i.getProResult())).collect(Collectors.toList());
            tjOrderDetails = new ArrayList<>(tjOrderDetails.stream().collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
            tjOrderDetails = new ArrayList<>(tjOrderDetails.stream()
                    .collect(Collectors.toMap(TjOrderDetail::getProId, i -> i, (existing, replacement) -> existing)).values());
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                TjProject tjProject = projectService.getById(String.valueOf(tjOrderDetail.getProId()));
                if (null != tjProject && tjProject.getNeedReport().equals("Y")) {
@@ -2784,19 +2798,21 @@
                        }
                        tjPdfVO.setProId(String.valueOf(tjOrderDetail.getProject().getProId()));
                        tjPdfVO.setPid(String.valueOf(tjProject.getProParentId()));
                        LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
                        wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
                        wrapper.eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
//                        LtkjExamJcbgd jcbgd = jcbgdService.getOne(wrapper);
//                        if (jcbgd != null){
//                            tjPdfVO.setTs(jcbgd.getYxbx());
//                            tjPdfVO.setSj(jcbgd.getBgNr());
//                            tjPdfVO.setShys(jcbgd.getShysxm());
//                        }
//                        LambdaQueryWrapper<LtkjExamJcbgd> wrapper = new LambdaQueryWrapper<>();
//                        wrapper.eq(LtkjExamJcbgd::getTjh, tjNumber);
//                        wrapper.eq(LtkjExamJcbgd::getXmdm, String.valueOf(tjOrderDetail.getProject().getProParentId()));
                        tjPdfVOS.add(tjPdfVO);
                    }
                }
            }
//            if(!tjPdfVOS.isEmpty()){
//                tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
//                tjPdfVOS = tjPdfVOS.stream()
//                        .sorted(Comparator.comparingInt(
//                                tjPdfVO -> tjPdfVO.getProName().length() // 根据名字的长度排序
//                        ))
//                        .collect(Collectors.toList());
//            }
            printReport.put(entry.getKey(), tjPdfVOS);
        }
    }
@@ -2854,6 +2870,14 @@
                    }
                }
            }
//            if(!tjPdfVOS.isEmpty()){
//                tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
//                tjPdfVOS = tjPdfVOS.stream()
//                        .sorted(Comparator.comparingInt(
//                                tjPdfVO -> tjPdfVO.getProName().length() // 根据名字的长度排序
//                        ))
//                        .collect(Collectors.toList());
//            }
            printReport.put(entry.getKey(), tjPdfVOS);
        }
    }

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

@@ -49,6 +49,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.text.Collator;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -1538,7 +1539,9 @@
                                tjOrderDetail.setProResult(tjOrderDetail.getProResult());
                            }

                            dels.add(tjOrderDetail);
                            if(remark.getOrgType().equals(tjOrderDetail.getOrgType())){
                                dels.add(tjOrderDetail);
                            }
                        }
                    }
                    String summary = remark.getSummary();
@@ -1551,6 +1554,12 @@
                    if (dels.isEmpty()) {
                        continue;
                    }
                    dels=dels.stream().sorted(Comparator.comparing(TjOrderDetail::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
                    dels = dels.stream()
                                .sorted(Comparator.comparingInt(
                                        tjPdfVO -> tjPdfVO.getProName().length() // 根据名字的长度排序
                                ))
                                .collect(Collectors.toList());
                    parent.put("sons", dels);
                    parent.put("remark", remark.getRemark());
                    parent.put("jgbx", remark.getJgbx());
@@ -1685,14 +1694,19 @@
            }
            List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);

            List<Map<String, Object>> collect = maps.stream()
                    .filter(a -> mapList.stream()
                            .allMatch(b -> a.get("jyjc").equals(b.get("jyjc"))))
                    .collect(Collectors.toList());

            List<Map<String, Object>> collect = mapList.stream()
                    .filter(b -> maps.stream()
                            .noneMatch(a -> a.get("proName").equals(b.get("proName"))))  // 过滤掉在 maps 中存在的相同元素
                    .collect(Collectors.toList());
            if(!collect.isEmpty()){
                mapList.addAll(collect);
//                return AjaxResult.success(result);
                maps.addAll(collect);
            }
            if(!maps.isEmpty()){
                List<Map<String, Object>> collect1 = maps.stream()
                        .sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
                        .collect(Collectors.toList());
                return AjaxResult.success(collect1);
            }
           return AjaxResult.success(maps);
        }else {

 ltkj-common/src/main/java/com/ltkj/common/enums/DataSourceType.java

@@ -21,4 +21,6 @@


    SLAVE_LIS,

    SLAVE_WS,
}

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

@@ -259,13 +259,61 @@
    }


    @Bean
//    @ConfigurationProperties("spring.datasource.druid.slavepacs")
//    @ConditionalOnProperty(prefix = "spring.datasource.druid.slavepacs", name = "enabled", havingValue = "true")
    public DataSource slaveDataWsSource(DruidProperties druidProperties) {
        DruidDataSource dataSource = DruidDataSourceBuilder.create().build();
        Properties props = new Properties();
        try {
            // 从文件中读取配置信息
            FileInputStream fis = null;
            try {
                fis = new FileInputStream(url);
            } catch (FileNotFoundException e) {
                log.info("数据库连接文件找不到");
            }
            props.load(fis);
            fis.close();
            // 这里是测试写法，具体的value可以通过请求参数传递过来
            String pacsenabled = props.getProperty("pacsenabled");
            if (pacsenabled.equals("false"))
                return null;
            String pacsdbtype = props.getProperty("wsdbtype");
            switch (pacsdbtype){
                case "sqlserver":
                    dataSource = creatSqlServer(pacsenabled, props.getProperty("wsip"),props.getProperty("wsprot"),
                            props.getProperty("wsname"),props.getProperty("wsusername"),props.getProperty("wspassword"));
                    break;
                case "mysql":
                    dataSource = creatMysql(pacsenabled, props.getProperty("wsip"),
                            props.getProperty("wsprot"),props.getProperty("wsname"),props.getProperty("wsusername"),props.getProperty("wspassword"));
                    break;
                case "oracle":
                    dataSource = creatOracle(pacsenabled, props.getProperty("wsip"),
                            props.getProperty("wsprot"),props.getProperty("wsname"),props.getProperty("wsusername"),props.getProperty("wspassword"));
                    break;
                default:
                    dataSource = creatOracle(pacsenabled, props.getProperty("wsip"),props.getProperty("wsprot"),props.getProperty("wsname"),props.getProperty("wsusername")
                            ,props.getProperty("wspassword"));
                    break;
            }
            log.info("数据库连接成功!!!");
        } catch (Exception e) {
            log.info("数据库连接失败  请联系管理员！");
            e.printStackTrace();
        }
        return druidProperties.dataSource(dataSource);
    }


    private DruidDataSource creatSqlServer(String enabled, String ip,String port,String db,String user,String password) throws SQLException {
        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=true;trustServerCertificate=true;sslProtocol=TLSv1.2;");
        properties.setProperty("druid.username", user);
        properties.setProperty("druid.password", password);
        dataSource.restart(properties);
@@ -305,6 +353,7 @@
        setDataSource(targetDataSources, DataSourceType.SLAVE_HIS.name(), "slaveHisDataSource");
        setDataSource(targetDataSources, DataSourceType.SLAVE_LIS.name(), "slaveDataLisSource");
        setDataSource(targetDataSources, DataSourceType.SLAVE_PACS.name(), "slaveDataPacsSource");
        setDataSource(targetDataSources, DataSourceType.SLAVE_WS.name(), "slaveDataWsSource");
        return new DynamicDataSource(masterDataSource, targetDataSources);
    }


 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java

@@ -239,6 +239,9 @@
    @TableField(exist = false)
    private String ks;

    @TableField(exist = false)
    private String orgType;

    @Override
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

 ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java

@@ -145,6 +145,9 @@
//    科室
    private String ks;

    @TableField(exist = false)
    private String orgType;


    @Override
    public String toString() {

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

@@ -279,6 +279,9 @@
    List<LtkjHysqd> getCcXZxYyLtkjHysqdByLisVi(String tjNum);





    @DataSource(value = DataSourceType.SLAVE_LIS)
    @Select("SELECT\n" +
            "  a.SAMPLEID tmh,\n" +
@@ -305,6 +308,39 @@
    List<LtkjHybgd> getCcXZxYyLtkjHybgdByLisVi(String tmh);


//    @DataSource(value = DataSourceType.SLAVE_WS)
    @Select("SELECT aa.tjh,ws.pro_id tmh,aa.bbbh,aa.bbmc,ws.pro_id xmid,aa.xmmc,aa.sqsj,aa.sqys,aa.jgsj,aa.sqdh,aa.sqrxm,aa.sqrdm,aa.jybgjg,aa.create_time FROM tj_wsxm ws LEFT JOIN (\n" +
            "   SELECT\n" +
            "        a.brid tjh,\n" +
            "         a.brid tmh,\n" +
            "        NULL bbbh,\n" +
            "        NULL bbmc,\n" +
            "        a.xmmc xmid,\n" +
            "        REGEXP_REPLACE(a.xmmc, '[0-9]', '') xmmc,\n" +
            "        a.bgsj sqsj,\n" +
            "        a.bgys sqys,\n" +
            "        a.bgsj jgsj,\n" +
            "        null sqdh,\n" +
            "        null sqrxm,\n" +
            "        '8001' sqrdm,\n" +
            "        a.bgys shrxm,\n" +
            "        '已审' jybgjg,\n" +
            "        SYSDATE() create_time  \n" +
            "      FROM\n" +
            "        aws a \n" +
            "      WHERE  a.brid=#{tjNum} GROUP BY REGEXP_REPLACE(a.xmmc, '[0-9]', '') )aa ON ws.pro_name=aa.xmmc WHERE LOCATE(ws.pro_name,aa.xmmc);")
    List<LtkjHysqd> getWsxmLtkjHysqdByLisVi(String tjNum);

//    @DataSource(value = DataSourceType.SLAVE_WS)
    @Select("SELECT ws.pro_id tmh,aa.jcxmid,aa.jcxm,NULL tdh,aa.jyjg,null jgdw,null fwzdz,null fwzgz,aa.jysj,aa.shsj,NULL shys,aa.shysmc,NULL tpurl,NULL ycbz,aa.create_time\n" +
            " FROM tj_wsxm ws \n" +
            " LEFT JOIN (\n" +
            "   SELECT distinct a.brid tmh,a.xmbm jcxmid,a.xmmc jcxm,NULL tdh,a.result jyjg,null jgdw,null fwzdz,null fwzgz,null fwz,a.bgsj jysj,a.bgys jyys,a.bgsj shsj," +
            " NULL shys,a.bgys shysmc, NULL tpurl,NULL ycbz,SYSDATE()  create_time FROM aws a WHERE  a.brid =#{tmh} )aa \n" +
            "\t\tON ws.pro_name=REGEXP_REPLACE(aa.jcxm, '[0-9]', '') WHERE LOCATE(ws.pro_name,REGEXP_REPLACE(aa.jcxm, '[0-9]', ''))")
    List<LtkjHybgd> getWsxmLtkjHybgdByLisVi(String tmh);



    @DataSource(value = DataSourceType.SLAVE_PACS)
    @Select("SELECT * FROM ris.V_TJ_JCBGXX_NEWTJ")