zjh
2024-12-04 decc3b9ce027fe35152b8b387a056c175a9aa08f
zjh20241202-4
12个文件已修改
4个文件已添加
290 ■■■■ 已修改文件
ltkj-admin/lib/ojdbc17.jar 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/lib/ojdbc8.jar 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/lib/orai18n-12.1.0.2.0.jar 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/pom.xml 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application-linux-test.yml 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application.yml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/test/java/zwxTest.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/TestMapper.xml 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/lib/ojdbc17.jar
Binary files differ
ltkj-admin/lib/ojdbc8.jar
Binary files differ
ltkj-admin/lib/orai18n-12.1.0.2.0.jar
Binary files differ
ltkj-admin/pom.xml
@@ -30,6 +30,23 @@
    </repositories>
    <dependencies>
        <dependency>
            <groupId>com.oracle.database.jdbc</groupId>
            <artifactId>ojdbc8</artifactId>
            <version>19.8.0.0</version>
            <scope>system</scope>
            <systemPath>${basedir}/lib/ojdbc8.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>com.oracle.database.jdbc</groupId>
            <artifactId>orai18n</artifactId>
            <version>1.0.2.0</version>
            <scope>system</scope>
            <systemPath>${basedir}/lib/orai18n-12.1.0.2.0.jar</systemPath>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter</artifactId>
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
@@ -255,35 +255,43 @@
        if (customer.getCusSex() == 0) patientInfo.put("PatientSex","M");
        else if (customer.getCusSex() == 1) patientInfo.put("PatientSex","F");
        else patientInfo.put("PatientSex","O");
        patientInfo.put("PatBirthday",customer.getCusBrithday());
        patientInfo.put("PatBirthday",new SimpleDateFormat("yyyy-MM-dd").format(customer.getCusBrithday()));
        patientInfo.put("IdCard",customer.getCusIdcard());
        patientInfo.put("hospitalid","chkwyy");
        String examItems = "";
//        String examItems = "";
        HashMap<String, Object> examItem = new HashMap<>();
        List<Map<String,Object>> list = new ArrayList<>();
        String date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
        for (TjProject project : projects) {
            HashMap<String, Object> examItem = new HashMap<>();
            HashMap<String, Object> examItems = new HashMap<>();
            // 申请单号规则:体检号_project.getProId()后四位
            examItem.put("HisID", tjOrder.getTjNumber() + String.valueOf(project.getProId()).substring(String.valueOf(project.getProId()).length() - 4));
            examItem.put("EmergencyFlag", "0");
            examItem.put("ExamItemID", project.getHisXmbm());
            examItem.put("ExamItemName", project.getHisXmmc());
            examItem.put("OrderDT", date);
            examItems.put("HisID", tjOrder.getTjNumber() + String.valueOf(project.getProId()).substring(String.valueOf(project.getProId()).length() - 4));
            examItems.put("EmergencyFlag", "0");
            examItems.put("ExamItemID", project.getHisXmbm());
            examItems.put("ExamItemName", project.getHisXmmc());
            examItems.put("OrderDT", date);
            SysDept dept = deptService.getById(project.getDeptId());
            examItem.put("Modality", dept.getModality());
            examItems.put("Modality", dept.getModality());
            // TODO 收费标识 1是收费 和 0未收费
            examItem.put("ChargeFlag","");
            examItems += "<ExamItem>"+
                    XmlUtil.mapToXmlStr(examItem)
                            .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
                            .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
                            .replaceAll("<xml>","")
                            .replaceAll("</xml>","")
                    +"</ExamItem>";
            examItems.put("ChargeFlag","");
//            examItems += "<ExamItem>"+
//                    XmlUtil.mapToXmlStr(examItem)
//                            .replace("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
////                            .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
//                            .replace("<xml>","")
//                            .replace("</xml>","")
//                    +"</ExamItem>";
            list.add(examItems);
        }
        examItem.put("ExamItem",list);
        hashMap.put("PatientInfor",patientInfo);
        hashMap.put("ExamItemList",examItems);
        hashMap.put("ExamItemList",examItem);
        root.put("Root",hashMap);
        String result = HttpRequest.post("").body(XmlUtil.mapToXmlStr(root)).contentType("application/xml;charset:utf-8;").execute().body();
        String result = HttpRequest.post("http://10.100.100.222:8000/WebInterfaceService.asmx")
        .body(XmlUtil.mapToXmlStr(root)).contentType("application/xml;charset:utf-8;").execute().body();
        String s = XmlUtil.mapToXmlStr(root);
        log.info("调用pacs传递参数的值为: "+s);
        Map<String, Object> map = XmlUtil.xmlToMap(result);
        if (map.get("Code").toString().equals("1")){
            for (TjProject project : projects) {
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java
@@ -287,26 +287,29 @@
        patientInfo.put("PatBirthday",customer.getCusBrithday());
        patientInfo.put("IdCard",customer.getCusIdcard());
//        ArrayList<HashMap<String, Object>> examItems = new ArrayList<>();
        String examItems = "";
//        String examItems = "";
        HashMap<String, Object> examItem = new HashMap<>();
        List<Map<String,Object>> lists = new ArrayList<>();
        for (TjProject project : projects) {
            HashMap<String, Object> examItem = new HashMap<>();
            examItem.put("HisID", tjOrder.getTjNumber() + String.valueOf(project.getProId()).substring(String.valueOf(project.getProId()).length() - 4));
            examItem.put("EmergencyFlag", "0");
            examItem.put("ExamItemID", project.getHisXmbm());
            examItem.put("ExamItemName", project.getHisXmmc());
            examItem.put("OrderDT", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tjOrder.getCreateTime()));
            HashMap<String, Object> examItems = new HashMap<>();
            examItems.put("HisID", tjOrder.getTjNumber() + String.valueOf(project.getProId()).substring(String.valueOf(project.getProId()).length() - 4));
            examItems.put("EmergencyFlag", "0");
            examItems.put("ExamItemID", project.getHisXmbm());
            examItems.put("ExamItemName", project.getHisXmmc());
            examItems.put("OrderDT", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tjOrder.getCreateTime()));
            SysDept dept = deptService.getById(project.getDeptId());
            examItem.put("Modality", dept.getModality());
            examItems += "<ExamItem>"+
                    XmlUtil.mapToXmlStr(examItem)
                            .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
                            .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
                            .replaceAll("<xml>","")
                            .replaceAll("</xml>","")
                    +"</ExamItem>";
            examItems.put("Modality", dept.getModality());
//            examItems += "<ExamItem>"+
//                    XmlUtil.mapToXmlStr(examItem)
//                            .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
//                            .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
//                            .replaceAll("<xml>","")
//                            .replaceAll("</xml>","")
//                    +"</ExamItem>";
            lists.add(examItems);
        }
        hashMap.put("ExamItemList", examItems);
        examItem.put("ExamItem",list);
        hashMap.put("ExamItemList", examItem);
        hashMap.put("PatientInfor",patientInfo);
        HashMap<String, Object> result = new HashMap<>();
        result.put("Code",1);
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -149,6 +149,24 @@
    }
    @GetMapping ("/pacs")
    @ApiOperation (value = "测试调用pacs视图数据接口")
    @RepeatSubmit
    public AjaxResult pacs() {
        List<Map<String, Object>> ccXZxYyPacsJgSt = testMapper.getCcXZxYyPacsJgSt();
        List<LtkjExamJcsqd> list = testMapper.getCcXZxYyPacsLtkjExamJcsqd("");
        log.info(list.toString());
        List<LtkjExamJcbgd> list1 = testMapper.getCcXZxYyPacsLtkjExamJcbgd("");
        log.info(list1.toString());
        return AjaxResult.success(ccXZxYyPacsJgSt);
    }
    @GetMapping ("/getCsList")
    @ApiOperation (value = "初审查询体检记录客户列表")//0待1已
    @Transactional
@@ -599,16 +617,12 @@
                                            }
                                        }
                                    }
                                }else {
                                    return AjaxResult.error("检查项目暂时未出结果,请稍后同步!!!");
                                }
                            }
                        }
                        return AjaxResult.success("同步成功");
                    }
                    else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equals("Y")){
                        List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber());
@@ -624,12 +638,28 @@
                                    ltkjHybgdService.saveBatch(hybgdList);
                                }
                            }
                            DynamicDataSourceContextHolder.clearDataSourceType();
                        }
                        testMapper.tjUpdateDetatilByVi(order.getTjNumber());
//                        List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(order.getTjNumber());
//                        if(null !=jcsqdList && !jcsqdList.isEmpty()){
//                            jcsqdService.deletedLtkjJcsqdByTjhAndTmh(order.getCardId());
//                            jcbgdService.deletedLtkjJcbgdByTjhAndTmh(order.getCardId());
//                            jcsqdService.saveBatch(jcsqdList);
//                            List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(order.getCardId());
//                            if(null != jcbgdList && !jcbgdList.isEmpty())jcbgdService.saveBatch(jcbgdList);
//                            DynamicDataSourceContextHolder.clearDataSourceType();
//                        }
                        String tjNumber1 = order.getTjNumber();
                        log.info("查询出来的体检号是: " + tjNumber1);
                        log.info("传过来的的体检号是: "+tjNumber);
                        Map<String,Object> map=new HashMap<>();
                        map.put("tjnum",tjNumber);
                        testMapper.tjUpdateDetatilByVi(map);
                    }else {
                        //化验
                        testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                    }
                    //化验
                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                    //检查
                  //检查
                    return AjaxResult.success("同步成功");
                }
                return AjaxResult.error("未查到该人员体检记录");
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1161,7 +1161,7 @@
                addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser,null);
            }
//            pacsApiMethodService.OrderAdd(tjCustomer,tjOrder);
            return AjaxResult.success(tjNumber);
        }
        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -412,7 +412,7 @@
            TjReport tjReport = new TjReport();
            tjReport.setTjNumber(String.valueOf(tjNumber));
            tjReport.setPath(urlValue + outputFileName1);
            String outputPath1 = value + "\\";
            String outputPath1 = value + File.separator;
            String pdfBinary = getPDFBinary(outputPath1 + outputFileName1);
            tjReport.setReport(pdfBinary);
            tjReport.setType("体检报告");
@@ -696,7 +696,7 @@
                    System.out.println("文件保存前耗时:" + (fujianEnd - pdfMkStart));
                    // 保存pdf文件
                    copy.close();
                    String outputPath1 = value + "\\";
                    String outputPath1 = value + File.separator;
                    String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "new_体检报告.pdf";
                    File file = new File(outputPath1 + outputFileName1);
                    BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(file));
@@ -1022,7 +1022,7 @@
                String template = reportTemplate.getTemplate();
                String userId = SecurityUtils.getLoginUser().getUsername();
                if (template != null) {
                    PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + "\\" + userId + "体检报告封面模板.pdf");
                    PDFBinaryUtil.base64StringToPDF(template, FileUtil.mkdir(value).getPath() + File.separator + userId + "体检报告封面模板.pdf");
                }
                // --------以上-------  根据数据库中的模板二进制文件  转pdf  创建文件夹  将pdf放进本地文件夹
@@ -1045,8 +1045,8 @@
                    tjOrderDetail.setProject(tjProject);
                }
                String inputFileName = value + "\\" + userId + "体检报告封面模板.pdf";
                String outputFileName = value + "\\" + userId + "体检报告封面页.pdf";
                String inputFileName = value + File.separator + userId + "体检报告封面模板.pdf";
                String outputFileName = value + File.separator + userId + "体检报告封面页.pdf";
                OutputStream os = null;
                PdfStamper ps = null;
                PdfReader reader = null;
@@ -1169,7 +1169,7 @@
                    //设置文档的页边距就是距离页面边上的距离,分别为:左边距,右边距,上边距,下边距
                    document.setMargins(70, 70, 40, 40);
                    //生成pdf的位置以及名称
                    String fileName = value + "\\" + userId + tjNumber + "体检报告项目详情页.pdf";
                    String fileName = value + File.separator + userId + tjNumber + "体检报告项目详情页.pdf";
                    OutputStream outputStream = Files.newOutputStream(Paths.get(fileName));
                    PdfWriter pdfWriter = PdfWriter.getInstance(document, outputStream);
@@ -1336,7 +1336,7 @@
//                    TjReport one11111 = tjReportService.getOne(rtwq1);
//                    if(null !=one11111){
//                        String report1 = one11111.getReport();
//                        PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + "\\" + userId + "医学名词.pdf");
//                        PDFBinaryUtil.base64StringToPDF(report1, FileUtil.mkdir(value).getPath() + File.separator + userId + "医学名词.pdf");
//                    }
                    LambdaQueryWrapper<TjReport> rtwq = new LambdaQueryWrapper<>();
@@ -1345,7 +1345,7 @@
                    TjReport one1111 = tjReportService.getOne(rtwq);
                    if (null != one1111) {
                        String report = one1111.getReport();
                        PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + "\\" + tjNumber + userId + "心电图.pdf");
                        PDFBinaryUtil.base64StringToPDF(report, FileUtil.mkdir(value).getPath() + File.separator + tjNumber + userId + "心电图.pdf");
                    }
                    LambdaQueryWrapper<TjReport> rtwq12 = new LambdaQueryWrapper<>();
@@ -1354,27 +1354,27 @@
                    TjReport one111112 = tjReportService.getOne(rtwq12);
                    if (null != one111112) {
                        String report12 = one111112.getReport();
                        PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + "\\" + tjNumber + userId + "附件.pdf");
                        PDFBinaryUtil.base64StringToPDF(report12, FileUtil.mkdir(value).getPath() + File.separator + tjNumber + userId + "附件.pdf");
                    }
                    //合并
                    String[] files1 = null;
                    if (one1111 != null) {
                        if (one111112 != null) {
                            files1 = new String[]{value + "\\" + userId + "体检报告封面页.pdf", value + "\\" + userId + tjNumber + "体检报告项目详情页.pdf", value + "\\" + tjNumber + userId + "附件.pdf", value + "\\" + tjNumber + userId + "心电图.pdf"};
                            files1 = new String[]{value + File.separator + userId + "体检报告封面页.pdf", value + File.separator + userId + tjNumber + "体检报告项目详情页.pdf", value + File.separator + tjNumber + userId + "附件.pdf", value + File.separator + tjNumber + userId + "心电图.pdf"};
                        } else {
                            files1 = new String[]{value + "\\" + userId + "体检报告封面页.pdf", value + "\\" + userId + tjNumber + "体检报告项目详情页.pdf", value + "\\" + tjNumber + userId + "心电图.pdf"};
                            files1 = new String[]{value + File.separator + userId + "体检报告封面页.pdf", value + File.separator + userId + tjNumber + "体检报告项目详情页.pdf", value + File.separator + tjNumber + userId + "心电图.pdf"};
                        }
                    } else {
                        if (one111112 != null) {
                            files1 = new String[]{value + "\\" + userId + "体检报告封面页.pdf", value + "\\" + userId + tjNumber + "体检报告项目详情页.pdf", value + "\\" + tjNumber + userId + "附件.pdf"};
                            files1 = new String[]{value + File.separator + userId + "体检报告封面页.pdf", value + File.separator + userId + tjNumber + "体检报告项目详情页.pdf", value + File.separator + tjNumber + userId + "附件.pdf"};
                        } else {
                            files1 = new String[]{value + "\\" + userId + "体检报告封面页.pdf", value + "\\" + userId + tjNumber + "体检报告项目详情页.pdf"};
                            files1 = new String[]{value + File.separator + userId + "体检报告封面页.pdf", value + File.separator + userId + tjNumber + "体检报告项目详情页.pdf"};
                        }
                    }
                    //合并
//                    String[] files1 = {value + "\\" + userId + "体检报告封面页.pdf", value + "\\" + userId + tjNumber+"体检报告项目详情页.pdf", value + "\\" +tjNumber+ userId + "附件.pdf", value + "\\" + tjNumber + userId + "心电图.pdf"};
                    String outputPath1 = value + "\\";
//                    String[] files1 = {value + File.separator + userId + "体检报告封面页.pdf", value + File.separator + userId + tjNumber+"体检报告项目详情页.pdf", value + File.separator +tjNumber+ userId + "附件.pdf", value + File.separator + tjNumber + userId + "心电图.pdf"};
                    String outputPath1 = value + File.separator;
                    String outputFileName1 = userId + tjNumber + tjCustomer.getCusName() + "_体检报告.pdf";
                    File file1 = new File(outputPath1 + outputFileName1);
@@ -1393,11 +1393,11 @@
                    tjReport.setPrint("pdf");
                    tjReportService.save(tjReport);
                    //FileUtil.del(value + "\\" + tjNumber + "体检报告.pdf");
                    //FileUtil.del(value + "\\" + userId + "体检报告封面模板.pdf");
                    //FileUtil.del(value + "\\" + userId +tjNumber+ "体检报告项目详情页.pdf");
                    //FileUtil.del(value + "\\" + userId + "体检报告封面页.pdf");
                    //FileUtil.del(value + "\\" + userId + "心电图.pdf");
                    //FileUtil.del(value + File.separator + tjNumber + "体检报告.pdf");
                    //FileUtil.del(value + File.separator + userId + "体检报告封面模板.pdf");
                    //FileUtil.del(value + File.separator + userId +tjNumber+ "体检报告项目详情页.pdf");
                    //FileUtil.del(value + File.separator + userId + "体检报告封面页.pdf");
                    //FileUtil.del(value + File.separator + userId + "心电图.pdf");
                    //修改order表中的打印报告时间为当前时间
@@ -1723,9 +1723,9 @@
        }
        String userId = SecurityUtils.getLoginUser().getUsername();
        PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + "\\" + userId + tjNumber + tjCustomer.getCusName() + "_体检报告.pdf");
        PDFBinaryUtil.base64StringToPDF(one.getReport(), FileUtil.mkdir(value).getPath() + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_体检报告.pdf");
        //String filePath = one.getPath();
        String filePath = value + "\\" + userId + tjNumber + tjCustomer.getCusName() + "_体检报告.pdf";
        String filePath = value + File.separator + userId + tjNumber + tjCustomer.getCusName() + "_体检报告.pdf";
        File f = new File(filePath);
        if (filePath.isEmpty()) {
            System.out.println("文件不存在!");
ltkj-admin/src/main/resources/application-linux-test.yml
@@ -21,7 +21,7 @@
# 开发环境配置
server:
  # 服务器的HTTP端口,默认为8080
  port: 5001
  port: 5002
  servlet:
    # 应用的访问路径
    context-path: /ltkj-admin
@@ -189,13 +189,13 @@
#  体检报告模板和报告临时生成存储的文件夹路径
path:
  filePath: D:\Tjreport
  filePath: /ltkj/Tjreport
  # nginx图片服务器
  reportServer: https://ltpeis.xaltjdkj.cn:5516/
#  体检套餐和轮播图存储路径
photoPath: D:\AppPhoto\uploadPath\
photoPath: /ltkj/uploadPath/
# nginx图片服务器
#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
photoServer: http://192.168.0.5:5502/uploadPath/
@@ -231,7 +231,7 @@
jimu:
  #  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
  #  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
  path: http://192.168.0.5:5001/ltkj-admin
  path: http://192.168.0.5:5000/ltkj-admin
#   path: http://10.168.0.9:5011
#   path: http://192.168.0.105:5011
#  path: http://192.168.1.113:5011
@@ -251,5 +251,5 @@
#  username = root
#  password = Root_ltkj123
config:
  properties: /Users/chacca/开发相关/代码/ltkj_peis/ltkj-admin/src/main/resources/config-test.properties
  path: /Users/chacca/开发相关/代码/ltkj_peis/ltkj-admin/src/main/resources
  properties: /ltkj/ltkjprojectconf/csconfig.properties
  path: /ltkj/ltkjprojectconf
ltkj-admin/src/main/resources/application.yml
@@ -3,6 +3,7 @@
#prod 泾川县部署正式环境使用(小程序端也可使用)
#test 泾川县部署测试环境使用
#  linux-prod
#  linux-test
spring:
  profiles:
    active: dev
ltkj-admin/src/test/java/zwxTest.java
@@ -1,6 +1,7 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.XmlUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -276,6 +277,16 @@
    }
    public static void main(String[] args) {
        String list = "<List>";
        for (int i = 0; i < 2; i++) {
            HashMap<String, Object> map = new HashMap<>();
            map.put("index",RandomUtil.randomInt(1,10));
            list+=XmlUtil.mapToXmlStr(map).replace("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
                    .replace("<xml>","").replace("</xml>","");
        }
        list+="</List>";
        HashMap<String, Object> map = new HashMap<>();
        map.put("Root",list);
        System.out.println(XmlUtil.mapToXmlStr(map).replaceAll("&lt;","<").replaceAll("&gt;",">"));
    }
}
ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
@@ -215,9 +215,8 @@
            Properties properties = new Properties();
            // 这里是测试写法,具体的value可以通过请求参数传递过来
            properties.setProperty("druid.enabled",props.getProperty("pacsenabled"));
            properties.setProperty("druid.driverClassName","com.microsoft.sqlserver.jdbc.SQLServerDriver");
            properties.setProperty("druid.url","jdbc:sqlserver://"+props.getProperty("pacsip")+":"+props.getProperty("pacsprot")+";DatabaseName="+props.getProperty("pacsname")+
                    ";&characterEncoding=utf8");
            properties.setProperty("druid.driverClassName","oracle.jdbc.OracleDriver");
            properties.setProperty("druid.url","jdbc:oracle:thin:@//"+props.getProperty("pacsip")+"/"+props.getProperty("pacsname"));
            properties.setProperty("druid.username",props.getProperty("pacsusername"));
            properties.setProperty("druid.password",props.getProperty("pacspassword"));
            dataSource.restart(properties);
ltkj-framework/src/main/java/com/ltkj/framework/config/SecurityConfig.java
@@ -110,7 +110,7 @@
                // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                .antMatchers("/login", "/register", "/captchaImage","/cus/**","/getCaptchaConfigKey","/report/jmreport/**",
                        "/sqlserver/getdata/**","/api/His/**","/system/config/zx","/system/config/gxxmpym","/system/report/savePdf",
                        "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi").permitAll()
                        "/system/dyjl/saveGjddyjl","/system/dyjl/saveBlGjddyjl","/check/ceshi","/check/pacs").permitAll()
                .antMatchers("/common/uploadImgExe","/common/listExeVal","/pacs/InvokeRisService/**").permitAll()
                .antMatchers("/check/dataSynchronizationApi").permitAll()
                // 静态资源,可匿名访问
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -84,8 +84,8 @@
                                   @Param("dockerId")String dockerId);
    @DataSource(value = DataSourceType.MASTER)
    @Select("call tj_update_detatil_by_vi(#{tjnum,mode=IN}")
    public void tjUpdateDetatilByVi(@Param("tjnum")String tjnum);
//    @Select("call tj_update_detatil_by_vi(#{tjnum,mode=IN}")
    public void tjUpdateDetatilByVi(Map<String,Object> map);
@@ -284,4 +284,50 @@
            "WHERE b.HOSPITALID='chkwyy' AND b.PATIENTTYPE=3 AND\n" +
            "  a.SAMPLEID = #{tmh}")
    List<LtkjHybgd> getCcXZxYyLtkjHybgdByLisVi(String tmh);
    @DataSource(value = DataSourceType.SLAVE_PACS)
    @Select("SELECT * FROM ris.V_TJ_JCBGXX_NEWTJ")
    List<Map<String, Object>> getCcXZxYyPacsJgSt();
    @DataSource(value = DataSourceType.SLAVE_PACS)
    @Select("SELECT\n" +
            "  a.HIS_ID tjh,\n" +
            "  a.HIS_ID tmh,\n" +
            "  a.JCLX jclx,\n" +
            "  NULL jczlx,\n" +
            "  a.BGYS bgys,\n" +
            "  NULL bgysid,\n" +
            "  a.SQRJ sqsj,\n" +
            "  a.BGSJ jgsj,\n" +
            "  a.JCMC jcxmmc,\n" +
            "  a.JCMCID jcxmid,\n" +
            "  a.JCBW bw,\n" +
            "  a.JCJL jgzt,\n" +
            "  a.JCSJ jgbx\n" +
            "   \n" +
            "FROM\n" +
            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE a.HIS_ID=#{tjNum}")
    List<LtkjExamJcsqd> getCcXZxYyPacsLtkjExamJcsqd(String tjNum);
    @DataSource(value = DataSourceType.SLAVE_PACS)
    @Select(" SELECT\n" +
            "  a.HIS_ID tjh,\n" +
            "  a.HIS_ID tmh,\n" +
            "  a.JCMCID xmdm,\n" +
            "  a.JCMC xmmc,\n" +
            "  NULL bg_mig,\n" +
            "  NULL bg_url,\n" +
            "  a.JCSJ bg_nr,\n" +
            "  a.SHYS shysdm,\n" +
            "  a.SHYS shysxm,\n" +
            "  a.JCJL yxbx,\n" +
            "  a.BGSJ zdsj,\n" +
            "  a.SQRJ sqsj,\n" +
            "  a.JCBW jcbw\n" +
            "FROM\n" +
            "  ris.V_TJ_JCBGXX_NEWTJ a  WHERE a.HIS_ID=#{tjNum}")
    List<LtkjExamJcbgd> getCcXZxYyPacsLtkjExamJcbgd(String tjNum);
}
ltkj-hosp/src/main/resources/mapper/TestMapper.xml
New file
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ltkj.hosp.mapper.TestMapper">
    <select id="tjUpdateDetatilByVi" parameterType="java.util.Map"  statementType="CALLABLE">
        {call tj_update_detatil_by_vi(
                #{tjNumber,mode=IN,jdbcType=VARCHAR}
              )}
    </select>
</mapper>