adding upcc id and chc id to pcps mappings

bcgov · Dec 18, 2024 · 6c9dfc2 · 6c9dfc2
1 parent 537fc4a
commit 6c9dfc2
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 16 deletions.
diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/PCDConstants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/PCDConstants.java
@@ -862,7 +862,7 @@ public class PCDConstants extends Constants {
 		 */
 		HEADERS.put(PC_PATIENT_SERVICES_UPCC_SUBMISSION, new String[] {
 				"SUBMISSION_ID", "CREATED_AT", "LATE_ENTRY", "SUBMITTER_FULL_NAME", "SUBMITTER_USER_NAME",
-				"SUBMITTER_EMAIL", "SUBMISSION_STATUS", "SUBMISSION_VERSION", "SUBMISSION_FORM_NAME", "UPCC_NAME",
+				"SUBMITTER_EMAIL", "SUBMISSION_STATUS", "SUBMISSION_VERSION", "SUBMISSION_FORM_NAME", "UPCC_NAME", "UPCC_CODE",
 				"PCN_COMMUNITY_NAME", "HEALTH_AUTHORITY", "UPCC_TYPE_OF_CARE", "FISCAL_YEAR", "PERIOD_REPORTED",
 				"CURRENT_APPROVED_FTES_FP", "CURRENT_APPROVED_FTES_NP", "CURRENT_APPROVED_FTES_RN",
 				"CURRENT_APPROVED_FTES_LPN", "CURRENT_APPROVED_FTES_OTHER", "FTES_HIRED_TO_DATE_FP",
@@ -884,7 +884,7 @@ public class PCDConstants extends Constants {
 		 */
 		HEADERS.put(PC_PATIENT_SERVICES_CHC_SUBMISSION, new String[] {
 				"SUBMISSION_ID", "CREATED_AT", "LATE_ENTRY", "SUBMITTER_FULL_NAME", "SUBMITTER_USER_NAME",
-				"SUBMITTER_EMAIL", "SUBMISSION_STATUS", "SUBMISSION_VERSION", "SUBMISSION_FORM_NAME", "CHC_NAME",
+				"SUBMITTER_EMAIL", "SUBMISSION_STATUS", "SUBMISSION_VERSION", "SUBMISSION_FORM_NAME", "CHC_NAME", "CHC_CODE",
 				"PCN_COMMUNITY_NAME", "HEALTH_AUTHORITY", "FISCAL_YEAR", "PERIOD_REPORTED", "CURRENT_APPROVED_FTES_FP",
 				"CURRENT_APPROVED_FTES_NP", "CURRENT_APPROVED_FTES_RN", "CURRENT_APPROVED_FTES_LPN",
 				"CURRENT_APPROVED_FTES_OTHER", "FTES_HIRED_TO_DATE_FP", "FTES_HIRED_TO_DATE_NP",

diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/pcd/chc/pcPatientServices/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/pcd/chc/pcPatientServices/json/Root.java
@@ -1,6 +1,7 @@
 package ca.bc.gov.chefs.etl.forms.pcd.chc.pcPatientServices.json;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import ca.bc.gov.chefs.etl.core.json.Form;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -13,6 +14,7 @@ public class Root {
     public String healthAuthority;
     public String periodReported;
     public String reasonForExceptionInPeriodReported;
+    public String chcId;
     public RootDataSubmission dataSubmission;
 
     public Form getForm() {
@@ -74,25 +76,33 @@ public void setDataSubmission(RootDataSubmission dataSubmission) {
     public String getLateEntry() {
         return lateEntry;
     }
-    
+
     public void setLateEntry(String lateEntry) {
         this.lateEntry = lateEntry;
     }
-    
+
     public String getChcName() {
         return chcName;
     }
-    
+
     public void setChcName(String chcName) {
         this.chcName = chcName;
     }
 
+    public String getChcId() {
+        return chcId;
+    }
+
+    public void setChcId(String chcId) {
+        this.chcId = chcId;
+    }
+
     @Override
     public String toString() {
-        return "Root [form=" + form + ", fiscalYear="
-                + fiscalYear + ", pcnCommunity=" + pcnCommunity + ", healthAuthority=" + healthAuthority
-                + ", periodReported="
-                + periodReported + ", reasonForExceptionInPeriodReported=" + reasonForExceptionInPeriodReported
-                + ", dataSubmission=" + dataSubmission + "]";
+        return "Root [form=" + form + ", lateEntry=" + lateEntry + ", chcName=" + chcName
+                + ", fiscalYear=" + fiscalYear + ", pcnCommunity=" + pcnCommunity
+                + ", healthAuthority=" + healthAuthority + ", periodReported=" + periodReported
+                + ", reasonForExceptionInPeriodReported=" + reasonForExceptionInPeriodReported
+                + ", chcId=" + chcId + ", dataSubmission=" + dataSubmission + "]";
     }
-}
+}
diff --git a/...ain/java/ca/bc/gov/chefs/etl/forms/pcd/chc/pcPatientServices/model/PCPSChcSubmission.java b/...ain/java/ca/bc/gov/chefs/etl/forms/pcd/chc/pcPatientServices/model/PCPSChcSubmission.java
@@ -18,6 +18,7 @@ public class PCPSChcSubmission implements IModel {
     private String submissionVersion;
     private String submissionFormName;
     private String chcName;
+    private String chcCode;
     private String pcnCommunityName;
     private String healthAuthority;
     private String fiscalYear;
@@ -280,6 +281,14 @@ public void setPcpsSubmissionData(List<PCPSChcSubmissionData> pcpsSubmissionData
         this.pcpsSubmissionData = pcpsSubmissionData;
     }
 
+    public String getChcCode() {
+        return chcCode;
+    }
+
+    public void setChcCode(String chcCode) {
+        this.chcCode = chcCode;
+    }
+
     @Override
     public String getFormType() {
         return PCDConstants.PC_PATIENT_SERVICES_CHC_SUBMISSION;
@@ -304,6 +313,7 @@ public List<String> getCsvElements() {
         elements.add(submissionVersion);
         elements.add(submissionFormName);
         elements.add(chcName);
+        elements.add(chcCode);
         elements.add(pcnCommunityName);
         elements.add(healthAuthority);
         elements.add(fiscalYear);

diff --git a/...v/chefs/etl/forms/pcd/chc/pcPatientServices/processor/PcdChcPCPSApiResponseProcessor.java b/...v/chefs/etl/forms/pcd/chc/pcPatientServices/processor/PcdChcPCPSApiResponseProcessor.java
@@ -79,6 +79,7 @@ private List<PCPSChcSubmission> parsePCPSRequest(List<Root> pcpsModels)
             pcpsSubmission.setSubmissionVersion("" + root.getForm().getVersion());
             pcpsSubmission.setSubmissionFormName(root.getForm().getFormName());
             pcpsSubmission.setChcName(root.getChcName());
+            pcpsSubmission.setChcCode(root.getChcId());
             pcpsSubmission.setPcnCommunityName(root.getPcnCommunity());
             pcpsSubmission.setHealthAuthority(root.getHealthAuthority());
             pcpsSubmission.setFiscalYear(root.getFiscalYear());

diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/pcd/upcc/pcPatientServices/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/pcd/upcc/pcPatientServices/json/Root.java
@@ -1,13 +1,15 @@
 package ca.bc.gov.chefs.etl.forms.pcd.upcc.pcPatientServices.json;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 import ca.bc.gov.chefs.etl.core.json.Form;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Root {
     public Form form;
     public String lateEntry;
     public String upccName;
+    public String upccId;
     public String upccTypeOfCare;
     public String fiscalYear;
     public String pcnCommunity;
@@ -96,12 +98,21 @@ public void setLateEntry(String lateEntry) {
         this.lateEntry = lateEntry;
     }
 
+    public String getUpccId() {
+        return upccId;
+    }
+
+    public void setUpccId(String upccId) {
+        this.upccId = upccId;
+    }
+
     @Override
     public String toString() {
-        return "Root [form=" + form + ", upccName=" + upccName + ", upccTypeOfCare=" + upccTypeOfCare + ", fiscalYear="
-                + fiscalYear + ", pcnCommunity=" + pcnCommunity + ", healthAuthority=" + healthAuthority
-                + ", periodReported="
-                + periodReported + ", reasonForExceptionInPeriodReported=" + reasonForExceptionInPeriodReported
+        return "Root [form=" + form + ", lateEntry=" + lateEntry + ", upccName=" + upccName
+                + ", upccId=" + upccId + ", upccTypeOfCare=" + upccTypeOfCare + ", fiscalYear="
+                + fiscalYear + ", pcnCommunity=" + pcnCommunity + ", healthAuthority="
+                + healthAuthority + ", periodReported=" + periodReported
+                + ", reasonForExceptionInPeriodReported=" + reasonForExceptionInPeriodReported
                 + ", dataSubmission=" + dataSubmission + "]";
     }
-}
+}
diff --git a/...n/java/ca/bc/gov/chefs/etl/forms/pcd/upcc/pcPatientServices/model/PCPSUpccSubmission.java b/...n/java/ca/bc/gov/chefs/etl/forms/pcd/upcc/pcPatientServices/model/PCPSUpccSubmission.java
@@ -17,6 +17,7 @@ public class PCPSUpccSubmission implements IModel {
     private String submissionVersion;
     private String submissionFormName;
     private String upccName;
+    private String upccCode;
     private String pcnCommunityName;
     private String healthAuthority;
     private String upccTypeOfCare;
@@ -287,6 +288,14 @@ public List<PCPSUpccSubmissionData> getPcpsSubmissionData() {
     public void setPcpsSubmissionData(List<PCPSUpccSubmissionData> pcpsSubmissionData) {
         this.pcpsSubmissionData = pcpsSubmissionData;
     }
+
+    public String getUpccCode() {
+        return upccCode;
+    }
+
+    public void setUpccCode(String upccCode) {
+        this.upccCode = upccCode;
+    }
 
     @Override
     public String getFormType() {
@@ -312,6 +321,7 @@ public List<String> getCsvElements() {
         elements.add(submissionVersion);
         elements.add(submissionFormName);
         elements.add(upccName);
+        elements.add(upccCode);
         elements.add(pcnCommunityName);
         elements.add(healthAuthority);
         elements.add(upccTypeOfCare);
@@ -358,4 +368,5 @@ public String toString() {
                 + teamBasedCareServiceNotes + "]" + ", pcpsSubmissionData=" + pcpsSubmissionData
                 + "]";
     }
+
 }
diff --git a/...chefs/etl/forms/pcd/upcc/pcPatientServices/processor/PcdUpccPCPSApiResponseProcessor.java b/...chefs/etl/forms/pcd/upcc/pcPatientServices/processor/PcdUpccPCPSApiResponseProcessor.java
@@ -79,6 +79,7 @@ private List<PCPSUpccSubmission> parsePCPSRequest(List<Root> pcpsModels)
             pcpsSubmission.setSubmissionVersion("" + root.getForm().getVersion());
             pcpsSubmission.setSubmissionFormName(root.getForm().getFormName());
             pcpsSubmission.setUpccName(root.getUpccName());
+            pcpsSubmission.setUpccCode(root.getUpccId());
             pcpsSubmission.setPcnCommunityName(root.getPcnCommunity());
             pcpsSubmission.setHealthAuthority(root.getHealthAuthority());
             pcpsSubmission.setUpccTypeOfCare(root.getUpccTypeOfCare());