From d69046f5156a670fa1fa478a589f6bf9b6034825 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Sun, 19 Oct 2025 12:56:51 +0100 Subject: [PATCH 01/19] add new variables --- .../informdb/movement/DepartmentState.java | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java index ebc08edd5..235d99e0c 100644 --- a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java +++ b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java @@ -54,6 +54,22 @@ public class DepartmentState extends AuditCore { * \brief Current speciality of the department. */ private String speciality; + + /** + * \brief Report Group Nine (RPT_GRP_NINE) value associated with this department. + */ + private String rptGrpNine; + + /** + * \brief Predicate determining whether the Department is a ward or flow area. + */ + private Boolean isWardOrFlowArea; + + /** + * \brief Predicate determining whether the Department is a core inpatient area. + */ + private Boolean isCoreInpatientArea; + /** * Create valid department state. * @param department parent department @@ -61,11 +77,19 @@ public class DepartmentState extends AuditCore { * @param validFrom time that the message was valid from * @param storedFrom time that emap core stared processing the message * @param speciality name of the current speciality of this department + * @param rptGrpNine Report Group Nine value associated with this department + * @param isWardOrFlowArea is this department a ward or flow area + * @param isCoreInpatientArea is this department a core inpatient area */ - public DepartmentState(Department department, String status, String speciality, Instant validFrom, Instant storedFrom) { + public DepartmentState(Department department, String status, + String speciality, String rptGrpNine, Boolean isWardOrFlowArea, + Boolean isCoreInpatientArea, Instant validFrom, Instant storedFrom) { departmentId = department; this.status = status; this.speciality = speciality; + this.rptGrpNine = rptGrpNine; + this.isWardOrFlowArea = isWardOrFlowArea; + this.isCoreInpatientArea = isCoreInpatientArea; setValidFrom(validFrom); setStoredFrom(storedFrom); } @@ -78,6 +102,9 @@ private DepartmentState(DepartmentState other) { departmentId = other.departmentId; status = other.status; speciality = other.speciality; + rptGrpNine = other.rptGrpNine; + isWardOrFlowArea = other.isWardOrFlowArea; + isCoreInpatientArea = other.isCoreInpatientArea; } @Override From 80ff91d36d5f16250169312fe40dd3d2acbc4294 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Sun, 19 Oct 2025 12:57:22 +0100 Subject: [PATCH 02/19] change check style to allow more than seven arguments to a function --- emap-checker.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/emap-checker.xml b/emap-checker.xml index 1e27d302e..a526209c9 100644 --- a/emap-checker.xml +++ b/emap-checker.xml @@ -107,8 +107,10 @@ - - + + + + From ffd29fee2f9e0a656dad41a4e95a511fe474b9ea Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Sun, 19 Oct 2025 14:05:53 +0100 Subject: [PATCH 03/19] Add the variables to the metadata class --- .../inform/interchange/location/DepartmentMetadata.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java index ad6fb9c72..1c6f49193 100644 --- a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java +++ b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java @@ -42,6 +42,13 @@ public class DepartmentMetadata extends EmapOperationMessage implements MinimalD private String departmentSpeciality; private Instant specialityUpdate; private String previousDepartmentSpeciality; + + /** + * Variables added to make location processing more robust. + */ + private String rptGrpNine; + private Boolean isWardOrFlowArea; + private Boolean isCoreInpatientArea; /** * Not used in processing, but useful to debugging ordering. */ From ad22070e92a16cf971ebdf97a6b22e99bcf94e5f Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Sun, 19 Oct 2025 14:06:26 +0100 Subject: [PATCH 04/19] fix the location controller to reflect the new metadata values --- .../emapstar/controllers/LocationController.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java b/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java index 482bf5a46..90bab82a3 100644 --- a/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java +++ b/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java @@ -199,7 +199,7 @@ class DepartmentController { } /** - * Get or create minomal department entity. + * Get or create minimal department entity. * @param msg minimal department message * @return saved department entity */ @@ -257,7 +257,10 @@ private static boolean updateFieldIfNull(String currentData, String newdata, Con void processDepartmentStates(DepartmentMetadata msg, Department department, Instant storedFrom) throws IncompatibleDatabaseStateException { Instant validFrom = msg.getSpecialityUpdate() == null ? msg.getDepartmentContactDate() : msg.getSpecialityUpdate(); DepartmentState currentState = new DepartmentState( - department, msg.getDepartmentRecordStatus().toString(), msg.getDepartmentSpeciality(), validFrom, storedFrom); + department, msg.getDepartmentRecordStatus().toString(), + msg.getDepartmentSpeciality(), msg.getRptGrpNine(), + msg.getIsWardOrFlowArea(), msg.getIsCoreInpatientArea(), + validFrom, storedFrom); if (departmentStateRepo.existsByDepartmentIdAndSpecialityAndValidFrom(department, msg.getDepartmentSpeciality(), validFrom)) { logger.debug("Department State already exists in the database, no need to process further"); @@ -274,9 +277,11 @@ void processDepartmentStates(DepartmentMetadata msg, Department department, Inst invalidatePreviousStateIfChanged(msg.getPreviousDepartmentSpeciality(), currentState, possiblePreviousState.get()); } else if (msg.getPreviousDepartmentSpeciality() != null) { // if the previous department speciality is not in the database - DepartmentState previousState = new DepartmentState( - department, msg.getDepartmentRecordStatus().toString(), msg.getPreviousDepartmentSpeciality(), - msg.getDepartmentContactDate(), storedFrom); + DepartmentState previousState = new DepartmentState(department, + msg.getDepartmentRecordStatus().toString(), + msg.getPreviousDepartmentSpeciality(), msg.getRptGrpNine(), + msg.getIsWardOrFlowArea(), msg.getIsCoreInpatientArea(), + msg.getDepartmentContactDate(), storedFrom); previousState.setStoredUntil(currentState.getStoredFrom()); previousState.setValidUntil(currentState.getValidFrom()); departmentStateRepo.saveAll(List.of(previousState, currentState)); From 32f117e5ef00202e6ca411d4f256afe187b99fc2 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Mon, 20 Oct 2025 11:35:03 +0100 Subject: [PATCH 05/19] files for testing hoover --- .../DepartmentMetadata/additional-acun_dept.yaml | 14 ++++++++++++++ .../dental_department_only.yaml | 11 +++++++++++ .../medsurg_active_pool_bed.yaml | 11 +++++++++++ .../no_department_history.yaml | 10 ++++++++++ .../paediatric_department_only_1.yaml | 12 ++++++++++++ .../paediatric_department_only_2.yaml | 12 ++++++++++++ .../paediatric_department_only_3.yaml | 12 ++++++++++++ 7 files changed, 82 insertions(+) create mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml create mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml create mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml create mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml create mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml create mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml create mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml new file mode 100644 index 000000000..7078e3aba --- /dev/null +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml @@ -0,0 +1,14 @@ +"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" +sourceSystem: "clarity" +departmentHl7: "ACUN" +departmentName: "EGA E03 ACU NURSERY" +departmentId: "2" +departmentSpeciality: "Maternity - Well Baby" +departmentRecordStatus: "ACTIVE" +previousDepartmentSpeciality: "Dental - Oral Medicine" +departmentContactDate: "2012-02-09T00:00:00Z" +specialityUpdate: "2022-02-09T00:00:20Z" +combinedUpdate: "2022-02-09T00:00:20Z" +rptGrpNine: "ACUN" +isWardOrFlowArea: true +isCoreInpatientArea: true \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml new file mode 100644 index 000000000..f74c366b6 --- /dev/null +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml @@ -0,0 +1,11 @@ +"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" +sourceSystem: "clarity" +# department +departmentHl7: "1000000059" +departmentName: "DENTAL: ORAL MEDICINE" +departmentId: "13" +departmentRecordStatus: "ACTIVE" +departmentContactDate: "2018-08-22T00:00:00Z" +departmentSpeciality: "Dental - Oral Medicine" +specialityUpdate: "2020-09-22T13:47:56Z" +combinedUpdate: "2020-09-22T13:47:56Z" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml new file mode 100644 index 000000000..41cf2670a --- /dev/null +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml @@ -0,0 +1,11 @@ +"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" +sourceSystem: "clarity" +# department +departmentHl7: "MEDSURG" +departmentName: "EMH MED SURG" +departmentId: "1" +departmentSpeciality: null +departmentRecordStatus: "DELETED_AND_HIDDEN" +departmentContactDate: "2005-12-08T00:00:00Z" +combinedUpdate: "2021-04-23T09:00:00Z" + diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml new file mode 100644 index 000000000..bbe538032 --- /dev/null +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml @@ -0,0 +1,10 @@ +"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" +sourceSystem: "clarity" +# department +departmentHl7: "1020100002" +departmentName: "UCH ROI" +departmentId: "1020100002" +departmentSpeciality: null +departmentRecordStatus: "ACTIVE" +departmentContactDate: "2022-12-08T00:00:00Z" +combinedUpdate: "2022-12-08T00:00:00Z" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml new file mode 100644 index 000000000..b396e601f --- /dev/null +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml @@ -0,0 +1,12 @@ +"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" +sourceSystem: "clarity" +# department +departmentHl7: "100000060" +departmentName: "OFF SE5PC" +departmentId: "1020610068" +departmentSpeciality: "Paediatric - Respiratory Medicine" +departmentRecordStatus: "ACTIVE" +departmentContactDate: "2021-08-25T23:00:00Z" +# missing previous department will be null +specialityUpdate: "2021-08-26T11:28:51Z" +combinedUpdate: "2021-08-26T11:28:51Z" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml new file mode 100644 index 000000000..7872eae2e --- /dev/null +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml @@ -0,0 +1,12 @@ +"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" +sourceSystem: "clarity" +# department +departmentHl7: "100000060" +departmentName: "OFF SE5PC" +departmentId: "1020610068" +departmentSpeciality: "Paediatric - Infectious Diseases" +previousDepartmentSpeciality: "Paediatric - Respiratory Medicine" +departmentRecordStatus: "ACTIVE" +departmentContactDate: "2021-08-25T23:00:00Z" +specialityUpdate: "2021-09-06T06:42:26Z" +combinedUpdate: "2021-09-06T06:42:26Z" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml new file mode 100644 index 000000000..1834085f7 --- /dev/null +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml @@ -0,0 +1,12 @@ +"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" +sourceSystem: "clarity" +# department +departmentHl7: "100000060" +departmentName: "OFF SE5PC" +departmentId: "1020610068" +departmentSpeciality: "Paediatric - RESPOND" +previousDepartmentSpeciality: "Paediatric - Infectious Diseases" +departmentRecordStatus: "ACTIVE" +departmentContactDate: "2021-08-25T23:00:00Z" +specialityUpdate: "2021-10-08T23:00:20Z" +combinedUpdate: "2021-10-08T23:00:20Z" \ No newline at end of file From 016c3150938dd41b0221e06e36273e8e85f5c7cf Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Tue, 21 Oct 2025 16:37:47 +0100 Subject: [PATCH 06/19] Adds site location to department metadata Adds site location information to the Department table to allow for easier querying of locations. Renames rptGrpNine to departmentType. Populates the site location based on sending facility in HL7 messages. --- .../ucl/rits/inform/interchange/adt/AdtMessage.java | 1 + .../interchange/location/DepartmentMetadata.java | 2 +- .../test/resources/DepartmentMetadata/acun_dept.yaml | 3 ++- .../DepartmentMetadata/additional-acun_dept.yaml | 5 +++-- .../dental_department_only.yaml | 1 + .../medsurg_active_pool_bed.yaml | 2 +- .../additional-local-only/no_department_history.yaml | 1 + .../paediatric_department_only_1.yaml | 3 ++- .../paediatric_department_only_2.yaml | 3 ++- .../paediatric_department_only_3.yaml | 3 ++- .../rits/inform/informdb/movement/Department.java | 5 +++++ .../inform/informdb/movement/DepartmentState.java | 12 ++++++------ .../inform/datasources/ids/AdtMessageFactory.java | 1 + 13 files changed, 28 insertions(+), 14 deletions(-) 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..603f63c14 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 @@ -26,6 +26,7 @@ public abstract class AdtMessage extends EmapOperationMessage { private String mrn; private String nhsNumber; private String visitNumber; + private String siteLocation; private InterchangeValue modeOfArrival = InterchangeValue.unknown(); private InterchangeValue ethnicGroup = InterchangeValue.unknown(); private InterchangeValue fullLocationString = InterchangeValue.unknown(); diff --git a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java index 1c6f49193..58e2322d5 100644 --- a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java +++ b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java @@ -46,7 +46,7 @@ public class DepartmentMetadata extends EmapOperationMessage implements MinimalD /** * Variables added to make location processing more robust. */ - private String rptGrpNine; + private String departmentType; private Boolean isWardOrFlowArea; private Boolean isCoreInpatientArea; /** diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml index ff889578d..6428ca20b 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml @@ -8,4 +8,5 @@ departmentRecordStatus: "ACTIVE" previousDepartmentSpeciality: "Dental - Oral Medicine" departmentContactDate: "2012-02-09T00:00:00Z" specialityUpdate: "2022-02-09T00:00:20Z" -combinedUpdate: "2022-02-09T00:00:20Z" \ No newline at end of file +combinedUpdate: "2022-02-09T00:00:20Z" +siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml index 7078e3aba..855281a54 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml @@ -9,6 +9,7 @@ previousDepartmentSpeciality: "Dental - Oral Medicine" departmentContactDate: "2012-02-09T00:00:00Z" specialityUpdate: "2022-02-09T00:00:20Z" combinedUpdate: "2022-02-09T00:00:20Z" -rptGrpNine: "ACUN" +departmentType: "ACUN" isWardOrFlowArea: true -isCoreInpatientArea: true \ No newline at end of file +isCoreInpatientArea: true +siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml index f74c366b6..eedb8a794 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml @@ -9,3 +9,4 @@ departmentContactDate: "2018-08-22T00:00:00Z" departmentSpeciality: "Dental - Oral Medicine" specialityUpdate: "2020-09-22T13:47:56Z" combinedUpdate: "2020-09-22T13:47:56Z" +siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml index 41cf2670a..9d45554f6 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml @@ -8,4 +8,4 @@ departmentSpeciality: null departmentRecordStatus: "DELETED_AND_HIDDEN" departmentContactDate: "2005-12-08T00:00:00Z" combinedUpdate: "2021-04-23T09:00:00Z" - +siteLocation: "UCLH" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml index bbe538032..51195e9bb 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml @@ -8,3 +8,4 @@ departmentSpeciality: null departmentRecordStatus: "ACTIVE" departmentContactDate: "2022-12-08T00:00:00Z" combinedUpdate: "2022-12-08T00:00:00Z" +siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml index b396e601f..739ef24dd 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml @@ -9,4 +9,5 @@ departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" # missing previous department will be null specialityUpdate: "2021-08-26T11:28:51Z" -combinedUpdate: "2021-08-26T11:28:51Z" \ No newline at end of file +combinedUpdate: "2021-08-26T11:28:51Z" +siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml index 7872eae2e..e12250363 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml @@ -9,4 +9,5 @@ previousDepartmentSpeciality: "Paediatric - Respiratory Medicine" departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" specialityUpdate: "2021-09-06T06:42:26Z" -combinedUpdate: "2021-09-06T06:42:26Z" \ No newline at end of file +combinedUpdate: "2021-09-06T06:42:26Z" +siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml index 1834085f7..a45b5a0d3 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml @@ -9,4 +9,5 @@ previousDepartmentSpeciality: "Paediatric - Infectious Diseases" departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" specialityUpdate: "2021-10-08T23:00:20Z" -combinedUpdate: "2021-10-08T23:00:20Z" \ No newline at end of file +combinedUpdate: "2021-10-08T23:00:20Z" +siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java index e6cb65c12..46c1ca90d 100644 --- a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java +++ b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java @@ -42,6 +42,11 @@ public class Department implements Serializable { */ private String name; + /** + * \brief Hospital site where this department is located + */ + private String siteLocation; + /** * Create minimal department. * @param internalId ID of the department in EPIC. diff --git a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java index 235d99e0c..9bf5b34e0 100644 --- a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java +++ b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java @@ -56,9 +56,9 @@ public class DepartmentState extends AuditCore { private String speciality; /** - * \brief Report Group Nine (RPT_GRP_NINE) value associated with this department. + * \brief Report Group Nine (departmentType) value associated with this department. */ - private String rptGrpNine; + private String departmentType; /** * \brief Predicate determining whether the Department is a ward or flow area. @@ -77,17 +77,17 @@ public class DepartmentState extends AuditCore { * @param validFrom time that the message was valid from * @param storedFrom time that emap core stared processing the message * @param speciality name of the current speciality of this department - * @param rptGrpNine Report Group Nine value associated with this department + * @param departmentType Report Group Nine value associated with this department * @param isWardOrFlowArea is this department a ward or flow area * @param isCoreInpatientArea is this department a core inpatient area */ public DepartmentState(Department department, String status, - String speciality, String rptGrpNine, Boolean isWardOrFlowArea, + String speciality, String departmentType, Boolean isWardOrFlowArea, Boolean isCoreInpatientArea, Instant validFrom, Instant storedFrom) { departmentId = department; this.status = status; this.speciality = speciality; - this.rptGrpNine = rptGrpNine; + this.departmentType = departmentType; this.isWardOrFlowArea = isWardOrFlowArea; this.isCoreInpatientArea = isCoreInpatientArea; setValidFrom(validFrom); @@ -102,7 +102,7 @@ private DepartmentState(DepartmentState other) { departmentId = other.departmentId; status = other.status; speciality = other.speciality; - rptGrpNine = other.rptGrpNine; + departmentType = other.departmentType; isWardOrFlowArea = other.isWardOrFlowArea; isCoreInpatientArea = other.isCoreInpatientArea; } 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 ec98bf202..ebc8ef265 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 @@ -105,6 +105,7 @@ private void addGenericDataToAdtMessage(final String sourceId, final PatientInfo if (sendingApplication.isEmpty()) { throw new Hl7MessageIgnoredException("No sending application in message"); } + msg.setSiteLocation(patientInfoHl7.getSendingFacility()); msg.setSourceSystem(patientInfoHl7.getSendingApplication()); // will be replaced if there is an evn segment msg.setRecordedDateTime(patientInfoHl7.getMessageTimestamp()); From d9ed94fbf44d0105ccb428d2f9a8881be910ec79 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Tue, 21 Oct 2025 16:44:20 +0100 Subject: [PATCH 07/19] fix linting --- .../uk/ac/ucl/rits/inform/informdb/movement/Department.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java index 46c1ca90d..e04bc10c4 100644 --- a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java +++ b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java @@ -43,7 +43,7 @@ public class Department implements Serializable { private String name; /** - * \brief Hospital site where this department is located + * \brief Hospital site where this department is located. */ private String siteLocation; From 6bdf74ccdba02e1b8e5d48713bcb9c38e6c51923 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Tue, 21 Oct 2025 16:53:18 +0100 Subject: [PATCH 08/19] missed the capitalization form --- .../datasinks/emapstar/controllers/LocationController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java b/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java index 90bab82a3..e9e0a62ac 100644 --- a/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java +++ b/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java @@ -258,7 +258,7 @@ void processDepartmentStates(DepartmentMetadata msg, Department department, Inst Instant validFrom = msg.getSpecialityUpdate() == null ? msg.getDepartmentContactDate() : msg.getSpecialityUpdate(); DepartmentState currentState = new DepartmentState( department, msg.getDepartmentRecordStatus().toString(), - msg.getDepartmentSpeciality(), msg.getRptGrpNine(), + msg.getDepartmentSpeciality(), msg.getDepartmentType(), msg.getIsWardOrFlowArea(), msg.getIsCoreInpatientArea(), validFrom, storedFrom); @@ -279,7 +279,7 @@ void processDepartmentStates(DepartmentMetadata msg, Department department, Inst // if the previous department speciality is not in the database DepartmentState previousState = new DepartmentState(department, msg.getDepartmentRecordStatus().toString(), - msg.getPreviousDepartmentSpeciality(), msg.getRptGrpNine(), + msg.getPreviousDepartmentSpeciality(), msg.getDepartmentType(), msg.getIsWardOrFlowArea(), msg.getIsCoreInpatientArea(), msg.getDepartmentContactDate(), storedFrom); previousState.setStoredUntil(currentState.getStoredFrom()); From 0aefbf649ed09d1738b631a4435d396df258b160 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Wed, 22 Oct 2025 14:46:27 +0100 Subject: [PATCH 09/19] update all the comparison messages to include site location --- .../src/test/resources/AdtMessages/DoubleA01WithA13/A03.yaml | 1 + .../src/test/resources/AdtMessages/DoubleA01WithA13/A08.yaml | 1 + .../src/test/resources/AdtMessages/DoubleA01WithA13/A13.yaml | 1 + .../resources/AdtMessages/Location/CancelAdmit/01_A01.yaml | 1 + .../resources/AdtMessages/Location/CancelAdmit/02_A11.yaml | 1 + .../resources/AdtMessages/Location/CancelAdmit/03_A01.yaml | 1 + .../resources/AdtMessages/Location/CancelAdmit/04_A02.yaml | 1 + .../resources/AdtMessages/Location/CancelAdmit/05_A03.yaml | 1 + .../resources/AdtMessages/Location/CancelDischarge/01_A01.yaml | 1 + .../resources/AdtMessages/Location/CancelDischarge/02_A02.yaml | 1 + .../resources/AdtMessages/Location/CancelDischarge/03_A03.yaml | 1 + .../resources/AdtMessages/Location/CancelDischarge/04_A13.yaml | 1 + .../resources/AdtMessages/Location/CancelDischarge/05_A03.yaml | 1 + .../resources/AdtMessages/Location/CancelTransfer/01_A01.yaml | 1 + .../resources/AdtMessages/Location/CancelTransfer/02_A02.yaml | 1 + .../resources/AdtMessages/Location/CancelTransfer/03_A02.yaml | 1 + .../resources/AdtMessages/Location/CancelTransfer/04_A12.yaml | 1 + .../resources/AdtMessages/Location/CancelTransfer/05_A02.yaml | 1 + .../resources/AdtMessages/Location/CancelTransfer/06_A03.yaml | 1 + .../resources/AdtMessages/Location/DuplicateSimple/01_A04.yaml | 1 + .../resources/AdtMessages/Location/DuplicateSimple/02_A01.yaml | 1 + .../resources/AdtMessages/Location/DuplicateSimple/03_A02.yaml | 1 + .../resources/AdtMessages/Location/DuplicateSimple/04_A03.yaml | 1 + .../src/test/resources/AdtMessages/Location/Moves/02_A01.yaml | 1 + .../src/test/resources/AdtMessages/Location/Moves/03_A02.yaml | 1 + .../src/test/resources/AdtMessages/Location/Moves/04_A02.yaml | 1 + .../src/test/resources/AdtMessages/Location/Moves/05_A02.yaml | 1 + .../src/test/resources/AdtMessages/Location/Moves/06_A02.yaml | 1 + .../src/test/resources/AdtMessages/Location/Moves/07_A06.yaml | 1 + .../src/test/resources/AdtMessages/Location/Moves/08_A03.yaml | 1 + .../src/test/resources/AdtMessages/generic/A01.yaml | 1 + .../src/test/resources/AdtMessages/generic/A02.yaml | 1 + .../src/test/resources/AdtMessages/generic/A03.yaml | 1 + .../src/test/resources/AdtMessages/generic/A04.yaml | 1 + .../src/test/resources/AdtMessages/generic/A06.yaml | 1 + .../src/test/resources/AdtMessages/generic/A08_v1.yaml | 1 + .../src/test/resources/AdtMessages/generic/A11.yaml | 1 + .../src/test/resources/AdtMessages/generic/A12.yaml | 1 + .../src/test/resources/AdtMessages/generic/A13.yaml | 1 + .../src/test/resources/AdtMessages/generic/A17.yaml | 1 + .../src/test/resources/AdtMessages/generic/A29.yaml | 1 + .../src/test/resources/AdtMessages/generic/A40.yaml | 1 + .../src/test/resources/AdtMessages/generic/A45.yaml | 1 + .../src/test/resources/AdtMessages/generic/A47.yaml | 1 + .../src/test/resources/AdtMessages/pending/A15.yaml | 1 + .../src/test/resources/AdtMessages/pending/A16.yaml | 1 + .../src/test/resources/AdtMessages/pending/A25.yaml | 1 + .../src/test/resources/AdtMessages/pending/A26.yaml | 1 + .../src/test/resources/DepartmentMetadata/acun_dept.yaml | 3 +-- 49 files changed, 49 insertions(+), 2 deletions(-) diff --git a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A03.yaml b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A03.yaml index d0bff6d47..d7c241bfc 100644 --- a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A03.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A03.yaml @@ -5,6 +5,7 @@ eventOccurredDateTime: "2013-02-11T13:45:00Z" sourceSystem: "EPIC" mrn: "40800000" visitNumber: "123412341234" +siteLocation: "UCLH" dischargeDateTime: "2013-02-11T13:45:00Z" dischargeDisposition: "19" dischargeLocation: "1" diff --git a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A08.yaml b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A08.yaml index 38de8c119..a9b7bc9f2 100644 --- a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A08.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A08.yaml @@ -4,6 +4,7 @@ eventReasonCode: "ADT_EVENT" sourceSystem: "EPIC" mrn: "40800000" visitNumber: "123412341234" +siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A13.yaml b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A13.yaml index e14ec7d68..d1f8b7939 100644 --- a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A13.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A13.yaml @@ -4,6 +4,7 @@ eventOccurredDateTime: "2013-02-11T13:45:00Z" visitNumber: "123412341234" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" cancelledDateTime: "2013-02-11T13:45:00Z" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/01_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/01_A01.yaml index 51795bd72..75922fc0f 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/01_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/01_A01.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/02_A11.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/02_A11.yaml index 21c4258e2..181afbd50 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/02_A11.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/02_A11.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" +siteLocation: "UCLH" cancelledDateTime: "2013-02-11T11:00:52Z" modeOfArrival: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/03_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/03_A01.yaml index 6e1ca3be8..6c2e51543 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/03_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/03_A01.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/04_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/04_A02.yaml index a8e198b6f..ce16c8ff0 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/04_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/04_A02.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" 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..ab039e083 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 @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" dischargeDateTime: "2013-02-11T15:00:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/01_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/01_A01.yaml index 67dd481ca..3bc2b7ecf 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/01_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/01_A01.yaml @@ -5,6 +5,7 @@ eventReasonCode: "ADT_EVENT" sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" +siteLocation: "UCLH" visitNumber: "123412341234" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/02_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/02_A02.yaml index ef1ed8500..acd242182 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/02_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/02_A02.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@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..091e37db5 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 @@ -9,6 +9,7 @@ mrn: "40800000" dischargeDateTime: "2013-02-11T12:30:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/04_A13.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/04_A13.yaml index b16668d04..3b1674dd0 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/04_A13.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/04_A13.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" cancelledDateTime: "2013-02-11T12:30:52Z" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" 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..b061f16ac 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 @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" dischargeDateTime: "2013-02-11T13:00:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/01_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/01_A01.yaml index 67dd481ca..b496b7557 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/01_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/01_A01.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/02_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/02_A02.yaml index ef1ed8500..acd242182 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/02_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/02_A02.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/03_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/03_A02.yaml index 5e116c917..2a27aa117 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/03_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/03_A02.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/04_A12.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/04_A12.yaml index e4c4920b7..ebccdcb96 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/04_A12.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/04_A12.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" +siteLocation: "UCLH" cancelledDateTime: "2013-02-11T12:30:52Z" cancelledLocation: "ED^DELETE ME^DELETE" fullLocationString: diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/05_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/05_A02.yaml index f6f313e4d..f209e2190 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/05_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/05_A02.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/06_A03.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/06_A03.yaml index 97aa98653..c64ede1d4 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/06_A03.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/06_A03.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" dischargeDateTime: "2013-02-11T14:00:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/01_A04.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/01_A04.yaml index 6d8431ae2..edda4b838 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/01_A04.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/01_A04.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" +siteLocation: "UCLH" presentationDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/02_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/02_A01.yaml index 2556795b5..a77b6f61f 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/02_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/02_A01.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/03_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/03_A02.yaml index 9d32e432c..c9062d970 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/03_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/03_A02.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@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..2f0982a8f 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 @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" dischargeDateTime: "2013-02-11T14:00:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/02_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/02_A01.yaml index 67dd481ca..b496b7557 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/02_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/02_A01.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/03_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/03_A02.yaml index 74a6c0f53..56790ab07 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/03_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/03_A02.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/04_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/04_A02.yaml index fb8255699..f0e01518d 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/04_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/04_A02.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/05_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/05_A02.yaml index d56baa47d..33d13e97a 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/05_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/05_A02.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/06_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/06_A02.yaml index b3658e6fa..1823e4c47 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/06_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/06_A02.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/07_A06.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/07_A06.yaml index 842c83553..d4337770a 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/07_A06.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/07_A06.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@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..e891d2563 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 @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" dischargeDateTime: "2013-02-11T17:00:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml index 88da640e3..f5c46174f 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" +siteLocation: "UCLH" admissionDateTime: "@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..bdf0aa7a1 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A02.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A03.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A03.yaml index a6dd9483f..977fad786 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A03.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A03.yaml @@ -5,6 +5,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" dischargeDateTime: "2013-02-11T10:00:00Z" dischargeDisposition: "19" dischargeLocation: "1" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml index 0b406bc03..9e295b247 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" presentationDateTime: "@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..9ea323a5e 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A06.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A06.yaml @@ -6,6 +6,7 @@ visitNumber: "1234567890" sourceSystem: "EPIC" mrn: "A/AA1111" nhsNumber: "9999999999" +siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A08_v1.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A08_v1.yaml index 09e1d7365..4ed7b7cb5 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A08_v1.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A08_v1.yaml @@ -5,6 +5,7 @@ sourceSystem: "EPIC" mrn: "40800000" visitNumber: "123412341234" nhsNumber: "9999999999" +siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A11.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A11.yaml index 8f061ef06..56d059da1 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A11.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A11.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" +siteLocation: "UCLH" cancelledDateTime: "2010-09-14T15:27:00Z" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A12.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A12.yaml index 2874461d2..1b62863a9 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A12.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A12.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" +siteLocation: "UCLH" cancelledDateTime: "2013-02-11T10:01:52Z" cancelledLocation: "THP3^UCHP03THR POOL01^THR" fullLocationString: diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A13.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A13.yaml index e3708c698..5f8e00938 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A13.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A13.yaml @@ -7,6 +7,7 @@ nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" cancelledDateTime: "2010-09-16T10:00:00Z" +siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A17.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A17.yaml index a6621b55a..861ae2ed3 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A17.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A17.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" visitNumber: "123412341234" nhsNumber: "9999999999" +siteLocation: "UCLH" otherMrn: "30700000" otherNhsNumber: "1111111111" otherVisitNumber: "0999999999" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A29.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A29.yaml index 1a372e324..d117601bd 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A29.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A29.yaml @@ -6,6 +6,7 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "" +siteLocation: "UCLH" patientBirthDate: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml index 6b167fe83..eef403593 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml @@ -5,6 +5,7 @@ previousMrn: "40800000" sourceSystem: "EPIC" mrn: "40800001" nhsNumber: "9999999999" +siteLocation: "UCLH" patientBirthDate: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml index 7206d3a86..757ee1b7d 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml @@ -7,6 +7,7 @@ sourceSystem: "EPIC" visitNumber: "123412341234" mrn: "60600000" nhsNumber: "1111111111" +siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" value: "T42E^T42E BY02^BY02-17" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml index d5afa8e59..65dd13bc5 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml @@ -5,6 +5,7 @@ previousMrn: "50100010" sourceSystem: "EPIC" mrn: "51111111" nhsNumber: "111222223" +siteLocation: "UCLH" patientBirthDate: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/pending/A15.yaml b/emap-interchange/src/test/resources/AdtMessages/pending/A15.yaml index 56d0cc178..98247bbb8 100644 --- a/emap-interchange/src/test/resources/AdtMessages/pending/A15.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/pending/A15.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/pending/A16.yaml b/emap-interchange/src/test/resources/AdtMessages/pending/A16.yaml index 374ded4eb..6e8bac8f0 100644 --- a/emap-interchange/src/test/resources/AdtMessages/pending/A16.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/pending/A16.yaml @@ -3,6 +3,7 @@ recordedDateTime: "2022-04-21T23:23:00Z" eventOccurredDateTime: "2022-04-21T23:22:58Z" eventReasonCode: "PNDDISCHARGE" visitNumber: "123412341234" +siteLocation: "UCLH" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" diff --git a/emap-interchange/src/test/resources/AdtMessages/pending/A25.yaml b/emap-interchange/src/test/resources/AdtMessages/pending/A25.yaml index f600ce670..0700afa60 100644 --- a/emap-interchange/src/test/resources/AdtMessages/pending/A25.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/pending/A25.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/pending/A26.yaml b/emap-interchange/src/test/resources/AdtMessages/pending/A26.yaml index 4bb9078d5..3a2616639 100644 --- a/emap-interchange/src/test/resources/AdtMessages/pending/A26.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/pending/A26.yaml @@ -6,6 +6,7 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" +siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml index 6428ca20b..ff889578d 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml @@ -8,5 +8,4 @@ departmentRecordStatus: "ACTIVE" previousDepartmentSpeciality: "Dental - Oral Medicine" departmentContactDate: "2012-02-09T00:00:00Z" specialityUpdate: "2022-02-09T00:00:20Z" -combinedUpdate: "2022-02-09T00:00:20Z" -siteLocation: "UCLH" \ No newline at end of file +combinedUpdate: "2022-02-09T00:00:20Z" \ No newline at end of file From 4eff55f6df2aef9c2d7ca64844ecfed6bcb10142 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Wed, 22 Oct 2025 14:55:52 +0100 Subject: [PATCH 10/19] no I didn't check they are all UCLH --- .../src/test/resources/AdtMessages/generic/A40.yaml | 2 +- .../src/test/resources/AdtMessages/generic/A45.yaml | 2 +- .../src/test/resources/AdtMessages/generic/A47.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml index eef403593..5c6cebc31 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml @@ -5,7 +5,7 @@ previousMrn: "40800000" sourceSystem: "EPIC" mrn: "40800001" nhsNumber: "9999999999" -siteLocation: "UCLH" +siteLocation: "RRV03" patientBirthDate: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml index 757ee1b7d..cddbbaaf6 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml @@ -7,7 +7,7 @@ sourceSystem: "EPIC" visitNumber: "123412341234" mrn: "60600000" nhsNumber: "1111111111" -siteLocation: "UCLH" +siteLocation: "RRV03" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" value: "T42E^T42E BY02^BY02-17" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml index 65dd13bc5..826c8cfea 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml @@ -5,7 +5,7 @@ previousMrn: "50100010" sourceSystem: "EPIC" mrn: "51111111" nhsNumber: "111222223" -siteLocation: "UCLH" +siteLocation: "RRV03" patientBirthDate: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" From f25f2bb9585123f145d45c035f2b60a5e669a4c7 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Sat, 25 Oct 2025 13:09:21 +0100 Subject: [PATCH 11/19] Revert "no I didn't check they are all UCLH" This reverts commit 4eff55f6df2aef9c2d7ca64844ecfed6bcb10142. --- .../src/test/resources/AdtMessages/generic/A40.yaml | 2 +- .../src/test/resources/AdtMessages/generic/A45.yaml | 2 +- .../src/test/resources/AdtMessages/generic/A47.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml index 5c6cebc31..eef403593 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml @@ -5,7 +5,7 @@ previousMrn: "40800000" sourceSystem: "EPIC" mrn: "40800001" nhsNumber: "9999999999" -siteLocation: "RRV03" +siteLocation: "UCLH" patientBirthDate: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml index cddbbaaf6..757ee1b7d 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml @@ -7,7 +7,7 @@ sourceSystem: "EPIC" visitNumber: "123412341234" mrn: "60600000" nhsNumber: "1111111111" -siteLocation: "RRV03" +siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" value: "T42E^T42E BY02^BY02-17" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml index 826c8cfea..65dd13bc5 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml @@ -5,7 +5,7 @@ previousMrn: "50100010" sourceSystem: "EPIC" mrn: "51111111" nhsNumber: "111222223" -siteLocation: "RRV03" +siteLocation: "UCLH" patientBirthDate: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" From e159567c7b952c830b194e93a7248d5a89e0098d Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Sat, 25 Oct 2025 13:10:01 +0100 Subject: [PATCH 12/19] Revert "update all the comparison messages to include site location" This reverts commit 0aefbf649ed09d1738b631a4435d396df258b160. --- .../src/test/resources/AdtMessages/DoubleA01WithA13/A03.yaml | 1 - .../src/test/resources/AdtMessages/DoubleA01WithA13/A08.yaml | 1 - .../src/test/resources/AdtMessages/DoubleA01WithA13/A13.yaml | 1 - .../resources/AdtMessages/Location/CancelAdmit/01_A01.yaml | 1 - .../resources/AdtMessages/Location/CancelAdmit/02_A11.yaml | 1 - .../resources/AdtMessages/Location/CancelAdmit/03_A01.yaml | 1 - .../resources/AdtMessages/Location/CancelAdmit/04_A02.yaml | 1 - .../resources/AdtMessages/Location/CancelAdmit/05_A03.yaml | 1 - .../resources/AdtMessages/Location/CancelDischarge/01_A01.yaml | 1 - .../resources/AdtMessages/Location/CancelDischarge/02_A02.yaml | 1 - .../resources/AdtMessages/Location/CancelDischarge/03_A03.yaml | 1 - .../resources/AdtMessages/Location/CancelDischarge/04_A13.yaml | 1 - .../resources/AdtMessages/Location/CancelDischarge/05_A03.yaml | 1 - .../resources/AdtMessages/Location/CancelTransfer/01_A01.yaml | 1 - .../resources/AdtMessages/Location/CancelTransfer/02_A02.yaml | 1 - .../resources/AdtMessages/Location/CancelTransfer/03_A02.yaml | 1 - .../resources/AdtMessages/Location/CancelTransfer/04_A12.yaml | 1 - .../resources/AdtMessages/Location/CancelTransfer/05_A02.yaml | 1 - .../resources/AdtMessages/Location/CancelTransfer/06_A03.yaml | 1 - .../resources/AdtMessages/Location/DuplicateSimple/01_A04.yaml | 1 - .../resources/AdtMessages/Location/DuplicateSimple/02_A01.yaml | 1 - .../resources/AdtMessages/Location/DuplicateSimple/03_A02.yaml | 1 - .../resources/AdtMessages/Location/DuplicateSimple/04_A03.yaml | 1 - .../src/test/resources/AdtMessages/Location/Moves/02_A01.yaml | 1 - .../src/test/resources/AdtMessages/Location/Moves/03_A02.yaml | 1 - .../src/test/resources/AdtMessages/Location/Moves/04_A02.yaml | 1 - .../src/test/resources/AdtMessages/Location/Moves/05_A02.yaml | 1 - .../src/test/resources/AdtMessages/Location/Moves/06_A02.yaml | 1 - .../src/test/resources/AdtMessages/Location/Moves/07_A06.yaml | 1 - .../src/test/resources/AdtMessages/Location/Moves/08_A03.yaml | 1 - .../src/test/resources/AdtMessages/generic/A01.yaml | 1 - .../src/test/resources/AdtMessages/generic/A02.yaml | 1 - .../src/test/resources/AdtMessages/generic/A03.yaml | 1 - .../src/test/resources/AdtMessages/generic/A04.yaml | 1 - .../src/test/resources/AdtMessages/generic/A06.yaml | 1 - .../src/test/resources/AdtMessages/generic/A08_v1.yaml | 1 - .../src/test/resources/AdtMessages/generic/A11.yaml | 1 - .../src/test/resources/AdtMessages/generic/A12.yaml | 1 - .../src/test/resources/AdtMessages/generic/A13.yaml | 1 - .../src/test/resources/AdtMessages/generic/A17.yaml | 1 - .../src/test/resources/AdtMessages/generic/A29.yaml | 1 - .../src/test/resources/AdtMessages/generic/A40.yaml | 1 - .../src/test/resources/AdtMessages/generic/A45.yaml | 1 - .../src/test/resources/AdtMessages/generic/A47.yaml | 1 - .../src/test/resources/AdtMessages/pending/A15.yaml | 1 - .../src/test/resources/AdtMessages/pending/A16.yaml | 1 - .../src/test/resources/AdtMessages/pending/A25.yaml | 1 - .../src/test/resources/AdtMessages/pending/A26.yaml | 1 - .../src/test/resources/DepartmentMetadata/acun_dept.yaml | 3 ++- 49 files changed, 2 insertions(+), 49 deletions(-) diff --git a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A03.yaml b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A03.yaml index d7c241bfc..d0bff6d47 100644 --- a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A03.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A03.yaml @@ -5,7 +5,6 @@ eventOccurredDateTime: "2013-02-11T13:45:00Z" sourceSystem: "EPIC" mrn: "40800000" visitNumber: "123412341234" -siteLocation: "UCLH" dischargeDateTime: "2013-02-11T13:45:00Z" dischargeDisposition: "19" dischargeLocation: "1" diff --git a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A08.yaml b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A08.yaml index a9b7bc9f2..38de8c119 100644 --- a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A08.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A08.yaml @@ -4,7 +4,6 @@ eventReasonCode: "ADT_EVENT" sourceSystem: "EPIC" mrn: "40800000" visitNumber: "123412341234" -siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A13.yaml b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A13.yaml index d1f8b7939..e14ec7d68 100644 --- a/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A13.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/DoubleA01WithA13/A13.yaml @@ -4,7 +4,6 @@ eventOccurredDateTime: "2013-02-11T13:45:00Z" visitNumber: "123412341234" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" cancelledDateTime: "2013-02-11T13:45:00Z" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/01_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/01_A01.yaml index 75922fc0f..51795bd72 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/01_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/01_A01.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/02_A11.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/02_A11.yaml index 181afbd50..21c4258e2 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/02_A11.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/02_A11.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" -siteLocation: "UCLH" cancelledDateTime: "2013-02-11T11:00:52Z" modeOfArrival: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/03_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/03_A01.yaml index 6c2e51543..6e1ca3be8 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/03_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/03_A01.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/04_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/04_A02.yaml index ce16c8ff0..a8e198b6f 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/04_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelAdmit/04_A02.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" 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 ab039e083..df2d72247 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 @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" dischargeDateTime: "2013-02-11T15:00:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/01_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/01_A01.yaml index 3bc2b7ecf..67dd481ca 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/01_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/01_A01.yaml @@ -5,7 +5,6 @@ eventReasonCode: "ADT_EVENT" sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" -siteLocation: "UCLH" visitNumber: "123412341234" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/02_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/02_A02.yaml index acd242182..ef1ed8500 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/02_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/02_A02.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@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 091e37db5..4dcc5ae8c 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 @@ -9,7 +9,6 @@ mrn: "40800000" dischargeDateTime: "2013-02-11T12:30:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/04_A13.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/04_A13.yaml index 3b1674dd0..b16668d04 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/04_A13.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelDischarge/04_A13.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" cancelledDateTime: "2013-02-11T12:30:52Z" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" 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 b061f16ac..12eba4d40 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 @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" dischargeDateTime: "2013-02-11T13:00:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/01_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/01_A01.yaml index b496b7557..67dd481ca 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/01_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/01_A01.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/02_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/02_A02.yaml index acd242182..ef1ed8500 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/02_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/02_A02.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/03_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/03_A02.yaml index 2a27aa117..5e116c917 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/03_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/03_A02.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/04_A12.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/04_A12.yaml index ebccdcb96..e4c4920b7 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/04_A12.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/04_A12.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" -siteLocation: "UCLH" cancelledDateTime: "2013-02-11T12:30:52Z" cancelledLocation: "ED^DELETE ME^DELETE" fullLocationString: diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/05_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/05_A02.yaml index f209e2190..f6f313e4d 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/05_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/05_A02.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/06_A03.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/06_A03.yaml index c64ede1d4..97aa98653 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/06_A03.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/CancelTransfer/06_A03.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" dischargeDateTime: "2013-02-11T14:00:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/01_A04.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/01_A04.yaml index edda4b838..6d8431ae2 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/01_A04.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/01_A04.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" -siteLocation: "UCLH" presentationDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/02_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/02_A01.yaml index a77b6f61f..2556795b5 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/02_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/02_A01.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/03_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/03_A02.yaml index c9062d970..9d32e432c 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/03_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/DuplicateSimple/03_A02.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@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 2f0982a8f..23c76ea56 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 @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" dischargeDateTime: "2013-02-11T14:00:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/02_A01.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/02_A01.yaml index b496b7557..67dd481ca 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/02_A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/02_A01.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/03_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/03_A02.yaml index 56790ab07..74a6c0f53 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/03_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/03_A02.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/04_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/04_A02.yaml index f0e01518d..fb8255699 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/04_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/04_A02.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/05_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/05_A02.yaml index 33d13e97a..d56baa47d 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/05_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/05_A02.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/06_A02.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/06_A02.yaml index 1823e4c47..b3658e6fa 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/06_A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/06_A02.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/07_A06.yaml b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/07_A06.yaml index d4337770a..842c83553 100644 --- a/emap-interchange/src/test/resources/AdtMessages/Location/Moves/07_A06.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/Location/Moves/07_A06.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@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 e891d2563..bfddb8b38 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 @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" dischargeDateTime: "2013-02-11T17:00:52Z" dischargeDisposition: "Feeling great" dischargeLocation: "Home" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml index f5c46174f..88da640e3 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A01.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" -siteLocation: "UCLH" admissionDateTime: "@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 bdf0aa7a1..43b1b8af5 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A02.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A02.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A03.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A03.yaml index 977fad786..a6dd9483f 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A03.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A03.yaml @@ -5,7 +5,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" dischargeDateTime: "2013-02-11T10:00:00Z" dischargeDisposition: "19" dischargeLocation: "1" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml index 9e295b247..0b406bc03 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A04.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" presentationDateTime: "@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 9ea323a5e..2f13fc145 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A06.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A06.yaml @@ -6,7 +6,6 @@ visitNumber: "1234567890" sourceSystem: "EPIC" mrn: "A/AA1111" nhsNumber: "9999999999" -siteLocation: "UCLH" admissionDateTime: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A08_v1.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A08_v1.yaml index 4ed7b7cb5..09e1d7365 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A08_v1.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A08_v1.yaml @@ -5,7 +5,6 @@ sourceSystem: "EPIC" mrn: "40800000" visitNumber: "123412341234" nhsNumber: "9999999999" -siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A11.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A11.yaml index 56d059da1..8f061ef06 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A11.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A11.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" -siteLocation: "UCLH" cancelledDateTime: "2010-09-14T15:27:00Z" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A12.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A12.yaml index 1b62863a9..2874461d2 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A12.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A12.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "123412341234" -siteLocation: "UCLH" cancelledDateTime: "2013-02-11T10:01:52Z" cancelledLocation: "THP3^UCHP03THR POOL01^THR" fullLocationString: diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A13.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A13.yaml index 5f8e00938..e3708c698 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A13.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A13.yaml @@ -7,7 +7,6 @@ nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" cancelledDateTime: "2010-09-16T10:00:00Z" -siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A17.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A17.yaml index 861ae2ed3..a6621b55a 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A17.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A17.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" visitNumber: "123412341234" nhsNumber: "9999999999" -siteLocation: "UCLH" otherMrn: "30700000" otherNhsNumber: "1111111111" otherVisitNumber: "0999999999" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A29.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A29.yaml index d117601bd..1a372e324 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A29.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A29.yaml @@ -6,7 +6,6 @@ sourceSystem: "EPIC" mrn: "40800000" nhsNumber: "9999999999" visitNumber: "" -siteLocation: "UCLH" patientBirthDate: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml index eef403593..6b167fe83 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A40.yaml @@ -5,7 +5,6 @@ previousMrn: "40800000" sourceSystem: "EPIC" mrn: "40800001" nhsNumber: "9999999999" -siteLocation: "UCLH" patientBirthDate: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml index 757ee1b7d..7206d3a86 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A45.yaml @@ -7,7 +7,6 @@ sourceSystem: "EPIC" visitNumber: "123412341234" mrn: "60600000" nhsNumber: "1111111111" -siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" value: "T42E^T42E BY02^BY02-17" diff --git a/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml b/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml index 65dd13bc5..d5afa8e59 100644 --- a/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/generic/A47.yaml @@ -5,7 +5,6 @@ previousMrn: "50100010" sourceSystem: "EPIC" mrn: "51111111" nhsNumber: "111222223" -siteLocation: "UCLH" patientBirthDate: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/pending/A15.yaml b/emap-interchange/src/test/resources/AdtMessages/pending/A15.yaml index 98247bbb8..56d0cc178 100644 --- a/emap-interchange/src/test/resources/AdtMessages/pending/A15.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/pending/A15.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/pending/A16.yaml b/emap-interchange/src/test/resources/AdtMessages/pending/A16.yaml index 6e8bac8f0..374ded4eb 100644 --- a/emap-interchange/src/test/resources/AdtMessages/pending/A16.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/pending/A16.yaml @@ -3,7 +3,6 @@ recordedDateTime: "2022-04-21T23:23:00Z" eventOccurredDateTime: "2022-04-21T23:22:58Z" eventReasonCode: "PNDDISCHARGE" visitNumber: "123412341234" -siteLocation: "UCLH" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" diff --git a/emap-interchange/src/test/resources/AdtMessages/pending/A25.yaml b/emap-interchange/src/test/resources/AdtMessages/pending/A25.yaml index 0700afa60..f600ce670 100644 --- a/emap-interchange/src/test/resources/AdtMessages/pending/A25.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/pending/A25.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/AdtMessages/pending/A26.yaml b/emap-interchange/src/test/resources/AdtMessages/pending/A26.yaml index 3a2616639..4bb9078d5 100644 --- a/emap-interchange/src/test/resources/AdtMessages/pending/A26.yaml +++ b/emap-interchange/src/test/resources/AdtMessages/pending/A26.yaml @@ -6,7 +6,6 @@ visitNumber: "123412341234" nhsNumber: "9999999999" sourceSystem: "EPIC" mrn: "40800000" -siteLocation: "UCLH" fullLocationString: "@class": "uk.ac.ucl.rits.inform.interchange.InterchangeValue" status: "SAVE" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml index ff889578d..6428ca20b 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml @@ -8,4 +8,5 @@ departmentRecordStatus: "ACTIVE" previousDepartmentSpeciality: "Dental - Oral Medicine" departmentContactDate: "2012-02-09T00:00:00Z" specialityUpdate: "2022-02-09T00:00:20Z" -combinedUpdate: "2022-02-09T00:00:20Z" \ No newline at end of file +combinedUpdate: "2022-02-09T00:00:20Z" +siteLocation: "UCLH" \ No newline at end of file From baaaa0a5f1a03f0fc15643377c80730e4da4f286 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Sat, 25 Oct 2025 13:10:44 +0100 Subject: [PATCH 13/19] take out the site location variable --- .../uk/ac/ucl/rits/inform/interchange/adt/AdtMessage.java | 1 - .../uk/ac/ucl/rits/inform/informdb/movement/Department.java | 5 ----- .../ucl/rits/inform/datasources/ids/AdtMessageFactory.java | 1 - 3 files changed, 7 deletions(-) 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 603f63c14..79835a44f 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 @@ -26,7 +26,6 @@ public abstract class AdtMessage extends EmapOperationMessage { private String mrn; private String nhsNumber; private String visitNumber; - private String siteLocation; private InterchangeValue modeOfArrival = InterchangeValue.unknown(); private InterchangeValue ethnicGroup = InterchangeValue.unknown(); private InterchangeValue fullLocationString = InterchangeValue.unknown(); diff --git a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java index e04bc10c4..e6cb65c12 100644 --- a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java +++ b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/Department.java @@ -42,11 +42,6 @@ public class Department implements Serializable { */ private String name; - /** - * \brief Hospital site where this department is located. - */ - private String siteLocation; - /** * Create minimal department. * @param internalId ID of the department in EPIC. 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 ebc8ef265..ec98bf202 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 @@ -105,7 +105,6 @@ private void addGenericDataToAdtMessage(final String sourceId, final PatientInfo if (sendingApplication.isEmpty()) { throw new Hl7MessageIgnoredException("No sending application in message"); } - msg.setSiteLocation(patientInfoHl7.getSendingFacility()); msg.setSourceSystem(patientInfoHl7.getSendingApplication()); // will be replaced if there is an evn segment msg.setRecordedDateTime(patientInfoHl7.getMessageTimestamp()); From d60ad275c89fed6274c8109057218ce26713bc0c Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Sat, 25 Oct 2025 13:24:09 +0100 Subject: [PATCH 14/19] add site location as metadata to be red by the hoover --- .../emapstar/controllers/LocationController.java | 4 ++-- .../interchange/location/DepartmentMetadata.java | 2 ++ .../rits/inform/informdb/movement/DepartmentState.java | 10 +++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java b/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java index e9e0a62ac..ae182908b 100644 --- a/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java +++ b/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java @@ -260,7 +260,7 @@ void processDepartmentStates(DepartmentMetadata msg, Department department, Inst department, msg.getDepartmentRecordStatus().toString(), msg.getDepartmentSpeciality(), msg.getDepartmentType(), msg.getIsWardOrFlowArea(), msg.getIsCoreInpatientArea(), - validFrom, storedFrom); + msg.getSiteLocation(), validFrom, storedFrom); if (departmentStateRepo.existsByDepartmentIdAndSpecialityAndValidFrom(department, msg.getDepartmentSpeciality(), validFrom)) { logger.debug("Department State already exists in the database, no need to process further"); @@ -281,7 +281,7 @@ void processDepartmentStates(DepartmentMetadata msg, Department department, Inst msg.getDepartmentRecordStatus().toString(), msg.getPreviousDepartmentSpeciality(), msg.getDepartmentType(), msg.getIsWardOrFlowArea(), msg.getIsCoreInpatientArea(), - msg.getDepartmentContactDate(), storedFrom); + msg.getSiteLocation(), msg.getDepartmentContactDate(),storedFrom); previousState.setStoredUntil(currentState.getStoredFrom()); previousState.setValidUntil(currentState.getValidFrom()); departmentStateRepo.saveAll(List.of(previousState, currentState)); diff --git a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java index 58e2322d5..467761180 100644 --- a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java +++ b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java @@ -49,6 +49,8 @@ public class DepartmentMetadata extends EmapOperationMessage implements MinimalD private String departmentType; private Boolean isWardOrFlowArea; private Boolean isCoreInpatientArea; + private String siteLocation; + /** * Not used in processing, but useful to debugging ordering. */ diff --git a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java index 9bf5b34e0..b026d542a 100644 --- a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java +++ b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java @@ -70,6 +70,11 @@ public class DepartmentState extends AuditCore { */ private Boolean isCoreInpatientArea; + /** + * \brief hospital location where this department is situated. + */ + private String siteLocation; + /** * Create valid department state. * @param department parent department @@ -80,16 +85,18 @@ public class DepartmentState extends AuditCore { * @param departmentType Report Group Nine value associated with this department * @param isWardOrFlowArea is this department a ward or flow area * @param isCoreInpatientArea is this department a core inpatient area + * @param siteLocation hospital location where this department is situated. */ public DepartmentState(Department department, String status, String speciality, String departmentType, Boolean isWardOrFlowArea, - Boolean isCoreInpatientArea, Instant validFrom, Instant storedFrom) { + Boolean isCoreInpatientArea, String siteLocation, Instant validFrom, Instant storedFrom) { departmentId = department; this.status = status; this.speciality = speciality; this.departmentType = departmentType; this.isWardOrFlowArea = isWardOrFlowArea; this.isCoreInpatientArea = isCoreInpatientArea; + this.siteLocation = siteLocation; setValidFrom(validFrom); setStoredFrom(storedFrom); } @@ -105,6 +112,7 @@ private DepartmentState(DepartmentState other) { departmentType = other.departmentType; isWardOrFlowArea = other.isWardOrFlowArea; isCoreInpatientArea = other.isCoreInpatientArea; + siteLocation = other.siteLocation; } @Override From 9492f6e3f7270cfb98ef68d560ad6ad0c6f3a2e5 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Sat, 25 Oct 2025 13:32:09 +0100 Subject: [PATCH 15/19] fix check style --- .../datasinks/emapstar/controllers/LocationController.java | 2 +- .../rits/inform/interchange/location/DepartmentMetadata.java | 2 +- .../ac/ucl/rits/inform/informdb/movement/DepartmentState.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java b/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java index ae182908b..742847ad0 100644 --- a/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java +++ b/core/src/main/java/uk/ac/ucl/rits/inform/datasinks/emapstar/controllers/LocationController.java @@ -281,7 +281,7 @@ void processDepartmentStates(DepartmentMetadata msg, Department department, Inst msg.getDepartmentRecordStatus().toString(), msg.getPreviousDepartmentSpeciality(), msg.getDepartmentType(), msg.getIsWardOrFlowArea(), msg.getIsCoreInpatientArea(), - msg.getSiteLocation(), msg.getDepartmentContactDate(),storedFrom); + msg.getSiteLocation(), msg.getDepartmentContactDate(), storedFrom); previousState.setStoredUntil(currentState.getStoredFrom()); previousState.setValidUntil(currentState.getValidFrom()); departmentStateRepo.saveAll(List.of(previousState, currentState)); diff --git a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java index 467761180..7a06350ca 100644 --- a/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java +++ b/emap-interchange/src/main/java/uk/ac/ucl/rits/inform/interchange/location/DepartmentMetadata.java @@ -50,7 +50,7 @@ public class DepartmentMetadata extends EmapOperationMessage implements MinimalD private Boolean isWardOrFlowArea; private Boolean isCoreInpatientArea; private String siteLocation; - + /** * Not used in processing, but useful to debugging ordering. */ diff --git a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java index b026d542a..46092781e 100644 --- a/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java +++ b/emap-star/emap-star/src/main/java/uk/ac/ucl/rits/inform/informdb/movement/DepartmentState.java @@ -73,7 +73,7 @@ public class DepartmentState extends AuditCore { /** * \brief hospital location where this department is situated. */ - private String siteLocation; + private String siteLocation; /** * Create valid department state. From 79767f14248015d8ef690e7cdfd1a82816884599 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Tue, 28 Oct 2025 16:08:18 +0000 Subject: [PATCH 16/19] add additional metadata and remove the files I don't need --- .../DepartmentMetadata/additional-acun_dept.yaml | 15 --------------- .../dental_department_only.yaml | 12 ------------ .../medsurg_active_pool_bed.yaml | 11 ----------- .../no_department_history.yaml | 11 ----------- .../paediatric_department_only_1.yaml | 13 ------------- .../paediatric_department_only_2.yaml | 13 ------------- .../paediatric_department_only_3.yaml | 13 ------------- .../local-only/dental_department_only.yaml | 4 ++++ .../local-only/medsurg_active_pool_bed.yaml | 5 ++++- .../local-only/no_department_history.yaml | 4 ++++ .../local-only/paediatric_department_only_1.yaml | 6 +++++- .../local-only/paediatric_department_only_2.yaml | 6 +++++- .../local-only/paediatric_department_only_3.yaml | 6 +++++- 13 files changed, 27 insertions(+), 92 deletions(-) delete mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml delete mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml delete mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml delete mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml delete mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml delete mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml delete mode 100644 emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml deleted file mode 100644 index 855281a54..000000000 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-acun_dept.yaml +++ /dev/null @@ -1,15 +0,0 @@ -"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" -sourceSystem: "clarity" -departmentHl7: "ACUN" -departmentName: "EGA E03 ACU NURSERY" -departmentId: "2" -departmentSpeciality: "Maternity - Well Baby" -departmentRecordStatus: "ACTIVE" -previousDepartmentSpeciality: "Dental - Oral Medicine" -departmentContactDate: "2012-02-09T00:00:00Z" -specialityUpdate: "2022-02-09T00:00:20Z" -combinedUpdate: "2022-02-09T00:00:20Z" -departmentType: "ACUN" -isWardOrFlowArea: true -isCoreInpatientArea: true -siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml deleted file mode 100644 index eedb8a794..000000000 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/dental_department_only.yaml +++ /dev/null @@ -1,12 +0,0 @@ -"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" -sourceSystem: "clarity" -# department -departmentHl7: "1000000059" -departmentName: "DENTAL: ORAL MEDICINE" -departmentId: "13" -departmentRecordStatus: "ACTIVE" -departmentContactDate: "2018-08-22T00:00:00Z" -departmentSpeciality: "Dental - Oral Medicine" -specialityUpdate: "2020-09-22T13:47:56Z" -combinedUpdate: "2020-09-22T13:47:56Z" -siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml deleted file mode 100644 index 9d45554f6..000000000 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/medsurg_active_pool_bed.yaml +++ /dev/null @@ -1,11 +0,0 @@ -"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" -sourceSystem: "clarity" -# department -departmentHl7: "MEDSURG" -departmentName: "EMH MED SURG" -departmentId: "1" -departmentSpeciality: null -departmentRecordStatus: "DELETED_AND_HIDDEN" -departmentContactDate: "2005-12-08T00:00:00Z" -combinedUpdate: "2021-04-23T09:00:00Z" -siteLocation: "UCLH" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml deleted file mode 100644 index 51195e9bb..000000000 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/no_department_history.yaml +++ /dev/null @@ -1,11 +0,0 @@ -"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" -sourceSystem: "clarity" -# department -departmentHl7: "1020100002" -departmentName: "UCH ROI" -departmentId: "1020100002" -departmentSpeciality: null -departmentRecordStatus: "ACTIVE" -departmentContactDate: "2022-12-08T00:00:00Z" -combinedUpdate: "2022-12-08T00:00:00Z" -siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml deleted file mode 100644 index 739ef24dd..000000000 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_1.yaml +++ /dev/null @@ -1,13 +0,0 @@ -"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" -sourceSystem: "clarity" -# department -departmentHl7: "100000060" -departmentName: "OFF SE5PC" -departmentId: "1020610068" -departmentSpeciality: "Paediatric - Respiratory Medicine" -departmentRecordStatus: "ACTIVE" -departmentContactDate: "2021-08-25T23:00:00Z" -# missing previous department will be null -specialityUpdate: "2021-08-26T11:28:51Z" -combinedUpdate: "2021-08-26T11:28:51Z" -siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml deleted file mode 100644 index e12250363..000000000 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_2.yaml +++ /dev/null @@ -1,13 +0,0 @@ -"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" -sourceSystem: "clarity" -# department -departmentHl7: "100000060" -departmentName: "OFF SE5PC" -departmentId: "1020610068" -departmentSpeciality: "Paediatric - Infectious Diseases" -previousDepartmentSpeciality: "Paediatric - Respiratory Medicine" -departmentRecordStatus: "ACTIVE" -departmentContactDate: "2021-08-25T23:00:00Z" -specialityUpdate: "2021-09-06T06:42:26Z" -combinedUpdate: "2021-09-06T06:42:26Z" -siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml deleted file mode 100644 index a45b5a0d3..000000000 --- a/emap-interchange/src/test/resources/DepartmentMetadata/additional-local-only/paediatric_department_only_3.yaml +++ /dev/null @@ -1,13 +0,0 @@ -"@class": "uk.ac.ucl.rits.inform.interchange.location.DepartmentMetadata" -sourceSystem: "clarity" -# department -departmentHl7: "100000060" -departmentName: "OFF SE5PC" -departmentId: "1020610068" -departmentSpeciality: "Paediatric - RESPOND" -previousDepartmentSpeciality: "Paediatric - Infectious Diseases" -departmentRecordStatus: "ACTIVE" -departmentContactDate: "2021-08-25T23:00:00Z" -specialityUpdate: "2021-10-08T23:00:20Z" -combinedUpdate: "2021-10-08T23:00:20Z" -siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml index f74c366b6..685b215c1 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml @@ -9,3 +9,7 @@ departmentContactDate: "2018-08-22T00:00:00Z" departmentSpeciality: "Dental - Oral Medicine" specialityUpdate: "2020-09-22T13:47:56Z" combinedUpdate: "2020-09-22T13:47:56Z" +siteLocation: "DENTAL HOSPITAL" +departmentType: "CLINICAL" +isWardOrFlowArea: false +isCoreInpatientArea: false diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml index 41cf2670a..ca316a463 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml @@ -8,4 +8,7 @@ departmentSpeciality: null departmentRecordStatus: "DELETED_AND_HIDDEN" departmentContactDate: "2005-12-08T00:00:00Z" combinedUpdate: "2021-04-23T09:00:00Z" - +siteLocation: "DENTAL HOSPITAL" +departmentType: "CLINICAL" +isWardOrFlowArea: false +isCoreInpatientArea: false diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml index bbe538032..a2bb05573 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml @@ -8,3 +8,7 @@ departmentSpeciality: null departmentRecordStatus: "ACTIVE" departmentContactDate: "2022-12-08T00:00:00Z" combinedUpdate: "2022-12-08T00:00:00Z" +siteLocation: "DENTAL HOSPITAL" +departmentType: "CLINICAL" +isWardOrFlowArea: false +isCoreInpatientArea: false \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml index b396e601f..720cd9c32 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml @@ -9,4 +9,8 @@ departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" # missing previous department will be null specialityUpdate: "2021-08-26T11:28:51Z" -combinedUpdate: "2021-08-26T11:28:51Z" \ No newline at end of file +combinedUpdate: "2021-08-26T11:28:51Z" +siteLocation: "DENTAL HOSPITAL" +departmentType: "CLINICAL" +isWardOrFlowArea: false +isCoreInpatientArea: false diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml index 7872eae2e..c2d4ba30d 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml @@ -9,4 +9,8 @@ previousDepartmentSpeciality: "Paediatric - Respiratory Medicine" departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" specialityUpdate: "2021-09-06T06:42:26Z" -combinedUpdate: "2021-09-06T06:42:26Z" \ No newline at end of file +combinedUpdate: "2021-09-06T06:42:26Z" +siteLocation: "DENTAL HOSPITAL" +departmentType: "CLINICAL" +isWardOrFlowArea: false +isCoreInpatientArea: false \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml index 1834085f7..616bb5b52 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml @@ -9,4 +9,8 @@ previousDepartmentSpeciality: "Paediatric - Infectious Diseases" departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" specialityUpdate: "2021-10-08T23:00:20Z" -combinedUpdate: "2021-10-08T23:00:20Z" \ No newline at end of file +combinedUpdate: "2021-10-08T23:00:20Z" +siteLocation: "DENTAL HOSPITAL" +departmentType: "CLINICAL" +isWardOrFlowArea: false +isCoreInpatientArea: false \ No newline at end of file From 9f38de2959c4dd196783c8c7647a5b16bf4fa98c Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Wed, 29 Oct 2025 13:31:38 +0000 Subject: [PATCH 17/19] Reordered variables --- .../src/test/resources/DepartmentMetadata/acun_dept.yaml | 5 ++++- .../local-only/dental_department_only.yaml | 5 +++-- .../local-only/medsurg_active_pool_bed.yaml | 5 +++-- .../local-only/no_department_history.yaml | 6 +++--- .../local-only/paediatric_department_only_1.yaml | 5 +++-- .../local-only/paediatric_department_only_2.yaml | 6 +++--- .../local-only/paediatric_department_only_3.yaml | 6 +++--- 7 files changed, 22 insertions(+), 16 deletions(-) diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml index 6428ca20b..feca9276c 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml @@ -8,5 +8,8 @@ departmentRecordStatus: "ACTIVE" previousDepartmentSpeciality: "Dental - Oral Medicine" departmentContactDate: "2012-02-09T00:00:00Z" specialityUpdate: "2022-02-09T00:00:20Z" +departmentType: "CLINICAL" +isWardOrFlowArea: false +isCoreInpatientArea: false +siteLocation: "DENTAL HOSPITAL" combinedUpdate: "2022-02-09T00:00:20Z" -siteLocation: "UCLH" \ No newline at end of file diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml index 685b215c1..9c3c27b68 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml @@ -8,8 +8,9 @@ departmentRecordStatus: "ACTIVE" departmentContactDate: "2018-08-22T00:00:00Z" departmentSpeciality: "Dental - Oral Medicine" specialityUpdate: "2020-09-22T13:47:56Z" -combinedUpdate: "2020-09-22T13:47:56Z" -siteLocation: "DENTAL HOSPITAL" departmentType: "CLINICAL" isWardOrFlowArea: false isCoreInpatientArea: false +siteLocation: "DENTAL HOSPITAL" +combinedUpdate: "2020-09-22T13:47:56Z" + diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml index ca316a463..8f25b0fd8 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml @@ -7,8 +7,9 @@ departmentId: "1" departmentSpeciality: null departmentRecordStatus: "DELETED_AND_HIDDEN" departmentContactDate: "2005-12-08T00:00:00Z" -combinedUpdate: "2021-04-23T09:00:00Z" -siteLocation: "DENTAL HOSPITAL" departmentType: "CLINICAL" isWardOrFlowArea: false isCoreInpatientArea: false +siteLocation: "DENTAL HOSPITAL" +combinedUpdate: "2021-04-23T09:00:00Z" + diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml index a2bb05573..53779ca60 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml @@ -7,8 +7,8 @@ departmentId: "1020100002" departmentSpeciality: null departmentRecordStatus: "ACTIVE" departmentContactDate: "2022-12-08T00:00:00Z" -combinedUpdate: "2022-12-08T00:00:00Z" -siteLocation: "DENTAL HOSPITAL" departmentType: "CLINICAL" isWardOrFlowArea: false -isCoreInpatientArea: false \ No newline at end of file +isCoreInpatientArea: false +siteLocation: "DENTAL HOSPITAL" +combinedUpdate: "2022-12-08T00:00:00Z" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml index 720cd9c32..7110f34db 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml @@ -9,8 +9,9 @@ departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" # missing previous department will be null specialityUpdate: "2021-08-26T11:28:51Z" -combinedUpdate: "2021-08-26T11:28:51Z" -siteLocation: "DENTAL HOSPITAL" departmentType: "CLINICAL" isWardOrFlowArea: false isCoreInpatientArea: false +siteLocation: "DENTAL HOSPITAL" +combinedUpdate: "2021-08-26T11:28:51Z" + diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml index c2d4ba30d..8c92ea616 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml @@ -9,8 +9,8 @@ previousDepartmentSpeciality: "Paediatric - Respiratory Medicine" departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" specialityUpdate: "2021-09-06T06:42:26Z" -combinedUpdate: "2021-09-06T06:42:26Z" -siteLocation: "DENTAL HOSPITAL" departmentType: "CLINICAL" isWardOrFlowArea: false -isCoreInpatientArea: false \ No newline at end of file +isCoreInpatientArea: false +siteLocation: "DENTAL HOSPITAL" +combinedUpdate: "2021-09-06T06:42:26Z" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml index 616bb5b52..61db4d9ab 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml @@ -9,8 +9,8 @@ previousDepartmentSpeciality: "Paediatric - Infectious Diseases" departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" specialityUpdate: "2021-10-08T23:00:20Z" -combinedUpdate: "2021-10-08T23:00:20Z" -siteLocation: "DENTAL HOSPITAL" departmentType: "CLINICAL" isWardOrFlowArea: false -isCoreInpatientArea: false \ No newline at end of file +isCoreInpatientArea: false +siteLocation: "DENTAL HOSPITAL" +combinedUpdate: "2021-10-08T23:00:20Z" From 57da9ee0bd853cd4f8e5f9faa715aee74968cdd7 Mon Sep 17 00:00:00 2001 From: Sarah Keating Date: Thu, 30 Oct 2025 13:54:25 +0000 Subject: [PATCH 18/19] FIX THE VALUES TO MATCH THOSE EXPECTED --- .../local-only/dental_department_only.yaml | 8 ++++---- .../local-only/no_department_history.yaml | 6 +++--- .../local-only/paediatric_department_only_1.yaml | 6 +++--- .../local-only/paediatric_department_only_2.yaml | 6 +++--- .../local-only/paediatric_department_only_3.yaml | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml index 9c3c27b68..35c7eb22a 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/dental_department_only.yaml @@ -8,9 +8,9 @@ departmentRecordStatus: "ACTIVE" departmentContactDate: "2018-08-22T00:00:00Z" departmentSpeciality: "Dental - Oral Medicine" specialityUpdate: "2020-09-22T13:47:56Z" -departmentType: "CLINICAL" -isWardOrFlowArea: false -isCoreInpatientArea: false -siteLocation: "DENTAL HOSPITAL" +departmentType: "2" +isWardOrFlowArea: true +isCoreInpatientArea: true +siteLocation: "UCLH" combinedUpdate: "2020-09-22T13:47:56Z" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml index 53779ca60..d7b8c0436 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/no_department_history.yaml @@ -7,8 +7,8 @@ departmentId: "1020100002" departmentSpeciality: null departmentRecordStatus: "ACTIVE" departmentContactDate: "2022-12-08T00:00:00Z" -departmentType: "CLINICAL" -isWardOrFlowArea: false +departmentType: "12" +isWardOrFlowArea: true isCoreInpatientArea: false -siteLocation: "DENTAL HOSPITAL" +siteLocation: "UCLH" combinedUpdate: "2022-12-08T00:00:00Z" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml index 7110f34db..a7f1faa24 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_1.yaml @@ -9,9 +9,9 @@ departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" # missing previous department will be null specialityUpdate: "2021-08-26T11:28:51Z" -departmentType: "CLINICAL" -isWardOrFlowArea: false +departmentType: "12" +isWardOrFlowArea: true isCoreInpatientArea: false -siteLocation: "DENTAL HOSPITAL" +siteLocation: "UCLH" combinedUpdate: "2021-08-26T11:28:51Z" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml index 8c92ea616..351787ec3 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_2.yaml @@ -9,8 +9,8 @@ previousDepartmentSpeciality: "Paediatric - Respiratory Medicine" departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" specialityUpdate: "2021-09-06T06:42:26Z" -departmentType: "CLINICAL" -isWardOrFlowArea: false +departmentType: "12" +isWardOrFlowArea: true isCoreInpatientArea: false -siteLocation: "DENTAL HOSPITAL" +siteLocation: "UCLH" combinedUpdate: "2021-09-06T06:42:26Z" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml index 61db4d9ab..0cd332acf 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/paediatric_department_only_3.yaml @@ -9,8 +9,8 @@ previousDepartmentSpeciality: "Paediatric - Infectious Diseases" departmentRecordStatus: "ACTIVE" departmentContactDate: "2021-08-25T23:00:00Z" specialityUpdate: "2021-10-08T23:00:20Z" -departmentType: "CLINICAL" -isWardOrFlowArea: false +departmentType: "12" +isWardOrFlowArea: true isCoreInpatientArea: false -siteLocation: "DENTAL HOSPITAL" +siteLocation: "UCLH" combinedUpdate: "2021-10-08T23:00:20Z" From 7f1d6957bb781d9d6e69e73085fd25b70acdf043 Mon Sep 17 00:00:00 2001 From: Stef Piatek Date: Thu, 30 Oct 2025 15:24:51 +0000 Subject: [PATCH 19/19] Fixup department queries --- .../src/test/resources/DepartmentMetadata/acun_dept.yaml | 8 ++++---- .../local-only/medsurg_active_pool_bed.yaml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml index feca9276c..b0e854559 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/acun_dept.yaml @@ -8,8 +8,8 @@ departmentRecordStatus: "ACTIVE" previousDepartmentSpeciality: "Dental - Oral Medicine" departmentContactDate: "2012-02-09T00:00:00Z" specialityUpdate: "2022-02-09T00:00:20Z" -departmentType: "CLINICAL" -isWardOrFlowArea: false -isCoreInpatientArea: false -siteLocation: "DENTAL HOSPITAL" +departmentType: "2" +isWardOrFlowArea: true +isCoreInpatientArea: true +siteLocation: "EMH" combinedUpdate: "2022-02-09T00:00:20Z" diff --git a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml index 8f25b0fd8..99c5cbbfb 100644 --- a/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml +++ b/emap-interchange/src/test/resources/DepartmentMetadata/local-only/medsurg_active_pool_bed.yaml @@ -7,9 +7,9 @@ departmentId: "1" departmentSpeciality: null departmentRecordStatus: "DELETED_AND_HIDDEN" departmentContactDate: "2005-12-08T00:00:00Z" -departmentType: "CLINICAL" -isWardOrFlowArea: false -isCoreInpatientArea: false -siteLocation: "DENTAL HOSPITAL" +departmentType: "2" +isWardOrFlowArea: true +isCoreInpatientArea: true +siteLocation: "UCLH" combinedUpdate: "2021-04-23T09:00:00Z"