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 = "" + + " " + + " 1" + + " WZHBAGL" + + " WZHBAGL_1127" + + " BS03102" + + " BS03102S51001" + + " GZ" + + " " + + " " + + " BS03102" + + " BS03102S51001" + + " S51" + + " S00" + + " " + "2025-03-14 00:50:29" + "" + + " " + + " " + + " 0" + + " 500" + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + "17762804477" + "" + + " " + + " " + + " " + 0 + "" + + " " + "2025-01-21 12:10:54" + "" + + " " + "2025-03-14 10:00:00" + "" + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + " " + + ""; + System.out.println(param1); + } public static class LisSystemCollectConverter {