Added support for resource Id with type UUID and OID

src/main/java/io/github/linuxforhealth/hl7/data/DataEnum.java

@@ -0,0 +1,7 @@
+package io.github.linuxforhealth.hl7.data;
+
+public class DataEnum {
+    public enum ResourceIdType {
+        UUID, OID
+    }
+}

src/main/java/io/github/linuxforhealth/hl7/data/Hl7RelatedGeneralUtils.java

@@ -18,6 +18,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.UUID;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.commons.text.StringTokenizer;
@@ -172,6 +173,25 @@ public static String generateResourceId() {
         return nano.toString() + "." + UUID.randomUUID().toString();
     }
 
+    /**
+     * Generates a resource id when provide type.
+     * Format can be urn:uuid:<random-uuid>, urn:oid:<random-int> default is <current nano second>.<random-uuid>
+     */
+    public static String generateResourceId(String type) {
+        if(type == null || type.isEmpty()) {
+            return generateResourceId();
+        }
+        DataEnum.ResourceIdType resourceIdType = DataEnum.ResourceIdType.valueOf(type);
+        switch (resourceIdType) {
+            case UUID:
+                return "urn:uuid:" + UUID.randomUUID();
+            case OID:
+                return "urn:oid:" + (int)(Math.random() * 1000000);
+            default:
+                return generateResourceId();
+        }
+    }
+
     // Special extractor only for use with PV1 records.
     // Extract the admit and discharge time and calculate duration length.
     // Returns null if for any reason the data is not usable, which
@@ -463,6 +483,31 @@ public static String getNarrativeDiv(String text) {
         return String.format(divText, StringEscapeUtils.escapeHtml4(text).replace("~", "<br />"));
     }
 
+    public static Integer getDurationInMinutes(Integer duration, String unit) {
+        if (duration == null) {
+            return null;
+        }
+
+        if (unit == null) {
+            return duration / 60; // Convert seconds to minutes
+        }
+
+        switch (unit.toLowerCase().trim()) {
+            case "":
+            case "s":
+            case "sec":
+                return duration / 60; // Convert seconds to minutes
+            case "h":
+            case "hr":
+                return duration * 60; // Convert hours to minutes
+            case "d":
+            case "day":
+                return duration * 24 * 60; // Convert days to minutes
+            default:
+                return duration; // Assume already in minutes
+        }
+    }
+
     // Private method to split and format the 7 digit local telecom number
     private static String formatLocalNumber(String localNumber) {
         // Split after the 3rd digit, add a space, add the rest of the number

src/main/java/io/github/linuxforhealth/hl7/data/SimpleDataTypeMapper.java

@@ -47,7 +47,8 @@ public enum SimpleDataTypeMapper {
   DIAGNOSTIC_REPORT_STATUS(SimpleDataValueResolver.DIAGNOSTIC_REPORT_STATUS_CODES),
   ARRAY(SimpleDataValueResolver.ARRAY),
   OBSERVATION_STATUS(SimpleDataValueResolver.OBSERVATION_STATUS_CODE_FHIR),
-  SERVICE_REQUEST_STATUS(SimpleDataValueResolver.SERVICE_REQUEST_STATUS), 
+  APPOINTMENT_STATUS_CODE_FHIR(SimpleDataValueResolver.APPOINTMENT_STATUS_CODE_FHIR),
+  SERVICE_REQUEST_STATUS(SimpleDataValueResolver.SERVICE_REQUEST_STATUS),
   RELATIVE_REFERENCE(SimpleDataValueResolver.RELATIVE_REFERENCE),
   MESSAGE_REASON_ENCOUNTER(SimpleDataValueResolver.MESSAGE_REASON_ENCOUNTER),
   SPECIMEN_STATUS(SimpleDataValueResolver.SPECIMEN_STATUS_CODE_FHIR),
@@ -78,7 +79,8 @@ public enum SimpleDataTypeMapper {
   CLEAN_SSN(SimpleDataValueResolver.CLEAN_SSN),
   ENCOUNTER_MODE_ARRIVAL_DISPLAY(SimpleDataValueResolver.ENCOUNTER_MODE_ARRIVAL_DISPLAY),
   CONTACT_POINT_SYSTEM(SimpleDataValueResolver.CONTACT_POINT_SYSTEM),
-  CONTACT_POINT_USE(SimpleDataValueResolver.CONTACT_POINT_USE);
+  CONTACT_POINT_USE(SimpleDataValueResolver.CONTACT_POINT_USE),
+  ALLERGY_INTOLERANCE_SEVERITY(SimpleDataValueResolver.ALLERGY_INTOLERANCE_SEVERITY_CODE_FHIR);
 
   private ValueExtractor<Object, ?> valueResolver;
 

src/main/java/io/github/linuxforhealth/hl7/data/SimpleDataValueResolver.java

@@ -35,6 +35,7 @@
 import org.apache.commons.lang3.math.NumberUtils;
 import org.hl7.fhir.dstu3.model.codesystems.MedicationRequestCategory;
 import org.hl7.fhir.exceptions.FHIRException;
+import org.hl7.fhir.r4.model.AllergyIntolerance;
 import org.hl7.fhir.r4.model.AllergyIntolerance.AllergyIntoleranceCategory;
 import org.hl7.fhir.r4.model.AllergyIntolerance.AllergyIntoleranceCriticality;
 import org.hl7.fhir.r4.model.DiagnosticReport.DiagnosticReportStatus;
@@ -44,6 +45,7 @@
 import org.hl7.fhir.r4.model.ServiceRequest.ServiceRequestStatus;
 import org.hl7.fhir.r4.model.Specimen.SpecimenStatus;
 
+import org.hl7.fhir.r4.model.codesystems.Appointmentstatus;
 import org.hl7.fhir.r4.model.codesystems.V3ActCode;
 import org.hl7.fhir.r4.model.codesystems.V3MaritalStatus;
 import org.hl7.fhir.r4.model.codesystems.ConditionCategory;
@@ -209,6 +211,12 @@ public class SimpleDataValueResolver {
         return getFHIRCode(val, ObservationStatus.class);
     };
 
+
+    public static final ValueExtractor<Object, String> APPOINTMENT_STATUS_CODE_FHIR = (Object value) -> {
+        String val = Hl7DataHandlerUtil.getStringValue(value);
+        return getFHIRCode(val, Appointmentstatus.class);
+    };
+
     // Handlers for searching Immunization.education siblings.
     public static final ValueExtractor<Object, String> FIND_EDUCATION_REFERENCE_TEXT = (Object value) -> {
         return getSelectedSiblingObservationTEXTfromObxGroup(value, "30956-7");
@@ -942,4 +950,9 @@ public static String getFHIRCode(String hl7Value, String fhirMappingConceptName)
         }
         return null;
     };
+
+    public static final ValueExtractor<Object, String> ALLERGY_INTOLERANCE_SEVERITY_CODE_FHIR = (Object value) -> {
+        String val = Hl7DataHandlerUtil.getStringValue(value);
+       return getFHIRCode(val, AllergyIntolerance.AllergyIntoleranceSeverity.class);
+    };
 }

src/main/resources/hl7/codesystem/v2ToFhirMapping.yml

@@ -572,4 +572,21 @@ ContactPointUse:
   VHN: home
   NET: home
   WPN: work
-  PRS: mobile
+  PRS: mobile
+Appointmentstatus:
+  PROPOSED: proposed
+  PENDING: pending
+  WAITLIST: waitlist
+  BOOKED: booked
+  STARTED: checked-in
+  COMPLETE: fulfilled
+  CANCELLED: cancelled
+  DC: cancelled
+  DISCONTINUED: cancelled
+  DELETED: entered-in-error
+  OVERBOOK: booked
+  NOSHOW: noshow
+AllergyIntoleranceSeverity:
+  MI: mild
+  MO: moderate
+  SV: severe

src/test/java/io/github/linuxforhealth/hl7/data/Hl7RelatedGeneralUtilsTest.java

@@ -9,10 +9,14 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+
 import com.google.common.collect.Lists;
 
 import org.hl7.fhir.r4.model.codesystems.EncounterStatus;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -424,4 +428,18 @@ void get_datetime_value_null() {
         assertThat(Hl7RelatedGeneralUtils.dateTimeWithZoneId(null,null)).isNull();
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = { "UUID", "OID", ""})
+    void getResourceIdWithType(String type) {
+        String resourceId = Hl7RelatedGeneralUtils.generateResourceId(type);
+        System.out.println("ResourceId: " + resourceId);
+        assertThat(resourceId).isNotNull();
+        if(type.equals("UUID")) {
+            assertThat(resourceId).startsWith("urn:uuid:");
+        } else if (type.equals("OID")) {
+            assertThat(resourceId).startsWith("urn:oid:");
+        } else {
+            assertThat(resourceId).contains(".");
+        }
+    }
 }

src/test/java/io/github/linuxforhealth/hl7/data/SimpleDataValueResolverTest.java

@@ -458,4 +458,25 @@ void testContactPointUse(String hl7Code) throws DataTypeException {
                 break;
         }
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = { "MI", "MO", "SV"})
+    void testAllergyIntoleranceSeverity(String hl7Code) {
+        String severity = SimpleDataValueResolver.ALLERGY_INTOLERANCE_SEVERITY_CODE_FHIR.apply(hl7Code);
+        switch (hl7Code) {
+            case "MI":
+                assertThat(severity).isEqualTo("mild");
+                break;
+            case "MO":
+                assertThat(severity).isEqualTo("moderate");
+                break;
+            case "SV":
+                assertThat(severity).isEqualTo("severe");
+                break;
+            default:
+                assertThat(severity).isNull();
+                break;
+        }
+
+    }
 }