From 6a7389dea30ef63c60b2cfdb93474092acbede3f Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 21 一月 2025 15:16:34 +0800
Subject: [PATCH] zjh20250121
---
ltkj-admin/src/test/java/zjhTest.java | 10 +++++++---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 21 ++++++++-------------
ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java | 2 +-
3 files changed, 16 insertions(+), 17 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 439aa17..6c3d023 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
@@ -1136,9 +1136,9 @@
builder.append(" (").append(index1).append(")").append(s).append("\n");
index1++;
}
- if (!contains) builder.append(" (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
+// if (!contains) builder.append(" (").append(index1).append(")").append("鏈姤鍛婁粎瀵规湰娆℃鏌ヨ礋璐ｏ紝涓村簥鍖荤敓渚濇嵁鐥呮儏濡傛湁鐤戦棶锛岃鍙婃椂澶嶆煡鎴栬繘涓�姝ユ鏌�");
// if (!contains) builder.append(" (").append(index1).append(")").append(" ");
- else builder.substring(0,builder.length() - 1);
+// else builder.substring(0,builder.length() - 1);
result = builder.toString();
}
// String content = " (" + index + ") " + detail.getProName() + "锛�" + result;
@@ -1155,12 +1155,14 @@
document2.add(paragraph);
}
String str = " ";
- List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"",
- detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
- .replaceAll("[ 娴嬪畾妫�娴媇",""),detail.getProResult());
+// List<Map<String, Object>> maps = tjRulesService.getyichangxiangmujianyiguize(entry.getKey().toString(),"",
+// detail.getYcbz(),tjOrder.getTjNumber(),detail.getProName().replaceAll("[锛�(][^锛�)]*[锛�)]", "")
+// .replaceAll("[ 娴嬪畾妫�娴媇",""),detail.getProResult());
+ List<Map<String, Object>> maps =new ArrayList<>();
if(detail.getDeptId().equals("2")){
- String[] split = result.split("銆�");
+ String[] split = result.split("銆倈,|锛�");
for (String s : split) {
+ s = s.replaceAll("\n", "").replaceAll("[锛�(][^锛�)]*[锛�)]", "");
// Map<String,Object> mapss= tjRulesService.getyichangxiangmujianyiguizeJianCha(s);
Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(detail.getKs(),s,"0");
if(null !=mapss){
@@ -1272,17 +1274,10 @@
}
}
}
-
-
-
-
-
-
for (int i = 0; i < 1; i++) {
paragraph = PdfUtils.setParagraph(defaultFont, "");
document2.add(paragraph);
}
-
paragraph = PdfUtils.setParagraph(defaultTitleFont, "鎬绘鍖荤敓寤鸿锛�");
document2.add(paragraph);
if (tjOrder.getCheckAdvice() == null) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
index c202786..ea472c0 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
@@ -489,7 +489,7 @@
public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) {
try {
String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
- String[] split = useLisAndPacsRegisterDictTeam.split(",");
+ String[] split = useLisAndPacsRegisterDictTeam.split(",|锛寍銆倈锛殀:");
List<String> list = Arrays.asList(split);
return list.contains(tjOrder.getTjType());
} catch (Exception e) {
diff --git a/ltkj-admin/src/test/java/zjhTest.java b/ltkj-admin/src/test/java/zjhTest.java
index 24ea44f..54c1c95 100644
--- a/ltkj-admin/src/test/java/zjhTest.java
+++ b/ltkj-admin/src/test/java/zjhTest.java
@@ -125,9 +125,13 @@
public static void main(String[] args) {
- BigDecimal ordPrice =new BigDecimal("13.05");
- BigDecimal multiply = ordPrice.multiply((new BigDecimal("6.5").divide(BigDecimal.valueOf(10))));
- System.out.println(multiply);
+// BigDecimal ordPrice =new BigDecimal("13.05");
+// BigDecimal multiply = ordPrice.multiply((new BigDecimal("6.5").divide(BigDecimal.valueOf(10))));
+// System.out.println(multiply);
+
+ String a="鎶楃敳鐘惰吅鐞冭泲鐧芥姉浣擄紙TGAb锛夋娴�,1111锛�2222銆�33333锛�555555:666666";
+ String[] split = a.split(",|锛寍銆倈锛殀:");
+ System.out.println(split);
}
--
Gitblit v1.8.0