From 3c4c9d16fbe7f36203f4a6ad5f3726e4cca48663 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 12 十二月 2024 00:09:01 +0800
Subject: [PATCH] 2024-12-12
---
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java | 2 +-
ltkj-hosp/src/main/resources/mapper/hosp/TjRulesMapper.xml | 2 +-
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 32 +++++++++++++++++++++-----------
ltkj-admin/src/test/java/zwxTest.java | 14 ++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java | 9 +++++++++
5 files changed, 46 insertions(+), 13 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index ad4efb3..145f86b 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/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);
}
diff --git a/ltkj-admin/src/test/java/zwxTest.java b/ltkj-admin/src/test/java/zwxTest.java
index 0c5073d..32844d9 100644
--- a/ltkj-admin/src/test/java/zwxTest.java
+++ b/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) 鍙岃偩杈撳翱绠¤唨鑳盉瓒咃細\n" +
+ " 鑲濊剰銆佽儐鍥娿�佽儼鑵恒�佽劸鑴忓０鍍忓浘鎵�瑙佹湭瑙佹槑鏄惧紓甯竆n" +
+ " 鍙岃偩銆佽緭灏跨澹板儚鍥炬湭瑙佹槑鏄惧紓甯竆n" +
+ " \n" +
+ " \n" +
+ " \n" +
+ " ";
+
+ str = str.replaceAll("[\\n\\r]+$", ""); // 鍘婚櫎鏈熬鐨勬崲琛岀
+ str = str.replaceAll("\\s+$", ""); // 鍘婚櫎鏈熬鐨勭┖鏍�
+ System.out.println(str);
+ }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
index 5a838b3..2a60f50 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjRulesMapper.java
+++ b/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);
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
index 5c8a400..e2277d9 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjRulesServiceImpl.java
+++ b/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);
}
}
diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjRulesMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjRulesMapper.xml
index 5008a77..783ca08 100644
--- a/ltkj-hosp/src/main/resources/mapper/hosp/TjRulesMapper.xml
+++ b/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},
--
Gitblit v1.8.0