Skip to content

U4X-985: Break out logic to improve estimated dob to as independent method on patient resource #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 8, 2025
Merged

U4X-985: Break out logic to improve estimated dob to as independent method on patient resource #196

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3791be1
U4X-985: Break out logic to improve estimated dob to as independent m…
slubwama May 7, 2025
2e02ca1
ensure results do not return a non unque results
slubwama May 7, 2025
7750d22
ensure results do not return a non unque results
slubwama May 7, 2025
17751a1
ensure results do not return a non unque results
slubwama May 7, 2025
023f21a
include other status that mean successful
slubwama May 7, 2025
17c23b5
improve response
slubwama May 8, 2025
9a6f0ac
remove all other changes in other PRs.
slubwama May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 27 additions & 13 deletions api/src/main/java/org/openmrs/module/ugandaemrsync/server/SyncFHIRRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,13 +752,16 @@ private String encodeResourceToString(String resourceType, String identifierType

if (resourceType.equals("Patient") || resourceType.equals("Practitioner")) {

if (resourceType.equals("Patient") && profile != null && profile.getKeepProfileIdentifierOnly()) {
try {
jsonString = removeIdentifierExceptProfileId(jsonString, "identifier");
jsonString = addCodingToIdentifier(jsonString, "identifier");
jsonString = addCodingToSystemToPrimaryIdentifier(jsonString, "identifier");
} catch (Exception exception) {
log.error(exception);
if (resourceType.equals("Patient")) {
jsonString = correctEstimatedDOB(jsonString);
if (profile != null && profile.getKeepProfileIdentifierOnly()) {
try {
jsonString = removeIdentifierExceptProfileId(jsonString, "identifier");
jsonString = addCodingToIdentifier(jsonString, "identifier");
jsonString = addCodingToSystemToPrimaryIdentifier(jsonString, "identifier");
} catch (Exception exception) {
log.error(exception);
}
}
}
jsonString = addAttributeToObject(jsonString, "telecom", "system", "phone");
Expand Down Expand Up @@ -833,16 +836,27 @@ public String addCodingToIdentifier(String payload, String attributeName) {
for (Object jsonObject1 : jsonObject.getJSONArray(attributeName)) {
JSONObject jsonObject2 = new JSONObject(jsonObject1.toString());
PatientIdentifier patientIdentifier = Context.getPatientService().getPatientIdentifierByUuid(jsonObject2.get("id").toString());
if (patientIdentifier.getPatient().getBirthdateEstimated()) {
jsonObject.put("birthDate", patientIdentifier.getPatient().getBirthdate().toString().replace(" 00:00:00.0", ""));
}
jsonObject.getJSONArray(attributeName).getJSONObject(identifierCount).getJSONObject("type").put("coding", new JSONArray().put(new JSONObject().put("system", "UgandaEMR").put("code", patientIdentifier.getIdentifierType().getUuid())));
identifierCount++;
}
}
return jsonObject.toString();
}

private String correctEstimatedDOB(String payload) {
JSONObject jsonObject = new JSONObject(payload);

if (!jsonObject.has("id"))
return payload;

Patient patient = Context.getPatientService().getPatientByUuid(jsonObject.getString("id"));
if (patient.getBirthdateEstimated()) {
jsonObject.put("birthDate", patient.getBirthdate().toString().replace(" 00:00:00.0", ""));
}

return jsonObject.toString();
}

private String addAttributeToObject(String payload, String targetObject, String attributeName, String attributeValue) {
JSONObject jsonObject = new JSONObject(payload);
if (jsonObject.has(targetObject) && jsonObject.getJSONArray(targetObject).length() > 0) {
Expand Down Expand Up @@ -1096,7 +1110,7 @@ public Collection<IBaseResource> getObservationResourceBundle(SyncFhirProfile sy

JSONArray codes = searchParams.getJSONArray("code");

lastSyncDate=getLastSyncDate(syncFhirProfile, "Observation");
lastSyncDate = getLastSyncDate(syncFhirProfile, "Observation");
for (Object conceptUID : codes) {
try {

Expand Down Expand Up @@ -1366,7 +1380,7 @@ private Collection<IBaseResource> getDiagnosticReportResourceBundle(SyncFhirCase

}
}

if (!searchParams.isEmpty() && searchParams.has("code")) {
JSONArray codes = searchParams.getJSONArray("code");
for (Object conceptUID : codes) {
Expand All @@ -1381,7 +1395,7 @@ private Collection<IBaseResource> getDiagnosticReportResourceBundle(SyncFhirCase
}

ReferenceAndListParam patientReference = new ReferenceAndListParam();
if(syncFhirCase!=null) {
if (syncFhirCase != null) {
patientReference.addValue(new ReferenceOrListParam().add(new ReferenceParam(SP_IDENTIFIER, syncFhirCase.getPatient().getPatientIdentifier().getIdentifier())));
}

Expand Down