diff --git a/src/main/java/com/wipro/fhir/controller/generateresource/ResourceRequestGateway.java b/src/main/java/com/wipro/fhir/controller/generateresource/ResourceRequestGateway.java index e293ac7..c888027 100644 --- a/src/main/java/com/wipro/fhir/controller/generateresource/ResourceRequestGateway.java +++ b/src/main/java/com/wipro/fhir/controller/generateresource/ResourceRequestGateway.java @@ -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) { @@ -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) { @@ -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) { diff --git a/src/main/java/com/wipro/fhir/controller/test/Test.java b/src/main/java/com/wipro/fhir/controller/test/Test.java index 8be0743..138db28 100644 --- a/src/main/java/com/wipro/fhir/controller/test/Test.java +++ b/src/main/java/com/wipro/fhir/controller/test/Test.java @@ -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); diff --git a/src/main/java/com/wipro/fhir/repo/v3/careContext/CareContextRepo.java b/src/main/java/com/wipro/fhir/repo/v3/careContext/CareContextRepo.java index 9015882..26696b1 100644 --- a/src/main/java/com/wipro/fhir/repo/v3/careContext/CareContextRepo.java +++ b/src/main/java/com/wipro/fhir/repo/v3/careContext/CareContextRepo.java @@ -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 { @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); } diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/DiagnosticRecordResourceBundle.java b/src/main/java/com/wipro/fhir/service/bundle_creation/DiagnosticRecordResourceBundle.java index cad83be..61c2bd4 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/DiagnosticRecordResourceBundle.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/DiagnosticRecordResourceBundle.java @@ -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 diagnosticReports, Practitioner practitioner, Organization organization); - String PopulateDiagnosticReportResourceBundle(ResourceRequestHandler resourceRequestHandler, + String populateDiagnosticReportResourceBundle(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p) throws FHIRException; } diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/DiagnosticRecordResourceBundleImpl.java b/src/main/java/com/wipro/fhir/service/bundle_creation/DiagnosticRecordResourceBundleImpl.java index 34a941d..71d4f0c 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/DiagnosticRecordResourceBundleImpl.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/DiagnosticRecordResourceBundleImpl.java @@ -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, @@ -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(); @@ -129,7 +129,7 @@ public String PopulateDiagnosticReportResourceBundle(ResourceRequestHandler reso List diagnosticResourceList = diagnosticReportResource.getDiagnosticReport(patient, new Encounter(), resourceRequestHandler, observationMap); - Composition composition = PopulateDiagnosticReportComposition(resourceRequestHandler, p, + Composition composition = populateDiagnosticReportComposition(resourceRequestHandler, p, diagnosticResourceList, practitioner, organization); List bundleEntries = new ArrayList<>(); @@ -193,7 +193,7 @@ public String PopulateDiagnosticReportResourceBundle(ResourceRequestHandler reso } @Override - public Composition PopulateDiagnosticReportComposition(ResourceRequestHandler resourceRequestHandler, + public Composition populateDiagnosticReportComposition(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p, List diagnosticReports, Practitioner practitioner, Organization organization) { Composition composition = new Composition(); diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/DischargeSummaryResourceBundle.java b/src/main/java/com/wipro/fhir/service/bundle_creation/DischargeSummaryResourceBundle.java index d793108..e06bdf5 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/DischargeSummaryResourceBundle.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/DischargeSummaryResourceBundle.java @@ -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 chiefComplaints, List physicalExam, List allergyList, FamilyMemberHistory familyMemberHistory, List pastMedicalHistoryConditions, List medicationRequests, List procedures); - String PopulateDischargeSummaryResourceBundle(ResourceRequestHandler resourceRequestHandler, + String populateDischargeSummaryResourceBundle(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p) throws FHIRException; } diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/DischargeSummaryResourceBundleImpl.java b/src/main/java/com/wipro/fhir/service/bundle_creation/DischargeSummaryResourceBundleImpl.java index 2c6af2d..db6c76b 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/DischargeSummaryResourceBundleImpl.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/DischargeSummaryResourceBundleImpl.java @@ -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, @@ -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; @@ -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 bundleEnteries = new ArrayList<>(); @@ -290,7 +290,7 @@ public String PopulateDischargeSummaryResourceBundle(ResourceRequestHandler reso @Override - public Composition PopulateDischargeSummaryComposition( + public Composition populateDischargeSummaryComposition( ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p, Practitioner practitioner, diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/ImmunizationRecordResourceBundle.java b/src/main/java/com/wipro/fhir/service/bundle_creation/ImmunizationRecordResourceBundle.java index 1c08e2d..5174c2a 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/ImmunizationRecordResourceBundle.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/ImmunizationRecordResourceBundle.java @@ -17,7 +17,7 @@ public interface ImmunizationRecordResourceBundle { Composition populateImmunizationComposition(Patient patient, Practitioner practitioner, Organization organization, List immunizations); - String PopulateImmunizationResourceBundle(ResourceRequestHandler resourceRequestHandler, + String populateImmunizationResourceBundle(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p) throws FHIRException; int processImmunizationRecordBundle(ResourceRequestHandler resourceRequestHandler, diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/ImmunizationRecordResourceBundleImpl.java b/src/main/java/com/wipro/fhir/service/bundle_creation/ImmunizationRecordResourceBundleImpl.java index b3c3bf9..95c8849 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/ImmunizationRecordResourceBundleImpl.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/ImmunizationRecordResourceBundleImpl.java @@ -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, @@ -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(); diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/OPConsultResourceBundle.java b/src/main/java/com/wipro/fhir/service/bundle_creation/OPConsultResourceBundle.java index 238c864..10a3ff1 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/OPConsultResourceBundle.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/OPConsultResourceBundle.java @@ -16,7 +16,7 @@ public interface OPConsultResourceBundle { - Composition PopulateOpConsultComposition(ResourceRequestHandler resourceRequestHandler, + Composition populateOpConsultComposition(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p, Practitioner practitioner, Organization organization, List conditionListChiefComplaints, List conditionListDiagnosis, List allergyList, FamilyMemberHistory familyMemberHistory, @@ -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; } diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/OPConsultResourceBundleImpl.java b/src/main/java/com/wipro/fhir/service/bundle_creation/OPConsultResourceBundleImpl.java index 5ee6cd6..08322a1 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/OPConsultResourceBundleImpl.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/OPConsultResourceBundleImpl.java @@ -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, @@ -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; @@ -157,7 +157,7 @@ public String PopulateOPConsultRecordResourceBundle(ResourceRequestHandler resou List 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 bundleEnteries = new ArrayList<>(); @@ -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 conditionListChiefComplaints, List conditionListDiagnosis, List allergyList, FamilyMemberHistory familyMemberHistory, List medicationStatement) { diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/PrescriptionResourceBundle.java b/src/main/java/com/wipro/fhir/service/bundle_creation/PrescriptionResourceBundle.java index ea5224c..c68fcc7 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/PrescriptionResourceBundle.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/PrescriptionResourceBundle.java @@ -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, Practitioner practitioner, Organization organization); diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/PrescriptionResourceBundleImpl.java b/src/main/java/com/wipro/fhir/service/bundle_creation/PrescriptionResourceBundleImpl.java index 3d869c6..b82cfd7 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/PrescriptionResourceBundleImpl.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/PrescriptionResourceBundleImpl.java @@ -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, @@ -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; @@ -117,7 +117,7 @@ public String PopulatePrescriptionResourceBundle(ResourceRequestHandler resource List 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 bundleEnteries = new ArrayList<>(); @@ -166,7 +166,7 @@ public String PopulatePrescriptionResourceBundle(ResourceRequestHandler resource } @Override - public Composition PopulatePrescriptionComposition(ResourceRequestHandler resourceRequestHandler, + public Composition populatePrescriptionComposition(ResourceRequestHandler resourceRequestHandler, PatientEligibleForResourceCreation p, List medicationRequest, Practitioner practitioner, Organization organization) { Composition composition = new Composition(); diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/WellnessRecordResourceBundle.java b/src/main/java/com/wipro/fhir/service/bundle_creation/WellnessRecordResourceBundle.java index bfb4977..bdb1fd3 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/WellnessRecordResourceBundle.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/WellnessRecordResourceBundle.java @@ -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 observationVitalList); diff --git a/src/main/java/com/wipro/fhir/service/bundle_creation/WellnessRecordResourceBundleImpl.java b/src/main/java/com/wipro/fhir/service/bundle_creation/WellnessRecordResourceBundleImpl.java index 88ba8d2..90114e7 100644 --- a/src/main/java/com/wipro/fhir/service/bundle_creation/WellnessRecordResourceBundleImpl.java +++ b/src/main/java/com/wipro/fhir/service/bundle_creation/WellnessRecordResourceBundleImpl.java @@ -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); @@ -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; @@ -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 bundleEnteries = new ArrayList<>(); @@ -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 observationVitalList) { Composition comp = new Composition(); diff --git a/src/main/java/com/wipro/fhir/service/v3/careContext/CareContextLinkingServiceImpl.java b/src/main/java/com/wipro/fhir/service/v3/careContext/CareContextLinkingServiceImpl.java index 0769946..5079ffc 100644 --- a/src/main/java/com/wipro/fhir/service/v3/careContext/CareContextLinkingServiceImpl.java +++ b/src/main/java/com/wipro/fhir/service/v3/careContext/CareContextLinkingServiceImpl.java @@ -119,7 +119,7 @@ public String generateTokenForCareContext(String request) throws FHIRException { } GenerateCareContextTokenRequest generateTokenRequest = new GenerateCareContextTokenRequest(); - if (null != careContextLinkRequest.getAbhaNumber() && "" != careContextLinkRequest.getAbhaNumber()) { + if (null != careContextLinkRequest.getAbhaNumber() && careContextLinkRequest.getAbhaNumber().isEmpty() ) { String abha = careContextLinkRequest.getAbhaNumber(); String abhaNumber = abha.replace("-", ""); generateTokenRequest.setAbhaNumber(abhaNumber); @@ -245,7 +245,7 @@ public String linkCareContext(String request) throws FHIRException { headers.add("Authorization", abhaAuthToken); headers.add("X-CM-ID", abhaMode); if (null != addCareContextRequest.getAbdmFacilityId() - && "" != addCareContextRequest.getAbdmFacilityId()) { + && addCareContextRequest.getAbdmFacilityId().isEmpty()) { headers.add("X-HIP-ID", addCareContextRequest.getAbdmFacilityId()); } else { headers.add("X-HIP-ID", abdmFacilityId); @@ -275,7 +275,7 @@ public String linkCareContext(String request) throws FHIRException { pcc.add(patient); } - if (null != addCareContextRequest.getAbhaNumber() && "" != addCareContextRequest.getAbhaNumber()) { + if (null != addCareContextRequest.getAbhaNumber() && addCareContextRequest.getAbhaNumber().isEmpty()) { String abha = addCareContextRequest.getAbhaNumber(); String abhaNumber = abha.replace("-", ""); linkCareContextRequest.setAbhaNumber(abhaNumber);