Generate message timestamp as slightly after the observation timestamp

SAFEHR-data · Aug 21, 2024 · fd45fed · fd45fed
1 parent ceafdae
commit fd45fed
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/...ator/src/main/java/uk/ac/ucl/rits/inform/datasources/waveform_generator/Hl7Generator.java b/...ator/src/main/java/uk/ac/ucl/rits/inform/datasources/waveform_generator/Hl7Generator.java
@@ -20,6 +20,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 import java.util.stream.Collectors;
 
 @Component
@@ -107,23 +108,25 @@ private String applyHl7Template(long samplingRate, String locationId, Instant ob
                                     String messageId, List<ImmutablePair<String, List<Double>>> valuesByStreamId) {
         // lines in HL7 messages must be CR terminated
         final String templateStr = """
-                MSH|^~\\&|DATACAPTOR||||20240731142108.741+0100||ORU^R01|${messageId}|P|2.3||||||UNICODE UTF-8|\r\
+                MSH|^~\\&|DATACAPTOR||||${messageDatetime}||ORU^R01|${messageId}|P|2.3||||||UNICODE UTF-8|\r\
                 PID|\r\
                 PV1||I|${locationId}|\r\
-                OBR|||||||${obsTimeStr}|||${locationId}|||${locationId}|\r\
+                OBR|||||||${obsDatetime}|||${locationId}|||${locationId}|\r\
                 """;
         final String obxTemplate = """
-                OBX|${obxI}|${dataType}|${streamId}||${valuesAsStr}||||||F||20|${obsTimeStr}|\r\
+                OBX|${obxI}|${dataType}|${streamId}||${valuesAsStr}||||||F||20|${obsDatetime}|\r\
                 """;
         ZoneId hospitalTimezone = ZoneId.of("Europe/London");
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss.SSSZZ");
-        // XXX: where to get message timestamp from? Just add a random bit maybe?
-        // Will sampling rate have to be inferred at the other end? It's in the coding table I think...
-        // message Id I think shouldn't be created here
-        String obsTimeStr = formatter.format(observationDatetime.atZone(hospitalTimezone));
+        String obsDatetime = formatter.format(observationDatetime.atZone(hospitalTimezone));
+        // go for something vaguely realistic
+        int milliSecondDelay = new Random().nextInt(50, 150);
+        Instant messageDatetime = observationDatetime.plusMillis(milliSecondDelay);
+        String messageDatetimeStr = formatter.format(messageDatetime.atZone(hospitalTimezone));
         Map<String, String> parameters = new HashMap<>();
         parameters.put("locationId", locationId);
-        parameters.put("obsTimeStr", obsTimeStr);
+        parameters.put("obsDatetime", obsDatetime);
+        parameters.put("messageDatetime", messageDatetimeStr);
         parameters.put("messageId", messageId);
 
         StringSubstitutor stringSubstitutor = new StringSubstitutor(parameters);