From b83df5a43c563bac919dee41d3a8b794f22f1030 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十二月 2024 19:20:45 +0800
Subject: [PATCH] zjh202412013
---
ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
index cdf9b24..f4da486 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsApiMethodService.java
@@ -255,35 +255,43 @@
if (customer.getCusSex() == 0) patientInfo.put("PatientSex","M");
else if (customer.getCusSex() == 1) patientInfo.put("PatientSex","F");
else patientInfo.put("PatientSex","O");
- patientInfo.put("PatBirthday",customer.getCusBrithday());
+ patientInfo.put("PatBirthday",new SimpleDateFormat("yyyy-MM-dd").format(customer.getCusBrithday()));
patientInfo.put("IdCard",customer.getCusIdcard());
+ patientInfo.put("hospitalid","chkwyy");
- String examItems = "";
+// String examItems = "";
+ HashMap<String, Object> examItem = new HashMap<>();
+ List<Map<String,Object>> list = new ArrayList<>();
String date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
for (TjProject project : projects) {
- HashMap<String, Object> examItem = new HashMap<>();
+ HashMap<String, Object> examItems = new HashMap<>();
// 鐢宠鍗曞彿瑙勫垯锛氫綋妫�鍙穇project.getProId()鍚庡洓浣�
- 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", date);
+ 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", date);
SysDept dept = deptService.getById(project.getDeptId());
- examItem.put("Modality", dept.getModality());
+ examItems.put("Modality", dept.getModality());
// TODO 鏀惰垂鏍囪瘑 1鏄敹璐� 鍜� 0鏈敹璐�
- examItem.put("ChargeFlag","");
- 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("ChargeFlag","");
+// examItems += "<ExamItem>"+
+// XmlUtil.mapToXmlStr(examItem)
+// .replace("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
+//// .replaceAll("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>","")
+// .replace("<xml>","")
+// .replace("</xml>","")
+// +"</ExamItem>";
+ list.add(examItems);
}
+ examItem.put("ExamItem",list);
hashMap.put("PatientInfor",patientInfo);
- hashMap.put("ExamItemList",examItems);
+ hashMap.put("ExamItemList",examItem);
root.put("Root",hashMap);
- String result = HttpRequest.post("").body(XmlUtil.mapToXmlStr(root)).contentType("application/xml;charset:utf-8;").execute().body();
+ String result = HttpRequest.post("http://10.100.100.222:8000/WebInterfaceService.asmx")
+ .body(XmlUtil.mapToXmlStr(root)).contentType("application/xml;charset:utf-8;").execute().body();
+ String s = XmlUtil.mapToXmlStr(root);
+ log.info("璋冪敤pacs浼犻�掑弬鏁扮殑鍊间负: "+s);
Map<String, Object> map = XmlUtil.xmlToMap(result);
if (map.get("Code").toString().equals("1")){
for (TjProject project : projects) {
--
Gitblit v1.8.0