diff --git a/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/VisitController.java b/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/VisitController.java
index 3469f99dc..772fb1fc7 100644
--- a/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/VisitController.java
+++ b/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/VisitController.java
@@ -138,7 +138,7 @@ public HospitalVisit updateOrCreateHospitalVisit(
         Instant validFrom = msg.bestGuessAtValidFrom();
         RowState<HospitalVisit, HospitalVisitAudit> visitState = getOrCreateHospitalVisit(
                 msg.getVisitNumber(), mrn, msg.getSourceSystem(), validFrom, storedFrom);
-
+        addAdmissionType(msg, visitState);
         if (visitShouldBeUpdated(validFrom, msg.getSourceSystem(), visitState)) {
             updateGenericData(msg, visitState);
 
@@ -219,6 +219,17 @@ private void addAdmissionDateTime(final AdmissionDateTime msg, RowState<Hospital
         visitState.assignInterchangeValue(msg.getAdmissionDateTime(), visit.getAdmissionDatetime(), visit::setAdmissionDatetime);
     }
 
+    /**
+     * Add admission type.
+     * @param msg        AdmissionDateTime
+     * @param visitState visit wrapped in state class
+     */
+    private void addAdmissionType(final AdtMessage msg, RowState<HospitalVisit, HospitalVisitAudit> visitState) {
+        HospitalVisit visit = visitState.getEntity();
+        visitState.assignInterchangeValue(msg.getAdmissionType(), visit.getAdmissionType(), visit::setAdmissionType);
+    }
+
+
     /**
      * Delete admission specific information.
      * @param msg        cancellation message
diff --git a/core/src/test/java/uk/ac/ucl/rits/inform/datasinks/emapstar/adt/TestAdtProcessingVisit.java b/core/src/test/java/uk/ac/ucl/rits/inform/datasinks/emapstar/adt/TestAdtProcessingVisit.java
index 50157c238..0ffee6c96 100644
--- a/core/src/test/java/uk/ac/ucl/rits/inform/datasinks/emapstar/adt/TestAdtProcessingVisit.java
+++ b/core/src/test/java/uk/ac/ucl/rits/inform/datasinks/emapstar/adt/TestAdtProcessingVisit.java
@@ -60,6 +60,7 @@ public void testCreateNewAdmit() throws Exception {
 
         HospitalVisit visit = visits.get(0);
         assertNotNull(visit.getAdmissionDatetime());
+        assertNotNull(visit.getAdmissionType());
         assertNull(visit.getPresentationDatetime());
         // no audit log should be added
         assertTrue(getAllAuditHospitalVisits().isEmpty());
diff --git a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/adt/AdmitPatient.java b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/adt/AdmitPatient.java
index 832d82cd6..e5e72e773 100644
--- a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/adt/AdmitPatient.java
+++ b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/adt/AdmitPatient.java
@@ -18,6 +18,7 @@
 @ToString(callSuper = true)
 public class AdmitPatient extends AdtMessage implements AdmissionDateTime  {
     private InterchangeValue<Instant> admissionDateTime = InterchangeValue.unknown();
+    private InterchangeValue<String> admissionType = InterchangeValue.unknown();
 
 
     @Override
diff --git a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/adt/AdtMessage.java b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/adt/AdtMessage.java
index 79835a44f..b679b1381 100644
--- a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/adt/AdtMessage.java
+++ b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/adt/AdtMessage.java
@@ -27,6 +27,7 @@ public abstract class AdtMessage extends EmapOperationMessage {
     private String nhsNumber;
     private String visitNumber;
     private InterchangeValue<String> modeOfArrival = InterchangeValue.unknown();
+
     private InterchangeValue<String> ethnicGroup = InterchangeValue.unknown();
     private InterchangeValue<String> fullLocationString = InterchangeValue.unknown();
     private InterchangeValue<String> previousLocationString = InterchangeValue.unknown();
@@ -44,6 +45,8 @@ public abstract class AdtMessage extends EmapOperationMessage {
     private InterchangeValue<String> patientTitle = InterchangeValue.unknown();
     private InterchangeValue<String> patientZipOrPostalCode = InterchangeValue.unknown();
 
+    private InterchangeValue<String> admissionType = InterchangeValue.unknown();
+
 
     /**
      * Ideally the time the event occurred, but uses the message date time as a backup.
diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/05_A03.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/05_A03.yaml
index df2d72247..0ba608258 100644
--- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/05_A03.yaml
+++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/05_A03.yaml
@@ -13,6 +13,10 @@ admissionDateTime:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
   value: "2013-02-11T13:00:52Z"
+admissionType:
+  "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
+  status: "SAVE"
+  value: "Matern Ante"
 fullLocationString:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/03_A03.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/03_A03.yaml
index 4dcc5ae8c..422ee1854 100644
--- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/03_A03.yaml
+++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/03_A03.yaml
@@ -13,6 +13,10 @@ admissionDateTime:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
   value: "2013-02-11T11:00:52Z"
+admissionType:
+  "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
+  status: "SAVE"
+  value: "Matern Ante"
 fullLocationString:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/05_A03.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/05_A03.yaml
index 12eba4d40..4fd265f81 100644
--- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/05_A03.yaml
+++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/05_A03.yaml
@@ -13,6 +13,10 @@ admissionDateTime:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
   value: "2013-02-11T11:00:52Z"
+admissionType:
+  "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
+  status: "SAVE"
+  value: "Matern Ante"
 fullLocationString:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/04_A03.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/04_A03.yaml
index 23c76ea56..f562e0e2c 100644
--- a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/04_A03.yaml
+++ b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/04_A03.yaml
@@ -13,6 +13,10 @@ admissionDateTime:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
   value: "2013-02-11T12:00:52Z"
+admissionType:
+  "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
+  status: "SAVE"
+  value: "Matern Ante"
 fullLocationString:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/08_A03.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/08_A03.yaml
index bfddb8b38..2c68f418b 100644
--- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/08_A03.yaml
+++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/08_A03.yaml
@@ -13,6 +13,10 @@ admissionDateTime:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
   value: "2013-02-11T10:00:52Z"
+admissionType:
+  "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
+  status: "SAVE"
+  value: "Matern Ante"
 fullLocationString:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml
index 88da640e3..272117cc9 100644
--- a/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml
+++ b/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml
@@ -18,6 +18,10 @@ fullLocationString:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   value: "T42E^T42E BY02^BY02-17"
   status: "SAVE"
+admissionType:
+  "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
+  value: "Matern Ante"
+  status: "SAVE"
 patientBirthDate:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A02.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A02.yaml
index 43b1b8af5..6c6198edf 100644
--- a/emap-interchange/src/test/resources/AdtMessages/generic/A02.yaml
+++ b/emap-interchange/src/test/resources/AdtMessages/generic/A02.yaml
@@ -10,6 +10,10 @@ admissionDateTime:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
   value: "2012-10-17T11:24:53Z"
+admissionType:
+  "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
+  status: "SAVE"
+  value: "Emerg Other"
 fullLocationString:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml
index 0b406bc03..95495d3e3 100644
--- a/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml
+++ b/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml
@@ -10,6 +10,10 @@ presentationDateTime:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
   value: "2013-02-11T10:00:52Z"
+admissionType:
+  "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
+  status: "SAVE"
+  value: "Matern Ante"
 fullLocationString:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A06.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A06.yaml
index 2f13fc145..48a25e3d4 100644
--- a/emap-interchange/src/test/resources/AdtMessages/generic/A06.yaml
+++ b/emap-interchange/src/test/resources/AdtMessages/generic/A06.yaml
@@ -10,6 +10,10 @@ admissionDateTime:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
   value: "2020-04-01T18:30:00Z"
+admissionType:
+  "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
+  status: "SAVE"
+  value: "Emergency"
 modeOfArrival:
   "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue"
   status: "SAVE"
diff --git a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/identity/HospitalVisit.java b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/identity/HospitalVisit.java
index 38c79a24d..34beccd0e 100644
--- a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/identity/HospitalVisit.java
+++ b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/identity/HospitalVisit.java
@@ -85,6 +85,11 @@ public class HospitalVisit extends TemporalCore<HospitalVisit, HospitalVisitAudi
     @Column(columnDefinition = "timestamp with time zone")
     private Instant admissionDatetime;
 
+    /**
+     * \brief the admission type for this hospitalVisit.
+     */
+    private String admissionType;
+
     /**
      * \brief Date and time at which this hospitalVisit formally ended.
      *
@@ -143,6 +148,7 @@ private HospitalVisit(HospitalVisit other) {
         this.hospitalVisitId = other.hospitalVisitId;
         this.encounter = other.encounter;
         this.admissionDatetime = other.admissionDatetime;
+        this.admissionType = other.admissionType;
         this.arrivalMethod = other.arrivalMethod;
         this.dischargeDestination = other.dischargeDestination;
         this.dischargeDisposition = other.dischargeDisposition;
diff --git a/hl7-reader/src/main/java/uk/ac/ucl/rits/inform/datasources/ids/AdtMessageFactory.java b/hl7-reader/src/main/java/uk/ac/ucl/rits/inform/datasources/ids/AdtMessageFactory.java
index 72626e4ae..0e5805178 100644
--- a/hl7-reader/src/main/java/uk/ac/ucl/rits/inform/datasources/ids/AdtMessageFactory.java
+++ b/hl7-reader/src/main/java/uk/ac/ucl/rits/inform/datasources/ids/AdtMessageFactory.java
@@ -191,6 +191,7 @@ private AdtMessage buildAdtMessageSubclass(final PV1Wrap pv1Wrap, final Message
             case "A01":
                 AdmitPatient admitPatient = new AdmitPatient();
                 admitPatient.setAdmissionDateTime(InterchangeValue.buildFromHl7(pv1Wrap.getAdmissionDateTime()));
+                admitPatient.setAdmissionType(InterchangeValue.buildFromHl7(pv1Wrap.getAdmissionType()));
                 msg = admitPatient;
                 break;
             case "A02":
@@ -198,11 +199,13 @@ private AdtMessage buildAdtMessageSubclass(final PV1Wrap pv1Wrap, final Message
             case "A07":
                 TransferPatient transferPatient = new TransferPatient();
                 transferPatient.setAdmissionDateTime(InterchangeValue.buildFromHl7(pv1Wrap.getAdmissionDateTime()));
+                transferPatient.setAdmissionType(InterchangeValue.buildFromHl7(pv1Wrap.getAdmissionType()));
                 msg = transferPatient;
                 break;
             case "A03":
                 DischargePatient dischargeMsg = new DischargePatient();
                 dischargeMsg.setAdmissionDateTime(InterchangeValue.buildFromHl7(pv1Wrap.getAdmissionDateTime()));
+                dischargeMsg.setAdmissionType(InterchangeValue.buildFromHl7(pv1Wrap.getAdmissionType()));
                 dischargeMsg.setDischargeDateTime(pv1Wrap.getDischargeDateTime());
                 dischargeMsg.setDischargeDisposition(pv1Wrap.getDischargeDisposition());
                 dischargeMsg.setDischargeLocation(pv1Wrap.getDischargeLocation());
@@ -214,6 +217,7 @@ private AdtMessage buildAdtMessageSubclass(final PV1Wrap pv1Wrap, final Message
                 }
                 RegisterPatient registerPatient = new RegisterPatient();
                 registerPatient.setPresentationDateTime(InterchangeValue.buildFromHl7(pv1Wrap.getAdmissionDateTime()));
+                registerPatient.setAdmissionType(InterchangeValue.buildFromHl7(pv1Wrap.getAdmissionType()));
                 msg = registerPatient;
                 break;
             case "A08":
diff --git a/hl7-reader/src/main/java/uk/ac/ucl/rits/inform/datasources/ids/hl7/parser/PV1Wrap.java b/hl7-reader/src/main/java/uk/ac/ucl/rits/inform/datasources/ids/hl7/parser/PV1Wrap.java
index a5e0a805b..18af1b545 100644
--- a/hl7-reader/src/main/java/uk/ac/ucl/rits/inform/datasources/ids/hl7/parser/PV1Wrap.java
+++ b/hl7-reader/src/main/java/uk/ac/ucl/rits/inform/datasources/ids/hl7/parser/PV1Wrap.java
@@ -78,6 +78,17 @@ default String getFullLocationString() {
         return createLocationString(currentLocation);
     }
 
+    /**
+     * PV1-4: Admission type.
+     * @return the admission type string
+     */
+    default String getAdmissionType() {
+        if (!pv1SegmentExists()) {
+            return null;
+        }
+        return getPV1().getAdmissionType().getValue();
+    }
+
     /**
      * PV1-6: Previous patient location concatenated together.
      * @return the previous location string
diff --git a/hl7-reader/src/test/java/uk/ac/ucl/rits/inform/datasources/ids/adt/TestAdtFields.java b/hl7-reader/src/test/java/uk/ac/ucl/rits/inform/datasources/ids/adt/TestAdtFields.java
index 1890ac992..258132136 100644
--- a/hl7-reader/src/test/java/uk/ac/ucl/rits/inform/datasources/ids/adt/TestAdtFields.java
+++ b/hl7-reader/src/test/java/uk/ac/ucl/rits/inform/datasources/ids/adt/TestAdtFields.java
@@ -165,4 +165,9 @@ public void testDeathIndicator() {
     void testEthnicGroup() {
         assertEquals(InterchangeValue.buildFromHl7("Not Yet Asked"), msg.getEthnicGroup());
     }
+
+    @Test
+    void testAdmissionType() {
+        assertEquals(InterchangeValue.buildFromHl7("Elective"), msg.getAdmissionType());
+    }
 }
diff --git a/hl7-reader/src/test/resources/Adt/TestForJunit.txt b/hl7-reader/src/test/resources/Adt/TestForJunit.txt
index 71f24eb69..475be92e5 100644
--- a/hl7-reader/src/test/resources/Adt/TestForJunit.txt
+++ b/hl7-reader/src/test/resources/Adt/TestForJunit.txt
@@ -3,7 +3,7 @@ EVN|A01|201209211843|hello|ADM|U439966^WYYYY^CLLLL|201201011200\r
 PID|||50032556^^^MRENTR^MEDREC~this is a test NHS number||INTERFACES^Amendadmission^Longforenamesecondfn^^LADY||194001010000|F|||42 Rooo Fooo^^Blorp^^ZZ1 0AB^^^^West Yorkshire|||||||||||Z1||||||||N
 PD1|||HH|397982^LA^M^^^DR^^^^^^^^G9010000~B8^4 L H L^B^^^^^ZZ1 0AB^^01222 222222^^^^B8&1~404278^ME^AH^^^^^^^^^^^D2444444~V244444^DENTAL SURGERY^9 W^B^WEST YORKSHIRE^^^BD1 1AA^^^^^^V22222&3||14\r
 NK1|1|NIECEOFTHEINTERFACETESTPATIENTDDDDD^Firstnameoftheneiceofthetestpatient|N|1 LINE OF VERY LONG ADDRESSWITHINFO&2 LINE OF VERY LONG ADDRESSWITHALLF^3 LINE OF VERYLONG ADDRESSWITH3DETA&4 LINE OF VERYLONGADDRESSWITH4DETAI^5 LINE FOR CITY OR TOWN ENTEREDINTO^^Z1 1AA^^^^6 LINE OF VERYLONGADDRESS FOR COUNT|02033333333|02033333333X888888|N\r
-PV1||I|H2HH^H203^H203-11|1~I|||399999^IS^DAV^^^PROF|397982^LA^M^^^DR~399999^IS^DAV^J^^PROF||41008||||19|||||1234TESTVISITNUM|||PLS-1|||||||||||||||||HH||2|||201209211840\r
+PV1||I|H2HH^H203^H203-11|Elective|||399999^IS^DAV^^^PROF|397982^LA^M^^^DR~399999^IS^DAV^J^^PROF||41008||||19|||||1234TESTVISITNUM|||PLS-1|||||||||||||||||HH||2|||201209211840\r
 PV2||W|DETAILS FOR a08 AMEND aDMISSION MESSAGE||||||||||B\r
 OBX|1|ST|^^^ABC^Assign Benefits^PLW-HL7||||||||N|||20120921\r
 OBX|2|ST|^^^LRRF^Reg Required Flags^PLW-HL7||~~~~14~1||||||N\r