Skip to content

Commit 151eadd

Browse files
jecihjoyjecihjoy
committed
FM2-161 : Created translations for appointment participants; patient, provider and appointment provider
1 parent f56afeb commit 151eadd

12 files changed

+715
-6
lines changed

‎fhir2-appnt-api/src/main/java/org/openmrs/module/fhirappnt/api/AppointmentFhirConstants.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,8 @@ public class AppointmentFhirConstants extends FhirConstants {
88

99
public static final String APPOINTMENT_SPECIALITY_VALUESET_URI = HL7_FHIR_VALUE_SET_PREFIX
1010
+ "/c80-practice-codes";
11+
12+
public static final String APPOINTMENT_PARTICIPANT_TYPE = HL7_FHIR_VALUE_SET_PREFIX
13+
+ "/encounter-participant-type";
14+
1115
}

‎fhir2-appnt-api/src/main/java/org/openmrs/module/fhirappnt/api/Impl/FhirBahmniAppointmentServiceImpl.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
import org.openmrs.module.fhir2.api.dao.FhirAppointmentDao;
88
import org.openmrs.module.fhir2.api.translators.AppointmentTranslator;
99
import org.springframework.beans.factory.annotation.Autowired;
10+
import org.springframework.context.annotation.Primary;
1011
import org.springframework.stereotype.Component;
1112
import org.springframework.transaction.annotation.Transactional;
1213

14+
@Primary
1315
@Component
1416
@Transactional
1517
@Setter(AccessLevel.PACKAGE)

‎fhir2-appnt-api/src/main/java/org/openmrs/module/fhirappnt/api/translators/AppointmentParticipantTranslator.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.openmrs.module.fhirappnt.api.translators;
2+
3+
import org.hl7.fhir.r4.model.Appointment;
4+
import org.openmrs.module.fhir2.api.translators.OpenmrsFhirUpdatableTranslator;
5+
6+
public interface AppointmentParticipantTranslator<T> extends OpenmrsFhirUpdatableTranslator<T, Appointment.AppointmentParticipantComponent> {
7+
}

‎fhir2-appnt-api/src/main/java/org/openmrs/module/fhirappnt/api/translators/impl/AppointmentPatientTranslatorImpl.java‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
package org.openmrs.module.fhirappnt.api.translators.impl;
2+
3+
import lombok.AccessLevel;
4+
import lombok.Setter;
5+
import org.hl7.fhir.r4.model.Appointment;
6+
import org.hl7.fhir.r4.model.CodeableConcept;
7+
import org.hl7.fhir.r4.model.Coding;
8+
import org.openmrs.Patient;
9+
import org.openmrs.module.fhir2.api.translators.PatientReferenceTranslator;
10+
import org.openmrs.module.fhir2.api.translators.impl.AbstractReferenceHandlingTranslator;
11+
import org.openmrs.module.fhirappnt.api.AppointmentFhirConstants;
12+
import org.openmrs.module.fhirappnt.api.translators.AppointmentParticipantTranslator;
13+
import org.springframework.beans.factory.annotation.Autowired;
14+
import org.springframework.stereotype.Component;
15+
16+
@Component
17+
@Setter(AccessLevel.PACKAGE)
18+
public class AppointmentPatientTranslatorImpl extends AbstractReferenceHandlingTranslator implements AppointmentParticipantTranslator<Patient> {
19+
20+
@Autowired
21+
private PatientReferenceTranslator patientReferenceTranslator;
22+
23+
@Override
24+
public Appointment.AppointmentParticipantComponent toFhirResource(Patient patient) {
25+
if (patient == null) {
26+
return null;
27+
}
28+
Appointment.AppointmentParticipantComponent participant = new Appointment.AppointmentParticipantComponent();
29+
CodeableConcept role = new CodeableConcept();
30+
role.addCoding(new Coding(AppointmentFhirConstants.APPOINTMENT_PARTICIPANT_TYPE, "Patient", "Patient"));
31+
participant.setRequired(Appointment.ParticipantRequired.REQUIRED);
32+
participant.setActor(patientReferenceTranslator.toFhirResource(patient));
33+
participant.addType(role);
34+
participant.setStatus(Appointment.ParticipationStatus.ACCEPTED);
35+
36+
return participant;
37+
}
38+
39+
@Override
40+
public Patient toOpenmrsType(Appointment.AppointmentParticipantComponent appointmentParticipantComponent) {
41+
return toOpenmrsType(new Patient(), appointmentParticipantComponent);
42+
}
43+
44+
@Override
45+
public Patient toOpenmrsType(Patient patient, Appointment.AppointmentParticipantComponent appointmentParticipantComponent) {
46+
if (appointmentParticipantComponent == null) {
47+
return patient;
48+
}
49+
50+
return patientReferenceTranslator.toOpenmrsType(appointmentParticipantComponent.getActor());
51+
}
52+
}

‎fhir2-appnt-api/src/main/java/org/openmrs/module/fhirappnt/api/translators/impl/AppointmentPractitionerTranslatorImpl.java‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
package org.openmrs.module.fhirappnt.api.translators.impl;
2+
3+
import lombok.AccessLevel;
4+
import lombok.Setter;
5+
import org.hl7.fhir.r4.model.Appointment;
6+
import org.hl7.fhir.r4.model.CodeableConcept;
7+
import org.hl7.fhir.r4.model.Coding;
8+
import org.openmrs.Provider;
9+
import org.openmrs.module.fhir2.api.dao.FhirPractitionerDao;
10+
import org.openmrs.module.fhir2.api.translators.impl.AbstractReferenceHandlingTranslator;
11+
import org.openmrs.module.fhirappnt.api.AppointmentFhirConstants;
12+
import org.openmrs.module.fhirappnt.api.translators.AppointmentParticipantTranslator;
13+
import org.springframework.beans.factory.annotation.Autowired;
14+
import org.springframework.stereotype.Component;
15+
16+
@Component
17+
@Setter(AccessLevel.PACKAGE)
18+
public class AppointmentPractitionerTranslatorImpl extends AbstractReferenceHandlingTranslator implements AppointmentParticipantTranslator<Provider> {
19+
20+
@Autowired
21+
private FhirPractitionerDao practitionerDao;
22+
23+
@Override
24+
public Appointment.AppointmentParticipantComponent toFhirResource(Provider provider) {
25+
if (provider == null) {
26+
return null;
27+
}
28+
Appointment.AppointmentParticipantComponent participant = new Appointment.AppointmentParticipantComponent();
29+
CodeableConcept role = new CodeableConcept();
30+
role.addCoding(new Coding(AppointmentFhirConstants.APPOINTMENT_PARTICIPANT_TYPE, "Practitioner", "Practitioner"));
31+
participant.setRequired(Appointment.ParticipantRequired.OPTIONAL);
32+
participant.setActor(createPractitionerReference(provider));
33+
participant.addType(role);
34+
35+
return participant;
36+
}
37+
38+
@Override
39+
public Provider toOpenmrsType(Appointment.AppointmentParticipantComponent appointmentParticipantComponent) {
40+
return toOpenmrsType(new Provider(), appointmentParticipantComponent);
41+
}
42+
43+
@Override
44+
public Provider toOpenmrsType(Provider appointmentProvider, Appointment.AppointmentParticipantComponent appointmentParticipantComponent) {
45+
if (appointmentParticipantComponent == null) {
46+
return appointmentProvider;
47+
}
48+
49+
return practitionerDao.getProviderByUuid(getReferenceId(appointmentParticipantComponent.getActor()));
50+
}
51+
}

‎fhir2-appnt-api/src/main/java/org/openmrs/module/fhirappnt/api/translators/impl/AppointmentProviderTranslatorImpl.java‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
package org.openmrs.module.fhirappnt.api.translators.impl;
2+
import lombok.AccessLevel;
3+
import lombok.Setter;
4+
import org.hl7.fhir.r4.model.Appointment;
5+
import org.hl7.fhir.r4.model.CodeableConcept;
6+
import org.hl7.fhir.r4.model.Coding;
7+
import org.openmrs.module.appointments.model.AppointmentProvider;
8+
import org.openmrs.module.appointments.model.AppointmentProviderResponse;
9+
import org.openmrs.module.fhir2.api.dao.FhirPractitionerDao;
10+
import org.openmrs.module.fhir2.api.translators.impl.AbstractReferenceHandlingTranslator;
11+
import org.openmrs.module.fhirappnt.api.AppointmentFhirConstants;
12+
import org.openmrs.module.fhirappnt.api.translators.AppointmentParticipantTranslator;
13+
import org.springframework.beans.factory.annotation.Autowired;
14+
import org.springframework.stereotype.Component;
15+
16+
@Component
17+
@Setter(AccessLevel.PACKAGE)
18+
public class AppointmentProviderTranslatorImpl extends AbstractReferenceHandlingTranslator implements AppointmentParticipantTranslator<AppointmentProvider> {
19+
20+
@Autowired
21+
private FhirPractitionerDao practitionerDao;
22+
23+
@Override
24+
public Appointment.AppointmentParticipantComponent toFhirResource(AppointmentProvider appointmentProvider) {
25+
if (appointmentProvider == null || appointmentProvider.getProvider() == null) {
26+
return null;
27+
}
28+
Appointment.AppointmentParticipantComponent participant = new Appointment.AppointmentParticipantComponent();
29+
CodeableConcept role = new CodeableConcept();
30+
role.addCoding(new Coding(AppointmentFhirConstants.APPOINTMENT_PARTICIPANT_TYPE, "AppointmentPractitioner", "AppointmentPractitioner"));
31+
participant.setRequired(Appointment.ParticipantRequired.OPTIONAL);
32+
participant.setActor(createPractitionerReference(appointmentProvider.getProvider()));
33+
participant.addType(role);
34+
35+
switch (appointmentProvider.getResponse()) {
36+
case ACCEPTED:
37+
return participant.setStatus(Appointment.ParticipationStatus.ACCEPTED);
38+
case TENTATIVE:
39+
return participant.setStatus(Appointment.ParticipationStatus.TENTATIVE);
40+
case AWAITING:
41+
return participant.setStatus(Appointment.ParticipationStatus.NEEDSACTION);
42+
case REJECTED:
43+
return participant.setStatus(Appointment.ParticipationStatus.DECLINED);
44+
case CANCELLED:
45+
return participant.setStatus(Appointment.ParticipationStatus.NULL);
46+
}
47+
48+
return participant;
49+
}
50+
51+
@Override
52+
public AppointmentProvider toOpenmrsType(Appointment.AppointmentParticipantComponent appointmentParticipantComponent) {
53+
return toOpenmrsType(new AppointmentProvider(), appointmentParticipantComponent);
54+
}
55+
56+
@Override
57+
public AppointmentProvider toOpenmrsType(AppointmentProvider appointmentProvider, Appointment.AppointmentParticipantComponent appointmentParticipantComponent) {
58+
if (appointmentParticipantComponent == null) {
59+
return appointmentProvider;
60+
}
61+
appointmentProvider.setProvider(practitionerDao.getProviderByUuid(getReferenceId(appointmentParticipantComponent.getActor())));
62+
switch (appointmentParticipantComponent.getStatus()) {
63+
case ACCEPTED:
64+
appointmentProvider.setResponse(AppointmentProviderResponse.ACCEPTED);
65+
case TENTATIVE:
66+
appointmentProvider.setResponse(AppointmentProviderResponse.TENTATIVE);
67+
case NEEDSACTION:
68+
appointmentProvider.setResponse(AppointmentProviderResponse.AWAITING);
69+
case DECLINED:
70+
appointmentProvider.setResponse(AppointmentProviderResponse.REJECTED);
71+
case NULL:
72+
appointmentProvider.setResponse(AppointmentProviderResponse.CANCELLED);
73+
}
74+
75+
return appointmentProvider;
76+
}
77+
}

‎fhir2-appnt-api/src/main/java/org/openmrs/module/fhirappnt/api/translators/impl/AppointmentSpecialityTranslatorImpl.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
import org.openmrs.module.fhirappnt.api.AppointmentFhirConstants;
66
import org.openmrs.module.fhirappnt.api.translators.AppointmentSpecialityTranslator;
77
import org.openmrs.module.appointments.model.Speciality;
8-
import org.springframework.stereotype.Component;
98

10-
@Component
119
public class AppointmentSpecialityTranslatorImpl implements AppointmentSpecialityTranslator {
1210

1311
@Override

‎fhir2-appnt-api/src/main/java/org/openmrs/module/fhirappnt/api/translators/impl/AppointmentTranslatorImpl.java‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,48 @@
11
package org.openmrs.module.fhirappnt.api.translators.impl;
2-
32
import lombok.AccessLevel;
43
import lombok.Setter;
54
import org.hl7.fhir.r4.model.Appointment;
5+
import org.openmrs.Patient;
6+
import org.openmrs.Provider;
7+
import org.openmrs.module.appointments.model.AppointmentProvider;
68
import org.openmrs.module.appointments.model.AppointmentStatus;
79
import org.openmrs.module.fhir2.api.translators.AppointmentTranslator;
10+
import org.openmrs.module.fhirappnt.api.translators.AppointmentParticipantTranslator;
11+
import org.springframework.beans.factory.annotation.Autowired;
812
import org.springframework.stereotype.Component;
913

14+
import java.util.HashSet;
15+
import java.util.Set;
1016

1117
@Component
1218
@Setter(AccessLevel.PACKAGE)
1319
public class AppointmentTranslatorImpl implements AppointmentTranslator<org.openmrs.module.appointments.model.Appointment> {
1420

21+
@Autowired
22+
private AppointmentParticipantTranslator<Patient> patientTranslator;
23+
24+
@Autowired
25+
private AppointmentParticipantTranslator<Provider> providerTranslator;
26+
27+
@Autowired
28+
private AppointmentParticipantTranslator<AppointmentProvider> appointmentParticipantTranslator;
29+
1530
@Override
1631
public Appointment toFhirResource(org.openmrs.module.appointments.model.Appointment appointment) {
1732
Appointment fhirAppointment = new Appointment();
1833
fhirAppointment.setId(appointment.getUuid());
1934
fhirAppointment.setStart(appointment.getStartDateTime());
2035
fhirAppointment.setEnd(appointment.getEndDateTime());
36+
fhirAppointment.addParticipant(patientTranslator.toFhirResource(appointment.getPatient()));
37+
if (appointment.getProvider() != null){
38+
fhirAppointment.addParticipant(providerTranslator.toFhirResource(appointment.getProvider()));
39+
}
40+
41+
if (appointment.getProviders() != null) {
42+
for (AppointmentProvider provider : appointment.getProviders()) {
43+
fhirAppointment.addParticipant(appointmentParticipantTranslator.toFhirResource(provider));
44+
}
45+
}
2146

2247
switch (appointment.getStatus()) {
2348
case Requested :
@@ -58,6 +83,23 @@ public org.openmrs.module.appointments.model.Appointment toOpenmrsType(org.openm
5883
appointment.setStartDateTime(fhirAppointment.getStart());
5984
appointment.setEndDateTime(fhirAppointment.getEnd());
6085

86+
Set<AppointmentProvider> providers = new HashSet<>();
87+
88+
if (fhirAppointment.hasParticipant()) {
89+
for (Appointment.AppointmentParticipantComponent participantComponent : fhirAppointment.getParticipant()) {
90+
if (participantComponent.getType().get(0).getCoding().get(0).getCode() == "Patient") {
91+
appointment.setPatient(patientTranslator.toOpenmrsType(participantComponent));
92+
} else if (participantComponent.getType().get(0).getCoding().get(0).getCode() == "Practitioner") {
93+
appointment.setProvider(providerTranslator.toOpenmrsType(participantComponent));
94+
} else {
95+
AppointmentProvider provider = appointmentParticipantTranslator.toOpenmrsType(participantComponent);
96+
provider.setAppointment(appointment);
97+
providers.add(provider);
98+
appointment.setProviders(providers);
99+
}
100+
}
101+
}
102+
61103
if (fhirAppointment.hasStatus()) {
62104
switch (fhirAppointment.getStatus()) {
63105
case PROPOSED:
@@ -84,4 +126,4 @@ public org.openmrs.module.appointments.model.Appointment toOpenmrsType(org.openm
84126

85127
return appointment;
86128
}
87-
}
129+
}

0 commit comments

Comments
 (0)