From c42f62b32bac302a7ac9fcde7489f7c5fc6e11aa Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 06 十二月 2024 15:35:17 +0800
Subject: [PATCH] zjh20241205-3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java
index ec53f35..b765b84 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java
+++ b/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);
--
Gitblit v1.8.0