Skip to content

taken coderabbit comments #129

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
helenKaryamsetty merged 51 commits into from
Dec 30, 2025
Merged

taken coderabbit comments #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
3814860
Abdm Facility fetch services changes
Sep 19, 2024
a2224b4
facility save after carecontext and patientcarecontextx update
Sep 26, 2024
1a28c2b
FacilityId save in mongo db and Variable declaration correction
Oct 8, 2024
fea418b
Mongo carecontext save query logic changes
Oct 8, 2024
9d30d46
ABHA Creation M1 V3 API changes
Oct 18, 2024
583594a
Abha V3 changes
Dec 9, 2024
8d206ef
resolved merge conflicts
Dec 9, 2024
4c76193
removed unused code
helenKaryamsetty Dec 9, 2024
c07d839
v3- verify auth by abdm API changes
Dec 12, 2024
d26eeda
Merge branch 'PSMRI:develop' into abdmV3
helenKaryamsetty Dec 12, 2024
5e93901
resolved merge conflicts
Dec 12, 2024
e669df1
fix pulled latest develop
helenKaryamsetty Oct 6, 2025
7a5c0d4
feat: Abdm M2 V3 changes
helenKaryamsetty Oct 6, 2025
43683a2
feat: mongo query change fetch for linktoken
helenKaryamsetty Oct 13, 2025
8ead599
Merge branch 'abdmV3' into abdmV3
helenKaryamsetty Oct 13, 2025
c1c5d38
fix: link carecontext authorization error
helenKaryamsetty Oct 14, 2025
497b3ff
Merge branch 'PSMRI:abdmV3' into abdmV3
helenKaryamsetty Oct 14, 2025
d748156
Merge branch 'abdmV3' of https://github.com/helenKaryamsetty/FHIR-API…
helenKaryamsetty Oct 14, 2025
811aef7
Merge branch 'PSMRI:abdmV3' into abdmV3
helenKaryamsetty Oct 31, 2025
945d874
feat: hiTypes addition
helenKaryamsetty Oct 31, 2025
c1c96f4
feat: version change for testing
helenKaryamsetty Oct 31, 2025
d267c17
fix: minor change for empty response
helenKaryamsetty Nov 4, 2025
49c97fa
fix: resolved merge conflicts
helenKaryamsetty Nov 4, 2025
6d5298f
Simplify queries in CareContextRepo interface
helenKaryamsetty Nov 4, 2025
23b4a20
fix: corrected response format
helenKaryamsetty Nov 6, 2025
db670fc
Merge branch 'abdmV3' of https://github.com/helenKaryamsetty/FHIR-API…
helenKaryamsetty Nov 6, 2025
5d6dd44
fix: minor logic change for care context linking
helenKaryamsetty Nov 19, 2025
1d9835a
Merge branch 'abdmV3' of https://github.com/helenKaryamsetty/FHIR-API…
helenKaryamsetty Nov 19, 2025
765d260
small correction in hiType and error message modification
helenKaryamsetty Dec 15, 2025
71c995d
Merge branch 'abdmV3' of https://github.com/helenKaryamsetty/FHIR-API…
helenKaryamsetty Dec 15, 2025
fec6064
modified error message
helenKaryamsetty Dec 15, 2025
fa7cf00
resolved merge conflicts
helenKaryamsetty Dec 15, 2025
7a21582
feat: new standard FHIR bundles creation
helenKaryamsetty Dec 22, 2025
09913fc
Merge branch 'abdmV3' of https://github.com/helenKaryamsetty/FHIR-API…
helenKaryamsetty Dec 22, 2025
8269c75
Fix environment variable for systemUrl
helenKaryamsetty Dec 22, 2025
055525e
Fix formatting of systemUrl property
helenKaryamsetty Dec 22, 2025
61506e6
fix: taken coderabbitai comments and minor changes
helenKaryamsetty Dec 23, 2025
a1df7fa
fix: resolved merge conflicts
helenKaryamsetty Dec 23, 2025
e2bec9a
fix: changed missed variable
helenKaryamsetty Dec 23, 2025
88654c5
fix: resolved merge conflicts
helenKaryamsetty Dec 23, 2025
e44be6f
Merge branch 'PSMRI:abdmV3' into abdmV3
helenKaryamsetty Dec 23, 2025
881bcbf
fix: modified the constructor
helenKaryamsetty Dec 23, 2025
d116010
Change exception message for Organization resource
helenKaryamsetty Dec 23, 2025
6237bad
Fix typo in exception message for PractitionerDataModel
helenKaryamsetty Dec 23, 2025
536f445
fix: corrected type error
helenKaryamsetty Dec 23, 2025
9b48197
Merge branch 'abdmV3' of https://github.com/helenKaryamsetty/FHIR-API…
helenKaryamsetty Dec 23, 2025
0b6d2ad
fix: correct medication histoory model class
helenKaryamsetty Dec 30, 2025
b5e0f12
Merge branch 'abdmV3' into abdmV3
helenKaryamsetty Dec 30, 2025
67307ae
fix: taken coderabbitai comments
helenKaryamsetty Dec 30, 2025
f72cde6
Merge branch 'PSMRI:abdmV3' into abdmV3
helenKaryamsetty Dec 30, 2025
fba8abb
Merge branch 'abdmV3' of https://github.com/helenKaryamsetty/FHIR-API…
helenKaryamsetty Dec 30, 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
6 changes: 3 additions & 3 deletions src/main/java/com/wipro/fhir/controller/generateresource/ResourceRequestGateway.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public String getPatientResource(@RequestBody ResourceRequestHandler patientReso

OutputResponse response = new OutputResponse();
try {
String s = opConsultRecordBundle.PopulateOPConsultRecordResourceBundle(patientResourceRequest, null);
String s = opConsultRecordBundle.populateOPConsultRecordResourceBundle(patientResourceRequest, null);

response.setResponse(s);
} catch (FHIRException e) {
Expand All @@ -104,7 +104,7 @@ public String getDiagnosticReportRecord(@RequestBody ResourceRequestHandler pati

OutputResponse response = new OutputResponse();
try {
String s = diagnosticReportRecord.PopulateDiagnosticReportResourceBundle(patientResourceRequest, null);
String s = diagnosticReportRecord.populateDiagnosticReportResourceBundle(patientResourceRequest, null);

response.setResponse(s);
} catch (FHIRException e) {
Expand All @@ -129,7 +129,7 @@ public String getPrescriptionRecord(@RequestBody ResourceRequestHandler patientR

OutputResponse response = new OutputResponse();
try {
String s = prescriptionRecordBundle.PopulatePrescriptionResourceBundle(patientResourceRequest, null);
String s = prescriptionRecordBundle.populatePrescriptionResourceBundle(patientResourceRequest, null);

response.setResponse(s);
} catch (FHIRException e) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/wipro/fhir/controller/test/Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public String parseFeeds(@RequestBody ResourceRequestHandler resourceRequestHand
OutputResponse response = new OutputResponse();
String s = null;
try {
s = oPConsultRecordBundleImpl.PopulateOPConsultRecordResourceBundle(resourceRequestHandler, null);
s = oPConsultRecordBundleImpl.populateOPConsultRecordResourceBundle(resourceRequestHandler, null);
response.setResponse(s);
} catch (Exception e) {
logger.error("Unexpected error:" , e);
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/wipro/fhir/repo/v3/careContext/CareContextRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,22 @@

import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.query.Param;

import com.wipro.fhir.data.request_handler.PatientEligibleForResourceCreation;

public interface CareContextRepo extends CrudRepository<PatientEligibleForResourceCreation, BigInteger> {

@Query(value="SELECT COUNT(*) FROM t_phy_vitals WHERE VisitCode = :visitCode", nativeQuery = true)
public int hasPhyVitals(String visitCode);
public int hasPhyVitals(@Param("visitCode") String visitCode);

@Query(value="SELECT COUNT(*) FROM t_prescribeddrug WHERE VisitCode = :visitCode", nativeQuery = true)
public int hasPrescribedDrugs(String visitCode);
public int hasPrescribedDrugs(@Param("visitCode") String visitCode);

@Query(value="SELECT COUNT(*) FROM t_lab_testorder WHERE VisitCode = :visitCode", nativeQuery = true)
public int hasLabtestsDone(String visitCode);
public int hasLabtestsDone(@Param("visitCode") String visitCode);

@Query(value="SELECT COUNT(*) FROM t_childvaccinedetail1 WHERE VisitCode = :visitCode", nativeQuery = true)
public int hasVaccineDetails(String visitCode);
public int hasVaccineDetails(@Param("visitCode") String visitCode);

}
4 changes: 2 additions & 2 deletions src/main/java/com/wipro/fhir/service/bundle_creation/DiagnosticRecordResourceBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ public interface DiagnosticRecordResourceBundle {
int processDiagnosticReportRecordBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException;

Composition PopulateDiagnosticReportComposition(ResourceRequestHandler resourceRequestHandler,
Composition populateDiagnosticReportComposition(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p, List<DiagnosticReport> diagnosticReports, Practitioner practitioner,
Organization organization);

String PopulateDiagnosticReportResourceBundle(ResourceRequestHandler resourceRequestHandler,
String populateDiagnosticReportResourceBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException;

}
8 changes: 4 additions & 4 deletions src/main/java/com/wipro/fhir/service/bundle_creation/DiagnosticRecordResourceBundleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public int processDiagnosticReportRecordBundle(ResourceRequestHandler resourceRe
PatientEligibleForResourceCreation p) throws FHIRException {
int i = 0;
// call method to generate Prescription resource
String diagnosticReportRecordBundle = PopulateDiagnosticReportResourceBundle(resourceRequestHandler, p);
String diagnosticReportRecordBundle = populateDiagnosticReportResourceBundle(resourceRequestHandler, p);

// call private method to create mongo object with resource data
AMRIT_ResourceMongo aMRIT_ResourceMongo = createDiagnosticReportRecordBundleMongo(p,
Expand All @@ -88,7 +88,7 @@ public int processDiagnosticReportRecordBundle(ResourceRequestHandler resourceRe
}

@Override
public String PopulateDiagnosticReportResourceBundle(ResourceRequestHandler resourceRequestHandler,
public String populateDiagnosticReportResourceBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException {

Bundle diagReportBundle = new Bundle();
Expand Down Expand Up @@ -129,7 +129,7 @@ public String PopulateDiagnosticReportResourceBundle(ResourceRequestHandler reso
List<DiagnosticReport> diagnosticResourceList = diagnosticReportResource.getDiagnosticReport(patient,
new Encounter(), resourceRequestHandler, observationMap);

Composition composition = PopulateDiagnosticReportComposition(resourceRequestHandler, p,
Composition composition = populateDiagnosticReportComposition(resourceRequestHandler, p,
diagnosticResourceList, practitioner, organization);

List<BundleEntryComponent> bundleEntries = new ArrayList<>();
Expand Down Expand Up @@ -193,7 +193,7 @@ public String PopulateDiagnosticReportResourceBundle(ResourceRequestHandler reso
}

@Override
public Composition PopulateDiagnosticReportComposition(ResourceRequestHandler resourceRequestHandler,
public Composition populateDiagnosticReportComposition(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p, List<DiagnosticReport> diagnosticReports, Practitioner practitioner, Organization organization) {

Composition composition = new Composition();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/wipro/fhir/service/bundle_creation/DischargeSummaryResourceBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ public interface DischargeSummaryResourceBundle {
int processDischargeSummaryRecordBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException;

Composition PopulateDischargeSummaryComposition(ResourceRequestHandler resourceRequestHandler,
Composition populateDischargeSummaryComposition(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p, Practitioner practitioner, Organization organization, Patient patient,
Encounter encounter, List<Condition> chiefComplaints, List<Condition> physicalExam,
List<AllergyIntolerance> allergyList, FamilyMemberHistory familyMemberHistory,
List<MedicationStatement> pastMedicalHistoryConditions, List<MedicationRequest> medicationRequests,
List<DiagnosticReport> procedures);

String PopulateDischargeSummaryResourceBundle(ResourceRequestHandler resourceRequestHandler,
String populateDischargeSummaryResourceBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException;

}
8 changes: 4 additions & 4 deletions src/main/java/com/wipro/fhir/service/bundle_creation/DischargeSummaryResourceBundleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public int processDischargeSummaryRecordBundle(ResourceRequestHandler resourceRe
PatientEligibleForResourceCreation p) throws FHIRException {
int i = 0;
// call method to generate Prescription resource
String dischargeSummaryBundle = PopulateDischargeSummaryResourceBundle(resourceRequestHandler, p);
String dischargeSummaryBundle = populateDischargeSummaryResourceBundle(resourceRequestHandler, p);

// call private method to create mongo object with resource data
AMRIT_ResourceMongo aMRIT_ResourceMongo = createDischargeSummaryBundleMongo(p,
Expand All @@ -121,7 +121,7 @@ public int processDischargeSummaryRecordBundle(ResourceRequestHandler resourceRe


@Override
public String PopulateDischargeSummaryResourceBundle(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p) throws FHIRException {
public String populateDischargeSummaryResourceBundle(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p) throws FHIRException {

Bundle dischargeSummaryBundle = new Bundle();
String serializeBundle = null;
Expand Down Expand Up @@ -185,7 +185,7 @@ public String PopulateDischargeSummaryResourceBundle(ResourceRequestHandler reso
new Encounter(), resourceRequestHandler, observationMap);

// composition
Composition composition = PopulateDischargeSummaryComposition(resourceRequestHandler, p, practitioner, organization, patient, encounter, conditionListChiefComplaints,
Composition composition = populateDischargeSummaryComposition(resourceRequestHandler, p, practitioner, organization, patient, encounter, conditionListChiefComplaints,
conditionListDiagnosis, allergyList, familyMemberHistory, medicationStatement, medicationRequest, diagnosticResourceList);

List<BundleEntryComponent> bundleEnteries = new ArrayList<>();
Expand Down Expand Up @@ -290,7 +290,7 @@ public String PopulateDischargeSummaryResourceBundle(ResourceRequestHandler reso

@Override

public Composition PopulateDischargeSummaryComposition(
public Composition populateDischargeSummaryComposition(
ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p,
Practitioner practitioner,
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/wipro/fhir/service/bundle_creation/ImmunizationRecordResourceBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public interface ImmunizationRecordResourceBundle {
Composition populateImmunizationComposition(Patient patient, Practitioner practitioner, Organization organization,
List<Immunization> immunizations);

String PopulateImmunizationResourceBundle(ResourceRequestHandler resourceRequestHandler,
String populateImmunizationResourceBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException;

int processImmunizationRecordBundle(ResourceRequestHandler resourceRequestHandler,
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/com/wipro/fhir/service/bundle_creation/ImmunizationRecordResourceBundleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public int processImmunizationRecordBundle(ResourceRequestHandler resourceReques
PatientEligibleForResourceCreation p) throws FHIRException {
int i = 0;
// call method to generate Prescription resource
String immunizationBundle = PopulateImmunizationResourceBundle(resourceRequestHandler, p);
String immunizationBundle = populateImmunizationResourceBundle(resourceRequestHandler, p);

// call private method to create mongo object with resource data
AMRIT_ResourceMongo aMRIT_ResourceMongo = createImmunizationBundleMongo(p,
Expand All @@ -81,7 +81,7 @@ public int processImmunizationRecordBundle(ResourceRequestHandler resourceReques
}

@Override
public String PopulateImmunizationResourceBundle(ResourceRequestHandler resourceRequestHandler,
public String populateImmunizationResourceBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException {

Bundle diagReportBundle = new Bundle();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/wipro/fhir/service/bundle_creation/OPConsultResourceBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

public interface OPConsultResourceBundle {

Composition PopulateOpConsultComposition(ResourceRequestHandler resourceRequestHandler,
Composition populateOpConsultComposition(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p, Practitioner practitioner, Organization organization,
List<Condition> conditionListChiefComplaints, List<Condition> conditionListDiagnosis,
List<AllergyIntolerance> allergyList, FamilyMemberHistory familyMemberHistory,
Expand All @@ -25,7 +25,7 @@ Composition PopulateOpConsultComposition(ResourceRequestHandler resourceRequestH
int processOpConsultRecordBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException;

String PopulateOPConsultRecordResourceBundle(ResourceRequestHandler resourceRequestHandler,
String populateOPConsultRecordResourceBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException;

}
8 changes: 4 additions & 4 deletions src/main/java/com/wipro/fhir/service/bundle_creation/OPConsultResourceBundleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public int processOpConsultRecordBundle(ResourceRequestHandler resourceRequestHa
PatientEligibleForResourceCreation p) throws FHIRException {
int i = 0;
// call method to generate Prescription resource
String opConsultBundle = PopulateOPConsultRecordResourceBundle(resourceRequestHandler, p);
String opConsultBundle = populateOPConsultRecordResourceBundle(resourceRequestHandler, p);

// call private method to create mongo object with resource data
AMRIT_ResourceMongo aMRIT_ResourceMongo = createOpConsultBundleMongo(p,
Expand All @@ -105,7 +105,7 @@ public int processOpConsultRecordBundle(ResourceRequestHandler resourceRequestHa


@Override
public String PopulateOPConsultRecordResourceBundle(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p) throws FHIRException {
public String populateOPConsultRecordResourceBundle(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p) throws FHIRException {

Bundle opConsultBundle = new Bundle();
String serializeBundle = null;
Expand Down Expand Up @@ -157,7 +157,7 @@ public String PopulateOPConsultRecordResourceBundle(ResourceRequestHandler resou
List<MedicationStatement> medicationStatement = medicalHistoryResource.getMedicalHistory(patient, resourceRequestHandler);

// composition
Composition composition = PopulateOpConsultComposition(resourceRequestHandler, p, practitioner, organization, conditionListChiefComplaints,
Composition composition = populateOpConsultComposition(resourceRequestHandler, p, practitioner, organization, conditionListChiefComplaints,
conditionListDiagnosis, allergyList,familyMemberHistory, medicationStatement);

List<BundleEntryComponent> bundleEnteries = new ArrayList<>();
Expand Down Expand Up @@ -238,7 +238,7 @@ public String PopulateOPConsultRecordResourceBundle(ResourceRequestHandler resou
}

@Override
public Composition PopulateOpConsultComposition(ResourceRequestHandler resourceRequestHandler,PatientEligibleForResourceCreation p,
public Composition populateOpConsultComposition(ResourceRequestHandler resourceRequestHandler,PatientEligibleForResourceCreation p,
Practitioner practitioner, Organization organization, List<Condition> conditionListChiefComplaints, List<Condition> conditionListDiagnosis,
List<AllergyIntolerance> allergyList, FamilyMemberHistory familyMemberHistory, List<MedicationStatement> medicationStatement) {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/wipro/fhir/service/bundle_creation/PrescriptionResourceBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

public interface PrescriptionResourceBundle {

String PopulatePrescriptionResourceBundle(ResourceRequestHandler resourceRequestHandler,
String populatePrescriptionResourceBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException;

Composition PopulatePrescriptionComposition(ResourceRequestHandler resourceRequestHandler,
Composition populatePrescriptionComposition(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p, List<MedicationRequest> medicationRequest, Practitioner practitioner,
Organization organization);

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/wipro/fhir/service/bundle_creation/PrescriptionResourceBundleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public int processPrescriptionRecordBundle(ResourceRequestHandler resourceReques
PatientEligibleForResourceCreation p) throws FHIRException {
int i = 0;
// call method to generate Prescription resource
String prescriptionBundle = PopulatePrescriptionResourceBundle(resourceRequestHandler, p);
String prescriptionBundle = populatePrescriptionResourceBundle(resourceRequestHandler, p);

// call private method to create mongo object with resource data
AMRIT_ResourceMongo aMRIT_ResourceMongo = createPrescriptionBundleMongo(p,
Expand All @@ -84,7 +84,7 @@ public int processPrescriptionRecordBundle(ResourceRequestHandler resourceReques
}

@Override
public String PopulatePrescriptionResourceBundle(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p) throws FHIRException {
public String populatePrescriptionResourceBundle(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p) throws FHIRException {

Bundle prescriptionBundle = new Bundle();
String serializeBundle = null;
Expand Down Expand Up @@ -117,7 +117,7 @@ public String PopulatePrescriptionResourceBundle(ResourceRequestHandler resource
List<MedicationRequest> medicationRequest = medicationRequestResource.getMedicationRequest(patient,
resourceRequestHandler, practitioner, null);
// composition
Composition composition = PopulatePrescriptionComposition(resourceRequestHandler, p, medicationRequest, practitioner, organization);
Composition composition = populatePrescriptionComposition(resourceRequestHandler, p, medicationRequest, practitioner, organization);

List<BundleEntryComponent> bundleEnteries = new ArrayList<>();

Expand Down Expand Up @@ -166,7 +166,7 @@ public String PopulatePrescriptionResourceBundle(ResourceRequestHandler resource
}

@Override
public Composition PopulatePrescriptionComposition(ResourceRequestHandler resourceRequestHandler,
public Composition populatePrescriptionComposition(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p, List<MedicationRequest> medicationRequest, Practitioner practitioner, Organization organization) {

Composition composition = new Composition();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/wipro/fhir/service/bundle_creation/WellnessRecordResourceBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@

public interface WellnessRecordResourceBundle {

String PopulateWellnessRecordResourceBundle(ResourceRequestHandler resourceRequestHandler,
String populateWellnessRecordResourceBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException;

Composition PopulateWellnessRecordComposition(ResourceRequestHandler resourceRequestHandler,
Composition populateWellnessRecordComposition(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p, Practitioner practitioner, Organization organization,
List<Observation> observationVitalList);

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/wipro/fhir/service/bundle_creation/WellnessRecordResourceBundleImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public int processWellnessRecordBundle(ResourceRequestHandler resourceRequestHan
PatientEligibleForResourceCreation p) throws FHIRException, Exception {
int i = 0;
// call method to generate Prescription resource
String wellnessBundle = PopulateWellnessRecordResourceBundle(resourceRequestHandler, p);
String wellnessBundle = populateWellnessRecordResourceBundle(resourceRequestHandler, p);

// call private method to create mongo object with resource data
AMRIT_ResourceMongo aMRIT_ResourceMongo = createPrescriptionBundleMongo(p, wellnessBundle);
Expand All @@ -78,7 +78,7 @@ public int processWellnessRecordBundle(ResourceRequestHandler resourceRequestHan
}

@Override
public String PopulateWellnessRecordResourceBundle(ResourceRequestHandler resourceRequestHandler,
public String populateWellnessRecordResourceBundle(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p) throws FHIRException {
Bundle wellnessBundle = new Bundle();
String serializeBundle = null;
Expand Down Expand Up @@ -110,7 +110,7 @@ public String PopulateWellnessRecordResourceBundle(ResourceRequestHandler resour
resourceRequestHandler);

// Composition
Composition composition = PopulateWellnessRecordComposition(resourceRequestHandler, p, practitioner,
Composition composition = populateWellnessRecordComposition(resourceRequestHandler, p, practitioner,
organization, observationVitalList);

List<BundleEntryComponent> bundleEnteries = new ArrayList<>();
Expand Down Expand Up @@ -158,7 +158,7 @@ public String PopulateWellnessRecordResourceBundle(ResourceRequestHandler resour
}

@Override
public Composition PopulateWellnessRecordComposition(ResourceRequestHandler resourceRequestHandler,
public Composition populateWellnessRecordComposition(ResourceRequestHandler resourceRequestHandler,
PatientEligibleForResourceCreation p, Practitioner practitioner, Organization organization,
List<Observation> observationVitalList) {
Composition comp = new Composition();
Expand Down
Loading
Loading