zjh20250120

zjh

2025-01-20 86c2fdbef4ed64b5f38adb23fe8b54b79054550b

zjh20250120

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

@@ -1156,8 +1156,8 @@
                        }
                        String str = "     ";
                        List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"",
                                detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("\\（[^\\）]*\\）", "")
                                        .replaceAll("[ 测定]",""),detail.getProResult());
                                detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                        .replaceAll("[ 测定检测]",""),detail.getProResult());
                        if(detail.getDeptId().equals("2")){
                            String[] split = result.split("。");
                            for (String s : split) {
@@ -1224,8 +1224,8 @@
//                        }
                            String str = "    ";
                            List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(i.get(5),"",
                                    i.get(2),tjOrder.getTjNumber(),i.get(0).replaceAll("\\（[^\\）]*\\）", "")
                                            .replaceAll("[ 测定]",""),i.get(1));
                                    i.get(2),tjOrder.getTjNumber(),i.get(0).replaceAll("[（(][^）)]*[）)]", "")
                                            .replaceAll("[ 测定检测]",""),i.get(1));
                            if (!maps.isEmpty()){
                                for (Map<String, Object> objectMap : maps) {
//                                paragraph = new Paragraph(str+"建议标题",defaultFont);

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

@@ -1662,8 +1662,8 @@
                                if(!tjOrderDetail.getDeptId().equals("2")){
                                    List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
                                            ,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
                                            ,tjOrderDetail.getProName().replaceAll("\\（[^\\）]*\\）", "")
                                                    .replaceAll("[ 测定]","")
                                            ,tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]","")
                                            ,tjOrderDetail.getProResult());
                                    if(null !=maps && !maps.isEmpty()){
                                        tjOrderDetail.setAdvices(maps);

 ltkj-admin/src/main/resources/application.yml

@@ -6,6 +6,9 @@
#  linux-test
#  linux-mjprod
#  linux-mjtest
#  win-xamjyyprod
#  win-chkwyyprod
#  win-pbkwyyprod
# 陕健医澄合矿务局中心医院正式 5001
# 陕健医澄合矿务局中心医院测试 5002
# 陕西西安煤机医院正式 5003

 ltkj-hosp/src/main/resources/mapper/hosp/TjProAdvicerulesMapper.xml

@@ -39,7 +39,7 @@
                            and bm like concat('%', #{bm}, '%')
                        </if>
                        <if test="ks != null  and ks != ''">
                            and ks = #{ks}
                            and ks like concat('%', #{ks}, '%')
                        </if>
                        <if test="jcxm != null  and jcxm != ''">
                            and jcxm like concat('%', #{jcxm}, '%')