From 1b7ed7edb09aaecf68ddf3396ee007bc6eadf52a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 30 十二月 2024 17:04:09 +0800
Subject: [PATCH] zjh202412030

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/pacs/PacsServiceController.java |   56 ++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 34 insertions(+), 22 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..f004e04 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
@@ -17,10 +17,7 @@
 import com.sun.org.apache.xpath.internal.operations.Bool;
 import jodd.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.security.PrivateKey;
 import java.text.SimpleDateFormat;
@@ -58,6 +55,8 @@
     private LtkjExamJcsqdService ltkjExamJcsqdService;
     @Autowired
     private LtkjExamJcbgdService ltkjExamJcbgdService;
+    @Autowired
+    private PacsApiMethodService pacsApiMethodService;
 
     //    浣撴寮�妫�鏌ョ敵璇峰崟璋冪敤姝ゆ帴鍙ｆ帹閫佺粰pacs鏈嶅姟
     public boolean OrderAdd(String tjNumber)
@@ -232,7 +231,7 @@
         return XmlUtil.mapToXmlStr(hashMap);
     }
 
-    //@PostMapping("QueryOrder")
+//    @PostMapping("QueryOrder")
     private String queryOrder(@RequestBody String json){
         Map<String, Object> map = XmlUtil.xmlToMap(json);
         JSONObject parseObj = JSONUtil.parseObj(map);
@@ -287,26 +286,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);
@@ -377,4 +379,14 @@
         return XmlUtil.mapToXmlStr(hashMap)
                 .replaceAll("&lt;","<").replaceAll("&gt;",">");
     }
+
+    @GetMapping("test")
+    public String test(){
+        TjCustomer tjCustomer = customerService.getById(1870373229901938690L);
+        LambdaQueryWrapper<TjOrder> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(TjOrder::getUserId,tjCustomer.getCusId());
+        TjOrder order = tjOrderService.getOne(wrapper);
+        pacsApiMethodService.OrderAdd(tjCustomer,order);
+        return "1111";
+    }
 }

--
Gitblit v1.8.0