From 0f710b61d2a0949184b47acee276f6181cfeac39 Mon Sep 17 00:00:00 2001
From: wyb <1977763549@qq.com>
Date: Tue, 1 Apr 2025 16:52:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A4=E6=96=AD=E5=87=BA=E9=99=A2?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/collector/LisSystemCollector.java | 56 ++++++++++++++++++-
 1 file changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/docus/server/collect/collector/LisSystemCollector.java b/src/main/java/com/docus/server/collect/collector/LisSystemCollector.java
index b409e7c..2a8d33c 100644
--- a/src/main/java/com/docus/server/collect/collector/LisSystemCollector.java
+++ b/src/main/java/com/docus/server/collect/collector/LisSystemCollector.java
@@ -88,16 +88,16 @@ public class LisSystemCollector {
      */
     public void sealCollect(TSeal tSeal, TBasic tBasic) {
         Date admissDate = tSeal.getAdmissDate();
-        String disDateStr = Objects.isNull(tBasic)?null:tBasic.getDisDate();
+        String disDateStr = (Objects.isNull(tBasic) || Func.isBlank(tBasic.getDisDate())) ? null : tBasic.getDisDate();
         String jzh = tSeal.getJzh();
-        if(Objects.isNull(admissDate)){
+        if (Objects.isNull(admissDate)) {
             log.error("封存病案采集失败，patientId:{} 患者住院时间为空！", tSeal.getPatientId());
             return;
         }
         // 报告的开始和结束时间就是入院时间 和 出院时间+15天(没有就取现在时间)
         String beginDateTime = Func.formatDateTime(admissDate);
         String endDateTime = Func.formatDateTime(new Date());
-        if(Func.isNotBlank(tBasic.getDisDate())){
+        if (Func.isNotBlank(disDateStr)) {
             LocalDateTime endLocalDateTime = Func.parseDateTime(disDateStr).plusDays(15L);
             endDateTime = Func.formatDateTime(endLocalDateTime);
         }
@@ -281,6 +281,56 @@ public class LisSystemCollector {
         return new Object[]{param1};
     }
 
+    public static void main(String[] args) {
+        String param1 = "<ESBEntry>" +
+                "    <AccessControl>" +
+                "        <SysFlag>1</SysFlag>" +
+                "        <UserName>WZHBAGL</UserName>" +
+                "        <Password>WZHBAGL_1127</Password>" +
+                "        <Fid>BS03102</Fid>" +
+                "        <OrderNo>BS03102S51001</OrderNo>" +
+                "        <SUBOR_HOSPITAL_DISTRICT>GZ</SUBOR_HOSPITAL_DISTRICT>" +
+                "    </AccessControl>" +
+                "    <MessageHeader>" +
+                "        <Fid>BS03102</Fid>" +
+                "        <OrderNo>BS03102S51001</OrderNo>" +
+                "        <SourceSysCode>S51</SourceSysCode>" +
+                "        <TargetSysCode>S00</TargetSysCode>" +
+                "        <MsgDate>" + "2025-03-14 00:50:29" + "</MsgDate>" +
+                "    </MessageHeader>" +
+                "    <RequestOption>" +
+                "        <triggerData>0</triggerData>" +
+                "        <dataAmount>500</dataAmount>" +
+                "    </RequestOption>" +
+                "    <MsgInfo  flag=\"1\">" +
+                "        <Msg/>" +
+                "        <distinct  value=\"0\"/>" +
+                "        <query  item=\"WS_INPUT\" compy=\" = \" value=\" 1 \" splice=\"AND\"/>" +
+                "        <query_ws  action=\"Q_WS_JYBGLBCX\">" +
+                "            <content>" +
+                "                <Request>" +
+                "                    <Msg>" +
+                "                        <VUID/>" +
+                "                        <OUTHOSP_INDEX_NO/>" +
+                "                        <OUTHOSP_NO/>" +
+                "                        <INHOSP_INDEX_NO/>" +
+                "                        <INHOSP_NO>" + "17762804477" + "</INHOSP_NO>" +
+                "                        <EMPI_ID/>" +
+                "                        <TEST_PAT_SOURCE_CODE/>" +
+                "                        <MICROBE_TEST_FLAG>" + 0 + "</MICROBE_TEST_FLAG>" +
+                "                        <BEGIN_DATETIME>" + "2025-01-21 12:10:54" + "</BEGIN_DATETIME>" +
+                "                        <END_DATETIME>" + "2025-03-14 10:00:00" + "</END_DATETIME>" +
+                "                    </Msg>" +
+                "                </Request>" +
+                "            </content>" +
+                "        </query_ws>" +
+                "    </MsgInfo>" +
+                "    <GroupInfo  flag=\"0\">" +
+                "        <AS  ID=\"\" linkField=\"\"/>" +
+                "    </GroupInfo>" +
+                "</ESBEntry>";
+        System.out.println(param1);
+    }
 
     public static class LisSystemCollectConverter {