zhaowenxuan
2024-12-12 3c4c9d16fbe7f36203f4a6ad5f3726e4cca48663
2024-12-12
5个文件已修改
59 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/test/java/zwxTest.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/resources/mapper/hosp/TjRulesMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -366,7 +366,9 @@
            document2.add(paragraph);
        }
        paragraph = PdfUtils.setParagraph(defaultTitleFont, "体检异常项目与分析");
        paragraph = PdfUtils.setParagraph(defaultTitleFont, "检查综述:");
        paragraph.setSpacingBefore(3f);
        paragraph.setSpacingAfter(2f);
        document2.add(paragraph);
        for (Map.Entry<String, Object> item : map.entrySet()) {
            String xmmc = item.getKey();
@@ -398,7 +400,7 @@
//
//                        }
                    String str = "     ";
                        List<Map<String, Object>> maps = tjRulesMapper.getyichangxiangmujianyiguize(i.get(5),null,i.get(2));
                        List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),null,i.get(2),tjOrder.getTjNumber());
                        if (!maps.isEmpty()){
                            for (Map<String, Object> objectMap : maps) {
//                                paragraph = new Paragraph(str+"建议标题",defaultFont);
@@ -427,6 +429,8 @@
                }
            }
            paragraph = PdfUtils.setParagraph(defaultFont, "");
            paragraph.setSpacingBefore(0f);
            paragraph.setSpacingAfter(5f);
            document2.add(paragraph);
        }
@@ -442,25 +446,28 @@
            int index = 1;
            for (TjOrderDetail detail : details) {
                if (!isXmWrite) {
                    paragraph = new Paragraph(xmmc,defaultFont);
                    paragraph = new Paragraph(xmmc, defaultFont);
                    paragraph.setAlignment(Element.ALIGN_LEFT);
                    document2.add(paragraph);
                    isXmWrite = true;
                }
                String result = detail.getProResult();
                if (StrUtil.isNotBlank(result)){
                    result = result.replaceAll("\n本报告仅对本次检查负责,临床医生依据病情如有疑问,请及时复查或进一步检查","");
                    result = "\n      "+result.replaceAll("\n","\n      ");
                if (StrUtil.isNotBlank(result)) {
                    result = result.replaceAll(" ","").replaceAll("\t","");
                    result = result.replaceAll("\n本报告仅对本次检查负责,临床医生依据病情如有疑问,请及时复查或进一步检查", "");
                    result = "\n      " + result.replaceAll("\n", "\n      ");
                }
                String content = "  ("+index + ") " + detail.getProName() + ":" + result;
                paragraph = new Paragraph(content,defaultFont);
                String content = "  (" + index + ") " + detail.getProName() + ":" + result;
                content = content.replaceAll("[\\n\\r]+$", "");
                content = content.replaceAll("\\s+$", "");
                paragraph = new Paragraph(content, defaultFont);
                paragraph.setAlignment(Element.ALIGN_LEFT);
                document2.add(paragraph);
                String str = "     ";
                List<Map<String, Object>> advices = detail.getAdvices();
                if (advices != null && !advices.isEmpty()){
                if (advices != null && !advices.isEmpty()) {
                    for (Map<String, Object> m : advices) {
                        paragraph = new Paragraph(str+m.get("bt").toString()+":"+m.get("nr").toString(),defaultFont);
                        paragraph = new Paragraph(str + m.get("bt").toString() + ":" + m.get("nr").toString(), defaultFont);
                        paragraph.setAlignment(Element.ALIGN_LEFT);
                        document2.add(paragraph);
                    }
@@ -468,6 +475,9 @@
                index++;
            }
            paragraph = PdfUtils.setParagraph(defaultFont, "");
            paragraph.setLeading(0f);
            paragraph.setSpacingBefore(0f);
            paragraph.setSpacingAfter(5f);
            document2.add(paragraph);
        }
@@ -475,7 +485,7 @@
        for (int i = 0; i < 2; i++) {
        for (int i = 0; i < 1; i++) {
            paragraph = PdfUtils.setParagraph(defaultFont, "");
            document2.add(paragraph);
        }
ltkj-admin/src/test/java/zwxTest.java
@@ -107,4 +107,18 @@
            log.error(String.valueOf(e));
        }
    }
    public static void main(String[] args) {
        String str = "  (1) 双肾输尿管膀胱B超:\n" +
                "      肝脏、胆囊、胰腺、脾脏声像图所见未见明显异常\n" +
                "      双肾、输尿管声像图未见明显异常\n" +
                "      \n" +
                "      \n" +
                "      \n" +
                "      ";
        str = str.replaceAll("[\\n\\r]+$", "");  // 去除末尾的换行符
        str = str.replaceAll("\\s+$", "");       // 去除末尾的空格
        System.out.println(str);
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
@@ -79,4 +79,13 @@
//            "         \n" +
//            "            WHERE (b.lis_xmbm= #{xmbm} OR a.pro_id=#{proId}) AND a.sign= #{ycbz}")
    List<Map<String,Object>> getyichangxiangmujianyiguize(Map<String, Object> map);
        @Select("call tj_ycjgjy(\n" +
                "                #{xmbm,mode=IN,jdbcType=VARCHAR},\n" +
                "                #{proId,mode=IN,jdbcType=VARCHAR},\n" +
                "                #{ycbz,mode=IN,jdbcType=VARCHAR},\n" +
                "                #{tjnum,mode=IN,jdbcType=VARCHAR} )")
    List<Map<String,Object>> getyichangxiangmujianyiguize1(@Param("xmbm") String xmbm,@Param("proId")String proId,
                                                           @Param("ycbz")String ycbz,@Param("tjnum")String tjnum);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
@@ -46,6 +46,6 @@
        map.put("proId",proId);
        map.put("ycbz",ycbz);
        map.put("tjnum",tjnum);
        return mapper.getyichangxiangmujianyiguize(map);
        return mapper.getyichangxiangmujianyiguize1(xmbm,proId,ycbz,tjnum);
    }
}
ltkj-hosp/src/main/resources/mapper/hosp/TjRulesMapper.xml
@@ -5,7 +5,7 @@
<mapper namespace="com.ltkj.hosp.mapper.TjRulesMapper">
    <select id="getyichangxiangmujianyiguize" parameterType="java.util.Map"  statementType="CALLABLE" resultType="java.util.Map">
        {call tj_lispacstongbujianyi(
        {call tj_ycjgjy(
                #{xmbm,mode=IN,jdbcType=VARCHAR},
                #{proId,mode=IN,jdbcType=VARCHAR},
                #{ycbz,mode=IN,jdbcType=VARCHAR},