From 4932b0b810acffc753792da6c861a15647ecfaf6 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Fri, 17 Feb 2023 16:19:00 -0800 Subject: [PATCH 001/183] Modifying the names to be medis etl. --- README.md | 4 ++-- deploy.yaml | 14 +++++++------- devfile.yaml | 2 +- pom.xml | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 91c66c45..e982db82 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# devfile-sample-java-springboot-basic -A basic sample application using Java Spring Boot with devfile +# medis-etl-service +Camel based app that is used to pullforms submissions from CHEFS via API, convert them into a set of CSV files for futher upload and loading into Oracle DB. diff --git a/deploy.yaml b/deploy.yaml index 471594ff..07a0e46b 100644 --- a/deploy.yaml +++ b/deploy.yaml @@ -1,20 +1,20 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: my-java-springboot + name: medis-etl-service spec: replicas: 1 selector: matchLabels: - app: java-springboot-app + app: medis-etl-app template: metadata: labels: - app: java-springboot-app + app: medis-etl-service spec: containers: - - name: my-java-springboot - image: java-springboot-image:latest + - name: etl-camel + image: medis-etl-image:latest ports: - name: http containerPort: 8081 @@ -27,7 +27,7 @@ spec: kind: Service apiVersion: v1 metadata: - name: my-java-springboot-svc + name: medis-etl-svc spec: ports: - name: http-8081 @@ -35,4 +35,4 @@ spec: protocol: TCP targetPort: 8081 selector: - app: java-springboot-app \ No newline at end of file + app: medis-etl-app \ No newline at end of file diff --git a/devfile.yaml b/devfile.yaml index 7339ccfc..9a63e0ad 100644 --- a/devfile.yaml +++ b/devfile.yaml @@ -20,7 +20,7 @@ parent: components: - name: image-build image: - imageName: java-springboot-image:latest + imageName: medis-etl-image:latest dockerfile: uri: docker/Dockerfile buildContext: . diff --git a/pom.xml b/pom.xml index 579a40a1..77892973 100644 --- a/pom.xml +++ b/pom.xml @@ -8,11 +8,11 @@ 2.3.5.RELEASE - com.example - demo + ca.bc.gov.hlth + medis-etl 0.0.1-SNAPSHOT - demo - Demo project for Spring Boot + medis-etl-svc + MEDIS ETL app 11 From 07108016f240a74cb8505e3cfce39a1907a0523c Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Wed, 22 Feb 2023 14:24:11 -0800 Subject: [PATCH 002/183] Adding individual components to support the app on OpenShift. Will convert this into template eventually. --- openshift/app.bc.yaml | 40 ++++++++++++++++++++++++++ openshift/app.dc.yaml | 62 ++++++++++++++++++++++++++++++++++++++++ openshift/app.is.yaml | 14 +++++++++ openshift/app.route.yaml | 22 ++++++++++++++ openshift/app.svc.yaml | 25 ++++++++++++++++ 5 files changed, 163 insertions(+) create mode 100644 openshift/app.bc.yaml create mode 100644 openshift/app.dc.yaml create mode 100644 openshift/app.is.yaml create mode 100644 openshift/app.route.yaml create mode 100644 openshift/app.svc.yaml diff --git a/openshift/app.bc.yaml b/openshift/app.bc.yaml new file mode 100644 index 00000000..841fa2bb --- /dev/null +++ b/openshift/app.bc.yaml @@ -0,0 +1,40 @@ +apiVersion: build.openshift.io/v1 +kind: BuildConfig +metadata: + labels: + app: medis-etl-app + app.kubernetes.io/component: medis-etl-app + app.kubernetes.io/instance: medis-etl-app + app.kubernetes.io/name: medis-etl-app + app.kubernetes.io/part-of: medis-etl + app.openshift.io/runtime: java-springboot-camel + name: medis-etl-app +spec: + failedBuildsHistoryLimit: 5 + nodeSelector: null + output: + to: + kind: ImageStreamTag + name: medis-etl-image:latest + postCommit: {} + resources: {} + runPolicy: Serial + source: + git: + uri: https://github.com/bcgov/medis-etl-service.git + type: Git + strategy: + dockerStrategy: + dockerfilePath: docker/Dockerfile + type: Docker + successfulBuildsHistoryLimit: 5 + triggers: + - generic: + secretReference: + name: medis-etl-webhook-secret + type: Generic + - github: + secretReference: + name: medis-etl-github-webhook-secret + type: GitHub + - type: ConfigChange diff --git a/openshift/app.dc.yaml b/openshift/app.dc.yaml new file mode 100644 index 00000000..e05bd1f6 --- /dev/null +++ b/openshift/app.dc.yaml @@ -0,0 +1,62 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + labels: + app: medis-etl-app + app.kubernetes.io/component: medis-etl-app + app.kubernetes.io/instance: medis-etl-app + app.kubernetes.io/name: medis-etl-app + app.kubernetes.io/part-of: medis-etl + app.openshift.io/runtime: java-springboot-camel + name: medis-etl-app +spec: + replicas: 1 + selector: + matchLabels: + app: medis-etl-app + strategy: + type: Recreate + template: + metadata: + labels: + app: medis-etl-app + deployment: medis-etl-app-deployment + spec: + containers: + - env: + - name: DEBUG_PORT + value: "5858" + - name: PROJECTS_ROOT + value: /projects + - name: PROJECT_SOURCE + value: /projects + image: image-registry.openshift-image-registry.svc:5000/c2da03-dev/medis-etl-image:latest + imagePullPolicy: Always + name: etl-camel + ports: + - containerPort: 8080 + name: http-springboot + protocol: TCP + - containerPort: 5858 + name: debug + protocol: TCP + resources: + limits: + memory: 768Mi + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: /ssh + name: medis-etl + readOnly: true + dnsPolicy: ClusterFirst + restartPolicy: Always + schedulerName: default-scheduler + securityContext: {} + terminationGracePeriodSeconds: 30 + volumes: + - name: medis-etl + secret: + defaultMode: 400 + secretName: medis-etl + diff --git a/openshift/app.is.yaml b/openshift/app.is.yaml new file mode 100644 index 00000000..e27cf3f4 --- /dev/null +++ b/openshift/app.is.yaml @@ -0,0 +1,14 @@ +apiVersion: image.openshift.io/v1 +kind: ImageStream +metadata: + labels: + app: medis-etl-app + app.kubernetes.io/component: medis-etl-app + app.kubernetes.io/instance: medis-etl-app + app.kubernetes.io/name: medis-etl-app + app.kubernetes.io/part-of: medis-etl + app.openshift.io/runtime: java-springboot-camel + name: medis-etl-image +spec: + lookupPolicy: + local: false diff --git a/openshift/app.route.yaml b/openshift/app.route.yaml new file mode 100644 index 00000000..25a27425 --- /dev/null +++ b/openshift/app.route.yaml @@ -0,0 +1,22 @@ +apiVersion: route.openshift.io/v1 +kind: Route +metadata: + labels: + app: medis-etl-app + app.kubernetes.io/component: medis-etl-app + app.kubernetes.io/instance: medis-etl-app + app.kubernetes.io/name: medis-etl-app + app.kubernetes.io/part-of: medis-etl + app.openshift.io/runtime: java-springboot-camel + name: medis-etl-app +spec: + port: + targetPort: "8081" + tls: + insecureEdgeTerminationPolicy: Redirect + termination: edge + to: + kind: Service + name: medis-etl-app + weight: 100 + wildcardPolicy: None diff --git a/openshift/app.svc.yaml b/openshift/app.svc.yaml new file mode 100644 index 00000000..3396e36e --- /dev/null +++ b/openshift/app.svc.yaml @@ -0,0 +1,25 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: medis-etl-app + app.kubernetes.io/component: medis-etl-app + app.kubernetes.io/instance: medis-etl-app + app.kubernetes.io/name: medis-etl-app + app.kubernetes.io/part-of: medis-etl + app.openshift.io/runtime: java-springboot-camel + name: medis-etl-app +spec: + ports: + - name: http-springboot + port: 8080 + protocol: TCP + targetPort: 8080 + - name: http-8081 + port: 8081 + protocol: TCP + targetPort: 8081 + selector: + app: medis-etl-app + deployment: medis-etl-app-deployment + sessionAffinity: None From 3a155987ab30aa8fd59e861d11049252b0946efd Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Wed, 22 Feb 2023 16:23:25 -0800 Subject: [PATCH 003/183] Adding pvc to hold transformed files. --- openshift/app.dc.yaml | 9 +++++++-- openshift/app.pvc.yaml | 10 ++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 openshift/app.pvc.yaml diff --git a/openshift/app.dc.yaml b/openshift/app.dc.yaml index e05bd1f6..bbba518c 100644 --- a/openshift/app.dc.yaml +++ b/openshift/app.dc.yaml @@ -46,8 +46,10 @@ spec: terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: + - mountPath: /data + name: medis-etl-files - mountPath: /ssh - name: medis-etl + name: medis-etl-ssh readOnly: true dnsPolicy: ClusterFirst restartPolicy: Always @@ -55,7 +57,10 @@ spec: securityContext: {} terminationGracePeriodSeconds: 30 volumes: - - name: medis-etl + - name: medis-etl-files + persistentVolumeClaim: + claimName: medis-etl-pvc + - name: medis-etl-ssh secret: defaultMode: 400 secretName: medis-etl diff --git a/openshift/app.pvc.yaml b/openshift/app.pvc.yaml new file mode 100644 index 00000000..8a39cbb2 --- /dev/null +++ b/openshift/app.pvc.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: PersistentVolumeClaim +metadata: + name: medis-etl-pvc +spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: 1Gi From b51b101d054a9bbb7487b0531e4d912e21dc3ad8 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Mon, 27 Feb 2023 11:24:33 -0800 Subject: [PATCH 004/183] Adding -cp /app/config into command line. This directory will host properties file in the pod. --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index bd14fc5d..0d60ca73 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -29,4 +29,4 @@ FROM openjdk:11-jdk COPY --from=0 /build/target/export-run-artifact.jar /app/target/export-run-artifact.jar EXPOSE 8081 -ENTRYPOINT [ "java", "-jar", "/app/target/export-run-artifact.jar", "--server.port=8081" ] +ENTRYPOINT [ "java", "-cp", "/app/config/" "-jar", "/app/target/export-run-artifact.jar", "--server.port=8081" ] From 299defe082f4c97768aaea0e117de0bd3158b882 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Mon, 27 Feb 2023 11:42:30 -0800 Subject: [PATCH 005/183] Fixing java command line. --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0d60ca73..05a27482 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -29,4 +29,4 @@ FROM openjdk:11-jdk COPY --from=0 /build/target/export-run-artifact.jar /app/target/export-run-artifact.jar EXPOSE 8081 -ENTRYPOINT [ "java", "-cp", "/app/config/" "-jar", "/app/target/export-run-artifact.jar", "--server.port=8081" ] +ENTRYPOINT [ "java", "-cp", "/app/config/", "-jar", "/app/target/export-run-artifact.jar", "--server.port=8081" ] From c0aa0e0a2d74646c39d7076964116dd7d7768b19 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Mon, 27 Feb 2023 15:05:04 -0800 Subject: [PATCH 006/183] Exposing medis-etl-config configmap under /app/conf directory on the pod. --- openshift/app.dc.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openshift/app.dc.yaml b/openshift/app.dc.yaml index bbba518c..ff19d837 100644 --- a/openshift/app.dc.yaml +++ b/openshift/app.dc.yaml @@ -48,6 +48,8 @@ spec: volumeMounts: - mountPath: /data name: medis-etl-files + - mountPath: /app/config + name: medis-etl-config - mountPath: /ssh name: medis-etl-ssh readOnly: true @@ -60,6 +62,9 @@ spec: - name: medis-etl-files persistentVolumeClaim: claimName: medis-etl-pvc + - name: medis-etl-config + configMap: + name: medis-etl-config - name: medis-etl-ssh secret: defaultMode: 400 From d09323eceb381b660880cc3306653658344a200d Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Mon, 27 Feb 2023 15:56:01 -0800 Subject: [PATCH 007/183] Adding configmap to support application properties files. --- openshift/app.cm.yaml | 65 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 openshift/app.cm.yaml diff --git a/openshift/app.cm.yaml b/openshift/app.cm.yaml new file mode 100644 index 00000000..0876feb9 --- /dev/null +++ b/openshift/app.cm.yaml @@ -0,0 +1,65 @@ +--- +apiVersion: template.openshift.io/v1 +kind: Template +labels: + app.kubernetes.io/component: medis-etl-app + app.kubernetes.io/instance: medis-etl-app + app.kubernetes.io/name: medis-etl-app + app.kubernetes.io/part-of: medis-etl + app.openshift.io/runtime: java-springboot-camel + app: "${APP_NAME}-${JOB_NAME}" + template: "${REPO_NAME}-app-cm-template" +metadata: + name: "${REPO_NAME}-app-cm" +objects: + - apiVersion: v1 + kind: ConfigMap + metadata: + name: medis-etl-config + data: + application.properties: >+ + # properties used in route + hostname = localhost + port = 8080 + server-socket=5555 + socket-read-sleep-time=100 + max-socket-read-tries=100 + thread-pool-size=5 + accept-remote-connections=true + valid-ip-list-file=fwlist.txt + + chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&type=submissions&minDate=%s&maxDate=%s + + aims.username=2f173b2b-2f3a-407a-aecf-6b4bdc9431ae + aims.password=tbd + + ltc.facility.username=e1f4761f-efdd-4529-805e-677d3ae21601 + ltc.facility.password=tbd + + ltc.staffing.username=16ce36ca-9b4b-4ec6-bb75-96c2e1f258bb + ltc.staffing.password=tbd + + ltc.ytd.username=256760e7-6e8b-44c4-8b63-51fb72c8c2cf + ltc.ytd.password=tbd + + log4j2.properties: >+ + appender.out.type = Console + appender.out.name = out + appender.out.layout.type = PatternLayout + appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n + rootLogger.level = INFO + rootLogger.appenderRef.out.ref = out + immutable: false +parameters: + - name: APP_NAME + description: Application name + displayName: Application name + required: true + - name: JOB_NAME + description: Job identifier (i.e. 'pr-5' OR 'master') + displayName: Job Branch Name + required: true + - name: REPO_NAME + description: Application repository name + displayName: Repository Name + required: true From f4267c317252041b0e6babb4b9682c1f8decb4aa Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Mon, 27 Feb 2023 15:58:45 -0800 Subject: [PATCH 008/183] Fixing line breaks in multiline notatin of yaml. --- openshift/app.cm.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/openshift/app.cm.yaml b/openshift/app.cm.yaml index 0876feb9..fd72b2f9 100644 --- a/openshift/app.cm.yaml +++ b/openshift/app.cm.yaml @@ -17,7 +17,7 @@ objects: metadata: name: medis-etl-config data: - application.properties: >+ + application.properties: | # properties used in route hostname = localhost port = 8080 @@ -41,8 +41,7 @@ objects: ltc.ytd.username=256760e7-6e8b-44c4-8b63-51fb72c8c2cf ltc.ytd.password=tbd - - log4j2.properties: >+ + log4j2.properties: | appender.out.type = Console appender.out.name = out appender.out.layout.type = PatternLayout From a8789e7fe3402057ab280fd1d847f79e56160af9 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Mon, 27 Feb 2023 16:09:03 -0800 Subject: [PATCH 009/183] Converting app.bc.yaml to template and also rolling in ImageStream. --- openshift/app.bc.yaml | 110 +++++++++++++++++++++++++++--------------- openshift/app.is.yaml | 14 ------ 2 files changed, 71 insertions(+), 53 deletions(-) delete mode 100644 openshift/app.is.yaml diff --git a/openshift/app.bc.yaml b/openshift/app.bc.yaml index 841fa2bb..a4422a99 100644 --- a/openshift/app.bc.yaml +++ b/openshift/app.bc.yaml @@ -1,40 +1,72 @@ -apiVersion: build.openshift.io/v1 -kind: BuildConfig +--- +apiVersion: template.openshift.io/v1 +kind: Template +labels: + app.kubernetes.io/component: medis-etl-app + app.kubernetes.io/instance: medis-etl-app + app.kubernetes.io/name: medis-etl-app + app.kubernetes.io/part-of: medis-etl + app.openshift.io/runtime: java-springboot-camel + app: "${APP_NAME}-${JOB_NAME}" + template: "${REPO_NAME}-app-bc-template" metadata: - labels: - app: medis-etl-app - app.kubernetes.io/component: medis-etl-app - app.kubernetes.io/instance: medis-etl-app - app.kubernetes.io/name: medis-etl-app - app.kubernetes.io/part-of: medis-etl - app.openshift.io/runtime: java-springboot-camel - name: medis-etl-app -spec: - failedBuildsHistoryLimit: 5 - nodeSelector: null - output: - to: - kind: ImageStreamTag - name: medis-etl-image:latest - postCommit: {} - resources: {} - runPolicy: Serial - source: - git: - uri: https://github.com/bcgov/medis-etl-service.git - type: Git - strategy: - dockerStrategy: - dockerfilePath: docker/Dockerfile - type: Docker - successfulBuildsHistoryLimit: 5 - triggers: - - generic: - secretReference: - name: medis-etl-webhook-secret - type: Generic - - github: - secretReference: - name: medis-etl-github-webhook-secret - type: GitHub - - type: ConfigChange + name: "${REPO_NAME}-app-bc" +objects: + - apiVersion: image.openshift.io/v1 + kind: ImageStream + metadata: + name: medis-etl-image + spec: + lookupPolicy: + local: false + + - apiVersion: build.openshift.io/v1 + kind: BuildConfig + metadata: + name: medis-etl-app + spec: + failedBuildsHistoryLimit: 5 + nodeSelector: null + output: + to: + kind: ImageStreamTag + name: medis-etl-image:latest + postCommit: {} + resources: {} + runPolicy: Serial + source: + git: + uri: ${SOURCE_REPO_URL} + type: Git + strategy: + dockerStrategy: + dockerfilePath: docker/Dockerfile + type: Docker + successfulBuildsHistoryLimit: 5 + triggers: + - generic: + secretReference: + name: medis-etl-webhook-secret + type: Generic + - github: + secretReference: + name: medis-etl-github-webhook-secret + type: GitHub + - type: ConfigChange +parameters: + - name: REPO_NAME + description: Application repository name + displayName: Repository Name + required: true + - name: JOB_NAME + description: Job identifier (i.e. 'pr-5' OR 'master') + displayName: Job Branch Name + required: true + - name: SOURCE_REPO_REF + description: Git Pull Request Reference (i.e. 'pull/CHANGE_ID/head') + displayName: Source Repository Reference + required: true + - name: SOURCE_REPO_URL + description: Git Repository URL + displayName: Source Repository URL + required: true \ No newline at end of file diff --git a/openshift/app.is.yaml b/openshift/app.is.yaml deleted file mode 100644 index e27cf3f4..00000000 --- a/openshift/app.is.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: image.openshift.io/v1 -kind: ImageStream -metadata: - labels: - app: medis-etl-app - app.kubernetes.io/component: medis-etl-app - app.kubernetes.io/instance: medis-etl-app - app.kubernetes.io/name: medis-etl-app - app.kubernetes.io/part-of: medis-etl - app.openshift.io/runtime: java-springboot-camel - name: medis-etl-image -spec: - lookupPolicy: - local: false From 2be1d69ed23a9fc8cc3f77e7ddcf5e493763ac8a Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Mon, 27 Feb 2023 16:15:59 -0800 Subject: [PATCH 010/183] Refactoring app.dc.yaml to be template. pvc, service, route were rolled into this template. --- openshift/app.dc.yaml | 268 +++++++++++++++++++++++++++++---------- openshift/app.pvc.yaml | 10 -- openshift/app.route.yaml | 22 ---- openshift/app.svc.yaml | 25 ---- 4 files changed, 201 insertions(+), 124 deletions(-) delete mode 100644 openshift/app.pvc.yaml delete mode 100644 openshift/app.route.yaml delete mode 100644 openshift/app.svc.yaml diff --git a/openshift/app.dc.yaml b/openshift/app.dc.yaml index ff19d837..9f03234d 100644 --- a/openshift/app.dc.yaml +++ b/openshift/app.dc.yaml @@ -1,72 +1,206 @@ -apiVersion: apps/v1 -kind: Deployment +--- +apiVersion: template.openshift.io/v1 +kind: Template +labels: + app.kubernetes.io/component: medis-etl-app + app.kubernetes.io/instance: medis-etl-app + app.kubernetes.io/name: medis-etl-app + app.kubernetes.io/part-of: medis-etl + app.openshift.io/runtime: java-springboot-camel + app: "${APP_NAME}-${JOB_NAME}" + template: "${REPO_NAME}-app-dc-template" metadata: - labels: - app: medis-etl-app - app.kubernetes.io/component: medis-etl-app - app.kubernetes.io/instance: medis-etl-app - app.kubernetes.io/name: medis-etl-app - app.kubernetes.io/part-of: medis-etl - app.openshift.io/runtime: java-springboot-camel - name: medis-etl-app -spec: - replicas: 1 - selector: - matchLabels: - app: medis-etl-app - strategy: - type: Recreate - template: + name: "${REPO_NAME}-app-dc" +objects: + - apiVersion: v1 + kind: PersistentVolumeClaim metadata: - labels: + name: medis-etl-pvc + spec: + accessModes: + - ReadWriteMany + resources: + requests: + storage: ${DATA_VOLUME_CAPACITY} + - apiVersion: v1 + kind: ConfigMap + metadata: + name: medis-etl-config + data: + medis-etl.properties: |- + config1=test1 + config2=test2 + config3=test3 + immutable: false + + - apiVersion: apps/v1 + kind: Deployment + metadata: + name: ${APP_NAME} + spec: + replicas: 1 + selector: + matchLabels: + app: ${APP_NAME} + strategy: + type: Recreate + template: + metadata: + labels: + app: ${APP_NAME} + deployment: ${APP_NAME}-deployment + spec: + containers: + - env: + - name: DEBUG_PORT + value: "5858" + - name: PROJECTS_ROOT + value: /projects + - name: PROJECT_SOURCE + value: /projects + image: image-registry.openshift-image-registry.svc:5000/c2da03-dev/medis-etl-image:latest + imagePullPolicy: Always + name: etl-camel + ports: + - containerPort: 8080 + name: http-springboot + protocol: TCP + - containerPort: 5858 + name: debug + protocol: TCP + resources: + limits: + memory: 768Mi + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + volumeMounts: + - mountPath: ${DATA_DIR} + name: medis-etl-files + - mountPath: ${APP_CONFIG_DIR} + name: medis-etl-config + - mountPath: /ssh + name: medis-etl-ssh + readOnly: true + dnsPolicy: ClusterFirst + restartPolicy: Always + schedulerName: default-scheduler + securityContext: {} + terminationGracePeriodSeconds: 30 + volumes: + - name: medis-etl-files + persistentVolumeClaim: + claimName: medis-etl-pvc + - name: medis-etl-config + configMap: + name: medis-etl-config + - name: medis-etl-ssh + secret: + defaultMode: 400 + secretName: medis-etl + + - apiVersion: v1 + kind: Service + metadata: + name: ${APP_NAME} + spec: + ports: + - name: http-springboot + port: 8080 + protocol: TCP + targetPort: 8080 + - name: http-8081 + port: 8081 + protocol: TCP + targetPort: 8081 + selector: app: medis-etl-app deployment: medis-etl-app-deployment + sessionAffinity: None + + - apiVersion: route.openshift.io/v1 + kind: Route + metadata: + name: ${APP_NAME} spec: - containers: - - env: - - name: DEBUG_PORT - value: "5858" - - name: PROJECTS_ROOT - value: /projects - - name: PROJECT_SOURCE - value: /projects - image: image-registry.openshift-image-registry.svc:5000/c2da03-dev/medis-etl-image:latest - imagePullPolicy: Always - name: etl-camel - ports: - - containerPort: 8080 - name: http-springboot - protocol: TCP - - containerPort: 5858 - name: debug - protocol: TCP - resources: - limits: - memory: 768Mi - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /data - name: medis-etl-files - - mountPath: /app/config - name: medis-etl-config - - mountPath: /ssh - name: medis-etl-ssh - readOnly: true - dnsPolicy: ClusterFirst - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - terminationGracePeriodSeconds: 30 - volumes: - - name: medis-etl-files - persistentVolumeClaim: - claimName: medis-etl-pvc - - name: medis-etl-config - configMap: - name: medis-etl-config - - name: medis-etl-ssh - secret: - defaultMode: 400 - secretName: medis-etl - + port: + targetPort: "8081" + tls: + insecureEdgeTerminationPolicy: Redirect + termination: edge + to: + kind: Service + name: medis-etl-app + weight: 100 + wildcardPolicy: None +parameters: + - name: APP_NAME + description: Application name + displayName: Application name + required: true + value: medis-etl-app + - name: ROUTE_HOST + description: The host the route will use to expose service outside cluster + displayName: Route host + required: true + - name: ROUTE_PATH + description: Configure the route path (ex. /pr-5 or /app), also used for VUE_APP_FRONTEND_BASEPATH + displayName: Route path + required: true + - name: JOB_NAME + description: Job identifier (i.e. 'pr-5' OR 'master') + displayName: Job Branch Name + required: true + - name: IMAGE_REGISTRY + description: The container registry + displayName: Docker Image Registry + required: true + value: ghcr.io + - name: IMAGE_NAMESPACE + description: The image namespace + displayName: Docker Image Namespace + required: true + value: bcgov + - name: IMAGE_TAG + description: The specific image tag to deploy + displayName: Docker Image Tag + required: true + value: latest + - name: NAMESPACE + description: Target namespace reference (i.e. 'wfezkf-dev') + displayName: Target Namespace + required: true + - name: REPO_NAME + description: Application repository name + displayName: Repository Name + required: true + - name: CPU_LIMIT + description: Limit Peak CPU per pod (in millicores ex. 1000m) + displayName: CPU Limit + value: 250m + - name: CPU_REQUEST + description: Requested CPU per pod (in millicores ex. 500m) + displayName: CPU Request + value: 50m + - name: MEMORY_LIMIT + description: Limit Peak Memory per pod (in gigabytes Gi or megabytes Mi ex. 2Gi) + displayName: Memory Limit + value: 1Gi + - name: MEMORY_REQUEST + description: Requested Memory per pod (in gigabytes Gi or megabytes Mi ex. 500Mi) + displayName: Memory Request + value: 256Mi + - name: APP_CONFIG_DIR + description: Path to apps properties file + displayName: Directory to mount for app config files + required: true + value: "/app/config" + - name: DATA_DIR + description: Path to data directory + displayName: Directory to mount for data files + required: true + value: "/data" + - name: DATA_VOLUME_CAPACITY + description: Volume space available for Data + displayName: Data Volume Capacity (use M or G, not Mi or Gi) + required: true + value: "1Gi" diff --git a/openshift/app.pvc.yaml b/openshift/app.pvc.yaml deleted file mode 100644 index 8a39cbb2..00000000 --- a/openshift/app.pvc.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: medis-etl-pvc -spec: - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1Gi diff --git a/openshift/app.route.yaml b/openshift/app.route.yaml deleted file mode 100644 index 25a27425..00000000 --- a/openshift/app.route.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - labels: - app: medis-etl-app - app.kubernetes.io/component: medis-etl-app - app.kubernetes.io/instance: medis-etl-app - app.kubernetes.io/name: medis-etl-app - app.kubernetes.io/part-of: medis-etl - app.openshift.io/runtime: java-springboot-camel - name: medis-etl-app -spec: - port: - targetPort: "8081" - tls: - insecureEdgeTerminationPolicy: Redirect - termination: edge - to: - kind: Service - name: medis-etl-app - weight: 100 - wildcardPolicy: None diff --git a/openshift/app.svc.yaml b/openshift/app.svc.yaml deleted file mode 100644 index 3396e36e..00000000 --- a/openshift/app.svc.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: medis-etl-app - app.kubernetes.io/component: medis-etl-app - app.kubernetes.io/instance: medis-etl-app - app.kubernetes.io/name: medis-etl-app - app.kubernetes.io/part-of: medis-etl - app.openshift.io/runtime: java-springboot-camel - name: medis-etl-app -spec: - ports: - - name: http-springboot - port: 8080 - protocol: TCP - targetPort: 8080 - - name: http-8081 - port: 8081 - protocol: TCP - targetPort: 8081 - selector: - app: medis-etl-app - deployment: medis-etl-app-deployment - sessionAffinity: None From d98ef6811508406f7f76b02265b2e3e63a326258 Mon Sep 17 00:00:00 2001 From: prit-cgi Date: Mon, 27 Feb 2023 23:29:07 -0500 Subject: [PATCH 011/183] added basic camel routes and configuration --- .gitignore | 13 + pom.xml | 221 + .../bc/gov/chefs/etl/ChefsETLMainMethod.java | 23 + .../bc/gov/chefs/etl/constant/Constants.java | 221 + .../gov/chefs/etl/core/routes/BaseRoute.java | 12 + .../chefs/etl/core/routes/ResponseRoute.java | 5 + .../chefs/etl/core/routes/TestFormRoute.java | 46 + .../etl/forms/aims/model/AimsMisuse.java | 55 + .../etl/forms/aims/model/AimsReferral.java | 76 + .../etl/forms/aims/model/MainEntity.java | 425 + .../aims/parser/AIMSFormPayloadExtractor.java | 38 + .../aims/processor/AIMSFormApiProcessor.java | 20 + .../AIMSFormApiResponseProcessor.java | 38 + .../aims/processor/AIMSFormProcessor.java | 20 + .../etl/forms/aims/route/AIMSFormRoute.java | 39 + .../ltc/facility/model/FacilityInfo.java | 559 + .../FacilityInfoFormApiProcessor.java | 22 + .../FacilityInfoFormApiResponseProcessor.java | 36 + .../processor/FacilityInfoFormProcessor.java | 17 + .../ltc/facility/route/FacilityFormRoute.java | 42 + .../etl/forms/ltc/quaterly/json/BedGrid0.java | 261 + .../etl/forms/ltc/quaterly/json/BedGrid1.java | 230 + .../etl/forms/ltc/quaterly/json/BedGrid2.java | 215 + .../etl/forms/ltc/quaterly/json/BedGrid3.java | 215 + .../etl/forms/ltc/quaterly/json/BedGrid4.java | 216 + .../etl/forms/ltc/quaterly/json/Form.java | 85 + .../etl/forms/ltc/quaterly/json/Root.java | 9459 +++++++++++++++++ .../quaterly/model/LtcBedYtdMaxOccupancy.java | 107 + .../model/LtcBedYtdMaxOccupancyTotals.java | 113 + .../model/LtcBedYtdOccupancyRate.java | 99 + .../model/LtcBedYtdOccupancyRateTotals.java | 94 + .../quaterly/model/LtcBedYtdOccupiedDays.java | 90 + .../model/LtcBedYtdOccupiedDaysTotals.java | 83 + .../ltc/quaterly/model/LtcYtdCompAddPos.java | 82 + .../quaterly/model/LtcYtdCompBenefits.java | 68 + .../ltc/quaterly/model/LtcYtdCompHrs.java | 97 + .../model/LtcYtdCompHrsSubtotals.java | 81 + .../quaterly/model/LtcYtdCompHrsTotals.java | 108 + .../ltc/quaterly/model/LtcYtdCompSal.java | 87 + .../model/LtcYtdCompSalSubtotals.java | 95 + .../quaterly/model/LtcYtdCompSalTotals.java | 95 + .../quaterly/model/LtcYtdDirectCareCost.java | 161 + .../model/LtcYtdDirectCareCostSubtotals.java | 175 + .../quaterly/model/LtcYtdDirectCareHrs.java | 147 + .../model/LtcYtdDirectCareHrsSubTotals.java | 155 + .../forms/ltc/quaterly/model/LtcYtdExp.java | 71 + .../quaterly/model/LtcYtdExpSubTotals.java | 58 + .../forms/ltc/quaterly/model/LtcYtdRev.java | 73 + .../quaterly/model/LtcYtdRevSubTotals.java | 59 + .../ltc/quaterly/model/LtcYtdSubmission.java | 251 + .../processor/LtcQuaterlyYtdApiProcessor.java | 20 + .../LtcQuaterlyYtdApiResponseProcessor.java | 2609 +++++ .../LtcQuaterlyYtdFileProcessor.java | 19 + .../processor/LtcQuaterlyYtdProcessor.java | 17 + .../quaterly/route/LtcQuaterlyYtdRoute.java | 43 + .../forms/ltc/staffing/LTCStaffPlanPerf.java | 52 + .../ltc/staffing/LTCStaffPlanPosType.java | 254 + .../forms/ltc/staffing/LTCStaffingAddPos.java | 91 + .../forms/ltc/staffing/LTCStaffingHrs.java | 176 + .../forms/ltc/staffing/LTCStaffingPlan.java | 516 + .../etl/forms/testform/LoginCredentials.java | 74 + .../etl/forms/testform/PersonDetails.java | 95 + .../forms/testform/TestFormApiProcessor.java | 25 + .../TestFormApiResponseProcessor.java | 35 + .../etl/forms/testform/TestFormProcessor.java | 37 + .../chefs/etl/forms/testform/TestModel.java | 102 + .../ca/bc/gov/chefs/etl/parser/FileModel.java | 30 + .../ca/bc/gov/chefs/etl/parser/IModel.java | 10 + .../etl/parser/TestFormPayloadExtractor.java | 41 + .../TestFormResponsePayloadExtractor.java | 29 + .../ca/bc/gov/chefs/etl/util/AuthUtil.java | 13 + .../ca/bc/gov/chefs/etl/util/CSVUtil.java | 107 + .../ca/bc/gov/chefs/etl/util/CommonUtils.java | 87 + .../ca/bc/gov/chefs/etl/util/Counter.java | 26 + .../ca/bc/gov/chefs/etl/util/FileUtil.java | 171 + .../bc/gov/chefs/etl/util/PropertiesUtil.java | 34 + src/main/resources/application-dev.properties | 0 src/main/resources/application.properties | 24 + src/main/resources/log4j2.properties | 6 + 79 files changed, 19801 insertions(+) create mode 100644 .gitignore create mode 100644 pom.xml create mode 100644 src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/core/routes/ResponseRoute.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/core/routes/TestFormRoute.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsMisuse.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/aims/parser/AIMSFormPayloadExtractor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInfo.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid0.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid1.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid2.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid3.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid4.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Form.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRate.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRateTotals.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDaysTotals.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCostSubtotals.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrsSubTotals.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExpSubTotals.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRevSubTotals.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdFileProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPerf.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPosType.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingAddPos.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingHrs.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingPlan.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/LoginCredentials.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/PersonDetails.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiResponseProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormProcessor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestModel.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/parser/FileModel.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/parser/IModel.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/parser/TestFormPayloadExtractor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/parser/TestFormResponsePayloadExtractor.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/util/AuthUtil.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/util/Counter.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/util/PropertiesUtil.java create mode 100644 src/main/resources/application-dev.properties create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/log4j2.properties diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..70061c21 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +.idea/* +*.iml +*.class +*target/ +*.idea/* +*.project +*.classpath +*bin/* +*/keystore/* +logs/* +.settings/* +.factorypath +keys/* \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..97165c9a --- /dev/null +++ b/pom.xml @@ -0,0 +1,221 @@ + + 4.0.0 + ca.bc.gov.chefs + etl + jar + 0.0.1-SNAPSHOT + CHEFS - ETL + + + UTF-8 + UTF-8 + 2.17.1 + 3.8.1 + 3.1.0 + 3.2.1 + 3.4.0 + 42.2.22 + 5.4.32.Final + 3.6.28 + 5.7.1 + 2.4.7 + 2.4.0 + + + + + + + org.apache.camel + camel-bom + 3.4.1 + import + pom + + + + + + + + org.apache.camel + camel-core-engine + + + org.apache.camel + camel-main + + + + org.apache.camel + camel-cron + + + org.apache.camel + camel-quartz + + + + + org.apache.camel + camel-jetty + + + org.apache.camel + camel-jackson + + + + org.apache.camel + camel-http + + + org.apache.camel + camel-direct + + + org.apache.camel + camel-bean + + + + org.apache.camel + camel-log + + + + + org.apache.logging.log4j + log4j-slf4j-impl + runtime + ${log4j2-version} + + + + + org.apache.camel + camel-test-junit5 + test + + + org.junit.jupiter + junit-jupiter-api + ${junit-version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit-version} + test + + + org.mockito + mockito-core + ${mockito-core-version} + test + + + + + net.minidev + json-smart + ${json-smart-version} + + + + + net.sf.supercsv + super-csv + ${supercsv-version} + + + + org.bouncycastle + bcpg-jdk15on + 1.70 + compile + + + + + org.bouncycastle + bcpkix-jdk15on + 1.70 + compile + + + + + + install + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin-version} + + 17 + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin-version} + + UTF-8 + + + + + org.apache.maven.plugins + maven-shade-plugin + ${maven-shade-plugin-version} + + + + package + + shade + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + true + executable-jar + medis-etl + + + ca.bc.gov.chefs.etl.ChefsETLMainMethod + + ca/bc/gov/chefs/etl/ + + + + META-INF/services/org/apache/camel/TypeConverterLoader + + + + + + + + + + + + + + diff --git a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java new file mode 100644 index 00000000..617b079a --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java @@ -0,0 +1,23 @@ +package ca.bc.gov.chefs.etl; + +import org.apache.camel.main.Main; + + +import ca.bc.gov.chefs.etl.core.routes.TestFormRoute; +import ca.bc.gov.chefs.etl.forms.ltc.facility.route.FacilityFormRoute; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.route.LtcQuaterlyYtdRoute; +import ca.bc.gov.chefs.etl.forms.aims.route.AIMSFormRoute; +/** + * Camel Class runner. + * */ +public class ChefsETLMainMethod { + + public static void main(String... args) throws Exception { + Main main = new Main(); + main.configure().addRoutesBuilder(TestFormRoute.class); + main.configure().addRoutesBuilder(AIMSFormRoute.class); + main.configure().addRoutesBuilder(FacilityFormRoute.class); + main.configure().addRoutesBuilder(LtcQuaterlyYtdRoute.class); + main.run(args); + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java new file mode 100644 index 00000000..848c724c --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -0,0 +1,221 @@ +package ca.bc.gov.chefs.etl.constant; + +import java.util.HashMap; + +import java.util.Map; + +public class Constants { + + /* + * Constants representing keys in application.properties. + * + */ + /* AIMS */ + public final static String AIMS_USERNAME = "aims.username"; + public final static String AIMS_PASSWORD = "aims.password"; + + public final static Map HEADERS = new HashMap(); + public final static String AIMS_FORM = "AIMS_FORM"; + public final static String AIMS_MISUSE = "AIMS_MISUSE"; + public final static String AIMS_REFERRAL = "AIMS_REFERRAL"; + + /* LTC Facility */ + public final static String LTC_FACILITY_USERNAME = "ltc.facility.username"; + public final static String LTC_FACILITY_PASSWORD = "ltc.facility.password"; + + /* LTC Quaterly YTD */ + public final static String LTC_YTD_USERNAME = "ltc.ytd.username"; + public final static String LTC_YTD_PASSWORD = "ltc.ytd.password"; + public final static String IN_SCOPE = "inScope"; + public final static String OUT_OF_SCOPE = "outOfScope"; + public final static String PRIVATE_BED = "privateBed"; + + // form names + public final static String LTC_BED_YTD_OCCUPIED_DAYS = "LTC_BED_YTD_OCCUPIED_DAYS"; + public final static String LTC_BED_YTD_OCCUPANCY_RATE = "LTC_BED_YTD_OCCUPANCY_RATE"; + public final static String LTC_BED_YTD_MAX_OCCUPANCY = "LTC_BED_YTD_MAX_OCCUPANCY"; + public final static String LTC_YTD_DIRECT_CARE_HRS = "LTC_YTD_DIRECT_CARE_HRS"; + public final static String LTC_YTD_COMP_HRS = "TC_YTD_COMP_HRS"; + public final static String LTC_YTD_COMP_SAL = "LTC_YTD_COMP_SAL"; + public final static String LTC_YTD_COMP_ADD_POS = "LTC_YTD_COMP_ADD_POS"; + public final static String LTC_YTD_DIRECT_CARE_COST = "LTC_YTD_DIRECT_CARE_COST"; + public final static String LTC_YTD_REV = "LTC_YTD_REV"; + public final static String LTC_YTD_EXP = "LTC_YTD_EXP"; + public final static String LTC_YTD_COMP_BENEFITS = "LTC_YTD_COMP_BENEFITS"; + public final static String LTC_YTD_SUBMISSION = "LTC_YTD_SUBMISSION"; + public static final String LTC_YTD_REV_SUB_TOTALS = "LTC_YTD_REV_SUB_TOTALS"; + public static final String LTC_YTD_EXP_SUB_TOTALS = "LTC_YTD_EXP_SUB_TOTALS"; + public final static String LTC_FACILITY = "LTC_FACILITY"; + public static final String LTC_YTD_COMP_SAL_SUBTOTALS = "LTC_YTD_COMP_SAL_SUBTOTALS"; + public static final String LTC_BED_YTD_MAX_OCCUPANCY_TOTALS = "LTC_BED_YTD_MAX_OCCUPANCY_TOTALS"; + + + public static final String LTC_YTD_COMP_SAL_TOTALS = "LTC_YTD_COMP_SAL_TOTALS"; + public static final String LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS = "LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS"; + public static final String LTC_YTD_DIRECT_CARE_COST_SUBTOTALS = "LTC_YTD_DIRECT_CARE_COST_SUBTOTALS"; + public static final String LTC_BED_YTD_OCCUPANCY_RATE_TOTALS = "LTC_BED_YTD_OCCUPANCY_RATE_TOTALS"; + public static final String LTC_BED_YTD_OCCUPIED_DAYS_TOTALS = "LTC_BED_YTD_OCCUPIED_DAYS_TOTALS"; + + /* File Constants */ + public final static String ETL_DIRECTORY = "etl"; + public final static String UNENCRYPTED_DIRECTORY = "unencrypted"; + public final static String ENCRYPTED_DIRECTORY = "encrypted"; + + + + + static { + HEADERS.put("TestModel#Main", new String[] { "confirmationId", "formName", "version", "createdAt", "fullName", + "username", "email", "status", "assignee", "assigneeEmail", }); + + HEADERS.put("TestModel#LoginCredentials", new String[] { "username1", "password", "confirmationId" }); + + HEADERS.put("TestModel#PersonDetails", + new String[] { "firstName", "lastName", "birthPlace", "education", "confirmationId" }); + // + + HEADERS.put(AIMS_FORM, + new String[] { "Confirmation_ID", "Submission_Date", "Submitted_by", "Submission_type", "Agency_Code", + "Program_Type", "Office_Code", "Referral_Source", "Office_Date", "Regional_HA", + "Contracting_HA", "Health_Num", "Last_Name", "First_Name", "Middle_Name", "Birthdate", + "Postal_Code", "Primary_Language", "Education_Level", "Marital_Status", "Employment_Status", + "Number_Dependent_Children", "Methadone_Maintenance", "Current_Injection_Drug_Use", "Substance", + "Other_Client_Info", "Substance_Relation", "Primary_Drug_of_Choice", "Adm_Screened_Ref", + "Activity_Date", "Activity_Service_Provider_Code", "Discharge_Type", "Discharge_Date", + "Discharge_Service_Provider_Code", "Discharge_Program_Completion" }); + HEADERS.put(AIMS_MISUSE, new String[] { "Confirmation_ID", "Substance_misuses" }); + + HEADERS.put(AIMS_REFERRAL, new String[] { "Confirmation_ID", "AIMS_Referral_ID", "Date", + "Service_Provider_Code", "Referral_Target", }); + + // LTC Facility + HEADERS.put(LTC_FACILITY, + new String[] { "Confirmation_ID","Is_Deleted", "Submission_Date", "Submitted_by","Facility_Name", "Facility_Address", "Facility_City", + "Facility_Postal_Code", "Facility_Telephone", "Facility_Website", "CCIMS_ID", "Program_type", + "Ownership_type", "Legislation_type", "Accreditation_Body", "Accreditation_Date", + "Accreditation_Expiry_Date", "Health_Authority", "Owner_Name", "Owner_Address", "Owner_City", + "Owner_postal_code", "Owner_contact_name","Owner_contact_phone","Owner_contact_position", "Owner_contact_email", "Operator_Name", + "Operator_Address", "Operator_City", "Operator_postal_code", "Operator_contact_Name", + "Operator_contact_phone", "Operator_contact_position", "Operator_contact_email", + "Preparer_contact_Name", "Preparer_contact_phone", "Preparer_contact_position", + "Preparer_contact_email", "Approver_Contact_Name", "Approver_Contact_phone", + "Approver_Contact_position", "Approver_contact_email", }); + + // LTC Quaterly YTD + HEADERS.put(LTC_BED_YTD_MAX_OCCUPANCY, + new String[] { "CONFIRMATION_ID", "QUARTER_INVENTORY", "BED_FUNDING_TYPE", "BED_SUBTYPE", "START_DATE", + "END_DATE", "NUMBER_OF_BEDS", "MAXIMUM_BED_DAYS", "NOTES" }); + + HEADERS.put(LTC_YTD_SUBMISSION, + new String[] { "CONFIRMATION_ID", "IS_DELETED", "SUBMISSION_DATE", "SUBMITTED_BY", "FACILITY_SUB_ID", + "PERIOD", "SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD" }); + + HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS, new String[] { "CONFIRMATION_ID", "OCC_QUARTER", "OCC_MONTH", + "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", "OCC_DAYS_YTD_TOTAL_DAYS", "OCC_DAYS_YTD_PRIVATE", }); + + HEADERS.put(LTC_BED_YTD_OCCUPANCY_RATE, + new String[] { "CONFIRMATION_ID", "OCC_RATE_QUARTER", "OCC_RATE_BED_TYPES", "PLAN_MAX_OCC_DAYS", + "YTD_MAX_OCC_DAYS", "YTD_OCC_DAYS", "PERCENT_OCC", "OCC_RATE_NOTES", }); + + HEADERS.put(LTC_YTD_DIRECT_CARE_HRS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "DIR_CARE_NAME", + "DIR_CARE_PROD_HRS_REG_YTD", "DIR_CARE_PROD_HRS_OT_YTD", "DIR_CARE_PROD_HRS_CONTRACTED_YTD", + "DIR_CARE_PROD_HRS_SUBTOTAL_YTD", "DIR_CARE_PROD_HRS_TOTAL_YTD", "DIR_CARE_NON_PROD_HRS_VAC_YTD", + "DIR_CARE_NON_PROD_HRS_SICK_YTD", "DIR_CARE_NON_PROD_HRS_OTHER_YTD", "DIR_CARE_NON_PROD_HRS_TOTAL_YTD", + "DIR_CARE_TOTAL_HRS_PAID_YTD", "DIR_CARE_YTD_NOTES", + + }); + HEADERS.put(LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS, + new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "SUB_TOTAL_DIR_CARE_PROD_HRS_REGULAR_YTD", + "SUB_TOTAL_DIR_CARE_PROD_HRS_OT_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_SUBTOTAL_YTD", + "SUB_TOTAL_DIR_CARE_PROD_HRS_CONT_SERV_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_TOTAL_YTD", + "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_VAC_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_SICK_YTD", + "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_OTHER_SERV_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_TOTAL_YTD", + "SUB_TOTAL_DIR_CARE_TOTAL_HRS_PAID_YTD", + + }); +// HEADERS.put(LTC_YTD_DIRECT_CARE_HRS, new String[] { "CONFIRMATION_ID", "QUARTER_INVENTORY", "BED_FUNDING_TYPE", +// "BED_SUBTYPE", "START_DATE", "END_DATE", "NUMBER_OF_BEDS", "MAXIMUM_BED_DAYS", "NOTES" }); + HEADERS.put(LTC_YTD_COMP_HRS, + new String[] { "CONFIRMATION_ID", "COMP_HRS_TYPE", "COMP_HRS_NAME", "COMP_HRS_PER_PAYROLL_YTD", + "COMP_HRS_STAFF_YTD", "COMP_HRS_CONTRACT_SERVICES_YTD", "COMP_HRS_OFFICE_ALLOC_YTD", + "COMP_TOTAL_WORKED_HRS_YTD" }); + + HEADERS.put(LTC_YTD_COMP_SAL, + new String[] { "CONFIRMATION_ID", "COMP_SAL_TYPE", "COMP_SAL_NAME", "COMP_SAL_STAFF_YTD", + "COMP_SAL_CONTRACT_SERVICES_YTD", "COMP_SAL_OFFICE_ALLOC_YTD", "Comp_Sal_Total_Cost_YTD" }); + + HEADERS.put(LTC_YTD_COMP_SAL_SUBTOTALS, + new String[] { "Confirmation_ID", "Comp_Sal_Type", "Sub_Total_Comp_Sal_Staff_YTD", + "Sub_Total_Comp_Sal_Contract_Services_YTD", "Sub_Total_Comp_Sal_Office_Alloc_YTD", + "Sub_Total_Comp_Sal_Total_Cost_YTD", }); + + HEADERS.put(LTC_YTD_COMP_SAL_TOTALS, + new String[] { "Confirmation_ID", "Comp_Sal_Total_Type", "Total_Comp_Sal_Staff_YTD", + "Total_Comp_Sal_Contract_Services_YTD", "Total_Comp_Sal_Office_Alloc_YTD", + "Total_Comp_Sal_Total_Cost_YTD", }); + + HEADERS.put(LTC_YTD_COMP_ADD_POS, new String[] { "CONFIRMATION_ID", "ADD_POS_TYPE", "ADD_POS_NAME", + "ADD_POS_CONTRACTED_OUT_YTD", "ADD_POS_LGL_NM_CON_SRV_YTD", "ADD_POS_PCT_SRV_CON_OUT_YTD", }); + HEADERS.put(LTC_YTD_DIRECT_CARE_COST, + new String[] { "CONFIRMATION_ID", "DIR_CARE_COST_TYPE", "DIR_CARE_COST_NAME", + "DIR_CARE_COST_PROD_HRS_REG_YTD", "DIR_CARE_COST_PROD_HRS_OT_YTD", + "DIR_CARE_CST_PROD_HRS_CONTRACTED_YTD", "DIR_CARE_COST_PROD_HRS_SUBTOTAL_YTD", + "DIR_CARE_COST_PROD_HRS_TOTAL_YTD", "DIR_CARE_CST_NON_PROD_HRS_VAC_YTD", + "DRC_CST_NON_PROD_HRS_SICK_YTD", "DIR_CARE_CST_NON_PROD_HRS_OTH_YTD", + "DIR_CARE_COST_NON_PROD_HRS_TOTAL_YTD", "DIR_CARE_COST_TOTAL_HRS_PAID_YTD", + "DIR_CARE_COST_HOURLY_RATE_STAFF_YTD", "DIR_CARE_COST_HOURLY_RATE_CONTRACTED_YTD", + "DIR_CARE_COST_YTD_NOTES", }); + + HEADERS.put(LTC_YTD_DIRECT_CARE_COST_SUBTOTALS,new String[] { + "CONFIRMATION_ID", + "DIR_CARE_TYPE", + "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_REGULAR_YTD", + "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_OT_YTD", + "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_SUBTOTAL_YTD", + "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_CONT_SERV_YTD", + "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_TOTAL_YTD", + "SUB_TOTAL_DIR_CARE_COST_NON_PROD_HRS_VAC_YTD", + "SUB_TOTAL_DIR_CARE_COST_NON_PROD_HRS_SICK_YTD", + "SUB_TOTAL_DIR_CARE_COST_NON_PROD_HRS_OTHER_SERV_YTD", + "SUB_TOTAL_DIR_CARE_COST_NON_PROD_HRS_TOTAL_YTD", + "SUB_TOTAL_DIR_CARE_COST_TOTAL_HRS_PAID_YTD", + "SUB_TOTAL_DIR_CARE_COST_HOURLY_RATE_STAFF_YTD", + "SUB_TOTAL_DIR_CARE_COST_HOURLY_RATE_CONTRACTED_YTD", + }); + + HEADERS.put(LTC_BED_YTD_MAX_OCCUPANCY_TOTALS, new String[] { + "CONFIRMATION_ID", + "BED_FUNDING_TYPE", + "TOTAL_BED_QUARTER_1", + "TOTAL_BED_QUARTER_2", + "TOTAL_BED_QUARTER_3", + "TOTAL_BED_QUARTER_4", + "TOTAL_PLANNED_BED_DAYS", + }); + + HEADERS.put(LTC_BED_YTD_OCCUPANCY_RATE_TOTALS, new String[] { + "CONFIRMATION_ID", + "OCC_RATE_QUARTER", + "TOTAL_PLAN_MAX_OCC_DAYS", + "TOTAL_YTD_MAX_OCC_DAYS", + "TOTAL_YTD_OCC_DAYS", + "TOTAL_PERCENT_OCC", + }); + + HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS_TOTALS, new String[] { + "CONFIRMATION_ID", + "OCC_QUARTER", + "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", + "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", + "OCC_DAYS_YTD_TOTAL_DAYS", + "OCC_DAYS_YTD_PRIVATE", + }); + + HEADERS.put(LTC_YTD_REV, new String[] { "CONFIRMATION_ID", "REV_TYPE", "REV_NAME", "REV_YTD", "REV_NOTES", }); + + HEADERS.put(LTC_YTD_EXP, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "EXP_NAME", "REV_YTD", "REV_NOTES", }); + HEADERS.put(LTC_YTD_COMP_BENEFITS, new String[] { "CONFIRMATION_ID", "BENEFITS_TYPE", "BENEFITS_AMOUNT_YTD" }); + + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java b/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java new file mode 100644 index 00000000..511c815d --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java @@ -0,0 +1,12 @@ +package ca.bc.gov.chefs.etl.core.routes; + +import java.util.Properties; + +import org.apache.camel.builder.RouteBuilder; + +import ca.bc.gov.chefs.etl.util.PropertiesUtil; + +public abstract class BaseRoute extends RouteBuilder { + static Properties properties = PropertiesUtil.loadProperties(); + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/core/routes/ResponseRoute.java b/src/main/java/ca/bc/gov/chefs/etl/core/routes/ResponseRoute.java new file mode 100644 index 00000000..eeb80d9f --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/core/routes/ResponseRoute.java @@ -0,0 +1,5 @@ +package ca.bc.gov.chefs.etl.core.routes; + +public class ResponseRoute { + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/core/routes/TestFormRoute.java b/src/main/java/ca/bc/gov/chefs/etl/core/routes/TestFormRoute.java new file mode 100644 index 00000000..cfcbca9c --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/core/routes/TestFormRoute.java @@ -0,0 +1,46 @@ +package ca.bc.gov.chefs.etl.core.routes; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ca.bc.gov.chefs.etl.forms.testform.TestFormApiProcessor; +import ca.bc.gov.chefs.etl.forms.testform.TestFormApiResponseProcessor; +import ca.bc.gov.chefs.etl.forms.testform.TestFormProcessor; +import ca.bc.gov.chefs.etl.parser.TestFormPayloadExtractor; + +public class TestFormRoute extends BaseRoute { + + private static final Logger logger = LoggerFactory.getLogger(TestFormRoute.class); + @Override + public void configure() throws Exception { + logger.info("Loaded TestFormRoute"); + + /** + * receive JSON payload, parse and set to make an API call + * + * + */ + // trigger + from("jetty:http://{{hostname}}:{{port}}/test").routeId("test-form") + .log("CHEFS-ETL received a request for TestForm extraction").bean(TestFormPayloadExtractor.class) + .process(new TestFormProcessor()).to("direct:test").end(); + + from("direct:test").process(new TestFormApiProcessor()) + // to the http uri + .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/07623d33-9f49-425a-b7d2-d849b3e0af5c/export?bridgeEndpoint=true&format=json") + .log("This is the status code from the response: ${header.CamelHttpResponseCode}") + .log("Trying to convert the received body OK") + .convertBodyTo(String.class) + .process(new TestFormApiResponseProcessor()) + .end(); + // database phase + from("jetty:http://{{hostname}}:{{port}}/testpgp").routeId("test-formpgp") + .log("CHEFS-ETL received a request for TestForm extraction").bean(TestFormPayloadExtractor.class) + .process(new TestFormProcessor()).to("direct:test").end(); + + + // file conversion + + } + +} \ No newline at end of file diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsMisuse.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsMisuse.java new file mode 100644 index 00000000..2d1312c2 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsMisuse.java @@ -0,0 +1,55 @@ +package ca.bc.gov.chefs.etl.forms.aims.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.util.Counter; + +public class AimsMisuse implements IModel { + + private String confirmationId; + private String substanceMisuse; + + public String getConfirmationId() { + return confirmationId.concat(String.valueOf(Counter.getNext(getFormType()))); + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getSubstanceMisuse() { + return substanceMisuse; + } + public void setSubstanceMisuse(String substanceMisuse) { + this.substanceMisuse = substanceMisuse; + } + + @Override + public String getFileName() { + return "AIMS_MISUSE"; + } + @Override + public String getFormType() { + return Constants.AIMS_MISUSE; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.confirmationId); + elements.add(this.substanceMisuse); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + @Override + public String toString() { + return "AimsMisuse [confirmationId=" + confirmationId + ", substanceMisuse=" + substanceMisuse + "]"; + } + + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java new file mode 100644 index 00000000..940c23d6 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java @@ -0,0 +1,76 @@ +package ca.bc.gov.chefs.etl.forms.aims.model; + +import java.util.ArrayList; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.util.Counter; + +public class AimsReferral implements IModel { + + @JsonIgnore + private String confirmationId; + @JsonProperty("serviceProviderCode1") + private String serviceProviderCode; + @JsonProperty("referralTarget") + private String referralTarget; + + @JsonProperty("DataGridReferral_date_1") + private String referralDate; + + public String getAimsReferralNumber() { + return confirmationId.concat("-"+String.valueOf(Counter.getNext(getFormType()))); + } + + public String getServiceProviderCode() { + return serviceProviderCode; + } + + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + + public void setServiceProviderCode(String serviceProviderCode) { + this.serviceProviderCode = serviceProviderCode; + } + + public String getReferralTarget() { + return referralTarget; + } + + public void setReferralTarget(String referralTarget) { + this.referralTarget = referralTarget; + } + + @Override + public String getFileName() { + return "AIMS_REFERRAL"; + } + + @Override + public String getFormType() { + return Constants.AIMS_REFERRAL; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.confirmationId); + elements.add(this.getAimsReferralNumber()); + elements.add(this.referralDate); + elements.add(this.serviceProviderCode); + elements.add(this.referralTarget); + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java new file mode 100644 index 00000000..54c1918b --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java @@ -0,0 +1,425 @@ +package ca.bc.gov.chefs.etl.forms.aims.model; + +import java.util.ArrayList; + +import java.util.List; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonUnwrapped; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +//@JsonIgnoreProperties(ignoreUnknown = true) +public class MainEntity implements IModel { + + @JsonIgnore + protected String confirmationId; + @JsonIgnore + protected String submissionDate; + @JsonIgnore + protected String submittedBy; + + @JsonProperty("submissionType") + protected String submissionType; + @JsonProperty("agencyCode") + protected String agencyCode; + @JsonProperty("programType1") + protected String programType; + @JsonProperty("officeCode1") + protected String officeCode; + @JsonProperty("referralSource1") + protected String referralSource; + @JsonProperty("date") // not confirmed yet + protected String officeDate; + @JsonProperty("regionalHa") + protected String regionalHA; + @JsonProperty("contractingHa") + protected String contractingHA; + @JsonProperty("personalHealthNumber") + protected String healthNum; + @JsonProperty("lastName") + protected String lastName; + @JsonProperty("givenNameFullName") + protected String firstName; + @JsonProperty("middleNameS") + protected String middleName; + @JsonProperty("birthdate") + protected String birthDate; + @JsonProperty("postalCode") + protected String postalCode; + @JsonProperty("primaryLanguage1") + protected String primaryLanguage; + @JsonProperty("educationLevel1") + protected String educationLevel; + @JsonProperty("maritalStatus1") + protected String maritalStatus; + @JsonProperty("employmentStatus1") + protected String employmentStatus; + @JsonProperty("numberOfDependentChildren") + protected String numberDependentChildren; + @JsonProperty("yoaClient1") + protected String methadoneMaintainance; + @JsonProperty("yoaClient2") + protected String currentInjectionDrugUse; + @JsonProperty("radioGroup1") + protected String substance; + @JsonProperty("otherPleaseSpecify") + protected String otherClientInfo; + @JsonProperty("relation4") + protected String substanceRelation; + @JsonProperty("primaryDrugOfChoice1") + protected String primaryDrugOfChoice; + @JsonProperty("radioGroup") + protected String admScreenedRef; + @JsonProperty("date1") + protected String activityDate; + @JsonProperty("serviceProviderCode2") + protected String activityServiceProviderCode; + @JsonProperty("radio1") + protected String dischargeType; + @JsonProperty("date2") + protected String dischargeDate; + @JsonProperty("serviceProviderCode") + protected String dischargeServiceProviderCode; + @JsonProperty("radioProgramCompletion") + protected String dischargeProgramCompletion; + + @JsonIgnore + protected List aimsMisuses; + + @JsonUnwrapped + protected AimsReferral aimsReferral; + + + @JsonProperty("form") + protected void unPackForm(Map form) { + this.confirmationId = form.get("confirmationId"); + this.submissionDate = form.get("createdAt"); + this.submittedBy = form.get("email"); + } + + @JsonProperty("selectBoxes1") + protected void unPackSelectBoxes(Map selectBoxes1) { + + List aimsMisuses = new ArrayList(); + for (Map.Entry entry : selectBoxes1.entrySet()) { + if (entry.getValue().equals("true")) { + AimsMisuse aimsMisuse = new AimsMisuse(); + aimsMisuse.setConfirmationId(this.confirmationId); + aimsMisuse.setSubstanceMisuse(entry.getKey()); + aimsMisuses.add(aimsMisuse); + } + } + this.setAimsMisuses(aimsMisuses); + } + + + @Override + public String getFileName() { + return "AIMS_FORM"; + } + @Override + public String getFormType() { + return Constants.AIMS_FORM; + } + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.confirmationId); + elements.add(this.submissionDate); + elements.add(this.submittedBy); + elements.add(this.submissionType); + elements.add(this.agencyCode); + elements.add(this.programType); + elements.add(this.officeCode); + elements.add(this.referralSource); + elements.add(this.officeDate); + elements.add(this.regionalHA); + elements.add(this.contractingHA); + elements.add(this.healthNum); + elements.add(this.lastName); + elements.add(this.firstName); + elements.add(this.middleName); + elements.add(this.birthDate); + elements.add(this.postalCode); + elements.add(this.primaryLanguage); + elements.add(this.educationLevel); + elements.add(this.maritalStatus); + elements.add(this.employmentStatus); + elements.add(this.numberDependentChildren); + elements.add(this.methadoneMaintainance); + elements.add(this.currentInjectionDrugUse); + elements.add(this.substance); + elements.add(this.otherClientInfo); + elements.add(this.substanceRelation); + elements.add(this.primaryDrugOfChoice); + elements.add(this.admScreenedRef); + elements.add(this.activityDate); + elements.add(this.activityServiceProviderCode); + elements.add(this.dischargeType); + elements.add(this.dischargeDate); + elements.add(this.dischargeServiceProviderCode); + elements.add(this.dischargeProgramCompletion); + + return elements; + } + @Override + public List getObjects() { + this.aimsReferral.setConfirmationId(this.confirmationId); + List objects = new ArrayList<>(); + if(this.getAimsMisuses()!=null) { + objects.addAll(this.getAimsMisuses()); + } + if(this.getAimsReferral()!=null) { + objects.add(this.getAimsReferral()); + } + return objects; + } + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getSubmissionDate() { + return submissionDate; + } + public void setSubmissionDate(String submissionDate) { + this.submissionDate = submissionDate; + } + public String getSubmittedBy() { + return submittedBy; + } + public void setSubmittedBy(String submittedBy) { + this.submittedBy = submittedBy; + } + public String getSubmissionType() { + return submissionType; + } + public void setSubmissionType(String submissionType) { + this.submissionType = submissionType; + } + public String getAgencyCode() { + return agencyCode; + } + public void setAgencyCode(String agencyCode) { + this.agencyCode = agencyCode; + } + public String getProgramType() { + return programType; + } + public void setProgramType(String programType) { + this.programType = programType; + } + public String getOfficeCode() { + return officeCode; + } + public void setOfficeCode(String officeCode) { + this.officeCode = officeCode; + } + public String getReferralSource() { + return referralSource; + } + public void setReferralSource(String referralSource) { + this.referralSource = referralSource; + } + public String getOfficeDate() { + return officeDate; + } + public void setOfficeDate(String officeDate) { + this.officeDate = officeDate; + } + public String getRegionalHA() { + return regionalHA; + } + public void setRegionalHA(String regionalHA) { + this.regionalHA = regionalHA; + } + public String getContractingHA() { + return contractingHA; + } + public void setContractingHA(String contractingHA) { + this.contractingHA = contractingHA; + } + public String getHealthNum() { + return healthNum; + } + public void setHealthNum(String healthNum) { + this.healthNum = healthNum; + } + public String getLastName() { + return lastName; + } + public void setLastName(String lastName) { + this.lastName = lastName; + } + public String getFirstName() { + return firstName; + } + public void setFirstName(String firstName) { + this.firstName = firstName; + } + public String getMiddleName() { + return middleName; + } + public void setMiddleName(String middleName) { + this.middleName = middleName; + } + public String getBirthDate() { + return birthDate; + } + public void setBirthDate(String birthDate) { + this.birthDate = birthDate; + } + public String getPostalCode() { + return postalCode; + } + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + public String getPrimaryLanguage() { + return primaryLanguage; + } + public void setPrimaryLanguage(String primaryLanguage) { + this.primaryLanguage = primaryLanguage; + } + public String getEducationLevel() { + return educationLevel; + } + public void setEducationLevel(String educationLevel) { + this.educationLevel = educationLevel; + } + public String getMaritalStatus() { + return maritalStatus; + } + public void setMaritalStatus(String maritalStatus) { + this.maritalStatus = maritalStatus; + } + public String getEmploymentStatus() { + return employmentStatus; + } + public void setEmploymentStatus(String employmentStatus) { + this.employmentStatus = employmentStatus; + } + public String getNumberDependentChildren() { + return numberDependentChildren; + } + public void setNumberDependentChildren(String numberDependentChildren) { + this.numberDependentChildren = numberDependentChildren; + } + public String getMethadoneMaintainance() { + return methadoneMaintainance; + } + public void setMethadoneMaintainance(String methadoneMaintainance) { + this.methadoneMaintainance = methadoneMaintainance; + } + public String getCurrentInjectionDrugUse() { + return currentInjectionDrugUse; + } + public void setCurrentInjectionDrugUse(String currentInjectionDrugUse) { + this.currentInjectionDrugUse = currentInjectionDrugUse; + } + public String getSubstance() { + return substance; + } + public void setSubstance(String substance) { + this.substance = substance; + } + public String getOtherClientInfo() { + return otherClientInfo; + } + public void setOtherClientInfo(String otherClientInfo) { + this.otherClientInfo = otherClientInfo; + } + public String getSubstanceRelation() { + return substanceRelation; + } + public void setSubstanceRelation(String substanceRelation) { + this.substanceRelation = substanceRelation; + } + public String getPrimaryDrugOfChoice() { + return primaryDrugOfChoice; + } + public void setPrimaryDrugOfChoice(String primaryDrugOfChoice) { + this.primaryDrugOfChoice = primaryDrugOfChoice; + } + public String getAdmScreenedRef() { + return admScreenedRef; + } + public void setAdmScreenedRef(String admScreenedRef) { + this.admScreenedRef = admScreenedRef; + } + public String getActivityDate() { + return activityDate; + } + public void setActivityDate(String activityDate) { + this.activityDate = activityDate; + } + public String getActivityServiceProviderCode() { + return activityServiceProviderCode; + } + public void setActivityServiceProviderCode(String activityServiceProviderCode) { + this.activityServiceProviderCode = activityServiceProviderCode; + } + public String getDischargeType() { + return dischargeType; + } + public void setDischargeType(String dischargeType) { + this.dischargeType = dischargeType; + } + public String getDischargeDate() { + return dischargeDate; + } + public void setDischargeDate(String dischargeDate) { + this.dischargeDate = dischargeDate; + } + public String getDischargeServiceProviderCode() { + return dischargeServiceProviderCode; + } + public void setDischargeServiceProviderCode(String dischargeServiceProviderCode) { + this.dischargeServiceProviderCode = dischargeServiceProviderCode; + } + public String getDischargeProgramCompletion() { + return dischargeProgramCompletion; + } + public void setDischargeProgramCompletion(String dischargeProgramCompletion) { + this.dischargeProgramCompletion = dischargeProgramCompletion; + } + public List getAimsMisuses() { + return aimsMisuses; + } + public void setAimsMisuses(List aimsMisuses) { + this.aimsMisuses = aimsMisuses; + } + public AimsReferral getAimsReferral() { + return aimsReferral; + } + public void setAimsReferral(AimsReferral aimsReferral) { + this.aimsReferral = aimsReferral; + } + + @Override + public String toString() { + return "MainEntity [confirmationId=" + confirmationId + ", submissionDate=" + submissionDate + ", submittedBy=" + + submittedBy + ", submissionType=" + submissionType + ", agencyCode=" + agencyCode + ", programType=" + + programType + ", officeCode=" + officeCode + ", referralSource=" + referralSource + ", officeDate=" + + officeDate + ", regionalHA=" + regionalHA + ", contractingHA=" + contractingHA + ", healthNum=" + + healthNum + ", lastName=" + lastName + ", firstName=" + firstName + ", middleName=" + middleName + + ", birthDate=" + birthDate + ", postalCode=" + postalCode + ", primaryLanguage=" + primaryLanguage + + ", educationLevel=" + educationLevel + ", maritalStatus=" + maritalStatus + ", employmentStatus=" + + employmentStatus + ", numberDependentChildren=" + numberDependentChildren + ", methadoneMaintainance=" + + methadoneMaintainance + ", currentInjectionDrugUse=" + currentInjectionDrugUse + ", substance=" + + substance + ", otherClientInfo=" + otherClientInfo + ", substanceRelation=" + substanceRelation + + ", primaryDrugOfChoice=" + primaryDrugOfChoice + ", admScreenedRef=" + admScreenedRef + + ", activityDate=" + activityDate + ", activityServiceProviderCode=" + activityServiceProviderCode + + ", dischargeType=" + dischargeType + ", dischargeDate=" + dischargeDate + + ", dischargeServiceProviderCode=" + dischargeServiceProviderCode + ", dischargeProgramCompletion=" + + dischargeProgramCompletion + ", aimsMisuses=" + aimsMisuses + ", aimsReferral=" + aimsReferral + "]"; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/parser/AIMSFormPayloadExtractor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/parser/AIMSFormPayloadExtractor.java new file mode 100644 index 00000000..c2d85d14 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/parser/AIMSFormPayloadExtractor.java @@ -0,0 +1,38 @@ +package ca.bc.gov.chefs.etl.forms.aims.parser; + +import java.util.Properties; + +import org.apache.camel.Exchange; +import org.apache.camel.Handler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ca.bc.gov.chefs.etl.parser.TestFormPayloadExtractor; +import ca.bc.gov.chefs.etl.util.PropertiesUtil; +import net.minidev.json.JSONObject; +import net.minidev.json.parser.JSONParser; +import net.minidev.json.parser.ParseException; + +public class AIMSFormPayloadExtractor { + private static final Logger logger = LoggerFactory.getLogger(TestFormPayloadExtractor.class); + + static Properties properties; + + private AIMSFormPayloadExtractor() { + } + + @Handler + public static void extractTestFormPayload(Exchange exchange, String testFormPayload) throws ParseException { + + try { + properties = PropertiesUtil.loadProperties(); + } catch (Exception e) { + + } + logger.info("Received payload data.. extracting now"); + logger.info("Received properties.. {}", properties.get("chefs.http.uri")); + JSONParser jsonParser = new JSONParser(JSONParser.DEFAULT_PERMISSIVE_MODE); + JSONObject testFormExtracted = (JSONObject) jsonParser.parse(testFormPayload); + exchange.getIn().setBody(testFormExtracted); + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java new file mode 100644 index 00000000..64738a48 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java @@ -0,0 +1,20 @@ +package ca.bc.gov.chefs.etl.forms.aims.processor; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.util.AuthUtil; +import ca.bc.gov.chefs.etl.util.PropertiesUtil; + +public class AIMSFormApiProcessor implements Processor { + + @Override + public void process(Exchange exchange) throws Exception { + exchange.getIn().setHeader("CamelHttpMethod", "GET"); + exchange.getIn().setHeader("Content-Type", "application/json"); + exchange.getIn().setHeader("accept", "application/json"); + exchange.getIn().setHeader("Authorization", AuthUtil.getBasicAuth(PropertiesUtil.getValue(Constants.AIMS_USERNAME), PropertiesUtil.getValue(Constants.AIMS_PASSWORD))); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java new file mode 100644 index 00000000..267d75f7 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java @@ -0,0 +1,38 @@ +package ca.bc.gov.chefs.etl.forms.aims.processor; + +import java.util.List; +import java.util.Map; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.forms.aims.model.MainEntity; +import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.util.CSVUtil; +import ca.bc.gov.chefs.etl.util.Counter; +import ca.bc.gov.chefs.etl.util.FileUtil; + + +public class AIMSFormApiResponseProcessor implements Processor { + + @SuppressWarnings("unchecked") + @Override + public void process(Exchange exchange) throws Exception { + String payload = exchange.getIn().getBody(String.class); + System.out.println(payload); + ObjectMapper mapper = new ObjectMapper(); + Counter.resetCounter(Constants.AIMS_REFERRAL); + List aimsModels = mapper.readValue(payload, new TypeReference>() { + }); + + List iModels = (List)(List) aimsModels; + + Map>> map = CSVUtil.provider(iModels); + FileUtil.writeToCSVFile(map); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormProcessor.java new file mode 100644 index 00000000..86073415 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormProcessor.java @@ -0,0 +1,20 @@ +package ca.bc.gov.chefs.etl.forms.aims.processor; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class AIMSFormProcessor implements Processor{ + + private static final Logger logger = LoggerFactory.getLogger(AIMSFormProcessor.class); + + @Override + public void process(Exchange exchange) throws Exception { + logger.info("Hello! Processing Now: current timestamp is: {}",System.currentTimeMillis()); + logger.info("Body Received: {}", exchange.getIn().getBody()); + + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java new file mode 100644 index 00000000..3d11e5a2 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java @@ -0,0 +1,39 @@ +package ca.bc.gov.chefs.etl.forms.aims.route; + +import org.slf4j.Logger; + +import org.slf4j.LoggerFactory; +import ca.bc.gov.chefs.etl.core.routes.BaseRoute; +import ca.bc.gov.chefs.etl.forms.aims.processor.AIMSFormApiProcessor; +import ca.bc.gov.chefs.etl.forms.aims.processor.AIMSFormApiResponseProcessor; +import ca.bc.gov.chefs.etl.forms.aims.processor.AIMSFormProcessor; + +public class AIMSFormRoute extends BaseRoute { + private static final Logger logger = LoggerFactory.getLogger(AIMSFormRoute.class); + @Override + public void configure() throws Exception { + logger.info("Loaded AIMS Form Route"); + + /** + * receive JSON payload, parse and set to make an API call + * + * + */ + // trigger + from("jetty:http://{{hostname}}:{{port}}/aims").routeId("aims-form") + .log("CHEFS-ETL received a request for AIMS Form extraction")//.bean(AIMSFormPayloadExtractor.class) + .process(new AIMSFormProcessor()).to("direct:aims").end(); + + from("direct:aims").process(new AIMSFormApiProcessor()) + // to the http uri + .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/2f173b2b-2f3a-407a-aecf-6b4bdc9431ae/export?bridgeEndpoint=true&format=json&type=submissions") + .log("This is the status code from the response: ${header.CamelHttpResponseCode}") + .log("Trying to convert the received body OK").convertBodyTo(String.class) + .process(new AIMSFormApiResponseProcessor()).end(); + // database phase + + // file conversion + + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInfo.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInfo.java new file mode 100644 index 00000000..40d7555c --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInfo.java @@ -0,0 +1,559 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.model; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.util.CSVUtil; + +@SuppressWarnings("unchecked") +@JsonIgnoreProperties(ignoreUnknown = true) +public class FacilityInfo implements IModel { + + @JsonIgnore + private String confirmationId; + @JsonIgnore + private String submissionDate; + @JsonIgnore + private String submittedBy; + @JsonProperty("facilityName2") + private String facilityName; + @JsonIgnore + private String facilityAddress; + @JsonProperty("city1") + private String facilityCity; + @JsonProperty("textField") + private String facilityPostalCode; + @JsonProperty("phoneNumber") + private String facilityTelephone; + @JsonProperty("facilityWebsite") + private String facilityWebsite; + @JsonProperty("simpletextfield1") + private String ccmsId; + @JsonProperty("programType1") + private String programType; + @JsonProperty("ownershipType1") + private String ownershipType; + @JsonProperty("selectList1") + private String legislationtType; + @JsonProperty("accreditationBody") + private String accreditationBody; + @JsonProperty("accreditationDate1") + private String accreditationDate; + @JsonProperty("accreditationExpiryDate1") + private String accreditationExpiryDate; + @JsonProperty("healthAuthority1") + private String healthAuthority; + @JsonProperty("ownerName") + private String ownerName; + @JsonIgnore + private String ownerAddress; + @JsonProperty("city3") + private String ownerCity; + @JsonProperty("postalCode1") + private String ownerPostalCode; + @JsonProperty("contactName") + private String ownerContactName; + @JsonProperty("phoneNumber3") + private String ownerContactPhone; + @JsonProperty("contactPosition") + private String ownerContactPosition; + @JsonProperty("contactEmail") + private String ownerContactEmail; + @JsonProperty("opName") + private String operatorName; + @JsonIgnore + private String operatorAddress; + @JsonProperty("city5") + private String operatorCity; + @JsonProperty("postalCode3") + private String operatorPostalCode; + @JsonProperty("contactName3") + private String operatorContactName; + @JsonProperty("contactPhoneNumber2") + private String operatorContactPhone; + @JsonProperty("contactPosition2") + private String operatorContactPosition; + @JsonProperty("contactEmail2") + private String operatorContactEmail; + @JsonProperty("name2") + private String preparerContactName; + @JsonProperty("phoneNumber4") + private String preparerContactPhone; + @JsonProperty("position3") + private String preparerContactPosition; + @JsonProperty("simpleemail2") + private String preparerContactEmail; + @JsonProperty("name3") + private String approverContactName; + @JsonProperty("simplephonenumber3") + private String ApproverContactPhone; + @JsonProperty("position4") + private String approverContactPosition; + @JsonProperty("email2") + private String approverContactEmail; + + @JsonProperty("isTheOwnerTheSameAsTheOperator1") + private boolean ownerSameAsOperator; + + @JsonProperty("form") + private void unPackForm(Map form) { + this.confirmationId = form.get("confirmationId"); + this.submissionDate = CSVUtil.getFormattedDate(form.get("createdAt")); + this.submittedBy = form.get("email"); + } + + @JsonProperty("bcaddress") + private void unPackBcAddress(Map bcaddress) { + if(bcaddress.containsKey("properties")) { + Map properties = (Map) bcaddress.get("properties"); + this.facilityAddress = properties.get("fullAddress"); + } + } + + @JsonProperty("bcaddress1") + private void unPackBcAddress1(Map bcaddress1) { + if(bcaddress1.containsKey("properties")) { + Map properties = (Map) bcaddress1.get("properties"); + this.ownerAddress = properties.get("fullAddress"); + } + } + + @JsonProperty("operatorAddress") + private void unPackOperatorAddress(Map operatorAddress) { + if(operatorAddress.containsKey("properties")) { + Map properties = (Map) operatorAddress.get("properties"); + this.operatorAddress = properties.get("fullAddress"); + } + } + + + + + + /* Overriden methods from IModel for CSV Parsing. */ + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + return Constants.LTC_FACILITY; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add("false"); + elements.add(this.getSubmissionDate()); + elements.add(this.getSubmittedBy()); + elements.add(this.getFacilityName()); + elements.add(this.getFacilityAddress()); + elements.add(this.getFacilityCity()); + elements.add(this.getFacilityPostalCode()); + elements.add(this.getFacilityTelephone()); + elements.add(this.getFacilityWebsite()); + elements.add(this.getCcmsId()); + elements.add(this.getProgramType()); + elements.add(this.getOwnershipType()); + elements.add(this.getLegislationtType()); + elements.add(this.getAccreditationBody()); + elements.add(this.getAccreditationDate()); + elements.add(this.getAccreditationExpiryDate()); + elements.add(this.getHealthAuthority()); + elements.add(this.getOwnerName()); + elements.add(this.getOwnerAddress()); + elements.add(this.getOwnerCity()); + elements.add(this.getOwnerPostalCode()); + elements.add(this.getOwnerContactName()); + elements.add(this.getOwnerContactPhone()); + elements.add(this.getOwnerContactPosition()); + elements.add(this.getOwnerContactEmail()); + elements.add(this.getOperatorName()); + elements.add(this.getOperatorAddress()); + elements.add(this.getOperatorCity()); + elements.add(this.getOperatorPostalCode()); + elements.add(this.getOperatorContactName()); + elements.add(this.getOperatorContactPhone()); + elements.add(this.getOperatorContactPosition()); + elements.add(this.getOperatorContactEmail()); + elements.add(this.getPreparerContactName()); + elements.add(this.getPreparerContactPhone()); + elements.add(this.getPreparerContactPosition()); + elements.add(this.getPreparerContactEmail()); + elements.add(this.getApproverContactName()); + elements.add(this.getApproverContactPhone()); + elements.add(this.getApproverContactPosition()); + elements.add(this.getApproverContactEmail()); + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + + /* getter and setters */ + public String getConfirmationId() { + return confirmationId; + } + + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + + public String getSubmissionDate() { + return submissionDate; + } + + public void setSubmissionDate(String submissionDate) { + this.submissionDate = submissionDate; + } + + public String getSubmittedBy() { + return submittedBy; + } + + public void setSubmittedBy(String submittedBy) { + this.submittedBy = submittedBy; + } + + public String getFacilityName() { + return facilityName; + } + + public void setFacilityName(String facilityName) { + this.facilityName = facilityName; + } + + public String getFacilityAddress() { + return facilityAddress; + } + + public void setFacilityAddress(String facilityAddress) { + this.facilityAddress = facilityAddress; + } + + public String getFacilityCity() { + return facilityCity; + } + + public void setFacilityCity(String facilityCity) { + this.facilityCity = facilityCity; + } + + public String getFacilityPostalCode() { + return facilityPostalCode; + } + + public void setFacilityPostalCode(String facilityPostalCode) { + this.facilityPostalCode = facilityPostalCode; + } + + public String getFacilityTelephone() { + return facilityTelephone; + } + + public void setFacilityTelephone(String facilityTelephone) { + this.facilityTelephone = facilityTelephone; + } + + public String getFacilityWebsite() { + return facilityWebsite; + } + + public void setFacilityWebsite(String facilityWebsite) { + this.facilityWebsite = facilityWebsite; + } + + public String getCcmsId() { + return ccmsId; + } + + public void setCcmsId(String ccmsId) { + this.ccmsId = ccmsId; + } + + public String getProgramType() { + return programType; + } + + public void setProgramType(String programType) { + this.programType = programType; + } + + public String getOwnershipType() { + return ownershipType; + } + + public void setOwnershipType(String ownershipType) { + this.ownershipType = ownershipType; + } + + public String getLegislationtType() { + return legislationtType; + } + + public String getAccreditationBody() { + return accreditationBody; + } + + public void setAccreditationBody(String accreditationBody) { + this.accreditationBody = accreditationBody; + } + + public void setLegislationtType(String legislationtType) { + this.legislationtType = legislationtType; + } + + public String getAccreditationDate() { + return CSVUtil.getFormattedDate(accreditationDate); + } + + public void setAccreditationDate(String accreditationDate) { + this.accreditationDate = accreditationDate; + } + + public String getAccreditationExpiryDate() { + return CSVUtil.getFormattedDate(accreditationExpiryDate); + } + + public void setAccreditationExpiryDate(String accreditationExpiryDate) { + this.accreditationExpiryDate = accreditationExpiryDate; + } + + public String getHealthAuthority() { + return healthAuthority; + } + + public void setHealthAuthority(String healthAuthority) { + this.healthAuthority = healthAuthority; + } + + public String getOwnerName() { + return ownerName; + } + + public void setOwnerName(String ownerName) { + this.ownerName = ownerName; + } + + public String getOwnerAddress() { + return ownerAddress; + } + + public void setOwnerAddress(String ownerAddress) { + this.ownerAddress = ownerAddress; + } + + public String getOwnerCity() { + return ownerCity; + } + + public void setOwnerCity(String ownerCity) { + this.ownerCity = ownerCity; + } + + public String getOwnerPostalCode() { + return ownerPostalCode; + } + + public void setOwnerPostalCode(String ownerPostalCode) { + this.ownerPostalCode = ownerPostalCode; + } + + public String getOwnerContactName() { + return ownerContactName; + } + + public void setOwnerContactName(String ownerContactName) { + this.ownerContactName = ownerContactName; + } + + public String getOwnerContactPhone() { + return ownerContactPhone; + } + + public void setOwnerContactPhone(String ownerContactPhone) { + this.ownerContactPhone = ownerContactPhone; + } + + public String getOwnerContactPosition() { + return ownerContactPosition; + } + + public void setOwnerContactPosition(String ownerContactPosition) { + this.ownerContactPosition = ownerContactPosition; + } + + + public String getOwnerContactEmail() { + return ownerContactEmail; + } + + public void setOwnerContactEmail(String ownerContactEmail) { + this.ownerContactEmail = ownerContactEmail; + } + + public String getOperatorName() { + if(ownerSameAsOperator) { + return this.getOwnerName(); + } + return operatorName; + } + + public void setOperatorName(String operatorName) { + this.operatorName = operatorName; + } + + public String getOperatorAddress() { + if(ownerSameAsOperator) { + return this.getOwnerAddress(); + } + return operatorAddress; + } + + public void setOperatorAddress(String operatorAddress) { + this.operatorAddress = operatorAddress; + } + + public String getOperatorCity() { + if(ownerSameAsOperator) { + return this.getOwnerCity(); + } + return operatorCity; + } + + public void setOperatorCity(String operatorCity) { + this.operatorCity = operatorCity; + } + + public String getOperatorPostalCode() { + if(ownerSameAsOperator) { + return this.getOwnerPostalCode(); + } + return operatorPostalCode; + } + + public void setOperatorPostalCode(String operatorPostalCode) { + this.operatorPostalCode = operatorPostalCode; + } + + public String getOperatorContactName() { + if(ownerSameAsOperator) { + return this.getOwnerContactName(); + } + return operatorContactName; + } + + public void setOperatorContactName(String operatorContactName) { + this.operatorContactName = operatorContactName; + } + + public String getOperatorContactPhone() { + if(ownerSameAsOperator) { + return this.getOwnerContactPhone(); + } + return operatorContactPhone; + } + + public void setOperatorContactPhone(String operatorContactPhone) { + this.operatorContactPhone = operatorContactPhone; + } + + public String getOperatorContactPosition() { + if(ownerSameAsOperator) { + return this.getOwnerContactPosition(); + } + return operatorContactPosition; + } + + public void setOperatorContactPosition(String operatorContactPosition) { + this.operatorContactPosition = operatorContactPosition; + } + + public String getOperatorContactEmail() { + if(ownerSameAsOperator) { + return this.getOwnerContactEmail(); + } + return operatorContactEmail; + } + + public void setOperatorContactEmail(String operatorContactEmail) { + this.operatorContactEmail = operatorContactEmail; + } + + public String getPreparerContactName() { + return preparerContactName; + } + + public void setPreparerContactName(String preparerContactName) { + this.preparerContactName = preparerContactName; + } + + public String getPreparerContactPhone() { + return preparerContactPhone; + } + + public void setPreparerContactPhone(String preparerContactPhone) { + this.preparerContactPhone = preparerContactPhone; + } + + public String getPreparerContactPosition() { + return preparerContactPosition; + } + + public void setPreparerContactPosition(String preparerContactPosition) { + this.preparerContactPosition = preparerContactPosition; + } + + public String getPreparerContactEmail() { + return preparerContactEmail; + } + + public void setPreparerContactEmail(String preparerContactEmail) { + this.preparerContactEmail = preparerContactEmail; + } + + public String getApproverContactName() { + return approverContactName; + } + + public void setApproverContactName(String approverContactName) { + this.approverContactName = approverContactName; + } + + public String getApproverContactPhone() { + return ApproverContactPhone; + } + + public void setApproverContactPhone(String approverContactPhone) { + ApproverContactPhone = approverContactPhone; + } + + public String getApproverContactEmail() { + return approverContactEmail; + } + + public String getApproverContactPosition() { + return approverContactPosition; + } + + public void setApproverContactPosition(String approverContactPosition) { + this.approverContactPosition = approverContactPosition; + } + + public void setApproverContactEmail(String approverContactEmail) { + this.approverContactEmail = approverContactEmail; + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java new file mode 100644 index 00000000..b15c2247 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java @@ -0,0 +1,22 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.processor; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.util.AuthUtil; +import ca.bc.gov.chefs.etl.util.PropertiesUtil; + +public class FacilityInfoFormApiProcessor implements Processor { + + @Override + public void process(Exchange exchange) throws Exception { + exchange.getIn().setHeader("CamelHttpMethod", "GET"); + exchange.getIn().setHeader("Content-Type", "application/json"); + exchange.getIn().setHeader("accept", "application/json"); + exchange.getIn().setHeader("Authorization", + AuthUtil.getBasicAuth(PropertiesUtil.getValue(Constants.LTC_FACILITY_USERNAME), + PropertiesUtil.getValue(Constants.LTC_FACILITY_PASSWORD))); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java new file mode 100644 index 00000000..3a5feb5d --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java @@ -0,0 +1,36 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.processor; + +import java.util.List; + +import java.util.Map; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +import ca.bc.gov.chefs.etl.forms.ltc.facility.model.FacilityInfo; +import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.util.CSVUtil; +import ca.bc.gov.chefs.etl.util.FileUtil; + +public class FacilityInfoFormApiResponseProcessor implements Processor { + + @SuppressWarnings("unchecked") + @Override + public void process(Exchange exchange) throws Exception { + String payload = exchange.getIn().getBody(String.class); + System.out.println(payload); + ObjectMapper mapper = new ObjectMapper(); + + List facilityInformationModels = mapper.readValue(payload, + new TypeReference>() { + }); + + List iModels = (List) (List) facilityInformationModels; + + Map>> map = CSVUtil.provider(iModels); + FileUtil.writeToCSVFile(map); + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormProcessor.java new file mode 100644 index 00000000..36f6238e --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormProcessor.java @@ -0,0 +1,17 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.processor; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class FacilityInfoFormProcessor implements Processor { + private static final Logger logger = LoggerFactory.getLogger(FacilityInfoFormProcessor.class); + + @Override + public void process(Exchange exchange) throws Exception { + logger.info("Hello! Processing Now: current timestamp is: {}", System.currentTimeMillis()); + logger.info("Body Received: {}", exchange.getIn().getBody()); + + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java new file mode 100644 index 00000000..258baa47 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java @@ -0,0 +1,42 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.route; + +import org.slf4j.Logger; + +import org.slf4j.LoggerFactory; + +import ca.bc.gov.chefs.etl.core.routes.BaseRoute; +import ca.bc.gov.chefs.etl.forms.ltc.facility.processor.FacilityInfoFormApiProcessor; +import ca.bc.gov.chefs.etl.forms.ltc.facility.processor.FacilityInfoFormApiResponseProcessor; +import ca.bc.gov.chefs.etl.forms.ltc.facility.processor.FacilityInfoFormProcessor; + +public class FacilityFormRoute extends BaseRoute { + + private static final Logger logger = LoggerFactory.getLogger(FacilityFormRoute.class); + + @Override + public void configure() throws Exception { + logger.info("Loaded Facility Info Form Route"); + + /** + * receive JSON payload, parse and set to make an API call + * + * + */ + // trigger + from("jetty:http://{{hostname}}:{{port}}/ltc/facility-information").routeId("ltc-facility-information-form") + .log("CHEFS-ETL received a request for LTC Facility Information Form extraction")// .bean(AIMSFormPayloadExtractor.class) + .process(new FacilityInfoFormProcessor()).to("direct:ltc-facility-information").end(); + + from("direct:ltc-facility-information").process(new FacilityInfoFormApiProcessor()) + // to the http uri + .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/e1f4761f-efdd-4529-805e-677d3ae21601/export?bridgeEndpoint=true&format=json&version=2&type=submissions") + .log("This is the status code from the response: ${header.CamelHttpResponseCode}") + .log("Trying to convert the received body OK").convertBodyTo(String.class) + .process(new FacilityInfoFormApiResponseProcessor()).end(); + // database phase + + // file conversion + + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid0.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid0.java new file mode 100644 index 00000000..8ae474fd --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid0.java @@ -0,0 +1,261 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; + +public class BedGrid0{ + public String bedType; + public String endDate; + public String endDate0; + public String inScopeBedDays; + public String inScopePlannedQ1; + public String inScopePlannedQ2; + public String inScopePlannedQ3; + public String inScopePlannedQ4; + public String inventoryNotes; + public String maximumBedDays; + public String notes; + public String notes1; + public String notes16; + public String numberOfBeds; + public String outScopeBedDays; + public String outScopePlannedQ1; + public String outScopePlannedQ2; + public String outScopePlannedQ3; + public String outScopePlannedQ4; + public String privateBedDays; + public String privatePlannedQ1; + public String privatePlannedQ2; + public String privatePlannedQ3; + public String privatePlannedQ4; + public String quarter; + public String selectList; + public String selectList1; + public String simpledatetime; + public String startDate; + public String startDate0; + public String subTypeIn; + public String subTypeOut; + public String subTypePrivate; + public String totalrow; + public String getBedType() { + return bedType; + } + public void setBedType(String bedType) { + this.bedType = bedType; + } + public String getEndDate() { + return endDate; + } + public void setEndDate(String endDate) { + this.endDate = endDate; + } + public String getEndDate0() { + return endDate0; + } + public void setEndDate0(String endDate0) { + this.endDate0 = endDate0; + } + public String getInScopeBedDays() { + return inScopeBedDays; + } + public void setInScopeBedDays(String inScopeBedDays) { + this.inScopeBedDays = inScopeBedDays; + } + public String getInScopePlannedQ1() { + return inScopePlannedQ1; + } + public void setInScopePlannedQ1(String inScopePlannedQ1) { + this.inScopePlannedQ1 = inScopePlannedQ1; + } + public String getInScopePlannedQ2() { + return inScopePlannedQ2; + } + public void setInScopePlannedQ2(String inScopePlannedQ2) { + this.inScopePlannedQ2 = inScopePlannedQ2; + } + public String getInScopePlannedQ3() { + return inScopePlannedQ3; + } + public void setInScopePlannedQ3(String inScopePlannedQ3) { + this.inScopePlannedQ3 = inScopePlannedQ3; + } + public String getInScopePlannedQ4() { + return inScopePlannedQ4; + } + public void setInScopePlannedQ4(String inScopePlannedQ4) { + this.inScopePlannedQ4 = inScopePlannedQ4; + } + public String getInventoryNotes() { + return inventoryNotes; + } + public void setInventoryNotes(String inventoryNotes) { + this.inventoryNotes = inventoryNotes; + } + public String getMaximumBedDays() { + return maximumBedDays; + } + public void setMaximumBedDays(String maximumBedDays) { + this.maximumBedDays = maximumBedDays; + } + public String getNotes() { + return notes; + } + public void setNotes(String notes) { + this.notes = notes; + } + public String getNotes1() { + return notes1; + } + public void setNotes1(String notes1) { + this.notes1 = notes1; + } + public String getNotes16() { + return notes16; + } + public void setNotes16(String notes16) { + this.notes16 = notes16; + } + public String getNumberOfBeds() { + return numberOfBeds; + } + public void setNumberOfBeds(String numberOfBeds) { + this.numberOfBeds = numberOfBeds; + } + public String getOutScopeBedDays() { + return outScopeBedDays; + } + public void setOutScopeBedDays(String outScopeBedDays) { + this.outScopeBedDays = outScopeBedDays; + } + public String getOutScopePlannedQ1() { + return outScopePlannedQ1; + } + public void setOutScopePlannedQ1(String outScopePlannedQ1) { + this.outScopePlannedQ1 = outScopePlannedQ1; + } + public String getOutScopePlannedQ2() { + return outScopePlannedQ2; + } + public void setOutScopePlannedQ2(String outScopePlannedQ2) { + this.outScopePlannedQ2 = outScopePlannedQ2; + } + public String getOutScopePlannedQ3() { + return outScopePlannedQ3; + } + public void setOutScopePlannedQ3(String outScopePlannedQ3) { + this.outScopePlannedQ3 = outScopePlannedQ3; + } + public String getOutScopePlannedQ4() { + return outScopePlannedQ4; + } + public void setOutScopePlannedQ4(String outScopePlannedQ4) { + this.outScopePlannedQ4 = outScopePlannedQ4; + } + public String getPrivateBedDays() { + return privateBedDays; + } + public void setPrivateBedDays(String privateBedDays) { + this.privateBedDays = privateBedDays; + } + public String getPrivatePlannedQ1() { + return privatePlannedQ1; + } + public void setPrivatePlannedQ1(String privatePlannedQ1) { + this.privatePlannedQ1 = privatePlannedQ1; + } + public String getPrivatePlannedQ2() { + return privatePlannedQ2; + } + public void setPrivatePlannedQ2(String privatePlannedQ2) { + this.privatePlannedQ2 = privatePlannedQ2; + } + public String getPrivatePlannedQ3() { + return privatePlannedQ3; + } + public void setPrivatePlannedQ3(String privatePlannedQ3) { + this.privatePlannedQ3 = privatePlannedQ3; + } + public String getPrivatePlannedQ4() { + return privatePlannedQ4; + } + public void setPrivatePlannedQ4(String privatePlannedQ4) { + this.privatePlannedQ4 = privatePlannedQ4; + } + public String getQuarter() { + return quarter; + } + public void setQuarter(String quarter) { + this.quarter = quarter; + } + public String getSelectList() { + return selectList; + } + public void setSelectList(String selectList) { + this.selectList = selectList; + } + public String getSelectList1() { + return selectList1; + } + public void setSelectList1(String selectList1) { + this.selectList1 = selectList1; + } + public String getSimpledatetime() { + return simpledatetime; + } + public void setSimpledatetime(String simpledatetime) { + this.simpledatetime = simpledatetime; + } + public String getStartDate() { + return startDate; + } + public void setStartDate(String startDate) { + this.startDate = startDate; + } + public String getStartDate0() { + return startDate0; + } + public void setStartDate0(String startDate0) { + this.startDate0 = startDate0; + } + public String getSubTypeIn() { + return subTypeIn; + } + public void setSubTypeIn(String subTypeIn) { + this.subTypeIn = subTypeIn; + } + public String getSubTypeOut() { + return subTypeOut; + } + public void setSubTypeOut(String subTypeOut) { + this.subTypeOut = subTypeOut; + } + public String getSubTypePrivate() { + return subTypePrivate; + } + public void setSubTypePrivate(String subTypePrivate) { + this.subTypePrivate = subTypePrivate; + } + public String getTotalrow() { + return totalrow; + } + public void setTotalrow(String totalrow) { + this.totalrow = totalrow; + } + @Override + public String toString() { + return "BedGrid0 [bedType=" + bedType + ", endDate=" + endDate + ", endDate0=" + endDate0 + ", inScopeBedDays=" + + inScopeBedDays + ", inScopePlannedQ1=" + inScopePlannedQ1 + ", inScopePlannedQ2=" + inScopePlannedQ2 + + ", inScopePlannedQ3=" + inScopePlannedQ3 + ", inScopePlannedQ4=" + inScopePlannedQ4 + + ", inventoryNotes=" + inventoryNotes + ", maximumBedDays=" + maximumBedDays + ", notes=" + notes + + ", notes1=" + notes1 + ", notes16=" + notes16 + ", numberOfBeds=" + numberOfBeds + + ", outScopeBedDays=" + outScopeBedDays + ", outScopePlannedQ1=" + outScopePlannedQ1 + + ", outScopePlannedQ2=" + outScopePlannedQ2 + ", outScopePlannedQ3=" + outScopePlannedQ3 + + ", outScopePlannedQ4=" + outScopePlannedQ4 + ", privateBedDays=" + privateBedDays + + ", privatePlannedQ1=" + privatePlannedQ1 + ", privatePlannedQ2=" + privatePlannedQ2 + + ", privatePlannedQ3=" + privatePlannedQ3 + ", privatePlannedQ4=" + privatePlannedQ4 + ", quarter=" + + quarter + ", selectList=" + selectList + ", selectList1=" + selectList1 + ", simpledatetime=" + + simpledatetime + ", startDate=" + startDate + ", startDate0=" + startDate0 + ", subTypeIn=" + + subTypeIn + ", subTypeOut=" + subTypeOut + ", subTypePrivate=" + subTypePrivate + ", totalrow=" + + totalrow + "]"; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid1.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid1.java new file mode 100644 index 00000000..1c19e0e8 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid1.java @@ -0,0 +1,230 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; + +public class BedGrid1{ + public String bedType; + public String bedType1; + public String endDate; + public String endDate1; + public String inScopeBedDays; + public String inScopeBedDays1; + public String maximumBedDays; + public String maximumBedDays1; + public String notes; + public String notes1; + public String notes16; + public String numberOfBeds; + public String numberOfBeds1; + public String outScopeBedDays; + public String outScopeBedDays1; + public String privateBedDays; + public String privateBedDays1; + public String quarter; + public String quarterNote1; + public String selectList; + public String selectList1; + public String simpledatetime; + public String startDate; + public String startDate1; + public String subTypeIn; + public String subTypeIn1; + public String subTypeOut; + public String subTypePrivate; + public String totalrow; + public String subTypeOut1; + public String getBedType() { + return bedType; + } + public void setBedType(String bedType) { + this.bedType = bedType; + } + public String getBedType1() { + return bedType1; + } + public void setBedType1(String bedType1) { + this.bedType1 = bedType1; + } + public String getEndDate() { + return endDate; + } + public void setEndDate(String endDate) { + this.endDate = endDate; + } + public String getEndDate1() { + return endDate1; + } + public void setEndDate1(String endDate1) { + this.endDate1 = endDate1; + } + public String getInScopeBedDays() { + return inScopeBedDays; + } + public void setInScopeBedDays(String inScopeBedDays) { + this.inScopeBedDays = inScopeBedDays; + } + public String getInScopeBedDays1() { + return inScopeBedDays1; + } + public void setInScopeBedDays1(String inScopeBedDays1) { + this.inScopeBedDays1 = inScopeBedDays1; + } + public String getMaximumBedDays() { + return maximumBedDays; + } + public void setMaximumBedDays(String maximumBedDays) { + this.maximumBedDays = maximumBedDays; + } + public String getMaximumBedDays1() { + return maximumBedDays1; + } + public void setMaximumBedDays1(String maximumBedDays1) { + this.maximumBedDays1 = maximumBedDays1; + } + public String getNotes() { + return notes; + } + public void setNotes(String notes) { + this.notes = notes; + } + public String getNotes1() { + return notes1; + } + public void setNotes1(String notes1) { + this.notes1 = notes1; + } + public String getNotes16() { + return notes16; + } + public void setNotes16(String notes16) { + this.notes16 = notes16; + } + public String getNumberOfBeds() { + return numberOfBeds; + } + public void setNumberOfBeds(String numberOfBeds) { + this.numberOfBeds = numberOfBeds; + } + public String getNumberOfBeds1() { + return numberOfBeds1; + } + public void setNumberOfBeds1(String numberOfBeds1) { + this.numberOfBeds1 = numberOfBeds1; + } + public String getOutScopeBedDays() { + return outScopeBedDays; + } + public void setOutScopeBedDays(String outScopeBedDays) { + this.outScopeBedDays = outScopeBedDays; + } + public String getOutScopeBedDays1() { + return outScopeBedDays1; + } + public void setOutScopeBedDays1(String outScopeBedDays1) { + this.outScopeBedDays1 = outScopeBedDays1; + } + public String getPrivateBedDays() { + return privateBedDays; + } + public void setPrivateBedDays(String privateBedDays) { + this.privateBedDays = privateBedDays; + } + public String getPrivateBedDays1() { + return privateBedDays1; + } + public void setPrivateBedDays1(String privateBedDays1) { + this.privateBedDays1 = privateBedDays1; + } + public String getQuarter() { + return quarter; + } + public void setQuarter(String quarter) { + this.quarter = quarter; + } + public String getQuarterNote1() { + return quarterNote1; + } + public void setQuarterNote1(String quarterNote1) { + this.quarterNote1 = quarterNote1; + } + public String getSelectList() { + return selectList; + } + public void setSelectList(String selectList) { + this.selectList = selectList; + } + public String getSelectList1() { + return selectList1; + } + public void setSelectList1(String selectList1) { + this.selectList1 = selectList1; + } + public String getSimpledatetime() { + return simpledatetime; + } + public void setSimpledatetime(String simpledatetime) { + this.simpledatetime = simpledatetime; + } + public String getStartDate() { + return startDate; + } + public void setStartDate(String startDate) { + this.startDate = startDate; + } + public String getStartDate1() { + return startDate1; + } + public void setStartDate1(String startDate1) { + this.startDate1 = startDate1; + } + public String getSubTypeIn() { + return subTypeIn; + } + public void setSubTypeIn(String subTypeIn) { + this.subTypeIn = subTypeIn; + } + public String getSubTypeIn1() { + return subTypeIn1; + } + public void setSubTypeIn1(String subTypeIn1) { + this.subTypeIn1 = subTypeIn1; + } + public String getSubTypeOut() { + return subTypeOut; + } + public void setSubTypeOut(String subTypeOut) { + this.subTypeOut = subTypeOut; + } + public String getSubTypePrivate() { + return subTypePrivate; + } + public void setSubTypePrivate(String subTypePrivate) { + this.subTypePrivate = subTypePrivate; + } + public String getTotalrow() { + return totalrow; + } + public void setTotalrow(String totalrow) { + this.totalrow = totalrow; + } + public String getSubTypeOut1() { + return subTypeOut1; + } + public void setSubTypeOut1(String subTypeOut1) { + this.subTypeOut1 = subTypeOut1; + } + @Override + public String toString() { + return "BedGrid1 [bedType=" + bedType + ", bedType1=" + bedType1 + ", endDate=" + endDate + ", endDate1=" + + endDate1 + ", inScopeBedDays=" + inScopeBedDays + ", inScopeBedDays1=" + inScopeBedDays1 + + ", maximumBedDays=" + maximumBedDays + ", maximumBedDays1=" + maximumBedDays1 + ", notes=" + notes + + ", notes1=" + notes1 + ", notes16=" + notes16 + ", numberOfBeds=" + numberOfBeds + ", numberOfBeds1=" + + numberOfBeds1 + ", outScopeBedDays=" + outScopeBedDays + ", outScopeBedDays1=" + outScopeBedDays1 + + ", privateBedDays=" + privateBedDays + ", privateBedDays1=" + privateBedDays1 + ", quarter=" + quarter + + ", quarterNote1=" + quarterNote1 + ", selectList=" + selectList + ", selectList1=" + selectList1 + + ", simpledatetime=" + simpledatetime + ", startDate=" + startDate + ", startDate1=" + startDate1 + + ", subTypeIn=" + subTypeIn + ", subTypeIn1=" + subTypeIn1 + ", subTypeOut=" + subTypeOut + + ", subTypePrivate=" + subTypePrivate + ", totalrow=" + totalrow + ", subTypeOut1=" + subTypeOut1 + + "]"; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid2.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid2.java new file mode 100644 index 00000000..340b1f6c --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid2.java @@ -0,0 +1,215 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; + +public class BedGrid2{ + public String bedType; + public String bedType2; + public String endDate; + public String endDate2; + public String inScopeBedDays; + public String inScopeBedDays2; + public String maximumBedDays; + public String maximumBedDays2; + public String notes; + public String notes1; + public String notes16; + public String notes2; + public String numberOfBeds; + public String numberOfBeds2; + public String outScopeBedDays; + public String outScopeBedDays2; + public String privateBedDays; + public String privateBedDays2; + public String quarter; + public String selectList; + public String selectList1; + public String simpledatetime; + public String startDate; + public String startDate2; + public String subTypeIn; + public String subTypeOut; + public String subTypePrivate; + public String totalrow; + public String getBedType() { + return bedType; + } + public void setBedType(String bedType) { + this.bedType = bedType; + } + public String getBedType2() { + return bedType2; + } + public void setBedType2(String bedType2) { + this.bedType2 = bedType2; + } + public String getEndDate() { + return endDate; + } + public void setEndDate(String endDate) { + this.endDate = endDate; + } + public String getEndDate2() { + return endDate2; + } + public void setEndDate2(String endDate2) { + this.endDate2 = endDate2; + } + public String getInScopeBedDays() { + return inScopeBedDays; + } + public void setInScopeBedDays(String inScopeBedDays) { + this.inScopeBedDays = inScopeBedDays; + } + public String getInScopeBedDays2() { + return inScopeBedDays2; + } + public void setInScopeBedDays2(String inScopeBedDays2) { + this.inScopeBedDays2 = inScopeBedDays2; + } + public String getMaximumBedDays() { + return maximumBedDays; + } + public void setMaximumBedDays(String maximumBedDays) { + this.maximumBedDays = maximumBedDays; + } + public String getMaximumBedDays2() { + return maximumBedDays2; + } + public void setMaximumBedDays2(String maximumBedDays2) { + this.maximumBedDays2 = maximumBedDays2; + } + public String getNotes() { + return notes; + } + public void setNotes(String notes) { + this.notes = notes; + } + public String getNotes1() { + return notes1; + } + public void setNotes1(String notes1) { + this.notes1 = notes1; + } + public String getNotes16() { + return notes16; + } + public void setNotes16(String notes16) { + this.notes16 = notes16; + } + public String getNotes2() { + return notes2; + } + public void setNotes2(String notes2) { + this.notes2 = notes2; + } + public String getNumberOfBeds() { + return numberOfBeds; + } + public void setNumberOfBeds(String numberOfBeds) { + this.numberOfBeds = numberOfBeds; + } + public String getNumberOfBeds2() { + return numberOfBeds2; + } + public void setNumberOfBeds2(String numberOfBeds2) { + this.numberOfBeds2 = numberOfBeds2; + } + public String getOutScopeBedDays() { + return outScopeBedDays; + } + public void setOutScopeBedDays(String outScopeBedDays) { + this.outScopeBedDays = outScopeBedDays; + } + public String getOutScopeBedDays2() { + return outScopeBedDays2; + } + public void setOutScopeBedDays2(String outScopeBedDays2) { + this.outScopeBedDays2 = outScopeBedDays2; + } + public String getPrivateBedDays() { + return privateBedDays; + } + public void setPrivateBedDays(String privateBedDays) { + this.privateBedDays = privateBedDays; + } + public String getPrivateBedDays2() { + return privateBedDays2; + } + public void setPrivateBedDays2(String privateBedDays2) { + this.privateBedDays2 = privateBedDays2; + } + public String getQuarter() { + return quarter; + } + public void setQuarter(String quarter) { + this.quarter = quarter; + } + public String getSelectList() { + return selectList; + } + public void setSelectList(String selectList) { + this.selectList = selectList; + } + public String getSelectList1() { + return selectList1; + } + public void setSelectList1(String selectList1) { + this.selectList1 = selectList1; + } + public String getSimpledatetime() { + return simpledatetime; + } + public void setSimpledatetime(String simpledatetime) { + this.simpledatetime = simpledatetime; + } + public String getStartDate() { + return startDate; + } + public void setStartDate(String startDate) { + this.startDate = startDate; + } + public String getStartDate2() { + return startDate2; + } + public void setStartDate2(String startDate2) { + this.startDate2 = startDate2; + } + public String getSubTypeIn() { + return subTypeIn; + } + public void setSubTypeIn(String subTypeIn) { + this.subTypeIn = subTypeIn; + } + public String getSubTypeOut() { + return subTypeOut; + } + public void setSubTypeOut(String subTypeOut) { + this.subTypeOut = subTypeOut; + } + public String getSubTypePrivate() { + return subTypePrivate; + } + public void setSubTypePrivate(String subTypePrivate) { + this.subTypePrivate = subTypePrivate; + } + public String getTotalrow() { + return totalrow; + } + public void setTotalrow(String totalrow) { + this.totalrow = totalrow; + } + @Override + public String toString() { + return "BedGrid2 [bedType=" + bedType + ", bedType2=" + bedType2 + ", endDate=" + endDate + ", endDate2=" + + endDate2 + ", inScopeBedDays=" + inScopeBedDays + ", inScopeBedDays2=" + inScopeBedDays2 + + ", maximumBedDays=" + maximumBedDays + ", maximumBedDays2=" + maximumBedDays2 + ", notes=" + notes + + ", notes1=" + notes1 + ", notes16=" + notes16 + ", notes2=" + notes2 + ", numberOfBeds=" + + numberOfBeds + ", numberOfBeds2=" + numberOfBeds2 + ", outScopeBedDays=" + outScopeBedDays + + ", outScopeBedDays2=" + outScopeBedDays2 + ", privateBedDays=" + privateBedDays + ", privateBedDays2=" + + privateBedDays2 + ", quarter=" + quarter + ", selectList=" + selectList + ", selectList1=" + + selectList1 + ", simpledatetime=" + simpledatetime + ", startDate=" + startDate + ", startDate2=" + + startDate2 + ", subTypeIn=" + subTypeIn + ", subTypeOut=" + subTypeOut + ", subTypePrivate=" + + subTypePrivate + ", totalrow=" + totalrow + "]"; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid3.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid3.java new file mode 100644 index 00000000..a9a84e1d --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid3.java @@ -0,0 +1,215 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; + +public class BedGrid3{ + public String bedType; + public String bedType3; + public String endDate; + public String endDate3; + public String inScopeBedDays; + public String inScopeBedDays3; + public String maximumBedDays; + public String maximumBedDays3; + public String notes; + public String notes1; + public String notes16; + public String notes3; + public String numberOfBeds; + public String numberOfBeds3; + public String outScopeBedDays; + public String outScopeBedDays3; + public String privateBedDays; + public String privateBedDays3; + public String quarter; + public String selectList; + public String selectList1; + public String simpledatetime; + public String startDate; + public String startDate3; + public String subTypeIn; + public String subTypeOut; + public String subTypePrivate; + public String totalrow; + public String getBedType() { + return bedType; + } + public void setBedType(String bedType) { + this.bedType = bedType; + } + public String getBedType3() { + return bedType3; + } + public void setBedType3(String bedType3) { + this.bedType3 = bedType3; + } + public String getEndDate() { + return endDate; + } + public void setEndDate(String endDate) { + this.endDate = endDate; + } + public String getEndDate3() { + return endDate3; + } + public void setEndDate3(String endDate3) { + this.endDate3 = endDate3; + } + public String getInScopeBedDays() { + return inScopeBedDays; + } + public void setInScopeBedDays(String inScopeBedDays) { + this.inScopeBedDays = inScopeBedDays; + } + public String getInScopeBedDays3() { + return inScopeBedDays3; + } + public void setInScopeBedDays3(String inScopeBedDays3) { + this.inScopeBedDays3 = inScopeBedDays3; + } + public String getMaximumBedDays() { + return maximumBedDays; + } + public void setMaximumBedDays(String maximumBedDays) { + this.maximumBedDays = maximumBedDays; + } + public String getMaximumBedDays3() { + return maximumBedDays3; + } + public void setMaximumBedDays3(String maximumBedDays3) { + this.maximumBedDays3 = maximumBedDays3; + } + public String getNotes() { + return notes; + } + public void setNotes(String notes) { + this.notes = notes; + } + public String getNotes1() { + return notes1; + } + public void setNotes1(String notes1) { + this.notes1 = notes1; + } + public String getNotes16() { + return notes16; + } + public void setNotes16(String notes16) { + this.notes16 = notes16; + } + public String getNotes3() { + return notes3; + } + public void setNotes3(String notes3) { + this.notes3 = notes3; + } + public String getNumberOfBeds() { + return numberOfBeds; + } + public void setNumberOfBeds(String numberOfBeds) { + this.numberOfBeds = numberOfBeds; + } + public String getNumberOfBeds3() { + return numberOfBeds3; + } + public void setNumberOfBeds3(String numberOfBeds3) { + this.numberOfBeds3 = numberOfBeds3; + } + public String getOutScopeBedDays() { + return outScopeBedDays; + } + public void setOutScopeBedDays(String outScopeBedDays) { + this.outScopeBedDays = outScopeBedDays; + } + public String getOutScopeBedDays3() { + return outScopeBedDays3; + } + public void setOutScopeBedDays3(String outScopeBedDays3) { + this.outScopeBedDays3 = outScopeBedDays3; + } + public String getPrivateBedDays() { + return privateBedDays; + } + public void setPrivateBedDays(String privateBedDays) { + this.privateBedDays = privateBedDays; + } + public String getPrivateBedDays3() { + return privateBedDays3; + } + public void setPrivateBedDays3(String privateBedDays3) { + this.privateBedDays3 = privateBedDays3; + } + public String getQuarter() { + return quarter; + } + public void setQuarter(String quarter) { + this.quarter = quarter; + } + public String getSelectList() { + return selectList; + } + public void setSelectList(String selectList) { + this.selectList = selectList; + } + public String getSelectList1() { + return selectList1; + } + public void setSelectList1(String selectList1) { + this.selectList1 = selectList1; + } + public String getSimpledatetime() { + return simpledatetime; + } + public void setSimpledatetime(String simpledatetime) { + this.simpledatetime = simpledatetime; + } + public String getStartDate() { + return startDate; + } + public void setStartDate(String startDate) { + this.startDate = startDate; + } + public String getStartDate3() { + return startDate3; + } + public void setStartDate3(String startDate3) { + this.startDate3 = startDate3; + } + public String getSubTypeIn() { + return subTypeIn; + } + public void setSubTypeIn(String subTypeIn) { + this.subTypeIn = subTypeIn; + } + public String getSubTypeOut() { + return subTypeOut; + } + public void setSubTypeOut(String subTypeOut) { + this.subTypeOut = subTypeOut; + } + public String getSubTypePrivate() { + return subTypePrivate; + } + public void setSubTypePrivate(String subTypePrivate) { + this.subTypePrivate = subTypePrivate; + } + public String getTotalrow() { + return totalrow; + } + public void setTotalrow(String totalrow) { + this.totalrow = totalrow; + } + @Override + public String toString() { + return "BedGrid3 [bedType=" + bedType + ", bedType3=" + bedType3 + ", endDate=" + endDate + ", endDate3=" + + endDate3 + ", inScopeBedDays=" + inScopeBedDays + ", inScopeBedDays3=" + inScopeBedDays3 + + ", maximumBedDays=" + maximumBedDays + ", maximumBedDays3=" + maximumBedDays3 + ", notes=" + notes + + ", notes1=" + notes1 + ", notes16=" + notes16 + ", notes3=" + notes3 + ", numberOfBeds=" + + numberOfBeds + ", numberOfBeds3=" + numberOfBeds3 + ", outScopeBedDays=" + outScopeBedDays + + ", outScopeBedDays3=" + outScopeBedDays3 + ", privateBedDays=" + privateBedDays + ", privateBedDays3=" + + privateBedDays3 + ", quarter=" + quarter + ", selectList=" + selectList + ", selectList1=" + + selectList1 + ", simpledatetime=" + simpledatetime + ", startDate=" + startDate + ", startDate3=" + + startDate3 + ", subTypeIn=" + subTypeIn + ", subTypeOut=" + subTypeOut + ", subTypePrivate=" + + subTypePrivate + ", totalrow=" + totalrow + "]"; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid4.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid4.java new file mode 100644 index 00000000..c1ccafd3 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid4.java @@ -0,0 +1,216 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; + +public class BedGrid4{ + public String bedType; + public String bedType4; + public String endDate; + public String endDate4; + public String inScopeBedDays; + public String inScopeBedDays4; + public String maximumBedDays; + public String maximumBedDays4; + public String notes; + public String notes1; + public String notes16; + public String notes4; + public String numberOfBeds; + public String numberOfBeds4; + public String outScopeBedDays; + public String outScopeBedDays4; + public String privateBedDays; + public String privateBedDays4; + public String quarter; + public String selectList; + public String selectList1; + public String simpledatetime; + public String startDate; + public String startDate4; + public String subTypeIn; + public String subTypeOut; + public String subTypePrivate; + public String totalrow; + public String getBedType() { + return bedType; + } + public void setBedType(String bedType) { + this.bedType = bedType; + } + public String getBedType4() { + return bedType4; + } + public void setBedType4(String bedType4) { + this.bedType4 = bedType4; + } + public String getEndDate() { + return endDate; + } + public void setEndDate(String endDate) { + this.endDate = endDate; + } + public String getEndDate4() { + return endDate4; + } + public void setEndDate4(String endDate4) { + this.endDate4 = endDate4; + } + public String getInScopeBedDays() { + return inScopeBedDays; + } + public void setInScopeBedDays(String inScopeBedDays) { + this.inScopeBedDays = inScopeBedDays; + } + public String getInScopeBedDays4() { + return inScopeBedDays4; + } + public void setInScopeBedDays4(String inScopeBedDays4) { + this.inScopeBedDays4 = inScopeBedDays4; + } + public String getMaximumBedDays() { + return maximumBedDays; + } + public void setMaximumBedDays(String maximumBedDays) { + this.maximumBedDays = maximumBedDays; + } + public String getMaximumBedDays4() { + return maximumBedDays4; + } + public void setMaximumBedDays4(String maximumBedDays4) { + this.maximumBedDays4 = maximumBedDays4; + } + public String getNotes() { + return notes; + } + public void setNotes(String notes) { + this.notes = notes; + } + public String getNotes1() { + return notes1; + } + public void setNotes1(String notes1) { + this.notes1 = notes1; + } + public String getNotes16() { + return notes16; + } + public void setNotes16(String notes16) { + this.notes16 = notes16; + } + public String getNotes4() { + return notes4; + } + public void setNotes4(String notes4) { + this.notes4 = notes4; + } + public String getNumberOfBeds() { + return numberOfBeds; + } + public void setNumberOfBeds(String numberOfBeds) { + this.numberOfBeds = numberOfBeds; + } + public String getNumberOfBeds4() { + return numberOfBeds4; + } + public void setNumberOfBeds4(String numberOfBeds4) { + this.numberOfBeds4 = numberOfBeds4; + } + public String getOutScopeBedDays() { + return outScopeBedDays; + } + public void setOutScopeBedDays(String outScopeBedDays) { + this.outScopeBedDays = outScopeBedDays; + } + public String getOutScopeBedDays4() { + return outScopeBedDays4; + } + public void setOutScopeBedDays4(String outScopeBedDays4) { + this.outScopeBedDays4 = outScopeBedDays4; + } + public String getPrivateBedDays() { + return privateBedDays; + } + public void setPrivateBedDays(String privateBedDays) { + this.privateBedDays = privateBedDays; + } + public String getPrivateBedDays4() { + return privateBedDays4; + } + public void setPrivateBedDays4(String privateBedDays4) { + this.privateBedDays4 = privateBedDays4; + } + public String getQuarter() { + return quarter; + } + public void setQuarter(String quarter) { + this.quarter = quarter; + } + public String getSelectList() { + return selectList; + } + public void setSelectList(String selectList) { + this.selectList = selectList; + } + public String getSelectList1() { + return selectList1; + } + public void setSelectList1(String selectList1) { + this.selectList1 = selectList1; + } + public String getSimpledatetime() { + return simpledatetime; + } + public void setSimpledatetime(String simpledatetime) { + this.simpledatetime = simpledatetime; + } + public String getStartDate() { + return startDate; + } + public void setStartDate(String startDate) { + this.startDate = startDate; + } + public String getStartDate4() { + return startDate4; + } + public void setStartDate4(String startDate4) { + this.startDate4 = startDate4; + } + public String getSubTypeIn() { + return subTypeIn; + } + public void setSubTypeIn(String subTypeIn) { + this.subTypeIn = subTypeIn; + } + public String getSubTypeOut() { + return subTypeOut; + } + public void setSubTypeOut(String subTypeOut) { + this.subTypeOut = subTypeOut; + } + public String getSubTypePrivate() { + return subTypePrivate; + } + public void setSubTypePrivate(String subTypePrivate) { + this.subTypePrivate = subTypePrivate; + } + public String getTotalrow() { + return totalrow; + } + public void setTotalrow(String totalrow) { + this.totalrow = totalrow; + } + @Override + public String toString() { + return "BedGrid4 [bedType=" + bedType + ", bedType4=" + bedType4 + ", endDate=" + endDate + ", endDate4=" + + endDate4 + ", inScopeBedDays=" + inScopeBedDays + ", inScopeBedDays4=" + inScopeBedDays4 + + ", maximumBedDays=" + maximumBedDays + ", maximumBedDays4=" + maximumBedDays4 + ", notes=" + notes + + ", notes1=" + notes1 + ", notes16=" + notes16 + ", notes4=" + notes4 + ", numberOfBeds=" + + numberOfBeds + ", numberOfBeds4=" + numberOfBeds4 + ", outScopeBedDays=" + outScopeBedDays + + ", outScopeBedDays4=" + outScopeBedDays4 + ", privateBedDays=" + privateBedDays + ", privateBedDays4=" + + privateBedDays4 + ", quarter=" + quarter + ", selectList=" + selectList + ", selectList1=" + + selectList1 + ", simpledatetime=" + simpledatetime + ", startDate=" + startDate + ", startDate4=" + + startDate4 + ", subTypeIn=" + subTypeIn + ", subTypeOut=" + subTypeOut + ", subTypePrivate=" + + subTypePrivate + ", totalrow=" + totalrow + "]"; + } + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Form.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Form.java new file mode 100644 index 00000000..7650af02 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Form.java @@ -0,0 +1,85 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; + +public class Form{ + public String assignee; + public String assigneeEmail; + public String confirmationId; + public String createdAt; + public String email; + public String formName; + public String fullName; + public String status; + public String username; + public String version; + + public String getAssignee() { + return assignee; + } + public void setAssignee(String assignee) { + this.assignee = assignee; + } + public String getAssigneeEmail() { + return assigneeEmail; + } + public void setAssigneeEmail(String assigneeEmail) { + this.assigneeEmail = assigneeEmail; + } + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getCreatedAt() { + return createdAt; + } + public void setCreatedAt(String createdAt) { + this.createdAt = createdAt; + } + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getFormName() { + return formName; + } + public void setFormName(String formName) { + this.formName = formName; + } + public String getFullName() { + return fullName; + } + public void setFullName(String fullName) { + this.fullName = fullName; + } + public String getStatus() { + return status; + } + public void setStatus(String status) { + this.status = status; + } + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } + public String getVersion() { + return version; + } + public void setVersion(String version) { + this.version = version; + } + + @Override + public String toString() { + return "Form [assignee=" + assignee + ", assigneeEmail=" + assigneeEmail + ", confirmationId=" + confirmationId + + ", createdAt=" + createdAt + ", email=" + email + ", formName=" + formName + ", fullName=" + fullName + + ", status=" + status + ", username=" + username + ", version=" + version + "]"; + } + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java new file mode 100644 index 00000000..008d0c48 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java @@ -0,0 +1,9459 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; + +import java.util.ArrayList; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class Root{ + public String alliedNPContractRate_total; + public String alliedNPContractRate1; + public String alliedNPContractRate2; + public String alliedNPContractRate3; + public String alliedNPContractRate4; + public String alliedNPContractRate5; + public String alliedNPContractRate6; + public String alliedNPCost_total; + public String alliedNPCost1; + public String alliedNPCost2; + public String alliedNPCost3; + public String alliedNPCost4; + public String alliedNPCost5; + public String alliedNPCost6; + public String alliedNPNProdC_calc1; + public String alliedNPNProdC_calc2; + public String alliedNPNProdC_calc3; + public String alliedNPNProdC_calc4; + public String alliedNPNProdC_calc5; + public String alliedNPNProdC_calc6; + public String alliedNPNProdC_calcsum1; + @JsonProperty("alliedNPNProdC_item1-1") + public String alliedNPNProdC_item11; + @JsonProperty("alliedNPNProdC_item1-2") + public String alliedNPNProdC_item12; + @JsonProperty("alliedNPNProdC_item1-3") + public String alliedNPNProdC_item13; + @JsonProperty("alliedNPNProdC_item1-4") + public String alliedNPNProdC_item14; + @JsonProperty("alliedNPNProdC_item1-5") + public String alliedNPNProdC_item15; + @JsonProperty("alliedNPNProdC_item1-6") + public String alliedNPNProdC_item16; + @JsonProperty("alliedNPNProdC_item2-1") + public String alliedNPNProdC_item21; + @JsonProperty("alliedNPNProdC_item2-2") + public String alliedNPNProdC_item22; + @JsonProperty("alliedNPNProdC_item2-3") + public String alliedNPNProdC_item23; + @JsonProperty("alliedNPNProdC_item2-4") + public String alliedNPNProdC_item24; + @JsonProperty("alliedNPNProdC_item2-5") + public String alliedNPNProdC_item25; + @JsonProperty("alliedNPNProdC_item2-6") + public String alliedNPNProdC_item26; + @JsonProperty("alliedNPNProdC_item3-1") + public String alliedNPNProdC_item31; + @JsonProperty("alliedNPNProdC_item3-2") + public String alliedNPNProdC_item32; + @JsonProperty("alliedNPNProdC_item3-3") + public String alliedNPNProdC_item33; + @JsonProperty("alliedNPNProdC_item3-4") + public String alliedNPNProdC_item34; + @JsonProperty("alliedNPNProdC_item3-5") + public String alliedNPNProdC_item35; + @JsonProperty("alliedNPNProdC_item3-6") + public String alliedNPNProdC_item36; + @JsonProperty("alliedNPNProdC_sum1-1") + public String alliedNPNProdC_sum11; + @JsonProperty("alliedNPNProdC_sum2-1") + public String alliedNPNProdC_sum21; + @JsonProperty("alliedNPNProdC_sum3-1") + public String alliedNPNProdC_sum31; + public String alliedNPNProdC_THP1; + public String alliedNPNProdC_THP2; + public String alliedNPNProdC_THP3; + public String alliedNPNProdC_THP4; + public String alliedNPNProdC_THP5; + public String alliedNPNProdC_THP6; + public String alliedNPNProdC_THPsum1; + public String alliedNPNProdH_calc1; + public String alliedNPNProdH_calc2; + public String alliedNPNProdH_calc3; + public String alliedNPNProdH_calc4; + public String alliedNPNProdH_calc5; + public String alliedNPNProdH_calc6; + public String alliedNPNProdH_calcsum1; + @JsonProperty("alliedNPNProdH_item1-1") + public String alliedNPNProdH_item11; + @JsonProperty("alliedNPNProdH_item1-2") + public String alliedNPNProdH_item12; + @JsonProperty("alliedNPNProdH_item1-3") + public String alliedNPNProdH_item13; + @JsonProperty("alliedNPNProdH_item1-4") + public String alliedNPNProdH_item14; + @JsonProperty("alliedNPNProdH_item1-5") + public String alliedNPNProdH_item15; + @JsonProperty("alliedNPNProdH_item1-6") + public String alliedNPNProdH_item16; + @JsonProperty("alliedNPNProdH_item2-1") + public String alliedNPNProdH_item21; + @JsonProperty("alliedNPNProdH_item2-2") + public String alliedNPNProdH_item22; + @JsonProperty("alliedNPNProdH_item2-3") + public String alliedNPNProdH_item23; + @JsonProperty("alliedNPNProdH_item2-4") + public String alliedNPNProdH_item24; + @JsonProperty("alliedNPNProdH_item2-5") + public String alliedNPNProdH_item25; + @JsonProperty("alliedNPNProdH_item2-6") + public String alliedNPNProdH_item26; + @JsonProperty("alliedNPNProdH_item3-1") + public String alliedNPNProdH_item31; + @JsonProperty("alliedNPNProdH_item3-2") + public String alliedNPNProdH_item32; + @JsonProperty("alliedNPNProdH_item3-3") + public String alliedNPNProdH_item33; + @JsonProperty("alliedNPNProdH_item3-4") + public String alliedNPNProdH_item34; + @JsonProperty("alliedNPNProdH_item3-5") + public String alliedNPNProdH_item35; + @JsonProperty("alliedNPNProdH_item3-6") + public String alliedNPNProdH_item36; + @JsonProperty("alliedNPNProdH_sum1-1") + public String alliedNPNProdH_sum11; + @JsonProperty("alliedNPNProdH_sum2-1") + public String alliedNPNProdH_sum21; + @JsonProperty("alliedNPNProdH_sum3-1") + public String alliedNPNProdH_sum31; + public String alliedNPNProdH_THP1; + public String alliedNPNProdH_THP2; + public String alliedNPNProdH_THP3; + public String alliedNPNProdH_THP4; + public String alliedNPNProdH_THP5; + public String alliedNPNProdH_THP6; + public String alliedNPNProdH_THPsum1; + public String alliedNPPercentage1; + public String alliedNPPercentage2; + public String alliedNPPercentage3; + public String alliedNPPercentage4; + public String alliedNPPercentage5; + public String alliedNPPercentage6; + public String alliedNPProdC_calc1; + public String alliedNPProdC_calc2; + public String alliedNPProdC_calc3; + public String alliedNPProdC_calc4; + public String alliedNPProdC_calc5; + public String alliedNPProdC_calc6; + public String alliedNPProdC_calcsum1; + @JsonProperty("alliedNPProdC_item1-1") + public String alliedNPProdC_item11; + @JsonProperty("alliedNPProdC_item1-2") + public String alliedNPProdC_item12; + @JsonProperty("alliedNPProdC_item1-3") + public String alliedNPProdC_item13; + @JsonProperty("alliedNPProdC_item1-4") + public String alliedNPProdC_item14; + @JsonProperty("alliedNPProdC_item1-5") + public String alliedNPProdC_item15; + @JsonProperty("alliedNPProdC_item1-6") + public String alliedNPProdC_item16; + @JsonProperty("alliedNPProdC_item2-1") + public String alliedNPProdC_item21; + @JsonProperty("alliedNPProdC_item2-2") + public String alliedNPProdC_item22; + @JsonProperty("alliedNPProdC_item2-3") + public String alliedNPProdC_item23; + @JsonProperty("alliedNPProdC_item2-4") + public String alliedNPProdC_item24; + @JsonProperty("alliedNPProdC_item2-5") + public String alliedNPProdC_item25; + @JsonProperty("alliedNPProdC_item2-6") + public String alliedNPProdC_item26; + public String alliedNPProdC_sub1; + public String alliedNPProdC_sub2; + public String alliedNPProdC_sub3; + public String alliedNPProdC_sub4; + public String alliedNPProdC_sub5; + public String alliedNPProdC_sub6; + public String alliedNPProdC_subsum1; + + @JsonProperty("alliedNPProdC_sum1-1") + public String alliedNPProdC_sum11; + @JsonProperty("alliedNPProdC_sum2-1") + public String alliedNPProdC_sum21; + public String alliedNPProdC_THP1; + public String alliedNPProdC_THP2; + public String alliedNPProdC_THP3; + public String alliedNPProdC_THP4; + public String alliedNPProdC_THP5; + public String alliedNPProdC_THP6; + public String alliedNPProdC_THPsum1; + public String alliedNPProdCCS_subsum1; + public String alliedNPProdCCS1; + public String alliedNPProdCCS2; + public String alliedNPProdCCS3; + public String alliedNPProdCCS4; + public String alliedNPProdCCS5; + public String alliedNPProdCCS6; + public String alliedNPProdH_calc1; + public String alliedNPProdH_calc2; + public String alliedNPProdH_calc3; + public String alliedNPProdH_calc4; + public String alliedNPProdH_calc5; + public String alliedNPProdH_calc6; + public String alliedNPProdH_calcsum1; + @JsonProperty("alliedNPProdH_item1-1") + public String alliedNPProdH_item11; + @JsonProperty("alliedNPProdH_item1-2") + public String alliedNPProdH_item12; + @JsonProperty("alliedNPProdH_item1-3") + public String alliedNPProdH_item13; + @JsonProperty("alliedNPProdH_item1-4") + public String alliedNPProdH_item14; + @JsonProperty("alliedNPProdH_item1-5") + public String alliedNPProdH_item15; + @JsonProperty("alliedNPProdH_item1-6") + public String alliedNPProdH_item16; + @JsonProperty("alliedNPProdH_item2-1") + public String alliedNPProdH_item21; + @JsonProperty("alliedNPProdH_item2-2") + public String alliedNPProdH_item22; + @JsonProperty("alliedNPProdH_item2-3") + public String alliedNPProdH_item23; + @JsonProperty("alliedNPProdH_item2-4") + public String alliedNPProdH_item24; + @JsonProperty("alliedNPProdH_item2-5") + public String alliedNPProdH_item25; + @JsonProperty("alliedNPProdH_item2-6") + public String alliedNPProdH_item26; + + public String alliedNPProdH_sub1; + public String alliedNPProdH_sub2; + public String alliedNPProdH_sub3; + public String alliedNPProdH_sub4; + public String alliedNPProdH_sub5; + public String alliedNPProdH_sub6; + public String alliedNPProdH_subsum1; + @JsonProperty("alliedNPProdH_sum1-1") + public String alliedNPProdH_sum11; + @JsonProperty("alliedNPProdH_sum2-1") + public String alliedNPProdH_sum21; + public String alliedNPProdH_THP1; + public String alliedNPProdH_THP2; + public String alliedNPProdH_THP3; + public String alliedNPProdH_THP4; + public String alliedNPProdH_THP5; + public String alliedNPProdH_THP6; + public String alliedNPProdH_THPsum1; + public String alliedNPProdHCS_subsum1; + public String alliedNPProdHCS1; + public String alliedNPProdHCS2; + public String alliedNPProdHCS3; + public String alliedNPProdHCS4; + public String alliedNPProdHCS5; + public String alliedNPProdHCS6; + public String alliedNPProvider1; + public String alliedNPProvider2; + public String alliedNPProvider3; + public String alliedNPProvider4; + public String alliedNPProvider5; + public String alliedNPProvider6; + @JsonProperty("alliedNProdC_sum2-1") + public String alliedNProdC_sum21; + @JsonProperty("alliedNProdH_sum2-1") + public String alliedNProdH_sum21; + public String alliedNPStaffRate_total; + public String alliedNPStaffRate1; + public String alliedNPStaffRate2; + public String alliedNPStaffRate3; + public String alliedNPStaffRate4; + public String alliedNPStaffRate5; + public String alliedNPStaffRate6; + public String alliedProfContractRate_total; + public String alliedProfContractRate1; + public String alliedProfContractRate2; + public String alliedProfContractRate3; + public String alliedProfContractRate4; + public String alliedProfContractRate5; + public String alliedProfCost_total; + public String alliedProfCost1; + public String alliedProfCost2; + public String alliedProfCost3; + public String alliedProfCost4; + public String alliedProfCost5; + public String alliedProfNProdC_calc1; + public String alliedProfNProdC_calc2; + public String alliedProfNProdC_calc3; + public String alliedProfNProdC_calc4; + public String alliedProfNProdC_calc5; + public String alliedProfNProdC_calcsum1; + @JsonProperty("alliedProfNProdC_item1-1") + public String alliedProfNProdC_item11; + @JsonProperty("alliedProfNProdC_item1-2") + public String alliedProfNProdC_item12; + @JsonProperty("alliedProfNProdC_item1-3") + public String alliedProfNProdC_item13; + @JsonProperty("alliedProfNProdC_item1-4") + public String alliedProfNProdC_item14; + @JsonProperty("alliedProfNProdC_item1-5") + public String alliedProfNProdC_item15; + @JsonProperty("alliedProfNProdC_item2-1") + public String alliedProfNProdC_item21; + @JsonProperty("alliedProfNProdC_item2-2") + public String alliedProfNProdC_item22; + @JsonProperty("alliedProfNProdC_item2-3") + public String alliedProfNProdC_item23; + @JsonProperty("alliedProfNProdC_item2-4") + public String alliedProfNProdC_item24; + @JsonProperty("alliedProfNProdC_item2-5") + public String alliedProfNProdC_item25; + @JsonProperty("alliedProfNProdC_item3-1") + public String alliedProfNProdC_item31; + @JsonProperty("alliedProfNProdC_item3-2") + public String alliedProfNProdC_item32; + @JsonProperty("alliedProfNProdC_item3-3") + public String alliedProfNProdC_item33; + @JsonProperty("alliedProfNProdC_item3-4") + public String alliedProfNProdC_item34; + @JsonProperty("alliedProfNProdC_item3-5") + public String alliedProfNProdC_item35; + @JsonProperty("alliedProfNProdC_sum1-1") + public String alliedProfNProdC_sum11; + @JsonProperty("alliedProfNProdC_sum3-1") + public String alliedProfNProdC_sum31; + public String alliedProfNProdC_THP1; + public String alliedProfNProdC_THP2; + public String alliedProfNProdC_THP3; + public String alliedProfNProdC_THP4; + public String alliedProfNProdC_THP5; + public String alliedProfNProdC_THPsum1; + public String alliedProfNProdH_calc1; + public String alliedProfNProdH_calc2; + public String alliedProfNProdH_calc3; + public String alliedProfNProdH_calc4; + public String alliedProfNProdH_calc5; + public String alliedProfNProdH_calcsum1; + @JsonProperty("alliedProfNProdH_item1-1") + public String alliedProfNProdH_item11; + @JsonProperty("alliedProfNProdH_item1-2") + public String alliedProfNProdH_item12; + @JsonProperty("alliedProfNProdH_item1-3") + public String alliedProfNProdH_item13; + @JsonProperty("alliedProfNProdH_item1-4") + public String alliedProfNProdH_item14; + @JsonProperty("alliedProfNProdH_item1-5") + public String alliedProfNProdH_item15; + @JsonProperty("alliedProfNProdH_item2-1") + public String alliedProfNProdH_item21; + @JsonProperty("alliedProfNProdH_item2-2") + public String alliedProfNProdH_item22; + @JsonProperty("alliedProfNProdH_item2-3") + public String alliedProfNProdH_item23; + @JsonProperty("alliedProfNProdH_item2-4") + public String alliedProfNProdH_item24; + @JsonProperty("alliedProfNProdH_item2-5") + public String alliedProfNProdH_item25; + @JsonProperty("alliedProfNProdH_item3-1") + public String alliedProfNProdH_item31; + @JsonProperty("alliedProfNProdH_item3-2") + public String alliedProfNProdH_item32; + @JsonProperty("alliedProfNProdH_item3-3") + public String alliedProfNProdH_item33; + @JsonProperty("alliedProfNProdH_item3-4") + public String alliedProfNProdH_item34; + @JsonProperty("alliedProfNProdH_item3-5") + public String alliedProfNProdH_item35; + @JsonProperty("alliedProfNProdH_sum1-1") + public String alliedProfNProdH_sum11; + @JsonProperty("alliedProfNProdH_sum3-1") + public String alliedProfNProdH_sum31; + public String alliedProfNProdH_THP1; + public String alliedProfNProdH_THP2; + public String alliedProfNProdH_THP3; + public String alliedProfNProdH_THP4; + public String alliedProfNProdH_THP5; + public String alliedProfNProdH_THPsum1; + public String alliedProfPercentage1; + public String alliedProfPercentage2; + public String alliedProfPercentage3; + public String alliedProfPercentage4; + public String alliedProfPercentage5; + public String alliedProfProdC_calc1; + public String alliedProfProdC_calc2; + public String alliedProfProdC_calc3; + public String alliedProfProdC_calc4; + public String alliedProfProdC_calc5; + public String alliedProfProdC_calcsum1; + + @JsonProperty("alliedProfProdC_item1-1") + public String alliedProfProdC_item11; + @JsonProperty("alliedProfProdC_item1-2") + public String alliedProfProdC_item12; + @JsonProperty("alliedProfProdC_item1-3") + public String alliedProfProdC_item13; + @JsonProperty("alliedProfProdC_item1-4") + public String alliedProfProdC_item14; + @JsonProperty("alliedProfProdC_item1-5") + public String alliedProfProdC_item15; + @JsonProperty("alliedProfProdC_item2-1") + public String alliedProfProdC_item21; + @JsonProperty("alliedProfProdC_item2-2") + public String alliedProfProdC_item22; + @JsonProperty("alliedProfProdC_item2-3") + public String alliedProfProdC_item23; + @JsonProperty("alliedProfProdC_item2-4") + public String alliedProfProdC_item24; + @JsonProperty("alliedProfProdC_item2-5") + public String alliedProfProdC_item25; + public String alliedProfProdC_sub1; + public String alliedProfProdC_sub2; + public String alliedProfProdC_sub3; + public String alliedProfProdC_sub4; + public String alliedProfProdC_sub5; + public String alliedProfProdC_subsum1; + @JsonProperty("alliedProfProdC_sum1-1") + public String alliedProfProdC_sum11; + @JsonProperty("alliedProfProdC_sum2-1") + public String alliedProfProdC_sum21; + public String alliedProfProdC_THP1; + public String alliedProfProdC_THP2; + public String alliedProfProdC_THP3; + public String alliedProfProdC_THP4; + public String alliedProfProdC_THP5; + public String alliedProfProdC_THPsum1; + public String alliedProfProdCCS_subsum1; + public String alliedProfProdCCS1; + public String alliedProfProdCCS2; + public String alliedProfProdCCS3; + public String alliedProfProdCCS4; + public String alliedProfProdCCS5; + public String alliedProfProdH_calc1; + public String alliedProfProdH_calc2; + public String alliedProfProdH_calc3; + public String alliedProfProdH_calc4; + public String alliedProfProdH_calc5; + public String alliedProfProdH_calcsum1; + @JsonProperty("alliedProfProdH_item1-1") + public String alliedProfProdH_item11; + @JsonProperty("alliedProfProdH_item1-2") + public String alliedProfProdH_item12; + @JsonProperty("alliedProfProdH_item1-3") + public String alliedProfProdH_item13; + @JsonProperty("alliedProfProdH_item1-4") + public String alliedProfProdH_item14; + @JsonProperty("alliedProfProdH_item1-5") + public String alliedProfProdH_item15; + @JsonProperty("alliedProfProdH_item2-1") + public String alliedProfProdH_item21; + @JsonProperty("alliedProfProdH_item2-2") + public String alliedProfProdH_item22; + @JsonProperty("alliedProfProdH_item2-3") + public String alliedProfProdH_item23; + @JsonProperty("alliedProfProdH_item2-4") + public String alliedProfProdH_item24; + @JsonProperty("alliedProfProdH_item2-5") + public String alliedProfProdH_item25; + public String alliedProfProdH_sub1; + public String alliedProfProdH_sub2; + public String alliedProfProdH_sub3; + public String alliedProfProdH_sub4; + public String alliedProfProdH_sub5; + public String alliedProfProdH_subsum1; + @JsonProperty("alliedProfProdH_sum11") + public String alliedProfProdH_sum11; + @JsonProperty("alliedProfProdH_sum2-1") + public String alliedProfProdH_sum21; + public String alliedProfProdH_THP1; + public String alliedProfProdH_THP2; + public String alliedProfProdH_THP3; + public String alliedProfProdH_THP4; + public String alliedProfProdH_THP5; + public String alliedProfProdH_THPsum1; + public String alliedProfProdHCS_subsum1; + public String alliedProfProdHCS1; + public String alliedProfProdHCS2; + public String alliedProfProdHCS3; + public String alliedProfProdHCS4; + public String alliedProfProdHCS5; + public String alliedProfProvider1; + public String alliedProfProvider2; + public String alliedProfProvider3; + public String alliedProfProvider4; + public String alliedProfProvider5; + public String alliedProfStaffRate_total; + public String alliedProfStaffRate1; + public String alliedProfStaffRate2; + public String alliedProfStaffRate3; + public String alliedProfStaffRate4; + public String alliedProfStaffRate5; + public ArrayList bedGrid0; + public ArrayList bedGrid1; + public ArrayList bedGrid2; + public ArrayList bedGrid3; + public ArrayList bedGrid4; + public String benefit_percentage_rec; + public String benefit_percentage_sub; + public String benefit_percentage_total; + public String benefit_percentage1; + public String benefit_percentage2; + public String benefit_percentage3; + public String benefit_percentage4; + public String benefit_percentage5; + public String benefit_percentage6; + public String benefit_percentage7; + public String benefit_percentage8; + public String benefit_value_rec; + public String benefit_value_sub; + public String benefit_value_total; + public String benefit_value1; + public String benefit_value11; + public String benefit_value2; + public String benefit_value3; + public String benefit_value4; + public String benefit_value5; + public String benefit_value6; + public String benefit_value7; + public String benefit_value8; + public String bTotal_accruedSalaryWage; + public String bTotal_benefits; + public String bTotal_recSalaryWage; + public String bTotal_salaryWage; + public String bTotal_value_sum1; + public String bTotal_YTDSalaryWage; + public String ccmisId; + public String compB_accrued; + public String compB_accrued1; + public String compB_accrued2; + public String compB_accrued3; + public String compB_calc1; + public String compB_calc10; + public String compB_calc11; + public String compB_calc12; + public String compB_calc13; + public String compB_calc14; + public String compB_calc15; + public String compB_calc16; + public String compB_calc17; + public String compB_calc18; + public String compB_calc19; + public String compB_calc2; + public String compB_calc20; + public String compB_calc21; + public String compB_calc22; + public String compB_calc23; + public String compB_calc24; + public String compB_calc25; + public String compB_calc26; + public String compB_calc27; + public String compB_calc3; + public String compB_calc4; + public String compB_calc5; + public String compB_calc6; + public String compB_calc7; + public String compB_calc8; + public String compB_calc9; + public String compB_calcsum1; + public String compB_calcsum2; + public String compB_calcsum3; + public String compB_calcsum4; + public String compB_calcsum5; + @JsonProperty("compB_item1-1") + public String compB_item11; + @JsonProperty("compB_item1-10") + public String compB_item110; + @JsonProperty("compB_item1-11") + public String compB_item111; + @JsonProperty("compB_item1-12") + public String compB_item112; + @JsonProperty("compB_item1-13") + public String compB_item113; + @JsonProperty("compB_item1-14") + public String compB_item114; + @JsonProperty("compB_item1-15") + public String compB_item115; + @JsonProperty("compB_item1-16") + public String compB_item116; + @JsonProperty("compB_item1-17") + public String compB_item117; + @JsonProperty("compB_item1-18") + public String compB_item118; + @JsonProperty("compB_item1-19") + public String compB_item119; + @JsonProperty("compB_item1-2") + public String compB_item12; + @JsonProperty("compB_item1-20") + public String compB_item120; + @JsonProperty("compB_item1-21") + public String compB_item121; + @JsonProperty("compB_item1-22") + public String compB_item122; + @JsonProperty("compB_item1-23") + public String compB_item123; + @JsonProperty("compB_item1-24") + public String compB_item124; + @JsonProperty("compB_item1-25") + public String compB_item125; + @JsonProperty("compB_item1-26") + public String compB_item126; + @JsonProperty("compB_item1-27") + public String compB_item127; + @JsonProperty("compB_item1-3") + public String compB_item13; + @JsonProperty("compB_item1-4") + public String compB_item14; + @JsonProperty("compB_item1-5") + public String compB_item15; + @JsonProperty("compB_item1-6") + public String compB_item16; + @JsonProperty("compB_item1-7") + public String compB_item17; + @JsonProperty("compB_item1-8") + public String compB_item18; + @JsonProperty("compB_item1-9") + public String compB_item19; + @JsonProperty("compB_item2-1") + public String compB_item21; + @JsonProperty("compB_item2-10") + public String compB_item210; + @JsonProperty("compB_item2-11") + public String compB_item211; + @JsonProperty("compB_item2-12") + public String compB_item212; + @JsonProperty("compB_item2-13") + public String compB_item213; + @JsonProperty("compB_item2-14") + public String compB_item214; + @JsonProperty("compB_item2-15") + public String compB_item215; + @JsonProperty("compB_item2-16") + public String compB_item216; + @JsonProperty("compB_item2-17") + public String compB_item217; + @JsonProperty("compB_item2-18") + public String compB_item218; + @JsonProperty("compB_item2-19") + public String compB_item219; + @JsonProperty("compB_item2-2") + public String compB_item22; + @JsonProperty("compB_item2-20") + public String compB_item220; + @JsonProperty("compB_item2-21") + public String compB_item221; + @JsonProperty("compB_item2-22") + public String compB_item222; + @JsonProperty("compB_item2-23") + public String compB_item223; + @JsonProperty("compB_item2-24") + public String compB_item224; + @JsonProperty("compB_item2-25") + public String compB_item225; + @JsonProperty("compB_item2-26") + public String compB_item226; + @JsonProperty("compB_item2-27") + public String compB_item227; + @JsonProperty("compB_item2-3") + public String compB_item23; + @JsonProperty("compB_item2-4") + public String compB_item24; + @JsonProperty("compB_item2-5") + public String compB_item25; + @JsonProperty("compB_item2-6") + public String compB_item26; + @JsonProperty("compB_item2-7") + public String compB_item27; + @JsonProperty("compB_item2-8") + public String compB_item28; + @JsonProperty("compB_item2-9") + public String compB_item29; + @JsonProperty("compB_item3-1") + public String compB_item31; + @JsonProperty("compB_item3-10") + public String compB_item310; + @JsonProperty("compB_item3-11") + public String compB_item311; + @JsonProperty("compB_item3-12") + public String compB_item312; + @JsonProperty("compB_item3-13") + public String compB_item313; + @JsonProperty("compB_item3-14") + public String compB_item314; + @JsonProperty("compB_item3-15") + public String compB_item315; + @JsonProperty("compB_item3-16") + public String compB_item316; + @JsonProperty("compB_item3-17") + public String compB_item317; + @JsonProperty("compB_item3-18") + public String compB_item318; + @JsonProperty("compB_item3-19") + public String compB_item319; + @JsonProperty("compB_item3-2") + public String compB_item32; + @JsonProperty("compB_item3-20") + public String compB_item320; + @JsonProperty("compB_item3-21") + public String compB_item321; + @JsonProperty("compB_item3-22") + public String compB_item322; + @JsonProperty("compB_item3-23") + public String compB_item323; + @JsonProperty("compB_item3-24") + public String compB_item324; + @JsonProperty("compB_item3-25") + public String compB_item325; + @JsonProperty("compB_item3-26") + public String compB_item326; + @JsonProperty("compB_item3-27") + public String compB_item327; + @JsonProperty("compB_item3-3") + public String compB_item33; + @JsonProperty("compB_item3-4") + public String compB_item34; + @JsonProperty("compB_item3-5") + public String compB_item35; + @JsonProperty("compB_item3-6") + public String compB_item36; + @JsonProperty("compB_item3-7") + public String compB_item37; + @JsonProperty("compB_item3-8") + public String compB_item38; + @JsonProperty("compB_item3-9") + public String compB_item39; + public String compB_laborOther; + public String compB_laborOther1; + public String compB_laborOther2; + public String compB_laborOther3; + public String compB_recovered; + public String compB_recovered1; + public String compB_recovered2; + public String compB_recovered3; + @JsonProperty("compB_sum11") + public String compB_sum11; + @JsonProperty("compB_sum1-2") + public String compB_sum12; + @JsonProperty("compB_sum1-3") + public String compB_sum13; + @JsonProperty("compB_sum1-4") + public String compB_sum14; + @JsonProperty("compB_sum1-5") + public String compB_sum15; + @JsonProperty("compB_sum2-1") + public String compB_sum21; + @JsonProperty("compB_sum2-2") + public String compB_sum22; + @JsonProperty("compB_sum2-3") + public String compB_sum23; + @JsonProperty("compB_sum2-4") + public String compB_sum24; + @JsonProperty("compB_sum2-5") + public String compB_sum25; + @JsonProperty("compB_sum3-1") + public String compB_sum31; + @JsonProperty("compB_sum3-2") + public String compB_sum32; + @JsonProperty("compB_sum3-3") + public String compB_sum33; + @JsonProperty("compB_sum3-4") + public String compB_sum34; + @JsonProperty("compB_sum3-5") + public String compB_sum35; + public String compB_total; + public String compB_total1; + public String compB_total2; + public String compB_total3; + public String compH_accrued; + public String compH_accrued2; + public String compH_accrued3; + public String compH_accrued4; + public String compH_calc1; + public String compH_calc10; + public String compH_calc11; + public String compH_calc12; + public String compH_calc13; + public String compH_calc14; + public String compH_calc15; + public String compH_calc16; + public String compH_calc17; + public String compH_calc18; + public String compH_calc19; + public String compH_calc2; + public String compH_calc20; + public String compH_calc21; + public String compH_calc22; + public String compH_calc23; + public String compH_calc24; + public String compH_calc25; + public String compH_calc26; + public String compH_calc27; + public String compH_calc3; + public String compH_calc4; + public String compH_calc5; + public String compH_calc6; + public String compH_calc7; + public String compH_calc8; + public String compH_calc9; + public String compH_calcsum1; + public String compH_calcsum2; + public String compH_calcsum3; + public String compH_calcsum4; + public String compH_calcsum5; + @JsonProperty("compH_item1-1") + public String compH_item11; + @JsonProperty("compH_item1-10") + public String compH_item110; + @JsonProperty("compH_item1-11") + public String compH_item111; + @JsonProperty("compH_item1-12") + public String compH_item112; + @JsonProperty("compH_item1-13") + public String compH_item113; + @JsonProperty("compH_item1-14") + public String compH_item114; + @JsonProperty("compH_item1-15") + public String compH_item115; + @JsonProperty("compH_item1-16") + public String compH_item116; + @JsonProperty("compH_item1-17") + public String compH_item117; + @JsonProperty("compH_item1-18") + public String compH_item118; + @JsonProperty("compH_item1-19") + public String compH_item119; + @JsonProperty("compH_item1-2") + public String compH_item12; + @JsonProperty("compH_item1-20") + public String compH_item120; + @JsonProperty("compH_item1-21") + public String compH_item121; + @JsonProperty("compH_item1-1-22") + public String compH_item122; + @JsonProperty("compH_item1-23") + public String compH_item123; + @JsonProperty("compH_item1-24") + public String compH_item124; + @JsonProperty("compH_item1-25") + public String compH_item125; + @JsonProperty("compH_item1-26") + public String compH_item126; + @JsonProperty("compH_item1-27") + public String compH_item127; + @JsonProperty("compH_item1-3") + public String compH_item13; + @JsonProperty("compH_item1-4") + public String compH_item14; + @JsonProperty("compH_item1-5") + public String compH_item15; + @JsonProperty("compH_item1-6") + public String compH_item16; + @JsonProperty("compH_item1-7") + public String compH_item17; + @JsonProperty("compH_item1-8") + public String compH_item18; + @JsonProperty("compH_item1-9") + public String compH_item19; + @JsonProperty("compH_item2-1") + public String compH_item21; + @JsonProperty("compH_item2-10") + public String compH_item210; + @JsonProperty("compH_item2-11") + public String compH_item211; + @JsonProperty("compH_item2-12") + public String compH_item212; + @JsonProperty("compH_item2-13") + public String compH_item213; + @JsonProperty("compH_item2-14") + public String compH_item214; + @JsonProperty("compH_item2-15") + public String compH_item215; + @JsonProperty("compH_item2-16") + public String compH_item216; + @JsonProperty("compH_item2-17") + public String compH_item217; + @JsonProperty("compH_item2-18") + public String compH_item218; + @JsonProperty("compH_item2-19") + public String compH_item219; + @JsonProperty("compH_item2-2") + public String compH_item22; + @JsonProperty("compH_item2-20") + public String compH_item220; + @JsonProperty("compH_item2-21") + public String compH_item221; + @JsonProperty("compH_item2-22") + public String compH_item222; + @JsonProperty("compH_item2-23") + public String compH_item223; + @JsonProperty("compH_item2-24") + public String compH_item224; + @JsonProperty("compH_item2-25") + public String compH_item225; + @JsonProperty("compH_item2-26") + public String compH_item226; + @JsonProperty("compH_item2-27") + public String compH_item227; + @JsonProperty("compH_item2-3") + public String compH_item23; + @JsonProperty("compH_item2-4") + public String compH_item24; + @JsonProperty("compH_item2-5") + public String compH_item25; + @JsonProperty("compH_item2-6") + public String compH_item26; + @JsonProperty("compH_item2-7") + public String compH_item27; + @JsonProperty("compH_item2-8") + public String compH_item28; + @JsonProperty("compH_item2-9") + public String compH_item29; + @JsonProperty("compH_item3-1") + public String compH_item31; + @JsonProperty("compH_item3-10") + public String compH_item310; + @JsonProperty("compH_item3-11") + public String compH_item311; + @JsonProperty("compH_item3-12") + public String compH_item312; + @JsonProperty("compH_item3-13") + public String compH_item313; + @JsonProperty("compH_item3-14") + public String compH_item314; + @JsonProperty("compH_item3-15") + public String compH_item315; + @JsonProperty("compH_item3-16") + public String compH_item316; + @JsonProperty("compH_item3-17") + public String compH_item317; + @JsonProperty("compH_item3-18") + public String compH_item318; + @JsonProperty("compH_item3-19") + public String compH_item319; + @JsonProperty("compH_item3-2") + public String compH_item32; + @JsonProperty("compH_item3-20") + public String compH_item320; + @JsonProperty("compH_item3-21") + public String compH_item321; + @JsonProperty("compH_item3-22") + public String compH_item322; + @JsonProperty("compH_item3-23") + public String compH_item323; + @JsonProperty("compH_item3-24") + public String compH_item324; + @JsonProperty("compH_item3-25") + public String compH_item325; + @JsonProperty("compH_item3-26") + public String compH_item326; + @JsonProperty("compH_item3-27") + public String compH_item327; + @JsonProperty("compH_item3-3") + public String compH_item33; + @JsonProperty("compH_item3-4") + public String compH_item34; + @JsonProperty("compH_item3-5") + public String compH_item35; + @JsonProperty("compH_item3-6") + public String compH_item36; + @JsonProperty("compH_item3-7") + public String compH_item37; + @JsonProperty("compH_item3-8") + public String compH_item38; + @JsonProperty("compH_item3-9") + public String compH_item39; + public String compH_PHP1; + public String compH_PHP10; + public String compH_PHP11; + public String compH_PHP12; + public String compH_PHP13; + public String compH_PHP14; + public String compH_PHP15; + public String compH_PHP16; + public String compH_PHP17; + public String compH_PHP18; + public String compH_PHP19; + public String compH_PHP2; + public String compH_PHP20; + public String compH_PHP21; + public String compH_PHP22; + public String compH_PHP23; + public String compH_PHP24; + public String compH_PHP25; + public String compH_PHP26; + public String compH_PHP27; + public String compH_PHP3; + public String compH_PHP4; + public String compH_PHP5; + public String compH_PHP6; + public String compH_PHP7; + public String compH_PHP8; + public String compH_PHP9; + public String compH_PHPsum1; + public String compH_PHPsum2; + public String compH_PHPsum3; + public String compH_PHPsum4; + public String compH_PHPsum5; + @JsonProperty("compH_sum1-1") + public String compH_sum11; + @JsonProperty("compH_sum1-2") + public String compH_sum12; + @JsonProperty("compH_sum1-3") + public String compH_sum13; + @JsonProperty("compH_sum1-4") + public String compH_sum14; + @JsonProperty("compH_sum1-5") + public String compH_sum15; + @JsonProperty("compH_sum2-1") + public String compH_sum21; + @JsonProperty("compH_sum2-2") + public String compH_sum22; + @JsonProperty("compH_sum2-3") + public String compH_sum23; + @JsonProperty("compH_sum2-4") + public String compH_sum24; + @JsonProperty("compH_sum2-5") + public String compH_sum25; + @JsonProperty("compH_sum13-1") + public String compH_sum31; + @JsonProperty("compH_sum3-2") + public String compH_sum32; + @JsonProperty("compH_sum3-3") + public String compH_sum33; + @JsonProperty("compH_sum3-4") + public String compH_sum34; + @JsonProperty("compH_sum3-5") + public String compH_sum35; + public String compH_total; + public String compH_total1; + public String compH_total2; + public String compH_total3; + public String compH_total4; + public String directCare_subtotal; + public String directCare_subtotal1; + public String directCare_subtotal2; + public String directCare_subtotal3; + public String endPeriod; + public String facilityName; + public Form form; + public String inScopeBedTotal1; + public String inScopeBedTotal2; + public String inScopeBedTotal3; + public String inScopeBedTotal4; + public String inScopeBedTotalYTD; + public String inScopeMonth1; + public String inScopeMonth10; + public String inScopeMonth11; + public String inScopeMonth12; + public String inScopeMonth2; + public String inScopeMonth3; + public String inScopeMonth4; + public String inScopeMonth5; + public String inScopeMonth6; + public String inScopeMonth7; + public String inScopeMonth8; + public String inScopeMonth9; + public String inScopeOccupied1; + public String inScopeOccupied2; + public String inScopeOccupied3; + public String inScopeOccupied4; + public String inScopeOccupiedYTD; + public String inScopeTotalQ1; + public String inScopeTotalQ2; + public String inScopeTotalQ3; + public String inScopeTotalQ4; + public String nopEx_note1; + public String nopEx_note2; + public String nopEx_sub_note; + @JsonProperty("nopEx_sum1-1") + public String nopEx_sum11; + @JsonProperty("nopEx_YTD1") + public String nopEx_YTD1; + @JsonProperty("nopEx_YTD2") + public String nopEx_YTD2; + public String nopRev_note1; + public String nopRev_note2; + public String nopRev_sub_note; + @JsonProperty("nopRev_sum1-1") + public String nopRev_sum11; + @JsonProperty("nopRev_YTD1") + public String nopRev_YTD1; + @JsonProperty("nopRev_YTD2") + public String nopRev_YTD2; + + public String nopSu_data1; + public String nopSu_note; + public String noteInScopeQ1; + public String noteInScopeQ2; + public String noteInScopeQ3; + public String noteInScopeQ4; + public String numberOfDaysAccrued; + public String numberOfTotalBeds; + public String numberOfTotalFundedBeds; + public String nursingContractRate_total; + public String nursingContractRate1; + public String nursingContractRate2; + public String nursingContractRate3; + public String nursingContractRate4; + public String nursingCost_total; + public String nursingCost1; + public String nursingCost2; + public String nursingCost3; + public String nursingCost4; + public String nursingNProdC_calc1; + public String nursingNProdC_calc2; + public String nursingNProdC_calc3; + public String nursingNProdC_calc4; + public String nursingNProdC_calcsum1; + @JsonProperty("nursingNProdC_item1-1") + public String nursingNProdC_item11; + @JsonProperty("nursingNProdC_item1-2") + public String nursingNProdC_item12; + @JsonProperty("nursingNProdC_item1-3") + public String nursingNProdC_item13; + @JsonProperty("nursingNProdC_item1-4") + public String nursingNProdC_item14; + @JsonProperty("nursingNProdC_item2-1") + public String nursingNProdC_item21; + @JsonProperty("nursingNProdC_item2-2") + public String nursingNProdC_item22; + @JsonProperty("nursingNProdC_item2-3") + public String nursingNProdC_item23; + @JsonProperty("nursingNProdC_item2-4") + public String nursingNProdC_item24; + @JsonProperty("nursingNProdC_item3-1") + public String nursingNProdC_item31; + @JsonProperty("nursingNProdC_item3-2") + public String nursingNProdC_item32; + @JsonProperty("nursingNProdC_item3-3") + public String nursingNProdC_item33; + @JsonProperty("nursingNProdC_item3-4") + public String nursingNProdC_item34; + @JsonProperty("nursingNProdC_sum1-1") + public String nursingNProdC_sum11; + @JsonProperty("nursingNProdC_sum2-1") + public String nursingNProdC_sum21; + @JsonProperty("nursingNProdC_sum3-1") + public String nursingNProdC_sum31; + public String nursingNProdC_THP1; + public String nursingNProdC_THP2; + public String nursingNProdC_THP3; + public String nursingNProdC_THP4; + public String nursingNProdC_THPsum1; + public String nursingNProdH_calc1; + public String nursingNProdH_calc2; + public String nursingNProdH_calc3; + public String nursingNProdH_calc4; + public String nursingNProdH_calcsum1; + @JsonProperty("nursingNProdH_item1-1") + public String nursingNProdH_item11; + @JsonProperty("nursingNProdH_item1-2") + public String nursingNProdH_item12; + @JsonProperty("nursingNProdH_item1-3") + public String nursingNProdH_item13; + @JsonProperty("nursingNProdH_item1-4") + public String nursingNProdH_item14; + @JsonProperty("nursingNProdH_item2-1") + public String nursingNProdH_item21; + @JsonProperty("nursingNProdH_item2-2") + public String nursingNProdH_item22; + @JsonProperty("nursingNProdH_item2-3") + public String nursingNProdH_item23; + @JsonProperty("nursingNProdH_item2-4") + public String nursingNProdH_item24; + @JsonProperty("nursingNProdH_item4-1") + public String nursingNProdH_item31; + @JsonProperty("nursingNProdH_item3-2") + public String nursingNProdH_item32; + @JsonProperty("nursingNProdH_item3-3") + public String nursingNProdH_item33; + @JsonProperty("nursingNProdH_item3-4") + public String nursingNProdH_item34; + @JsonProperty("nursingNProdH_sum1-1") + public String nursingNProdH_sum11; + @JsonProperty("nursingNProdH_sum2-1") + public String nursingNProdH_sum21; + @JsonProperty("nursingNProdH_sum3-1") + public String nursingNProdH_sum31; + public String nursingNProdH_THP1; + public String nursingNProdH_THP2; + public String nursingNProdH_THP3; + public String nursingNProdH_THP4; + public String nursingNProdH_THPsum1; + public String nursingPercentage1; + public String nursingPercentage2; + public String nursingPercentage3; + public String nursingPercentage4; + public String nursingProdC_calc1; + public String nursingProdC_calc2; + public String nursingProdC_calc3; + public String nursingProdC_calc4; + public String nursingProdC_calcsum1; + @JsonProperty("nursingProdC_item1-1") + public String nursingProdC_item11; + @JsonProperty("nursingProdC_item1-2") + public String nursingProdC_item12; + @JsonProperty("nursingProdC_item1-3") + public String nursingProdC_item13; + @JsonProperty("nursingProdC_item1-4") + public String nursingProdC_item14; + @JsonProperty("nursingProdC_item2-1") + public String nursingProdC_item21; + @JsonProperty("nursingProdC_item2-2") + public String nursingProdC_item22; + @JsonProperty("nursingProdC_item2-3") + public String nursingProdC_item23; + @JsonProperty("nursingProdC_item2-4") + public String nursingProdC_item24; + public String nursingProdC_sub1; + public String nursingProdC_sub2; + public String nursingProdC_sub3; + public String nursingProdC_sub4; + public String nursingProdC_subsum1; + @JsonProperty("nursingProdC_sum1-1") + public String nursingProdC_sum11; + @JsonProperty("nursingProdC_sum2-1") + public String nursingProdC_sum21; + public String nursingProdC_THP1; + public String nursingProdC_THP2; + public String nursingProdC_THP3; + public String nursingProdC_THP4; + public String nursingProdC_THPsum1; + public String nursingProdCCS_subsum1; + public String nursingProdCCS1; + public String nursingProdCCS2; + public String nursingProdCCS3; + public String nursingProdCCS4; + public String nursingProdH_calc1; + public String nursingProdH_calc2; + public String nursingProdH_calc3; + public String nursingProdH_calc4; + public String nursingProdH_calcsum1; + @JsonProperty("nursingProdH_item1-1") + public String nursingProdH_item11; + @JsonProperty("nursingProdH_item1-2") + public String nursingProdH_item12; + @JsonProperty("nursingProdH_item1-3") + public String nursingProdH_item13; + @JsonProperty("nursingProdH_item1-4") + public String nursingProdH_item14; + @JsonProperty("nursingProdH_item2-1") + public String nursingProdH_item21; + @JsonProperty("nursingProdH_item2-2") + public String nursingProdH_item22; + @JsonProperty("nursingProdH_item2-3") + public String nursingProdH_item23; + @JsonProperty("nursingProdH_item2-4") + public String nursingProdH_item24; + public String nursingProdH_sub1; + public String nursingProdH_sub2; + public String nursingProdH_sub3; + public String nursingProdH_sub4; + public String nursingProdH_subsum1; + @JsonProperty("nursingProdH_sum1-1") + public String nursingProdH_sum11; + @JsonProperty("nursingProdH_sum2-1") + public String nursingProdH_sum21; + public String nursingProdH_THP1; + public String nursingProdH_THP2; + public String nursingProdH_THP3; + public String nursingProdH_THP4; + public String nursingProdH_THPsum1; + public String nursingProdHCS_subsum1; + public String nursingProdHCS1; + public String nursingProdHCS2; + public String nursingProdHCS3; + public String nursingProdHCS4; + public String nursingProvider1; + public String nursingProvider2; + public String nursingProvider3; + public String nursingProvider4; + public String nursingStaffRate_total; + public String nursingStaffRate1; + public String nursingStaffRate2; + public String nursingStaffRate3; + public String nursingStaffRate4; + public String occupiedPercentageInScopeQ1; + public String occupiedPercentageInScopeQ2; + public String occupiedPercentageInScopeQ3; + public String occupiedPercentageInScopeQ4; + public String occupiedPercentageOutScopeQ1; + public String occupiedPercentageOutScopeQ2; + public String occupiedPercentageOutScopeQ3; + public String occupiedPercentageOutScopeQ4; + public String occupiedPercentagePrivateQ1; + public String occupiedPercentagePrivateQ2; + public String occupiedPercentagePrivateQ3; + public String occupiedPercentagePrivateQ4; + public String occupiedPercentageTotalQ1; + public String occupiedPercentageTotalQ2; + public String occupiedPercentageTotalQ3; + public String occupiedPercentageTotalQ4; + public String occupiedQ1; + public String occupiedQ2; + public String occupiedQ3; + public String occupiedQ4; + public String occupiedTotal; + public String opEx_calc38; + public String opEx_calc39; + public String opEx_data_total; + @JsonProperty("opEx_item1-38") + public String opEx_item138; + @JsonProperty("opEx_item1-39") + public String opEx_item139; + public String opEx_note_sum6; + public String opEx_note1; + public String opEx_note10; + public String opEx_note11; + public String opEx_note12; + public String opEx_note13; + public String opEx_note14; + public String opEx_note15; + public String opEx_note16; + public String opEx_note17; + public String opEx_note18; + public String opEx_note19; + public String opEx_note2; + public String opEx_note20; + public String opEx_note21; + public String opEx_note22; + public String opEx_note23; + public String opEx_note24; + public String opEx_note25; + public String opEx_note26; + public String opEx_note27; + public String opEx_note28; + public String opEx_note29; + public String opEx_note3; + public String opEx_note30; + public String opEx_note31; + public String opEx_note32; + public String opEx_note33; + public String opEx_note34; + public String opEx_note35; + public String opEx_note36; + public String opEx_note38; + public String opEx_note39; + public String opEx_note4; + public String opEx_note5; + public String opEx_note6; + public String opEx_note7; + public String opEx_note8; + public String opEx_note9; + public String opEx_sub_note; + public String opEx_sub1; + public String opEx_sum_note1; + public String opEx_sum_note2; + public String opEx_sum_note3; + public String opEx_sum_note4; + public String opEx_sum_note5; + @JsonProperty("opEx_sum1-1") + public String opEx_sum11; + @JsonProperty("opEx_sum1-2") + public String opEx_sum12; + @JsonProperty("opEx_sum1-3") + public String opEx_sum13; + @JsonProperty("opEx_sum1-4") + public String opEx_sum14; + @JsonProperty("opEx_sum1-5") + public String opEx_sum15; + @JsonProperty("opEx_sum1-6") + public String opEx_sum16; + @JsonProperty("opEx_total_note") + public String opEx_total_note; + @JsonProperty("opEx_YTD-1") + public String opEx_YTD1; + @JsonProperty("opEx_YTD-10") + public String opEx_YTD10; + @JsonProperty("opEx_YTD-11") + public String opEx_YTD11; + @JsonProperty("opEx_YTD-12") + public String opEx_YTD12; + @JsonProperty("opEx_YTD-13") + public String opEx_YTD13; + @JsonProperty("opEx_YTD-14") + public String opEx_YTD14; + @JsonProperty("opEx_YTD-15") + public String opEx_YTD15; + @JsonProperty("opEx_YTD-16") + public String opEx_YTD16; + @JsonProperty("opEx_YTD-17") + public String opEx_YTD17; + @JsonProperty("opEx_YTD-18") + public String opEx_YTD18; + @JsonProperty("opEx_YTD-19") + public String opEx_YTD19; + @JsonProperty("opEx_YTD-2") + public String opEx_YTD2; + @JsonProperty("opEx_YTD-20") + public String opEx_YTD20; + @JsonProperty("opEx_YTD-21") + public String opEx_YTD21; + @JsonProperty("opEx_YTD-22") + public String opEx_YTD22; + @JsonProperty("opEx_YTD-23") + public String opEx_YTD23; + @JsonProperty("opEx_YTD-24") + public String opEx_YTD24; + @JsonProperty("opEx_YTD-25") + public String opEx_YTD25; + @JsonProperty("opEx_YTD-26") + public String opEx_YTD26; + @JsonProperty("opEx_YTD-27") + public String opEx_YTD27; + @JsonProperty("opEx_YTD-28") + public String opEx_YTD28; + @JsonProperty("opEx_YTD-29") + public String opEx_YTD29; + @JsonProperty("opEx_YTD-3") + public String opEx_YTD3; + @JsonProperty("opEx_YTD-30") + public String opEx_YTD30; + @JsonProperty("opEx_YTD-31") + public String opEx_YTD31; + @JsonProperty("opEx_YTD-32") + public String opEx_YTD32; + @JsonProperty("opEx_YTD-33") + public String opEx_YTD33; + @JsonProperty("opEx_YTD-34") + public String opEx_YTD34; + @JsonProperty("opEx_YTD-35") + public String opEx_YTD35; + @JsonProperty("opEx_YTD-4") + public String opEx_YTD4; + @JsonProperty("opEx_YTD-5") + public String opEx_YTD5; + @JsonProperty("opEx_YTD-6") + public String opEx_YTD6; + @JsonProperty("opEx_YTD-7") + public String opEx_YTD7; + @JsonProperty("opEx_YTD-8") + public String opEx_YTD8; + @JsonProperty("opEx_sum-9") + public String opEx_YTD9; + public String opRev_note1; + public String opRev_note10; + public String opRev_note11; + public String opRev_note12; + public String opRev_note13; + public String opRev_note14; + public String opRev_note15; + public String opRev_note16; + public String opRev_note17; + public String opRev_note18; + public String opRev_note19; + public String opRev_note2; + public String opRev_note20; + public String opRev_note3; + public String opRev_note4; + public String opRev_note5; + public String opRev_note6; + public String opRev_note7; + public String opRev_note8; + public String opRev_note9; + public String opRev_sum_note1; + public String opRev_sum_note2; + public String opRev_sum_note3; + public String opRev_sum_note4; + public String opRev_sum_note5; + @JsonProperty("opRev_sum1-1") + public String opRev_sum11; + @JsonProperty("opRev_sum1-2") + public String opRev_sum12; + @JsonProperty("opRev_sum1-3") + public String opRev_sum13; + @JsonProperty("opRev_sum1-4") + public String opRev_sum14; + @JsonProperty("opRev_sum1-5") + public String opRev_sum15; + public String opRev_total_note; + public String opRev_YTD_total; + @JsonProperty("opRev_YTD-1") + public String opRev_YTD1; + @JsonProperty("opRev_YTD-10") + public String opRev_YTD10; + @JsonProperty("opRev_YTD-11") + public String opRev_YTD11; + @JsonProperty("opRev_YTD-12") + public String opRev_YTD12; + @JsonProperty("opRev_YTD-13") + public String opRev_YTD13; + @JsonProperty("opRev_YTD-14") + public String opRev_YTD14; + @JsonProperty("opRev_YTD-15") + public String opRev_YTD15; + @JsonProperty("opRev_YTD-16") + public String opRev_YTD16; + @JsonProperty("opRev_YTD-17") + public String opRev_YTD17; + @JsonProperty("opRev_YTD-18") + public String opRev_YTD18; + @JsonProperty("opRev_YTD-19") + public String opRev_YTD19; + @JsonProperty("opRev_YTD-2") + public String opRev_YTD2; + @JsonProperty("opRev_YTD-20") + public String opRev_YTD20; + @JsonProperty("opRev_YTD-3") + public String opRev_YTD3; + @JsonProperty("opRev_YTD-4") + public String opRev_YTD4; + @JsonProperty("opRev_YTD-5") + public String opRev_YTD5; + @JsonProperty("opRev_YTD-6") + public String opRev_YTD6; + @JsonProperty("opRev_YTD-7") + public String opRev_YTD7; + @JsonProperty("opRev_YTD-8") + public String opRev_YTD8; + @JsonProperty("opRev_YTD-9") + public String opRev_YTD9; + public String opSu_data_total; + public String opSu_data_total_note; + @JsonProperty("opRev_item1-1") + public String opSuB_item11; + public String opSuB_note; + public String outScopeBedTotal1; + public String outScopeBedTotal2; + public String outScopeBedTotal3; + public String outScopeBedTotal4; + public String outScopeBedTotalYTD; + public String outScopeMonth1; + public String outScopeMonth10; + public String outScopeMonth11; + public String outScopeMonth12; + public String outScopeMonth2; + public String outScopeMonth3; + public String outScopeMonth4; + public String outScopeMonth5; + public String outScopeMonth6; + public String outScopeMonth7; + public String outScopeMonth8; + public String outScopeMonth9; + public String outScopeOccupied1; + public String outScopeOccupied2; + public String outScopeOccupied3; + public String outScopeOccupied4; + public String outScopeOccupiedYTD; + public String outScopeTotalQ1; + public String outScopeTotalQ2; + public String outScopeTotalQ3; + public String outScopeTotalQ4; + public String payrollEndDate; + public String payrollStartDate; + public String plannedInScope; + public String plannedInScope1; + public String plannedInScope2; + public String plannedInScope3; + public String plannedInScope4; + public String plannedOutScope; + public String plannedOutScope1; + public String plannedOutScope2; + public String plannedOutScope3; + public String plannedOutScope4; + public String plannedPrivate; + public String plannedPrivate1; + public String plannedPrivate2; + public String plannedPrivate3; + public String plannedPrivate4; + public String plannedTotal; + public String plannedTotal1; + public String plannedTotal2; + public String plannedTotal3; + public String plannedTotal4; + public String privateBedTotal1; + public String privateBedTotal2; + public String privateBedTotal3; + public String privateBedTotal4; + public String privateBedTotalYTD; + public String privateMonth1; + public String privateMonth10; + public String privateMonth11; + public String privateMonth12; + public String privateMonth2; + public String privateMonth3; + public String privateMonth4; + public String privateMonth5; + public String privateMonth6; + public String privateMonth7; + public String privateMonth8; + public String privateMonth9; + public String privateOccupied1; + public String privateOccupied2; + public String privateOccupied3; + public String privateOccupied4; + public String privateOccupiedYTD; + public String privateTotalQ1; + public String privateTotalQ2; + public String privateTotalQ3; + public String privateTotalQ4; + public String quarter; + public String startPeriod; + public String submission; + public String threshold; + public String totalBed1; + public String totalBed2; + public String totalBed3; + public String totalBed4; + public String totalBedYTD; + public String totalMonth1; + public String totalMonth10; + public String totalMonth11; + public String totalMonth12; + public String totalMonth2; + public String totalMonth3; + public String totalMonth4; + public String totalMonth5; + public String totalMonth6; + public String totalMonth7; + public String totalMonth8; + public String totalMonth9; + public String totalQ1; + public String totalQ2; + public String totalQ3; + public String totalQ4; + @JsonProperty("YTDMaxInScopeQ1") + public String yTDMaxInScopeQ1; + @JsonProperty("YTDMaxInScopeQ2") + public String yTDMaxInScopeQ2; + @JsonProperty("YTDMaxInScopeQ3") + public String yTDMaxInScopeQ3; + @JsonProperty("YTDMaxInScopeQ4") + public String yTDMaxInScopeQ4; + @JsonProperty("YTDMaxOutScopeQ1") + public String yTDMaxOutScopeQ1; + @JsonProperty("YTDMaxOutScopeQ2") + public String yTDMaxOutScopeQ2; + @JsonProperty("YTDMaxOutScopeQ3") + public String yTDMaxOutScopeQ3; + @JsonProperty("YTDMaxOutScopeQ4") + public String yTDMaxOutScopeQ4; + @JsonProperty("YTDMaxPrivateQ1") + public String yTDMaxPrivateQ1; + @JsonProperty("YTDMaxPrivateQ2") + public String yTDMaxPrivateQ2; + @JsonProperty("YTDMaxPrivateQ3") + public String yTDMaxPrivateQ3; + @JsonProperty("YTDMaxPrivateQ4") + public String yTDMaxPrivateQ4; + @JsonProperty("YTDMaxTotalQ1") + public String yTDMaxTotalQ1; + @JsonProperty("YTDMaxTotalQ2") + public String yTDMaxTotalQ2; + @JsonProperty("YTDMaxTotalQ3") + public String yTDMaxTotalQ3; + @JsonProperty("YTDMaxTotalQ4") + public String yTDMaxTotalQ4; + @JsonProperty("YTDOccupiedInScopeQ1") + public String yTDOccupiedInScopeQ1; + @JsonProperty("YTDOccupiedInScopeQ2") + public String yTDOccupiedInScopeQ2; + @JsonProperty("YTDOccupiedInScopeQ3") + public String yTDOccupiedInScopeQ3; + @JsonProperty("YTDOccupiedInScopeQ4") + public String yTDOccupiedInScopeQ4; + @JsonProperty("YTDOccupiedOutScopeQ1") + public String yTDOccupiedOutScopeQ1; + @JsonProperty("YTDOccupiedOutScopeQ2") + public String yTDOccupiedOutScopeQ2; + @JsonProperty("YTDOccupiedOutScopeQ3") + public String yTDOccupiedOutScopeQ3; + @JsonProperty("YTDOccupiedOutScopeQ4") + public String yTDOccupiedOutScopeQ4; + @JsonProperty("YTDOccupiedPrivateQ1") + public String yTDOccupiedPrivateQ1; + @JsonProperty("YTDOccupiedPrivateQ2") + public String yTDOccupiedPrivateQ2; + @JsonProperty("YTDOccupiedPrivateQ3") + public String yTDOccupiedPrivateQ3; + @JsonProperty("YTDOccupiedPrivateQ4") + public String yTDOccupiedPrivateQ4; + @JsonProperty("YTDOccupiedTotalQ1") + public String yTDOccupiedTotalQ1; + @JsonProperty("YTDOccupiedTotalQ2") + public String yTDOccupiedTotalQ2; + @JsonProperty("YTDOccupiedTotalQ3") + public String yTDOccupiedTotalQ3; + @JsonProperty("YTDOccupiedTotalQ4") + public String yTDOccupiedTotalQ4; + public String ytdPayrollDays; + @JsonProperty("YTDPlannedInScopeQ1") + public String yTDPlannedInScopeQ1; + @JsonProperty("YTDPlannedInScopeQ2") + public String yTDPlannedInScopeQ2; + @JsonProperty("YTDPlannedInScopeQ3") + public String yTDPlannedInScopeQ3; + @JsonProperty("YTDPlannedInScopeQ4") + public String yTDPlannedInScopeQ4; + @JsonProperty("YTDPlannedOutScopeQ1") + public String yTDPlannedOutScopeQ1; + @JsonProperty("YTDPlannedOutScopeQ2") + public String yTDPlannedOutScopeQ2; + @JsonProperty("YTDPlannedOutScopeQ3") + public String yTDPlannedOutScopeQ3; + @JsonProperty("YTDPlannedOutScopeQ4") + public String yTDPlannedOutScopeQ4; + @JsonProperty("YTDPlannedPrivateQ1") + public String yTDPlannedPrivateQ1; + @JsonProperty("YTDPlannedPrivateQ2") + public String yTDPlannedPrivateQ2; + @JsonProperty("YTDPlannedPrivateQ3") + public String yTDPlannedPrivateQ3; + @JsonProperty("YTDPlannedPrivateQ4") + public String yTDPlannedPrivateQ4; + @JsonProperty("YTDPlannedTotalQ1") + public String yTDPlannedTotalQ1; + @JsonProperty("YTDPlannedTotalQ2") + public String yTDPlannedTotalQ2; + @JsonProperty("YTDPlannedTotalQ3") + public String yTDPlannedTotalQ3; + @JsonProperty("YTDPlannedTotalQ4") + public String yTDPlannedTotalQ4; + public String getAlliedNPContractRate_total() { + return alliedNPContractRate_total; + } + public void setAlliedNPContractRate_total(String alliedNPContractRate_total) { + this.alliedNPContractRate_total = alliedNPContractRate_total; + } + public String getAlliedNPContractRate1() { + return alliedNPContractRate1; + } + public void setAlliedNPContractRate1(String alliedNPContractRate1) { + this.alliedNPContractRate1 = alliedNPContractRate1; + } + public String getAlliedNPContractRate2() { + return alliedNPContractRate2; + } + public void setAlliedNPContractRate2(String alliedNPContractRate2) { + this.alliedNPContractRate2 = alliedNPContractRate2; + } + public String getAlliedNPContractRate3() { + return alliedNPContractRate3; + } + public void setAlliedNPContractRate3(String alliedNPContractRate3) { + this.alliedNPContractRate3 = alliedNPContractRate3; + } + public String getAlliedNPContractRate4() { + return alliedNPContractRate4; + } + public void setAlliedNPContractRate4(String alliedNPContractRate4) { + this.alliedNPContractRate4 = alliedNPContractRate4; + } + public String getAlliedNPContractRate5() { + return alliedNPContractRate5; + } + public void setAlliedNPContractRate5(String alliedNPContractRate5) { + this.alliedNPContractRate5 = alliedNPContractRate5; + } + public String getAlliedNPContractRate6() { + return alliedNPContractRate6; + } + public void setAlliedNPContractRate6(String alliedNPContractRate6) { + this.alliedNPContractRate6 = alliedNPContractRate6; + } + public String getAlliedNPCost_total() { + return alliedNPCost_total; + } + public void setAlliedNPCost_total(String alliedNPCost_total) { + this.alliedNPCost_total = alliedNPCost_total; + } + public String getAlliedNPCost1() { + return alliedNPCost1; + } + public void setAlliedNPCost1(String alliedNPCost1) { + this.alliedNPCost1 = alliedNPCost1; + } + public String getAlliedNPCost2() { + return alliedNPCost2; + } + public void setAlliedNPCost2(String alliedNPCost2) { + this.alliedNPCost2 = alliedNPCost2; + } + public String getAlliedNPCost3() { + return alliedNPCost3; + } + public void setAlliedNPCost3(String alliedNPCost3) { + this.alliedNPCost3 = alliedNPCost3; + } + public String getAlliedNPCost4() { + return alliedNPCost4; + } + public void setAlliedNPCost4(String alliedNPCost4) { + this.alliedNPCost4 = alliedNPCost4; + } + public String getAlliedNPCost5() { + return alliedNPCost5; + } + public void setAlliedNPCost5(String alliedNPCost5) { + this.alliedNPCost5 = alliedNPCost5; + } + public String getAlliedNPCost6() { + return alliedNPCost6; + } + public void setAlliedNPCost6(String alliedNPCost6) { + this.alliedNPCost6 = alliedNPCost6; + } + public String getAlliedNPNProdC_calc1() { + return alliedNPNProdC_calc1; + } + public void setAlliedNPNProdC_calc1(String alliedNPNProdC_calc1) { + this.alliedNPNProdC_calc1 = alliedNPNProdC_calc1; + } + public String getAlliedNPNProdC_calc2() { + return alliedNPNProdC_calc2; + } + public void setAlliedNPNProdC_calc2(String alliedNPNProdC_calc2) { + this.alliedNPNProdC_calc2 = alliedNPNProdC_calc2; + } + public String getAlliedNPNProdC_calc3() { + return alliedNPNProdC_calc3; + } + public void setAlliedNPNProdC_calc3(String alliedNPNProdC_calc3) { + this.alliedNPNProdC_calc3 = alliedNPNProdC_calc3; + } + public String getAlliedNPNProdC_calc4() { + return alliedNPNProdC_calc4; + } + public void setAlliedNPNProdC_calc4(String alliedNPNProdC_calc4) { + this.alliedNPNProdC_calc4 = alliedNPNProdC_calc4; + } + public String getAlliedNPNProdC_calc5() { + return alliedNPNProdC_calc5; + } + public void setAlliedNPNProdC_calc5(String alliedNPNProdC_calc5) { + this.alliedNPNProdC_calc5 = alliedNPNProdC_calc5; + } + public String getAlliedNPNProdC_calc6() { + return alliedNPNProdC_calc6; + } + public void setAlliedNPNProdC_calc6(String alliedNPNProdC_calc6) { + this.alliedNPNProdC_calc6 = alliedNPNProdC_calc6; + } + public String getAlliedNPNProdC_calcsum1() { + return alliedNPNProdC_calcsum1; + } + public void setAlliedNPNProdC_calcsum1(String alliedNPNProdC_calcsum1) { + this.alliedNPNProdC_calcsum1 = alliedNPNProdC_calcsum1; + } + public String getAlliedNPNProdC_item11() { + return alliedNPNProdC_item11; + } + public void setAlliedNPNProdC_item11(String alliedNPNProdC_item11) { + this.alliedNPNProdC_item11 = alliedNPNProdC_item11; + } + public String getAlliedNPNProdC_item12() { + return alliedNPNProdC_item12; + } + public void setAlliedNPNProdC_item12(String alliedNPNProdC_item12) { + this.alliedNPNProdC_item12 = alliedNPNProdC_item12; + } + public String getAlliedNPNProdC_item13() { + return alliedNPNProdC_item13; + } + public void setAlliedNPNProdC_item13(String alliedNPNProdC_item13) { + this.alliedNPNProdC_item13 = alliedNPNProdC_item13; + } + public String getAlliedNPNProdC_item14() { + return alliedNPNProdC_item14; + } + public void setAlliedNPNProdC_item14(String alliedNPNProdC_item14) { + this.alliedNPNProdC_item14 = alliedNPNProdC_item14; + } + public String getAlliedNPNProdC_item15() { + return alliedNPNProdC_item15; + } + public void setAlliedNPNProdC_item15(String alliedNPNProdC_item15) { + this.alliedNPNProdC_item15 = alliedNPNProdC_item15; + } + public String getAlliedNPNProdC_item16() { + return alliedNPNProdC_item16; + } + public void setAlliedNPNProdC_item16(String alliedNPNProdC_item16) { + this.alliedNPNProdC_item16 = alliedNPNProdC_item16; + } + public String getAlliedNPNProdC_item21() { + return alliedNPNProdC_item21; + } + public void setAlliedNPNProdC_item21(String alliedNPNProdC_item21) { + this.alliedNPNProdC_item21 = alliedNPNProdC_item21; + } + public String getAlliedNPNProdC_item22() { + return alliedNPNProdC_item22; + } + public void setAlliedNPNProdC_item22(String alliedNPNProdC_item22) { + this.alliedNPNProdC_item22 = alliedNPNProdC_item22; + } + public String getAlliedNPNProdC_item23() { + return alliedNPNProdC_item23; + } + public void setAlliedNPNProdC_item23(String alliedNPNProdC_item23) { + this.alliedNPNProdC_item23 = alliedNPNProdC_item23; + } + public String getAlliedNPNProdC_item24() { + return alliedNPNProdC_item24; + } + public void setAlliedNPNProdC_item24(String alliedNPNProdC_item24) { + this.alliedNPNProdC_item24 = alliedNPNProdC_item24; + } + public String getAlliedNPNProdC_item25() { + return alliedNPNProdC_item25; + } + public void setAlliedNPNProdC_item25(String alliedNPNProdC_item25) { + this.alliedNPNProdC_item25 = alliedNPNProdC_item25; + } + public String getAlliedNPNProdC_item26() { + return alliedNPNProdC_item26; + } + public void setAlliedNPNProdC_item26(String alliedNPNProdC_item26) { + this.alliedNPNProdC_item26 = alliedNPNProdC_item26; + } + public String getAlliedNPNProdC_item31() { + return alliedNPNProdC_item31; + } + public void setAlliedNPNProdC_item31(String alliedNPNProdC_item31) { + this.alliedNPNProdC_item31 = alliedNPNProdC_item31; + } + public String getAlliedNPNProdC_item32() { + return alliedNPNProdC_item32; + } + public void setAlliedNPNProdC_item32(String alliedNPNProdC_item32) { + this.alliedNPNProdC_item32 = alliedNPNProdC_item32; + } + public String getAlliedNPNProdC_item33() { + return alliedNPNProdC_item33; + } + public void setAlliedNPNProdC_item33(String alliedNPNProdC_item33) { + this.alliedNPNProdC_item33 = alliedNPNProdC_item33; + } + public String getAlliedNPNProdC_item34() { + return alliedNPNProdC_item34; + } + public void setAlliedNPNProdC_item34(String alliedNPNProdC_item34) { + this.alliedNPNProdC_item34 = alliedNPNProdC_item34; + } + public String getAlliedNPNProdC_item35() { + return alliedNPNProdC_item35; + } + public void setAlliedNPNProdC_item35(String alliedNPNProdC_item35) { + this.alliedNPNProdC_item35 = alliedNPNProdC_item35; + } + public String getAlliedNPNProdC_item36() { + return alliedNPNProdC_item36; + } + public void setAlliedNPNProdC_item36(String alliedNPNProdC_item36) { + this.alliedNPNProdC_item36 = alliedNPNProdC_item36; + } + public String getAlliedNPNProdC_sum11() { + return alliedNPNProdC_sum11; + } + public void setAlliedNPNProdC_sum11(String alliedNPNProdC_sum11) { + this.alliedNPNProdC_sum11 = alliedNPNProdC_sum11; + } + public String getAlliedNPNProdC_sum21() { + return alliedNPNProdC_sum21; + } + public void setAlliedNPNProdC_sum21(String alliedNPNProdC_sum21) { + this.alliedNPNProdC_sum21 = alliedNPNProdC_sum21; + } + public String getAlliedNPNProdC_sum31() { + return alliedNPNProdC_sum31; + } + public void setAlliedNPNProdC_sum31(String alliedNPNProdC_sum31) { + this.alliedNPNProdC_sum31 = alliedNPNProdC_sum31; + } + public String getAlliedNPNProdC_THP1() { + return alliedNPNProdC_THP1; + } + public void setAlliedNPNProdC_THP1(String alliedNPNProdC_THP1) { + this.alliedNPNProdC_THP1 = alliedNPNProdC_THP1; + } + public String getAlliedNPNProdC_THP2() { + return alliedNPNProdC_THP2; + } + public void setAlliedNPNProdC_THP2(String alliedNPNProdC_THP2) { + this.alliedNPNProdC_THP2 = alliedNPNProdC_THP2; + } + public String getAlliedNPNProdC_THP3() { + return alliedNPNProdC_THP3; + } + public void setAlliedNPNProdC_THP3(String alliedNPNProdC_THP3) { + this.alliedNPNProdC_THP3 = alliedNPNProdC_THP3; + } + public String getAlliedNPNProdC_THP4() { + return alliedNPNProdC_THP4; + } + public void setAlliedNPNProdC_THP4(String alliedNPNProdC_THP4) { + this.alliedNPNProdC_THP4 = alliedNPNProdC_THP4; + } + public String getAlliedNPNProdC_THP5() { + return alliedNPNProdC_THP5; + } + public void setAlliedNPNProdC_THP5(String alliedNPNProdC_THP5) { + this.alliedNPNProdC_THP5 = alliedNPNProdC_THP5; + } + public String getAlliedNPNProdC_THP6() { + return alliedNPNProdC_THP6; + } + public void setAlliedNPNProdC_THP6(String alliedNPNProdC_THP6) { + this.alliedNPNProdC_THP6 = alliedNPNProdC_THP6; + } + public String getAlliedNPNProdC_THPsum1() { + return alliedNPNProdC_THPsum1; + } + public void setAlliedNPNProdC_THPsum1(String alliedNPNProdC_THPsum1) { + this.alliedNPNProdC_THPsum1 = alliedNPNProdC_THPsum1; + } + public String getAlliedNPNProdH_calc1() { + return alliedNPNProdH_calc1; + } + public void setAlliedNPNProdH_calc1(String alliedNPNProdH_calc1) { + this.alliedNPNProdH_calc1 = alliedNPNProdH_calc1; + } + public String getAlliedNPNProdH_calc2() { + return alliedNPNProdH_calc2; + } + public void setAlliedNPNProdH_calc2(String alliedNPNProdH_calc2) { + this.alliedNPNProdH_calc2 = alliedNPNProdH_calc2; + } + public String getAlliedNPNProdH_calc3() { + return alliedNPNProdH_calc3; + } + public void setAlliedNPNProdH_calc3(String alliedNPNProdH_calc3) { + this.alliedNPNProdH_calc3 = alliedNPNProdH_calc3; + } + public String getAlliedNPNProdH_calc4() { + return alliedNPNProdH_calc4; + } + public void setAlliedNPNProdH_calc4(String alliedNPNProdH_calc4) { + this.alliedNPNProdH_calc4 = alliedNPNProdH_calc4; + } + public String getAlliedNPNProdH_calc5() { + return alliedNPNProdH_calc5; + } + public void setAlliedNPNProdH_calc5(String alliedNPNProdH_calc5) { + this.alliedNPNProdH_calc5 = alliedNPNProdH_calc5; + } + public String getAlliedNPNProdH_calc6() { + return alliedNPNProdH_calc6; + } + public void setAlliedNPNProdH_calc6(String alliedNPNProdH_calc6) { + this.alliedNPNProdH_calc6 = alliedNPNProdH_calc6; + } + public String getAlliedNPNProdH_calcsum1() { + return alliedNPNProdH_calcsum1; + } + public void setAlliedNPNProdH_calcsum1(String alliedNPNProdH_calcsum1) { + this.alliedNPNProdH_calcsum1 = alliedNPNProdH_calcsum1; + } + public String getAlliedNPNProdH_item11() { + return alliedNPNProdH_item11; + } + public void setAlliedNPNProdH_item11(String alliedNPNProdH_item11) { + this.alliedNPNProdH_item11 = alliedNPNProdH_item11; + } + public String getAlliedNPNProdH_item12() { + return alliedNPNProdH_item12; + } + public void setAlliedNPNProdH_item12(String alliedNPNProdH_item12) { + this.alliedNPNProdH_item12 = alliedNPNProdH_item12; + } + public String getAlliedNPNProdH_item13() { + return alliedNPNProdH_item13; + } + public void setAlliedNPNProdH_item13(String alliedNPNProdH_item13) { + this.alliedNPNProdH_item13 = alliedNPNProdH_item13; + } + public String getAlliedNPNProdH_item14() { + return alliedNPNProdH_item14; + } + public void setAlliedNPNProdH_item14(String alliedNPNProdH_item14) { + this.alliedNPNProdH_item14 = alliedNPNProdH_item14; + } + public String getAlliedNPNProdH_item15() { + return alliedNPNProdH_item15; + } + public void setAlliedNPNProdH_item15(String alliedNPNProdH_item15) { + this.alliedNPNProdH_item15 = alliedNPNProdH_item15; + } + public String getAlliedNPNProdH_item16() { + return alliedNPNProdH_item16; + } + public void setAlliedNPNProdH_item16(String alliedNPNProdH_item16) { + this.alliedNPNProdH_item16 = alliedNPNProdH_item16; + } + public String getAlliedNPNProdH_item21() { + return alliedNPNProdH_item21; + } + public void setAlliedNPNProdH_item21(String alliedNPNProdH_item21) { + this.alliedNPNProdH_item21 = alliedNPNProdH_item21; + } + public String getAlliedNPNProdH_item22() { + return alliedNPNProdH_item22; + } + public void setAlliedNPNProdH_item22(String alliedNPNProdH_item22) { + this.alliedNPNProdH_item22 = alliedNPNProdH_item22; + } + public String getAlliedNPNProdH_item23() { + return alliedNPNProdH_item23; + } + public void setAlliedNPNProdH_item23(String alliedNPNProdH_item23) { + this.alliedNPNProdH_item23 = alliedNPNProdH_item23; + } + public String getAlliedNPNProdH_item24() { + return alliedNPNProdH_item24; + } + public void setAlliedNPNProdH_item24(String alliedNPNProdH_item24) { + this.alliedNPNProdH_item24 = alliedNPNProdH_item24; + } + public String getAlliedNPNProdH_item25() { + return alliedNPNProdH_item25; + } + public void setAlliedNPNProdH_item25(String alliedNPNProdH_item25) { + this.alliedNPNProdH_item25 = alliedNPNProdH_item25; + } + public String getAlliedNPNProdH_item26() { + return alliedNPNProdH_item26; + } + public void setAlliedNPNProdH_item26(String alliedNPNProdH_item26) { + this.alliedNPNProdH_item26 = alliedNPNProdH_item26; + } + public String getAlliedNPNProdH_item31() { + return alliedNPNProdH_item31; + } + public void setAlliedNPNProdH_item31(String alliedNPNProdH_item31) { + this.alliedNPNProdH_item31 = alliedNPNProdH_item31; + } + public String getAlliedNPNProdH_item32() { + return alliedNPNProdH_item32; + } + public void setAlliedNPNProdH_item32(String alliedNPNProdH_item32) { + this.alliedNPNProdH_item32 = alliedNPNProdH_item32; + } + public String getAlliedNPNProdH_item33() { + return alliedNPNProdH_item33; + } + public void setAlliedNPNProdH_item33(String alliedNPNProdH_item33) { + this.alliedNPNProdH_item33 = alliedNPNProdH_item33; + } + public String getAlliedNPNProdH_item34() { + return alliedNPNProdH_item34; + } + public void setAlliedNPNProdH_item34(String alliedNPNProdH_item34) { + this.alliedNPNProdH_item34 = alliedNPNProdH_item34; + } + public String getAlliedNPNProdH_item35() { + return alliedNPNProdH_item35; + } + public void setAlliedNPNProdH_item35(String alliedNPNProdH_item35) { + this.alliedNPNProdH_item35 = alliedNPNProdH_item35; + } + public String getAlliedNPNProdH_item36() { + return alliedNPNProdH_item36; + } + public void setAlliedNPNProdH_item36(String alliedNPNProdH_item36) { + this.alliedNPNProdH_item36 = alliedNPNProdH_item36; + } + public String getAlliedNPNProdH_sum11() { + return alliedNPNProdH_sum11; + } + public void setAlliedNPNProdH_sum11(String alliedNPNProdH_sum11) { + this.alliedNPNProdH_sum11 = alliedNPNProdH_sum11; + } + public String getAlliedNPNProdH_sum21() { + return alliedNPNProdH_sum21; + } + public void setAlliedNPNProdH_sum21(String alliedNPNProdH_sum21) { + this.alliedNPNProdH_sum21 = alliedNPNProdH_sum21; + } + public String getAlliedNPNProdH_sum31() { + return alliedNPNProdH_sum31; + } + public void setAlliedNPNProdH_sum31(String alliedNPNProdH_sum31) { + this.alliedNPNProdH_sum31 = alliedNPNProdH_sum31; + } + public String getAlliedNPNProdH_THP1() { + return alliedNPNProdH_THP1; + } + public void setAlliedNPNProdH_THP1(String alliedNPNProdH_THP1) { + this.alliedNPNProdH_THP1 = alliedNPNProdH_THP1; + } + public String getAlliedNPNProdH_THP2() { + return alliedNPNProdH_THP2; + } + public void setAlliedNPNProdH_THP2(String alliedNPNProdH_THP2) { + this.alliedNPNProdH_THP2 = alliedNPNProdH_THP2; + } + public String getAlliedNPNProdH_THP3() { + return alliedNPNProdH_THP3; + } + public void setAlliedNPNProdH_THP3(String alliedNPNProdH_THP3) { + this.alliedNPNProdH_THP3 = alliedNPNProdH_THP3; + } + public String getAlliedNPNProdH_THP4() { + return alliedNPNProdH_THP4; + } + public void setAlliedNPNProdH_THP4(String alliedNPNProdH_THP4) { + this.alliedNPNProdH_THP4 = alliedNPNProdH_THP4; + } + public String getAlliedNPNProdH_THP5() { + return alliedNPNProdH_THP5; + } + public void setAlliedNPNProdH_THP5(String alliedNPNProdH_THP5) { + this.alliedNPNProdH_THP5 = alliedNPNProdH_THP5; + } + public String getAlliedNPNProdH_THP6() { + return alliedNPNProdH_THP6; + } + public void setAlliedNPNProdH_THP6(String alliedNPNProdH_THP6) { + this.alliedNPNProdH_THP6 = alliedNPNProdH_THP6; + } + public String getAlliedNPNProdH_THPsum1() { + return alliedNPNProdH_THPsum1; + } + public void setAlliedNPNProdH_THPsum1(String alliedNPNProdH_THPsum1) { + this.alliedNPNProdH_THPsum1 = alliedNPNProdH_THPsum1; + } + public String getAlliedNPPercentage1() { + return alliedNPPercentage1; + } + public void setAlliedNPPercentage1(String alliedNPPercentage1) { + this.alliedNPPercentage1 = alliedNPPercentage1; + } + public String getAlliedNPPercentage2() { + return alliedNPPercentage2; + } + public void setAlliedNPPercentage2(String alliedNPPercentage2) { + this.alliedNPPercentage2 = alliedNPPercentage2; + } + public String getAlliedNPPercentage3() { + return alliedNPPercentage3; + } + public void setAlliedNPPercentage3(String alliedNPPercentage3) { + this.alliedNPPercentage3 = alliedNPPercentage3; + } + public String getAlliedNPPercentage4() { + return alliedNPPercentage4; + } + public void setAlliedNPPercentage4(String alliedNPPercentage4) { + this.alliedNPPercentage4 = alliedNPPercentage4; + } + public String getAlliedNPPercentage5() { + return alliedNPPercentage5; + } + public void setAlliedNPPercentage5(String alliedNPPercentage5) { + this.alliedNPPercentage5 = alliedNPPercentage5; + } + public String getAlliedNPPercentage6() { + return alliedNPPercentage6; + } + public void setAlliedNPPercentage6(String alliedNPPercentage6) { + this.alliedNPPercentage6 = alliedNPPercentage6; + } + public String getAlliedNPProdC_calc1() { + return alliedNPProdC_calc1; + } + public void setAlliedNPProdC_calc1(String alliedNPProdC_calc1) { + this.alliedNPProdC_calc1 = alliedNPProdC_calc1; + } + public String getAlliedNPProdC_calc2() { + return alliedNPProdC_calc2; + } + public void setAlliedNPProdC_calc2(String alliedNPProdC_calc2) { + this.alliedNPProdC_calc2 = alliedNPProdC_calc2; + } + public String getAlliedNPProdC_calc3() { + return alliedNPProdC_calc3; + } + public void setAlliedNPProdC_calc3(String alliedNPProdC_calc3) { + this.alliedNPProdC_calc3 = alliedNPProdC_calc3; + } + public String getAlliedNPProdC_calc4() { + return alliedNPProdC_calc4; + } + public void setAlliedNPProdC_calc4(String alliedNPProdC_calc4) { + this.alliedNPProdC_calc4 = alliedNPProdC_calc4; + } + public String getAlliedNPProdC_calc5() { + return alliedNPProdC_calc5; + } + public void setAlliedNPProdC_calc5(String alliedNPProdC_calc5) { + this.alliedNPProdC_calc5 = alliedNPProdC_calc5; + } + public String getAlliedNPProdC_calc6() { + return alliedNPProdC_calc6; + } + public void setAlliedNPProdC_calc6(String alliedNPProdC_calc6) { + this.alliedNPProdC_calc6 = alliedNPProdC_calc6; + } + public String getAlliedNPProdC_calcsum1() { + return alliedNPProdC_calcsum1; + } + public void setAlliedNPProdC_calcsum1(String alliedNPProdC_calcsum1) { + this.alliedNPProdC_calcsum1 = alliedNPProdC_calcsum1; + } + public String getAlliedNPProdC_item11() { + return alliedNPProdC_item11; + } + public void setAlliedNPProdC_item11(String alliedNPProdC_item11) { + this.alliedNPProdC_item11 = alliedNPProdC_item11; + } + public String getAlliedNPProdC_item12() { + return alliedNPProdC_item12; + } + public void setAlliedNPProdC_item12(String alliedNPProdC_item12) { + this.alliedNPProdC_item12 = alliedNPProdC_item12; + } + public String getAlliedNPProdC_item13() { + return alliedNPProdC_item13; + } + public void setAlliedNPProdC_item13(String alliedNPProdC_item13) { + this.alliedNPProdC_item13 = alliedNPProdC_item13; + } + public String getAlliedNPProdC_item14() { + return alliedNPProdC_item14; + } + public void setAlliedNPProdC_item14(String alliedNPProdC_item14) { + this.alliedNPProdC_item14 = alliedNPProdC_item14; + } + public String getAlliedNPProdC_item15() { + return alliedNPProdC_item15; + } + public void setAlliedNPProdC_item15(String alliedNPProdC_item15) { + this.alliedNPProdC_item15 = alliedNPProdC_item15; + } + public String getAlliedNPProdC_item16() { + return alliedNPProdC_item16; + } + public void setAlliedNPProdC_item16(String alliedNPProdC_item16) { + this.alliedNPProdC_item16 = alliedNPProdC_item16; + } + public String getAlliedNPProdC_item21() { + return alliedNPProdC_item21; + } + public void setAlliedNPProdC_item21(String alliedNPProdC_item21) { + this.alliedNPProdC_item21 = alliedNPProdC_item21; + } + public String getAlliedNPProdC_item22() { + return alliedNPProdC_item22; + } + public void setAlliedNPProdC_item22(String alliedNPProdC_item22) { + this.alliedNPProdC_item22 = alliedNPProdC_item22; + } + public String getAlliedNPProdC_item23() { + return alliedNPProdC_item23; + } + public void setAlliedNPProdC_item23(String alliedNPProdC_item23) { + this.alliedNPProdC_item23 = alliedNPProdC_item23; + } + public String getAlliedNPProdC_item24() { + return alliedNPProdC_item24; + } + public void setAlliedNPProdC_item24(String alliedNPProdC_item24) { + this.alliedNPProdC_item24 = alliedNPProdC_item24; + } + public String getAlliedNPProdC_item25() { + return alliedNPProdC_item25; + } + public void setAlliedNPProdC_item25(String alliedNPProdC_item25) { + this.alliedNPProdC_item25 = alliedNPProdC_item25; + } + public String getAlliedNPProdC_item26() { + return alliedNPProdC_item26; + } + public void setAlliedNPProdC_item26(String alliedNPProdC_item26) { + this.alliedNPProdC_item26 = alliedNPProdC_item26; + } + public String getAlliedNPProdC_sub1() { + return alliedNPProdC_sub1; + } + public void setAlliedNPProdC_sub1(String alliedNPProdC_sub1) { + this.alliedNPProdC_sub1 = alliedNPProdC_sub1; + } + public String getAlliedNPProdC_sub2() { + return alliedNPProdC_sub2; + } + public void setAlliedNPProdC_sub2(String alliedNPProdC_sub2) { + this.alliedNPProdC_sub2 = alliedNPProdC_sub2; + } + public String getAlliedNPProdC_sub3() { + return alliedNPProdC_sub3; + } + public void setAlliedNPProdC_sub3(String alliedNPProdC_sub3) { + this.alliedNPProdC_sub3 = alliedNPProdC_sub3; + } + public String getAlliedNPProdC_sub4() { + return alliedNPProdC_sub4; + } + public void setAlliedNPProdC_sub4(String alliedNPProdC_sub4) { + this.alliedNPProdC_sub4 = alliedNPProdC_sub4; + } + public String getAlliedNPProdC_sub5() { + return alliedNPProdC_sub5; + } + public void setAlliedNPProdC_sub5(String alliedNPProdC_sub5) { + this.alliedNPProdC_sub5 = alliedNPProdC_sub5; + } + public String getAlliedNPProdC_sub6() { + return alliedNPProdC_sub6; + } + public void setAlliedNPProdC_sub6(String alliedNPProdC_sub6) { + this.alliedNPProdC_sub6 = alliedNPProdC_sub6; + } + public String getAlliedNPProdC_subsum1() { + return alliedNPProdC_subsum1; + } + public void setAlliedNPProdC_subsum1(String alliedNPProdC_subsum1) { + this.alliedNPProdC_subsum1 = alliedNPProdC_subsum1; + } + public String getAlliedNPProdC_sum11() { + return alliedNPProdC_sum11; + } + public void setAlliedNPProdC_sum11(String alliedNPProdC_sum11) { + this.alliedNPProdC_sum11 = alliedNPProdC_sum11; + } + public String getAlliedNPProdC_sum21() { + return alliedNPProdC_sum21; + } + public void setAlliedNPProdC_sum21(String alliedNPProdC_sum21) { + this.alliedNPProdC_sum21 = alliedNPProdC_sum21; + } + public String getAlliedNPProdC_THP1() { + return alliedNPProdC_THP1; + } + public void setAlliedNPProdC_THP1(String alliedNPProdC_THP1) { + this.alliedNPProdC_THP1 = alliedNPProdC_THP1; + } + public String getAlliedNPProdC_THP2() { + return alliedNPProdC_THP2; + } + public void setAlliedNPProdC_THP2(String alliedNPProdC_THP2) { + this.alliedNPProdC_THP2 = alliedNPProdC_THP2; + } + public String getAlliedNPProdC_THP3() { + return alliedNPProdC_THP3; + } + public void setAlliedNPProdC_THP3(String alliedNPProdC_THP3) { + this.alliedNPProdC_THP3 = alliedNPProdC_THP3; + } + public String getAlliedNPProdC_THP4() { + return alliedNPProdC_THP4; + } + public void setAlliedNPProdC_THP4(String alliedNPProdC_THP4) { + this.alliedNPProdC_THP4 = alliedNPProdC_THP4; + } + public String getAlliedNPProdC_THP5() { + return alliedNPProdC_THP5; + } + public void setAlliedNPProdC_THP5(String alliedNPProdC_THP5) { + this.alliedNPProdC_THP5 = alliedNPProdC_THP5; + } + public String getAlliedNPProdC_THP6() { + return alliedNPProdC_THP6; + } + public void setAlliedNPProdC_THP6(String alliedNPProdC_THP6) { + this.alliedNPProdC_THP6 = alliedNPProdC_THP6; + } + public String getAlliedNPProdC_THPsum1() { + return alliedNPProdC_THPsum1; + } + public void setAlliedNPProdC_THPsum1(String alliedNPProdC_THPsum1) { + this.alliedNPProdC_THPsum1 = alliedNPProdC_THPsum1; + } + public String getAlliedNPProdCCS_subsum1() { + return alliedNPProdCCS_subsum1; + } + public void setAlliedNPProdCCS_subsum1(String alliedNPProdCCS_subsum1) { + this.alliedNPProdCCS_subsum1 = alliedNPProdCCS_subsum1; + } + public String getAlliedNPProdCCS1() { + return alliedNPProdCCS1; + } + public void setAlliedNPProdCCS1(String alliedNPProdCCS1) { + this.alliedNPProdCCS1 = alliedNPProdCCS1; + } + public String getAlliedNPProdCCS2() { + return alliedNPProdCCS2; + } + public void setAlliedNPProdCCS2(String alliedNPProdCCS2) { + this.alliedNPProdCCS2 = alliedNPProdCCS2; + } + public String getAlliedNPProdCCS3() { + return alliedNPProdCCS3; + } + public void setAlliedNPProdCCS3(String alliedNPProdCCS3) { + this.alliedNPProdCCS3 = alliedNPProdCCS3; + } + public String getAlliedNPProdCCS4() { + return alliedNPProdCCS4; + } + public void setAlliedNPProdCCS4(String alliedNPProdCCS4) { + this.alliedNPProdCCS4 = alliedNPProdCCS4; + } + public String getAlliedNPProdCCS5() { + return alliedNPProdCCS5; + } + public void setAlliedNPProdCCS5(String alliedNPProdCCS5) { + this.alliedNPProdCCS5 = alliedNPProdCCS5; + } + public String getAlliedNPProdCCS6() { + return alliedNPProdCCS6; + } + public void setAlliedNPProdCCS6(String alliedNPProdCCS6) { + this.alliedNPProdCCS6 = alliedNPProdCCS6; + } + public String getAlliedNPProdH_calc1() { + return alliedNPProdH_calc1; + } + public void setAlliedNPProdH_calc1(String alliedNPProdH_calc1) { + this.alliedNPProdH_calc1 = alliedNPProdH_calc1; + } + public String getAlliedNPProdH_calc2() { + return alliedNPProdH_calc2; + } + public void setAlliedNPProdH_calc2(String alliedNPProdH_calc2) { + this.alliedNPProdH_calc2 = alliedNPProdH_calc2; + } + public String getAlliedNPProdH_calc3() { + return alliedNPProdH_calc3; + } + public void setAlliedNPProdH_calc3(String alliedNPProdH_calc3) { + this.alliedNPProdH_calc3 = alliedNPProdH_calc3; + } + public String getAlliedNPProdH_calc4() { + return alliedNPProdH_calc4; + } + public void setAlliedNPProdH_calc4(String alliedNPProdH_calc4) { + this.alliedNPProdH_calc4 = alliedNPProdH_calc4; + } + public String getAlliedNPProdH_calc5() { + return alliedNPProdH_calc5; + } + public void setAlliedNPProdH_calc5(String alliedNPProdH_calc5) { + this.alliedNPProdH_calc5 = alliedNPProdH_calc5; + } + public String getAlliedNPProdH_calc6() { + return alliedNPProdH_calc6; + } + public void setAlliedNPProdH_calc6(String alliedNPProdH_calc6) { + this.alliedNPProdH_calc6 = alliedNPProdH_calc6; + } + public String getAlliedNPProdH_calcsum1() { + return alliedNPProdH_calcsum1; + } + public void setAlliedNPProdH_calcsum1(String alliedNPProdH_calcsum1) { + this.alliedNPProdH_calcsum1 = alliedNPProdH_calcsum1; + } + public String getAlliedNPProdH_item11() { + return alliedNPProdH_item11; + } + public void setAlliedNPProdH_item11(String alliedNPProdH_item11) { + this.alliedNPProdH_item11 = alliedNPProdH_item11; + } + public String getAlliedNPProdH_item12() { + return alliedNPProdH_item12; + } + public void setAlliedNPProdH_item12(String alliedNPProdH_item12) { + this.alliedNPProdH_item12 = alliedNPProdH_item12; + } + public String getAlliedNPProdH_item13() { + return alliedNPProdH_item13; + } + public void setAlliedNPProdH_item13(String alliedNPProdH_item13) { + this.alliedNPProdH_item13 = alliedNPProdH_item13; + } + public String getAlliedNPProdH_item14() { + return alliedNPProdH_item14; + } + public void setAlliedNPProdH_item14(String alliedNPProdH_item14) { + this.alliedNPProdH_item14 = alliedNPProdH_item14; + } + public String getAlliedNPProdH_item15() { + return alliedNPProdH_item15; + } + public void setAlliedNPProdH_item15(String alliedNPProdH_item15) { + this.alliedNPProdH_item15 = alliedNPProdH_item15; + } + public String getAlliedNPProdH_item16() { + return alliedNPProdH_item16; + } + public void setAlliedNPProdH_item16(String alliedNPProdH_item16) { + this.alliedNPProdH_item16 = alliedNPProdH_item16; + } + public String getAlliedNPProdH_item21() { + return alliedNPProdH_item21; + } + public void setAlliedNPProdH_item21(String alliedNPProdH_item21) { + this.alliedNPProdH_item21 = alliedNPProdH_item21; + } + public String getAlliedNPProdH_item22() { + return alliedNPProdH_item22; + } + public void setAlliedNPProdH_item22(String alliedNPProdH_item22) { + this.alliedNPProdH_item22 = alliedNPProdH_item22; + } + public String getAlliedNPProdH_item23() { + return alliedNPProdH_item23; + } + public void setAlliedNPProdH_item23(String alliedNPProdH_item23) { + this.alliedNPProdH_item23 = alliedNPProdH_item23; + } + public String getAlliedNPProdH_item24() { + return alliedNPProdH_item24; + } + public void setAlliedNPProdH_item24(String alliedNPProdH_item24) { + this.alliedNPProdH_item24 = alliedNPProdH_item24; + } + public String getAlliedNPProdH_item25() { + return alliedNPProdH_item25; + } + public void setAlliedNPProdH_item25(String alliedNPProdH_item25) { + this.alliedNPProdH_item25 = alliedNPProdH_item25; + } + public String getAlliedNPProdH_item26() { + return alliedNPProdH_item26; + } + public void setAlliedNPProdH_item26(String alliedNPProdH_item26) { + this.alliedNPProdH_item26 = alliedNPProdH_item26; + } + public String getAlliedNPProdH_sub1() { + return alliedNPProdH_sub1; + } + public void setAlliedNPProdH_sub1(String alliedNPProdH_sub1) { + this.alliedNPProdH_sub1 = alliedNPProdH_sub1; + } + public String getAlliedNPProdH_sub2() { + return alliedNPProdH_sub2; + } + public void setAlliedNPProdH_sub2(String alliedNPProdH_sub2) { + this.alliedNPProdH_sub2 = alliedNPProdH_sub2; + } + public String getAlliedNPProdH_sub3() { + return alliedNPProdH_sub3; + } + public void setAlliedNPProdH_sub3(String alliedNPProdH_sub3) { + this.alliedNPProdH_sub3 = alliedNPProdH_sub3; + } + public String getAlliedNPProdH_sub4() { + return alliedNPProdH_sub4; + } + public void setAlliedNPProdH_sub4(String alliedNPProdH_sub4) { + this.alliedNPProdH_sub4 = alliedNPProdH_sub4; + } + public String getAlliedNPProdH_sub5() { + return alliedNPProdH_sub5; + } + public void setAlliedNPProdH_sub5(String alliedNPProdH_sub5) { + this.alliedNPProdH_sub5 = alliedNPProdH_sub5; + } + public String getAlliedNPProdH_sub6() { + return alliedNPProdH_sub6; + } + public void setAlliedNPProdH_sub6(String alliedNPProdH_sub6) { + this.alliedNPProdH_sub6 = alliedNPProdH_sub6; + } + public String getAlliedNPProdH_subsum1() { + return alliedNPProdH_subsum1; + } + public void setAlliedNPProdH_subsum1(String alliedNPProdH_subsum1) { + this.alliedNPProdH_subsum1 = alliedNPProdH_subsum1; + } + public String getAlliedNPProdH_sum11() { + return alliedNPProdH_sum11; + } + public void setAlliedNPProdH_sum11(String alliedNPProdH_sum11) { + this.alliedNPProdH_sum11 = alliedNPProdH_sum11; + } + public String getAlliedNPProdH_sum21() { + return alliedNPProdH_sum21; + } + public void setAlliedNPProdH_sum21(String alliedNPProdH_sum21) { + this.alliedNPProdH_sum21 = alliedNPProdH_sum21; + } + public String getAlliedNPProdH_THP1() { + return alliedNPProdH_THP1; + } + public void setAlliedNPProdH_THP1(String alliedNPProdH_THP1) { + this.alliedNPProdH_THP1 = alliedNPProdH_THP1; + } + public String getAlliedNPProdH_THP2() { + return alliedNPProdH_THP2; + } + public void setAlliedNPProdH_THP2(String alliedNPProdH_THP2) { + this.alliedNPProdH_THP2 = alliedNPProdH_THP2; + } + public String getAlliedNPProdH_THP3() { + return alliedNPProdH_THP3; + } + public void setAlliedNPProdH_THP3(String alliedNPProdH_THP3) { + this.alliedNPProdH_THP3 = alliedNPProdH_THP3; + } + public String getAlliedNPProdH_THP4() { + return alliedNPProdH_THP4; + } + public void setAlliedNPProdH_THP4(String alliedNPProdH_THP4) { + this.alliedNPProdH_THP4 = alliedNPProdH_THP4; + } + public String getAlliedNPProdH_THP5() { + return alliedNPProdH_THP5; + } + public void setAlliedNPProdH_THP5(String alliedNPProdH_THP5) { + this.alliedNPProdH_THP5 = alliedNPProdH_THP5; + } + public String getAlliedNPProdH_THP6() { + return alliedNPProdH_THP6; + } + public void setAlliedNPProdH_THP6(String alliedNPProdH_THP6) { + this.alliedNPProdH_THP6 = alliedNPProdH_THP6; + } + public String getAlliedNPProdH_THPsum1() { + return alliedNPProdH_THPsum1; + } + public void setAlliedNPProdH_THPsum1(String alliedNPProdH_THPsum1) { + this.alliedNPProdH_THPsum1 = alliedNPProdH_THPsum1; + } + public String getAlliedNPProdHCS_subsum1() { + return alliedNPProdHCS_subsum1; + } + public void setAlliedNPProdHCS_subsum1(String alliedNPProdHCS_subsum1) { + this.alliedNPProdHCS_subsum1 = alliedNPProdHCS_subsum1; + } + public String getAlliedNPProdHCS1() { + return alliedNPProdHCS1; + } + public void setAlliedNPProdHCS1(String alliedNPProdHCS1) { + this.alliedNPProdHCS1 = alliedNPProdHCS1; + } + public String getAlliedNPProdHCS2() { + return alliedNPProdHCS2; + } + public void setAlliedNPProdHCS2(String alliedNPProdHCS2) { + this.alliedNPProdHCS2 = alliedNPProdHCS2; + } + public String getAlliedNPProdHCS3() { + return alliedNPProdHCS3; + } + public void setAlliedNPProdHCS3(String alliedNPProdHCS3) { + this.alliedNPProdHCS3 = alliedNPProdHCS3; + } + public String getAlliedNPProdHCS4() { + return alliedNPProdHCS4; + } + public void setAlliedNPProdHCS4(String alliedNPProdHCS4) { + this.alliedNPProdHCS4 = alliedNPProdHCS4; + } + public String getAlliedNPProdHCS5() { + return alliedNPProdHCS5; + } + public void setAlliedNPProdHCS5(String alliedNPProdHCS5) { + this.alliedNPProdHCS5 = alliedNPProdHCS5; + } + public String getAlliedNPProdHCS6() { + return alliedNPProdHCS6; + } + public void setAlliedNPProdHCS6(String alliedNPProdHCS6) { + this.alliedNPProdHCS6 = alliedNPProdHCS6; + } + public String getAlliedNPProvider1() { + return alliedNPProvider1; + } + public void setAlliedNPProvider1(String alliedNPProvider1) { + this.alliedNPProvider1 = alliedNPProvider1; + } + public String getAlliedNPProvider2() { + return alliedNPProvider2; + } + public void setAlliedNPProvider2(String alliedNPProvider2) { + this.alliedNPProvider2 = alliedNPProvider2; + } + public String getAlliedNPProvider3() { + return alliedNPProvider3; + } + public void setAlliedNPProvider3(String alliedNPProvider3) { + this.alliedNPProvider3 = alliedNPProvider3; + } + public String getAlliedNPProvider4() { + return alliedNPProvider4; + } + public void setAlliedNPProvider4(String alliedNPProvider4) { + this.alliedNPProvider4 = alliedNPProvider4; + } + public String getAlliedNPProvider5() { + return alliedNPProvider5; + } + public void setAlliedNPProvider5(String alliedNPProvider5) { + this.alliedNPProvider5 = alliedNPProvider5; + } + public String getAlliedNPProvider6() { + return alliedNPProvider6; + } + public void setAlliedNPProvider6(String alliedNPProvider6) { + this.alliedNPProvider6 = alliedNPProvider6; + } + public String getAlliedNProdC_sum21() { + return alliedNProdC_sum21; + } + public void setAlliedNProdC_sum21(String alliedNProdC_sum21) { + this.alliedNProdC_sum21 = alliedNProdC_sum21; + } + public String getAlliedNProdH_sum21() { + return alliedNProdH_sum21; + } + public void setAlliedNProdH_sum21(String alliedNProdH_sum21) { + this.alliedNProdH_sum21 = alliedNProdH_sum21; + } + public String getAlliedNPStaffRate_total() { + return alliedNPStaffRate_total; + } + public void setAlliedNPStaffRate_total(String alliedNPStaffRate_total) { + this.alliedNPStaffRate_total = alliedNPStaffRate_total; + } + public String getAlliedNPStaffRate1() { + return alliedNPStaffRate1; + } + public void setAlliedNPStaffRate1(String alliedNPStaffRate1) { + this.alliedNPStaffRate1 = alliedNPStaffRate1; + } + public String getAlliedNPStaffRate2() { + return alliedNPStaffRate2; + } + public void setAlliedNPStaffRate2(String alliedNPStaffRate2) { + this.alliedNPStaffRate2 = alliedNPStaffRate2; + } + public String getAlliedNPStaffRate3() { + return alliedNPStaffRate3; + } + public void setAlliedNPStaffRate3(String alliedNPStaffRate3) { + this.alliedNPStaffRate3 = alliedNPStaffRate3; + } + public String getAlliedNPStaffRate4() { + return alliedNPStaffRate4; + } + public void setAlliedNPStaffRate4(String alliedNPStaffRate4) { + this.alliedNPStaffRate4 = alliedNPStaffRate4; + } + public String getAlliedNPStaffRate5() { + return alliedNPStaffRate5; + } + public void setAlliedNPStaffRate5(String alliedNPStaffRate5) { + this.alliedNPStaffRate5 = alliedNPStaffRate5; + } + public String getAlliedNPStaffRate6() { + return alliedNPStaffRate6; + } + public void setAlliedNPStaffRate6(String alliedNPStaffRate6) { + this.alliedNPStaffRate6 = alliedNPStaffRate6; + } + public String getAlliedProfContractRate_total() { + return alliedProfContractRate_total; + } + public void setAlliedProfContractRate_total(String alliedProfContractRate_total) { + this.alliedProfContractRate_total = alliedProfContractRate_total; + } + public String getAlliedProfContractRate1() { + return alliedProfContractRate1; + } + public void setAlliedProfContractRate1(String alliedProfContractRate1) { + this.alliedProfContractRate1 = alliedProfContractRate1; + } + public String getAlliedProfContractRate2() { + return alliedProfContractRate2; + } + public void setAlliedProfContractRate2(String alliedProfContractRate2) { + this.alliedProfContractRate2 = alliedProfContractRate2; + } + public String getAlliedProfContractRate3() { + return alliedProfContractRate3; + } + public void setAlliedProfContractRate3(String alliedProfContractRate3) { + this.alliedProfContractRate3 = alliedProfContractRate3; + } + public String getAlliedProfContractRate4() { + return alliedProfContractRate4; + } + public void setAlliedProfContractRate4(String alliedProfContractRate4) { + this.alliedProfContractRate4 = alliedProfContractRate4; + } + public String getAlliedProfContractRate5() { + return alliedProfContractRate5; + } + public void setAlliedProfContractRate5(String alliedProfContractRate5) { + this.alliedProfContractRate5 = alliedProfContractRate5; + } + public String getAlliedProfCost_total() { + return alliedProfCost_total; + } + public void setAlliedProfCost_total(String alliedProfCost_total) { + this.alliedProfCost_total = alliedProfCost_total; + } + public String getAlliedProfCost1() { + return alliedProfCost1; + } + public void setAlliedProfCost1(String alliedProfCost1) { + this.alliedProfCost1 = alliedProfCost1; + } + public String getAlliedProfCost2() { + return alliedProfCost2; + } + public void setAlliedProfCost2(String alliedProfCost2) { + this.alliedProfCost2 = alliedProfCost2; + } + public String getAlliedProfCost3() { + return alliedProfCost3; + } + public void setAlliedProfCost3(String alliedProfCost3) { + this.alliedProfCost3 = alliedProfCost3; + } + public String getAlliedProfCost4() { + return alliedProfCost4; + } + public void setAlliedProfCost4(String alliedProfCost4) { + this.alliedProfCost4 = alliedProfCost4; + } + public String getAlliedProfCost5() { + return alliedProfCost5; + } + public void setAlliedProfCost5(String alliedProfCost5) { + this.alliedProfCost5 = alliedProfCost5; + } + public String getAlliedProfNProdC_calc1() { + return alliedProfNProdC_calc1; + } + public void setAlliedProfNProdC_calc1(String alliedProfNProdC_calc1) { + this.alliedProfNProdC_calc1 = alliedProfNProdC_calc1; + } + public String getAlliedProfNProdC_calc2() { + return alliedProfNProdC_calc2; + } + public void setAlliedProfNProdC_calc2(String alliedProfNProdC_calc2) { + this.alliedProfNProdC_calc2 = alliedProfNProdC_calc2; + } + public String getAlliedProfNProdC_calc3() { + return alliedProfNProdC_calc3; + } + public void setAlliedProfNProdC_calc3(String alliedProfNProdC_calc3) { + this.alliedProfNProdC_calc3 = alliedProfNProdC_calc3; + } + public String getAlliedProfNProdC_calc4() { + return alliedProfNProdC_calc4; + } + public void setAlliedProfNProdC_calc4(String alliedProfNProdC_calc4) { + this.alliedProfNProdC_calc4 = alliedProfNProdC_calc4; + } + public String getAlliedProfNProdC_calc5() { + return alliedProfNProdC_calc5; + } + public void setAlliedProfNProdC_calc5(String alliedProfNProdC_calc5) { + this.alliedProfNProdC_calc5 = alliedProfNProdC_calc5; + } + public String getAlliedProfNProdC_calcsum1() { + return alliedProfNProdC_calcsum1; + } + public void setAlliedProfNProdC_calcsum1(String alliedProfNProdC_calcsum1) { + this.alliedProfNProdC_calcsum1 = alliedProfNProdC_calcsum1; + } + public String getAlliedProfNProdC_item11() { + return alliedProfNProdC_item11; + } + public void setAlliedProfNProdC_item11(String alliedProfNProdC_item11) { + this.alliedProfNProdC_item11 = alliedProfNProdC_item11; + } + public String getAlliedProfNProdC_item12() { + return alliedProfNProdC_item12; + } + public void setAlliedProfNProdC_item12(String alliedProfNProdC_item12) { + this.alliedProfNProdC_item12 = alliedProfNProdC_item12; + } + public String getAlliedProfNProdC_item13() { + return alliedProfNProdC_item13; + } + public void setAlliedProfNProdC_item13(String alliedProfNProdC_item13) { + this.alliedProfNProdC_item13 = alliedProfNProdC_item13; + } + public String getAlliedProfNProdC_item14() { + return alliedProfNProdC_item14; + } + public void setAlliedProfNProdC_item14(String alliedProfNProdC_item14) { + this.alliedProfNProdC_item14 = alliedProfNProdC_item14; + } + public String getAlliedProfNProdC_item15() { + return alliedProfNProdC_item15; + } + public void setAlliedProfNProdC_item15(String alliedProfNProdC_item15) { + this.alliedProfNProdC_item15 = alliedProfNProdC_item15; + } + public String getAlliedProfNProdC_item21() { + return alliedProfNProdC_item21; + } + public void setAlliedProfNProdC_item21(String alliedProfNProdC_item21) { + this.alliedProfNProdC_item21 = alliedProfNProdC_item21; + } + public String getAlliedProfNProdC_item22() { + return alliedProfNProdC_item22; + } + public void setAlliedProfNProdC_item22(String alliedProfNProdC_item22) { + this.alliedProfNProdC_item22 = alliedProfNProdC_item22; + } + public String getAlliedProfNProdC_item23() { + return alliedProfNProdC_item23; + } + public void setAlliedProfNProdC_item23(String alliedProfNProdC_item23) { + this.alliedProfNProdC_item23 = alliedProfNProdC_item23; + } + public String getAlliedProfNProdC_item24() { + return alliedProfNProdC_item24; + } + public void setAlliedProfNProdC_item24(String alliedProfNProdC_item24) { + this.alliedProfNProdC_item24 = alliedProfNProdC_item24; + } + public String getAlliedProfNProdC_item25() { + return alliedProfNProdC_item25; + } + public void setAlliedProfNProdC_item25(String alliedProfNProdC_item25) { + this.alliedProfNProdC_item25 = alliedProfNProdC_item25; + } + public String getAlliedProfNProdC_item31() { + return alliedProfNProdC_item31; + } + public void setAlliedProfNProdC_item31(String alliedProfNProdC_item31) { + this.alliedProfNProdC_item31 = alliedProfNProdC_item31; + } + public String getAlliedProfNProdC_item32() { + return alliedProfNProdC_item32; + } + public void setAlliedProfNProdC_item32(String alliedProfNProdC_item32) { + this.alliedProfNProdC_item32 = alliedProfNProdC_item32; + } + public String getAlliedProfNProdC_item33() { + return alliedProfNProdC_item33; + } + public void setAlliedProfNProdC_item33(String alliedProfNProdC_item33) { + this.alliedProfNProdC_item33 = alliedProfNProdC_item33; + } + public String getAlliedProfNProdC_item34() { + return alliedProfNProdC_item34; + } + public void setAlliedProfNProdC_item34(String alliedProfNProdC_item34) { + this.alliedProfNProdC_item34 = alliedProfNProdC_item34; + } + public String getAlliedProfNProdC_item35() { + return alliedProfNProdC_item35; + } + public void setAlliedProfNProdC_item35(String alliedProfNProdC_item35) { + this.alliedProfNProdC_item35 = alliedProfNProdC_item35; + } + public String getAlliedProfNProdC_sum11() { + return alliedProfNProdC_sum11; + } + public void setAlliedProfNProdC_sum11(String alliedProfNProdC_sum11) { + this.alliedProfNProdC_sum11 = alliedProfNProdC_sum11; + } + public String getAlliedProfNProdC_sum31() { + return alliedProfNProdC_sum31; + } + public void setAlliedProfNProdC_sum31(String alliedProfNProdC_sum31) { + this.alliedProfNProdC_sum31 = alliedProfNProdC_sum31; + } + public String getAlliedProfNProdC_THP1() { + return alliedProfNProdC_THP1; + } + public void setAlliedProfNProdC_THP1(String alliedProfNProdC_THP1) { + this.alliedProfNProdC_THP1 = alliedProfNProdC_THP1; + } + public String getAlliedProfNProdC_THP2() { + return alliedProfNProdC_THP2; + } + public void setAlliedProfNProdC_THP2(String alliedProfNProdC_THP2) { + this.alliedProfNProdC_THP2 = alliedProfNProdC_THP2; + } + public String getAlliedProfNProdC_THP3() { + return alliedProfNProdC_THP3; + } + public void setAlliedProfNProdC_THP3(String alliedProfNProdC_THP3) { + this.alliedProfNProdC_THP3 = alliedProfNProdC_THP3; + } + public String getAlliedProfNProdC_THP4() { + return alliedProfNProdC_THP4; + } + public void setAlliedProfNProdC_THP4(String alliedProfNProdC_THP4) { + this.alliedProfNProdC_THP4 = alliedProfNProdC_THP4; + } + public String getAlliedProfNProdC_THP5() { + return alliedProfNProdC_THP5; + } + public void setAlliedProfNProdC_THP5(String alliedProfNProdC_THP5) { + this.alliedProfNProdC_THP5 = alliedProfNProdC_THP5; + } + public String getAlliedProfNProdC_THPsum1() { + return alliedProfNProdC_THPsum1; + } + public void setAlliedProfNProdC_THPsum1(String alliedProfNProdC_THPsum1) { + this.alliedProfNProdC_THPsum1 = alliedProfNProdC_THPsum1; + } + public String getAlliedProfNProdH_calc1() { + return alliedProfNProdH_calc1; + } + public void setAlliedProfNProdH_calc1(String alliedProfNProdH_calc1) { + this.alliedProfNProdH_calc1 = alliedProfNProdH_calc1; + } + public String getAlliedProfNProdH_calc2() { + return alliedProfNProdH_calc2; + } + public void setAlliedProfNProdH_calc2(String alliedProfNProdH_calc2) { + this.alliedProfNProdH_calc2 = alliedProfNProdH_calc2; + } + public String getAlliedProfNProdH_calc3() { + return alliedProfNProdH_calc3; + } + public void setAlliedProfNProdH_calc3(String alliedProfNProdH_calc3) { + this.alliedProfNProdH_calc3 = alliedProfNProdH_calc3; + } + public String getAlliedProfNProdH_calc4() { + return alliedProfNProdH_calc4; + } + public void setAlliedProfNProdH_calc4(String alliedProfNProdH_calc4) { + this.alliedProfNProdH_calc4 = alliedProfNProdH_calc4; + } + public String getAlliedProfNProdH_calc5() { + return alliedProfNProdH_calc5; + } + public void setAlliedProfNProdH_calc5(String alliedProfNProdH_calc5) { + this.alliedProfNProdH_calc5 = alliedProfNProdH_calc5; + } + public String getAlliedProfNProdH_calcsum1() { + return alliedProfNProdH_calcsum1; + } + public void setAlliedProfNProdH_calcsum1(String alliedProfNProdH_calcsum1) { + this.alliedProfNProdH_calcsum1 = alliedProfNProdH_calcsum1; + } + public String getAlliedProfNProdH_item11() { + return alliedProfNProdH_item11; + } + public void setAlliedProfNProdH_item11(String alliedProfNProdH_item11) { + this.alliedProfNProdH_item11 = alliedProfNProdH_item11; + } + public String getAlliedProfNProdH_item12() { + return alliedProfNProdH_item12; + } + public void setAlliedProfNProdH_item12(String alliedProfNProdH_item12) { + this.alliedProfNProdH_item12 = alliedProfNProdH_item12; + } + public String getAlliedProfNProdH_item13() { + return alliedProfNProdH_item13; + } + public void setAlliedProfNProdH_item13(String alliedProfNProdH_item13) { + this.alliedProfNProdH_item13 = alliedProfNProdH_item13; + } + public String getAlliedProfNProdH_item14() { + return alliedProfNProdH_item14; + } + public void setAlliedProfNProdH_item14(String alliedProfNProdH_item14) { + this.alliedProfNProdH_item14 = alliedProfNProdH_item14; + } + public String getAlliedProfNProdH_item15() { + return alliedProfNProdH_item15; + } + public void setAlliedProfNProdH_item15(String alliedProfNProdH_item15) { + this.alliedProfNProdH_item15 = alliedProfNProdH_item15; + } + public String getAlliedProfNProdH_item21() { + return alliedProfNProdH_item21; + } + public void setAlliedProfNProdH_item21(String alliedProfNProdH_item21) { + this.alliedProfNProdH_item21 = alliedProfNProdH_item21; + } + public String getAlliedProfNProdH_item22() { + return alliedProfNProdH_item22; + } + public void setAlliedProfNProdH_item22(String alliedProfNProdH_item22) { + this.alliedProfNProdH_item22 = alliedProfNProdH_item22; + } + public String getAlliedProfNProdH_item23() { + return alliedProfNProdH_item23; + } + public void setAlliedProfNProdH_item23(String alliedProfNProdH_item23) { + this.alliedProfNProdH_item23 = alliedProfNProdH_item23; + } + public String getAlliedProfNProdH_item24() { + return alliedProfNProdH_item24; + } + public void setAlliedProfNProdH_item24(String alliedProfNProdH_item24) { + this.alliedProfNProdH_item24 = alliedProfNProdH_item24; + } + public String getAlliedProfNProdH_item25() { + return alliedProfNProdH_item25; + } + public void setAlliedProfNProdH_item25(String alliedProfNProdH_item25) { + this.alliedProfNProdH_item25 = alliedProfNProdH_item25; + } + public String getAlliedProfNProdH_item31() { + return alliedProfNProdH_item31; + } + public void setAlliedProfNProdH_item31(String alliedProfNProdH_item31) { + this.alliedProfNProdH_item31 = alliedProfNProdH_item31; + } + public String getAlliedProfNProdH_item32() { + return alliedProfNProdH_item32; + } + public void setAlliedProfNProdH_item32(String alliedProfNProdH_item32) { + this.alliedProfNProdH_item32 = alliedProfNProdH_item32; + } + public String getAlliedProfNProdH_item33() { + return alliedProfNProdH_item33; + } + public void setAlliedProfNProdH_item33(String alliedProfNProdH_item33) { + this.alliedProfNProdH_item33 = alliedProfNProdH_item33; + } + public String getAlliedProfNProdH_item34() { + return alliedProfNProdH_item34; + } + public void setAlliedProfNProdH_item34(String alliedProfNProdH_item34) { + this.alliedProfNProdH_item34 = alliedProfNProdH_item34; + } + public String getAlliedProfNProdH_item35() { + return alliedProfNProdH_item35; + } + public void setAlliedProfNProdH_item35(String alliedProfNProdH_item35) { + this.alliedProfNProdH_item35 = alliedProfNProdH_item35; + } + public String getAlliedProfNProdH_sum11() { + return alliedProfNProdH_sum11; + } + public void setAlliedProfNProdH_sum11(String alliedProfNProdH_sum11) { + this.alliedProfNProdH_sum11 = alliedProfNProdH_sum11; + } + public String getAlliedProfNProdH_sum31() { + return alliedProfNProdH_sum31; + } + public void setAlliedProfNProdH_sum31(String alliedProfNProdH_sum31) { + this.alliedProfNProdH_sum31 = alliedProfNProdH_sum31; + } + public String getAlliedProfNProdH_THP1() { + return alliedProfNProdH_THP1; + } + public void setAlliedProfNProdH_THP1(String alliedProfNProdH_THP1) { + this.alliedProfNProdH_THP1 = alliedProfNProdH_THP1; + } + public String getAlliedProfNProdH_THP2() { + return alliedProfNProdH_THP2; + } + public void setAlliedProfNProdH_THP2(String alliedProfNProdH_THP2) { + this.alliedProfNProdH_THP2 = alliedProfNProdH_THP2; + } + public String getAlliedProfNProdH_THP3() { + return alliedProfNProdH_THP3; + } + public void setAlliedProfNProdH_THP3(String alliedProfNProdH_THP3) { + this.alliedProfNProdH_THP3 = alliedProfNProdH_THP3; + } + public String getAlliedProfNProdH_THP4() { + return alliedProfNProdH_THP4; + } + public void setAlliedProfNProdH_THP4(String alliedProfNProdH_THP4) { + this.alliedProfNProdH_THP4 = alliedProfNProdH_THP4; + } + public String getAlliedProfNProdH_THP5() { + return alliedProfNProdH_THP5; + } + public void setAlliedProfNProdH_THP5(String alliedProfNProdH_THP5) { + this.alliedProfNProdH_THP5 = alliedProfNProdH_THP5; + } + public String getAlliedProfNProdH_THPsum1() { + return alliedProfNProdH_THPsum1; + } + public void setAlliedProfNProdH_THPsum1(String alliedProfNProdH_THPsum1) { + this.alliedProfNProdH_THPsum1 = alliedProfNProdH_THPsum1; + } + public String getAlliedProfPercentage1() { + return alliedProfPercentage1; + } + public void setAlliedProfPercentage1(String alliedProfPercentage1) { + this.alliedProfPercentage1 = alliedProfPercentage1; + } + public String getAlliedProfPercentage2() { + return alliedProfPercentage2; + } + public void setAlliedProfPercentage2(String alliedProfPercentage2) { + this.alliedProfPercentage2 = alliedProfPercentage2; + } + public String getAlliedProfPercentage3() { + return alliedProfPercentage3; + } + public void setAlliedProfPercentage3(String alliedProfPercentage3) { + this.alliedProfPercentage3 = alliedProfPercentage3; + } + public String getAlliedProfPercentage4() { + return alliedProfPercentage4; + } + public void setAlliedProfPercentage4(String alliedProfPercentage4) { + this.alliedProfPercentage4 = alliedProfPercentage4; + } + public String getAlliedProfPercentage5() { + return alliedProfPercentage5; + } + public void setAlliedProfPercentage5(String alliedProfPercentage5) { + this.alliedProfPercentage5 = alliedProfPercentage5; + } + public String getAlliedProfProdC_calc1() { + return alliedProfProdC_calc1; + } + public void setAlliedProfProdC_calc1(String alliedProfProdC_calc1) { + this.alliedProfProdC_calc1 = alliedProfProdC_calc1; + } + public String getAlliedProfProdC_calc2() { + return alliedProfProdC_calc2; + } + public void setAlliedProfProdC_calc2(String alliedProfProdC_calc2) { + this.alliedProfProdC_calc2 = alliedProfProdC_calc2; + } + public String getAlliedProfProdC_calc3() { + return alliedProfProdC_calc3; + } + public void setAlliedProfProdC_calc3(String alliedProfProdC_calc3) { + this.alliedProfProdC_calc3 = alliedProfProdC_calc3; + } + public String getAlliedProfProdC_calc4() { + return alliedProfProdC_calc4; + } + public void setAlliedProfProdC_calc4(String alliedProfProdC_calc4) { + this.alliedProfProdC_calc4 = alliedProfProdC_calc4; + } + public String getAlliedProfProdC_calc5() { + return alliedProfProdC_calc5; + } + public void setAlliedProfProdC_calc5(String alliedProfProdC_calc5) { + this.alliedProfProdC_calc5 = alliedProfProdC_calc5; + } + public String getAlliedProfProdC_calcsum1() { + return alliedProfProdC_calcsum1; + } + public void setAlliedProfProdC_calcsum1(String alliedProfProdC_calcsum1) { + this.alliedProfProdC_calcsum1 = alliedProfProdC_calcsum1; + } + public String getAlliedProfProdC_item11() { + return alliedProfProdC_item11; + } + public void setAlliedProfProdC_item11(String alliedProfProdC_item11) { + this.alliedProfProdC_item11 = alliedProfProdC_item11; + } + public String getAlliedProfProdC_item12() { + return alliedProfProdC_item12; + } + public void setAlliedProfProdC_item12(String alliedProfProdC_item12) { + this.alliedProfProdC_item12 = alliedProfProdC_item12; + } + public String getAlliedProfProdC_item13() { + return alliedProfProdC_item13; + } + public void setAlliedProfProdC_item13(String alliedProfProdC_item13) { + this.alliedProfProdC_item13 = alliedProfProdC_item13; + } + public String getAlliedProfProdC_item14() { + return alliedProfProdC_item14; + } + public void setAlliedProfProdC_item14(String alliedProfProdC_item14) { + this.alliedProfProdC_item14 = alliedProfProdC_item14; + } + public String getAlliedProfProdC_item15() { + return alliedProfProdC_item15; + } + public void setAlliedProfProdC_item15(String alliedProfProdC_item15) { + this.alliedProfProdC_item15 = alliedProfProdC_item15; + } + public String getAlliedProfProdC_item21() { + return alliedProfProdC_item21; + } + public void setAlliedProfProdC_item21(String alliedProfProdC_item21) { + this.alliedProfProdC_item21 = alliedProfProdC_item21; + } + public String getAlliedProfProdC_item22() { + return alliedProfProdC_item22; + } + public void setAlliedProfProdC_item22(String alliedProfProdC_item22) { + this.alliedProfProdC_item22 = alliedProfProdC_item22; + } + public String getAlliedProfProdC_item23() { + return alliedProfProdC_item23; + } + public void setAlliedProfProdC_item23(String alliedProfProdC_item23) { + this.alliedProfProdC_item23 = alliedProfProdC_item23; + } + public String getAlliedProfProdC_item24() { + return alliedProfProdC_item24; + } + public void setAlliedProfProdC_item24(String alliedProfProdC_item24) { + this.alliedProfProdC_item24 = alliedProfProdC_item24; + } + public String getAlliedProfProdC_item25() { + return alliedProfProdC_item25; + } + public void setAlliedProfProdC_item25(String alliedProfProdC_item25) { + this.alliedProfProdC_item25 = alliedProfProdC_item25; + } + public String getAlliedProfProdC_sub1() { + return alliedProfProdC_sub1; + } + public void setAlliedProfProdC_sub1(String alliedProfProdC_sub1) { + this.alliedProfProdC_sub1 = alliedProfProdC_sub1; + } + public String getAlliedProfProdC_sub2() { + return alliedProfProdC_sub2; + } + public void setAlliedProfProdC_sub2(String alliedProfProdC_sub2) { + this.alliedProfProdC_sub2 = alliedProfProdC_sub2; + } + public String getAlliedProfProdC_sub3() { + return alliedProfProdC_sub3; + } + public void setAlliedProfProdC_sub3(String alliedProfProdC_sub3) { + this.alliedProfProdC_sub3 = alliedProfProdC_sub3; + } + public String getAlliedProfProdC_sub4() { + return alliedProfProdC_sub4; + } + public void setAlliedProfProdC_sub4(String alliedProfProdC_sub4) { + this.alliedProfProdC_sub4 = alliedProfProdC_sub4; + } + public String getAlliedProfProdC_sub5() { + return alliedProfProdC_sub5; + } + public void setAlliedProfProdC_sub5(String alliedProfProdC_sub5) { + this.alliedProfProdC_sub5 = alliedProfProdC_sub5; + } + public String getAlliedProfProdC_subsum1() { + return alliedProfProdC_subsum1; + } + public void setAlliedProfProdC_subsum1(String alliedProfProdC_subsum1) { + this.alliedProfProdC_subsum1 = alliedProfProdC_subsum1; + } + public String getAlliedProfProdC_sum11() { + return alliedProfProdC_sum11; + } + public void setAlliedProfProdC_sum11(String alliedProfProdC_sum11) { + this.alliedProfProdC_sum11 = alliedProfProdC_sum11; + } + public String getAlliedProfProdC_sum21() { + return alliedProfProdC_sum21; + } + public void setAlliedProfProdC_sum21(String alliedProfProdC_sum21) { + this.alliedProfProdC_sum21 = alliedProfProdC_sum21; + } + public String getAlliedProfProdC_THP1() { + return alliedProfProdC_THP1; + } + public void setAlliedProfProdC_THP1(String alliedProfProdC_THP1) { + this.alliedProfProdC_THP1 = alliedProfProdC_THP1; + } + public String getAlliedProfProdC_THP2() { + return alliedProfProdC_THP2; + } + public void setAlliedProfProdC_THP2(String alliedProfProdC_THP2) { + this.alliedProfProdC_THP2 = alliedProfProdC_THP2; + } + public String getAlliedProfProdC_THP3() { + return alliedProfProdC_THP3; + } + public void setAlliedProfProdC_THP3(String alliedProfProdC_THP3) { + this.alliedProfProdC_THP3 = alliedProfProdC_THP3; + } + public String getAlliedProfProdC_THP4() { + return alliedProfProdC_THP4; + } + public void setAlliedProfProdC_THP4(String alliedProfProdC_THP4) { + this.alliedProfProdC_THP4 = alliedProfProdC_THP4; + } + public String getAlliedProfProdC_THP5() { + return alliedProfProdC_THP5; + } + public void setAlliedProfProdC_THP5(String alliedProfProdC_THP5) { + this.alliedProfProdC_THP5 = alliedProfProdC_THP5; + } + public String getAlliedProfProdC_THPsum1() { + return alliedProfProdC_THPsum1; + } + public void setAlliedProfProdC_THPsum1(String alliedProfProdC_THPsum1) { + this.alliedProfProdC_THPsum1 = alliedProfProdC_THPsum1; + } + public String getAlliedProfProdCCS_subsum1() { + return alliedProfProdCCS_subsum1; + } + public void setAlliedProfProdCCS_subsum1(String alliedProfProdCCS_subsum1) { + this.alliedProfProdCCS_subsum1 = alliedProfProdCCS_subsum1; + } + public String getAlliedProfProdCCS1() { + return alliedProfProdCCS1; + } + public void setAlliedProfProdCCS1(String alliedProfProdCCS1) { + this.alliedProfProdCCS1 = alliedProfProdCCS1; + } + public String getAlliedProfProdCCS2() { + return alliedProfProdCCS2; + } + public void setAlliedProfProdCCS2(String alliedProfProdCCS2) { + this.alliedProfProdCCS2 = alliedProfProdCCS2; + } + public String getAlliedProfProdCCS3() { + return alliedProfProdCCS3; + } + public void setAlliedProfProdCCS3(String alliedProfProdCCS3) { + this.alliedProfProdCCS3 = alliedProfProdCCS3; + } + public String getAlliedProfProdCCS4() { + return alliedProfProdCCS4; + } + public void setAlliedProfProdCCS4(String alliedProfProdCCS4) { + this.alliedProfProdCCS4 = alliedProfProdCCS4; + } + public String getAlliedProfProdCCS5() { + return alliedProfProdCCS5; + } + public void setAlliedProfProdCCS5(String alliedProfProdCCS5) { + this.alliedProfProdCCS5 = alliedProfProdCCS5; + } + public String getAlliedProfProdH_calc1() { + return alliedProfProdH_calc1; + } + public void setAlliedProfProdH_calc1(String alliedProfProdH_calc1) { + this.alliedProfProdH_calc1 = alliedProfProdH_calc1; + } + public String getAlliedProfProdH_calc2() { + return alliedProfProdH_calc2; + } + public void setAlliedProfProdH_calc2(String alliedProfProdH_calc2) { + this.alliedProfProdH_calc2 = alliedProfProdH_calc2; + } + public String getAlliedProfProdH_calc3() { + return alliedProfProdH_calc3; + } + public void setAlliedProfProdH_calc3(String alliedProfProdH_calc3) { + this.alliedProfProdH_calc3 = alliedProfProdH_calc3; + } + public String getAlliedProfProdH_calc4() { + return alliedProfProdH_calc4; + } + public void setAlliedProfProdH_calc4(String alliedProfProdH_calc4) { + this.alliedProfProdH_calc4 = alliedProfProdH_calc4; + } + public String getAlliedProfProdH_calc5() { + return alliedProfProdH_calc5; + } + public void setAlliedProfProdH_calc5(String alliedProfProdH_calc5) { + this.alliedProfProdH_calc5 = alliedProfProdH_calc5; + } + public String getAlliedProfProdH_calcsum1() { + return alliedProfProdH_calcsum1; + } + public void setAlliedProfProdH_calcsum1(String alliedProfProdH_calcsum1) { + this.alliedProfProdH_calcsum1 = alliedProfProdH_calcsum1; + } + public String getAlliedProfProdH_item11() { + return alliedProfProdH_item11; + } + public void setAlliedProfProdH_item11(String alliedProfProdH_item11) { + this.alliedProfProdH_item11 = alliedProfProdH_item11; + } + public String getAlliedProfProdH_item12() { + return alliedProfProdH_item12; + } + public void setAlliedProfProdH_item12(String alliedProfProdH_item12) { + this.alliedProfProdH_item12 = alliedProfProdH_item12; + } + public String getAlliedProfProdH_item13() { + return alliedProfProdH_item13; + } + public void setAlliedProfProdH_item13(String alliedProfProdH_item13) { + this.alliedProfProdH_item13 = alliedProfProdH_item13; + } + public String getAlliedProfProdH_item14() { + return alliedProfProdH_item14; + } + public void setAlliedProfProdH_item14(String alliedProfProdH_item14) { + this.alliedProfProdH_item14 = alliedProfProdH_item14; + } + public String getAlliedProfProdH_item15() { + return alliedProfProdH_item15; + } + public void setAlliedProfProdH_item15(String alliedProfProdH_item15) { + this.alliedProfProdH_item15 = alliedProfProdH_item15; + } + public String getAlliedProfProdH_item21() { + return alliedProfProdH_item21; + } + public void setAlliedProfProdH_item21(String alliedProfProdH_item21) { + this.alliedProfProdH_item21 = alliedProfProdH_item21; + } + public String getAlliedProfProdH_item22() { + return alliedProfProdH_item22; + } + public void setAlliedProfProdH_item22(String alliedProfProdH_item22) { + this.alliedProfProdH_item22 = alliedProfProdH_item22; + } + public String getAlliedProfProdH_item23() { + return alliedProfProdH_item23; + } + public void setAlliedProfProdH_item23(String alliedProfProdH_item23) { + this.alliedProfProdH_item23 = alliedProfProdH_item23; + } + public String getAlliedProfProdH_item24() { + return alliedProfProdH_item24; + } + public void setAlliedProfProdH_item24(String alliedProfProdH_item24) { + this.alliedProfProdH_item24 = alliedProfProdH_item24; + } + public String getAlliedProfProdH_item25() { + return alliedProfProdH_item25; + } + public void setAlliedProfProdH_item25(String alliedProfProdH_item25) { + this.alliedProfProdH_item25 = alliedProfProdH_item25; + } + public String getAlliedProfProdH_sub1() { + return alliedProfProdH_sub1; + } + public void setAlliedProfProdH_sub1(String alliedProfProdH_sub1) { + this.alliedProfProdH_sub1 = alliedProfProdH_sub1; + } + public String getAlliedProfProdH_sub2() { + return alliedProfProdH_sub2; + } + public void setAlliedProfProdH_sub2(String alliedProfProdH_sub2) { + this.alliedProfProdH_sub2 = alliedProfProdH_sub2; + } + public String getAlliedProfProdH_sub3() { + return alliedProfProdH_sub3; + } + public void setAlliedProfProdH_sub3(String alliedProfProdH_sub3) { + this.alliedProfProdH_sub3 = alliedProfProdH_sub3; + } + public String getAlliedProfProdH_sub4() { + return alliedProfProdH_sub4; + } + public void setAlliedProfProdH_sub4(String alliedProfProdH_sub4) { + this.alliedProfProdH_sub4 = alliedProfProdH_sub4; + } + public String getAlliedProfProdH_sub5() { + return alliedProfProdH_sub5; + } + public void setAlliedProfProdH_sub5(String alliedProfProdH_sub5) { + this.alliedProfProdH_sub5 = alliedProfProdH_sub5; + } + public String getAlliedProfProdH_subsum1() { + return alliedProfProdH_subsum1; + } + public void setAlliedProfProdH_subsum1(String alliedProfProdH_subsum1) { + this.alliedProfProdH_subsum1 = alliedProfProdH_subsum1; + } + public String getAlliedProfProdH_sum11() { + return alliedProfProdH_sum11; + } + public void setAlliedProfProdH_sum11(String alliedProfProdH_sum11) { + this.alliedProfProdH_sum11 = alliedProfProdH_sum11; + } + public String getAlliedProfProdH_sum21() { + return alliedProfProdH_sum21; + } + public void setAlliedProfProdH_sum21(String alliedProfProdH_sum21) { + this.alliedProfProdH_sum21 = alliedProfProdH_sum21; + } + public String getAlliedProfProdH_THP1() { + return alliedProfProdH_THP1; + } + public void setAlliedProfProdH_THP1(String alliedProfProdH_THP1) { + this.alliedProfProdH_THP1 = alliedProfProdH_THP1; + } + public String getAlliedProfProdH_THP2() { + return alliedProfProdH_THP2; + } + public void setAlliedProfProdH_THP2(String alliedProfProdH_THP2) { + this.alliedProfProdH_THP2 = alliedProfProdH_THP2; + } + public String getAlliedProfProdH_THP3() { + return alliedProfProdH_THP3; + } + public void setAlliedProfProdH_THP3(String alliedProfProdH_THP3) { + this.alliedProfProdH_THP3 = alliedProfProdH_THP3; + } + public String getAlliedProfProdH_THP4() { + return alliedProfProdH_THP4; + } + public void setAlliedProfProdH_THP4(String alliedProfProdH_THP4) { + this.alliedProfProdH_THP4 = alliedProfProdH_THP4; + } + public String getAlliedProfProdH_THP5() { + return alliedProfProdH_THP5; + } + public void setAlliedProfProdH_THP5(String alliedProfProdH_THP5) { + this.alliedProfProdH_THP5 = alliedProfProdH_THP5; + } + public String getAlliedProfProdH_THPsum1() { + return alliedProfProdH_THPsum1; + } + public void setAlliedProfProdH_THPsum1(String alliedProfProdH_THPsum1) { + this.alliedProfProdH_THPsum1 = alliedProfProdH_THPsum1; + } + public String getAlliedProfProdHCS_subsum1() { + return alliedProfProdHCS_subsum1; + } + public void setAlliedProfProdHCS_subsum1(String alliedProfProdHCS_subsum1) { + this.alliedProfProdHCS_subsum1 = alliedProfProdHCS_subsum1; + } + public String getAlliedProfProdHCS1() { + return alliedProfProdHCS1; + } + public void setAlliedProfProdHCS1(String alliedProfProdHCS1) { + this.alliedProfProdHCS1 = alliedProfProdHCS1; + } + public String getAlliedProfProdHCS2() { + return alliedProfProdHCS2; + } + public void setAlliedProfProdHCS2(String alliedProfProdHCS2) { + this.alliedProfProdHCS2 = alliedProfProdHCS2; + } + public String getAlliedProfProdHCS3() { + return alliedProfProdHCS3; + } + public void setAlliedProfProdHCS3(String alliedProfProdHCS3) { + this.alliedProfProdHCS3 = alliedProfProdHCS3; + } + public String getAlliedProfProdHCS4() { + return alliedProfProdHCS4; + } + public void setAlliedProfProdHCS4(String alliedProfProdHCS4) { + this.alliedProfProdHCS4 = alliedProfProdHCS4; + } + public String getAlliedProfProdHCS5() { + return alliedProfProdHCS5; + } + public void setAlliedProfProdHCS5(String alliedProfProdHCS5) { + this.alliedProfProdHCS5 = alliedProfProdHCS5; + } + public String getAlliedProfProvider1() { + return alliedProfProvider1; + } + public void setAlliedProfProvider1(String alliedProfProvider1) { + this.alliedProfProvider1 = alliedProfProvider1; + } + public String getAlliedProfProvider2() { + return alliedProfProvider2; + } + public void setAlliedProfProvider2(String alliedProfProvider2) { + this.alliedProfProvider2 = alliedProfProvider2; + } + public String getAlliedProfProvider3() { + return alliedProfProvider3; + } + public void setAlliedProfProvider3(String alliedProfProvider3) { + this.alliedProfProvider3 = alliedProfProvider3; + } + public String getAlliedProfProvider4() { + return alliedProfProvider4; + } + public void setAlliedProfProvider4(String alliedProfProvider4) { + this.alliedProfProvider4 = alliedProfProvider4; + } + public String getAlliedProfProvider5() { + return alliedProfProvider5; + } + public void setAlliedProfProvider5(String alliedProfProvider5) { + this.alliedProfProvider5 = alliedProfProvider5; + } + public String getAlliedProfStaffRate_total() { + return alliedProfStaffRate_total; + } + public void setAlliedProfStaffRate_total(String alliedProfStaffRate_total) { + this.alliedProfStaffRate_total = alliedProfStaffRate_total; + } + public String getAlliedProfStaffRate1() { + return alliedProfStaffRate1; + } + public void setAlliedProfStaffRate1(String alliedProfStaffRate1) { + this.alliedProfStaffRate1 = alliedProfStaffRate1; + } + public String getAlliedProfStaffRate2() { + return alliedProfStaffRate2; + } + public void setAlliedProfStaffRate2(String alliedProfStaffRate2) { + this.alliedProfStaffRate2 = alliedProfStaffRate2; + } + public String getAlliedProfStaffRate3() { + return alliedProfStaffRate3; + } + public void setAlliedProfStaffRate3(String alliedProfStaffRate3) { + this.alliedProfStaffRate3 = alliedProfStaffRate3; + } + public String getAlliedProfStaffRate4() { + return alliedProfStaffRate4; + } + public void setAlliedProfStaffRate4(String alliedProfStaffRate4) { + this.alliedProfStaffRate4 = alliedProfStaffRate4; + } + public String getAlliedProfStaffRate5() { + return alliedProfStaffRate5; + } + public void setAlliedProfStaffRate5(String alliedProfStaffRate5) { + this.alliedProfStaffRate5 = alliedProfStaffRate5; + } + public ArrayList getBedGrid0() { + return bedGrid0; + } + public void setBedGrid0(ArrayList bedGrid0) { + this.bedGrid0 = bedGrid0; + } + public ArrayList getBedGrid1() { + return bedGrid1; + } + public void setBedGrid1(ArrayList bedGrid1) { + this.bedGrid1 = bedGrid1; + } + public ArrayList getBedGrid2() { + return bedGrid2; + } + public void setBedGrid2(ArrayList bedGrid2) { + this.bedGrid2 = bedGrid2; + } + public ArrayList getBedGrid3() { + return bedGrid3; + } + public void setBedGrid3(ArrayList bedGrid3) { + this.bedGrid3 = bedGrid3; + } + public ArrayList getBedGrid4() { + return bedGrid4; + } + public void setBedGrid4(ArrayList bedGrid4) { + this.bedGrid4 = bedGrid4; + } + public String getBenefit_percentage_rec() { + return benefit_percentage_rec; + } + public void setBenefit_percentage_rec(String benefit_percentage_rec) { + this.benefit_percentage_rec = benefit_percentage_rec; + } + public String getBenefit_percentage_sub() { + return benefit_percentage_sub; + } + public void setBenefit_percentage_sub(String benefit_percentage_sub) { + this.benefit_percentage_sub = benefit_percentage_sub; + } + public String getBenefit_percentage_total() { + return benefit_percentage_total; + } + public void setBenefit_percentage_total(String benefit_percentage_total) { + this.benefit_percentage_total = benefit_percentage_total; + } + public String getBenefit_percentage1() { + return benefit_percentage1; + } + public void setBenefit_percentage1(String benefit_percentage1) { + this.benefit_percentage1 = benefit_percentage1; + } + public String getBenefit_percentage2() { + return benefit_percentage2; + } + public void setBenefit_percentage2(String benefit_percentage2) { + this.benefit_percentage2 = benefit_percentage2; + } + public String getBenefit_percentage3() { + return benefit_percentage3; + } + public void setBenefit_percentage3(String benefit_percentage3) { + this.benefit_percentage3 = benefit_percentage3; + } + public String getBenefit_percentage4() { + return benefit_percentage4; + } + public void setBenefit_percentage4(String benefit_percentage4) { + this.benefit_percentage4 = benefit_percentage4; + } + public String getBenefit_percentage5() { + return benefit_percentage5; + } + public void setBenefit_percentage5(String benefit_percentage5) { + this.benefit_percentage5 = benefit_percentage5; + } + public String getBenefit_percentage6() { + return benefit_percentage6; + } + public void setBenefit_percentage6(String benefit_percentage6) { + this.benefit_percentage6 = benefit_percentage6; + } + public String getBenefit_percentage7() { + return benefit_percentage7; + } + public void setBenefit_percentage7(String benefit_percentage7) { + this.benefit_percentage7 = benefit_percentage7; + } + public String getBenefit_percentage8() { + return benefit_percentage8; + } + public void setBenefit_percentage8(String benefit_percentage8) { + this.benefit_percentage8 = benefit_percentage8; + } + public String getBenefit_value_rec() { + return benefit_value_rec; + } + public void setBenefit_value_rec(String benefit_value_rec) { + this.benefit_value_rec = benefit_value_rec; + } + public String getBenefit_value_sub() { + return benefit_value_sub; + } + public void setBenefit_value_sub(String benefit_value_sub) { + this.benefit_value_sub = benefit_value_sub; + } + public String getBenefit_value_total() { + return benefit_value_total; + } + public void setBenefit_value_total(String benefit_value_total) { + this.benefit_value_total = benefit_value_total; + } + public String getBenefit_value1() { + return benefit_value1; + } + public void setBenefit_value1(String benefit_value1) { + this.benefit_value1 = benefit_value1; + } + public String getBenefit_value11() { + return benefit_value11; + } + public void setBenefit_value11(String benefit_value11) { + this.benefit_value11 = benefit_value11; + } + public String getBenefit_value2() { + return benefit_value2; + } + public void setBenefit_value2(String benefit_value2) { + this.benefit_value2 = benefit_value2; + } + public String getBenefit_value3() { + return benefit_value3; + } + public void setBenefit_value3(String benefit_value3) { + this.benefit_value3 = benefit_value3; + } + public String getBenefit_value4() { + return benefit_value4; + } + public void setBenefit_value4(String benefit_value4) { + this.benefit_value4 = benefit_value4; + } + public String getBenefit_value5() { + return benefit_value5; + } + public void setBenefit_value5(String benefit_value5) { + this.benefit_value5 = benefit_value5; + } + public String getBenefit_value6() { + return benefit_value6; + } + public void setBenefit_value6(String benefit_value6) { + this.benefit_value6 = benefit_value6; + } + public String getBenefit_value7() { + return benefit_value7; + } + public void setBenefit_value7(String benefit_value7) { + this.benefit_value7 = benefit_value7; + } + public String getBenefit_value8() { + return benefit_value8; + } + public void setBenefit_value8(String benefit_value8) { + this.benefit_value8 = benefit_value8; + } + public String getbTotal_accruedSalaryWage() { + return bTotal_accruedSalaryWage; + } + public void setbTotal_accruedSalaryWage(String bTotal_accruedSalaryWage) { + this.bTotal_accruedSalaryWage = bTotal_accruedSalaryWage; + } + public String getbTotal_benefits() { + return bTotal_benefits; + } + public void setbTotal_benefits(String bTotal_benefits) { + this.bTotal_benefits = bTotal_benefits; + } + public String getbTotal_recSalaryWage() { + return bTotal_recSalaryWage; + } + public void setbTotal_recSalaryWage(String bTotal_recSalaryWage) { + this.bTotal_recSalaryWage = bTotal_recSalaryWage; + } + public String getbTotal_salaryWage() { + return bTotal_salaryWage; + } + public void setbTotal_salaryWage(String bTotal_salaryWage) { + this.bTotal_salaryWage = bTotal_salaryWage; + } + public String getbTotal_value_sum1() { + return bTotal_value_sum1; + } + public void setbTotal_value_sum1(String bTotal_value_sum1) { + this.bTotal_value_sum1 = bTotal_value_sum1; + } + public String getbTotal_YTDSalaryWage() { + return bTotal_YTDSalaryWage; + } + public void setbTotal_YTDSalaryWage(String bTotal_YTDSalaryWage) { + this.bTotal_YTDSalaryWage = bTotal_YTDSalaryWage; + } + public String getCcmisId() { + return ccmisId; + } + public void setCcmisId(String ccmisId) { + this.ccmisId = ccmisId; + } + public String getCompB_accrued() { + return compB_accrued; + } + public void setCompB_accrued(String compB_accrued) { + this.compB_accrued = compB_accrued; + } + public String getCompB_accrued1() { + return compB_accrued1; + } + public void setCompB_accrued1(String compB_accrued1) { + this.compB_accrued1 = compB_accrued1; + } + public String getCompB_accrued2() { + return compB_accrued2; + } + public void setCompB_accrued2(String compB_accrued2) { + this.compB_accrued2 = compB_accrued2; + } + public String getCompB_accrued3() { + return compB_accrued3; + } + public void setCompB_accrued3(String compB_accrued3) { + this.compB_accrued3 = compB_accrued3; + } + public String getCompB_calc1() { + return compB_calc1; + } + public void setCompB_calc1(String compB_calc1) { + this.compB_calc1 = compB_calc1; + } + public String getCompB_calc10() { + return compB_calc10; + } + public void setCompB_calc10(String compB_calc10) { + this.compB_calc10 = compB_calc10; + } + public String getCompB_calc11() { + return compB_calc11; + } + public void setCompB_calc11(String compB_calc11) { + this.compB_calc11 = compB_calc11; + } + public String getCompB_calc12() { + return compB_calc12; + } + public void setCompB_calc12(String compB_calc12) { + this.compB_calc12 = compB_calc12; + } + public String getCompB_calc13() { + return compB_calc13; + } + public void setCompB_calc13(String compB_calc13) { + this.compB_calc13 = compB_calc13; + } + public String getCompB_calc14() { + return compB_calc14; + } + public void setCompB_calc14(String compB_calc14) { + this.compB_calc14 = compB_calc14; + } + public String getCompB_calc15() { + return compB_calc15; + } + public void setCompB_calc15(String compB_calc15) { + this.compB_calc15 = compB_calc15; + } + public String getCompB_calc16() { + return compB_calc16; + } + public void setCompB_calc16(String compB_calc16) { + this.compB_calc16 = compB_calc16; + } + public String getCompB_calc17() { + return compB_calc17; + } + public void setCompB_calc17(String compB_calc17) { + this.compB_calc17 = compB_calc17; + } + public String getCompB_calc18() { + return compB_calc18; + } + public void setCompB_calc18(String compB_calc18) { + this.compB_calc18 = compB_calc18; + } + public String getCompB_calc19() { + return compB_calc19; + } + public void setCompB_calc19(String compB_calc19) { + this.compB_calc19 = compB_calc19; + } + public String getCompB_calc2() { + return compB_calc2; + } + public void setCompB_calc2(String compB_calc2) { + this.compB_calc2 = compB_calc2; + } + public String getCompB_calc20() { + return compB_calc20; + } + public void setCompB_calc20(String compB_calc20) { + this.compB_calc20 = compB_calc20; + } + public String getCompB_calc21() { + return compB_calc21; + } + public void setCompB_calc21(String compB_calc21) { + this.compB_calc21 = compB_calc21; + } + public String getCompB_calc22() { + return compB_calc22; + } + public void setCompB_calc22(String compB_calc22) { + this.compB_calc22 = compB_calc22; + } + public String getCompB_calc23() { + return compB_calc23; + } + public void setCompB_calc23(String compB_calc23) { + this.compB_calc23 = compB_calc23; + } + public String getCompB_calc24() { + return compB_calc24; + } + public void setCompB_calc24(String compB_calc24) { + this.compB_calc24 = compB_calc24; + } + public String getCompB_calc25() { + return compB_calc25; + } + public void setCompB_calc25(String compB_calc25) { + this.compB_calc25 = compB_calc25; + } + public String getCompB_calc26() { + return compB_calc26; + } + public void setCompB_calc26(String compB_calc26) { + this.compB_calc26 = compB_calc26; + } + public String getCompB_calc27() { + return compB_calc27; + } + public void setCompB_calc27(String compB_calc27) { + this.compB_calc27 = compB_calc27; + } + public String getCompB_calc3() { + return compB_calc3; + } + public void setCompB_calc3(String compB_calc3) { + this.compB_calc3 = compB_calc3; + } + public String getCompB_calc4() { + return compB_calc4; + } + public void setCompB_calc4(String compB_calc4) { + this.compB_calc4 = compB_calc4; + } + public String getCompB_calc5() { + return compB_calc5; + } + public void setCompB_calc5(String compB_calc5) { + this.compB_calc5 = compB_calc5; + } + public String getCompB_calc6() { + return compB_calc6; + } + public void setCompB_calc6(String compB_calc6) { + this.compB_calc6 = compB_calc6; + } + public String getCompB_calc7() { + return compB_calc7; + } + public void setCompB_calc7(String compB_calc7) { + this.compB_calc7 = compB_calc7; + } + public String getCompB_calc8() { + return compB_calc8; + } + public void setCompB_calc8(String compB_calc8) { + this.compB_calc8 = compB_calc8; + } + public String getCompB_calc9() { + return compB_calc9; + } + public void setCompB_calc9(String compB_calc9) { + this.compB_calc9 = compB_calc9; + } + public String getCompB_calcsum1() { + return compB_calcsum1; + } + public void setCompB_calcsum1(String compB_calcsum1) { + this.compB_calcsum1 = compB_calcsum1; + } + public String getCompB_calcsum2() { + return compB_calcsum2; + } + public void setCompB_calcsum2(String compB_calcsum2) { + this.compB_calcsum2 = compB_calcsum2; + } + public String getCompB_calcsum3() { + return compB_calcsum3; + } + public void setCompB_calcsum3(String compB_calcsum3) { + this.compB_calcsum3 = compB_calcsum3; + } + public String getCompB_calcsum4() { + return compB_calcsum4; + } + public void setCompB_calcsum4(String compB_calcsum4) { + this.compB_calcsum4 = compB_calcsum4; + } + public String getCompB_calcsum5() { + return compB_calcsum5; + } + public void setCompB_calcsum5(String compB_calcsum5) { + this.compB_calcsum5 = compB_calcsum5; + } + public String getCompB_item11() { + return compB_item11; + } + public void setCompB_item11(String compB_item11) { + this.compB_item11 = compB_item11; + } + public String getCompB_item110() { + return compB_item110; + } + public void setCompB_item110(String compB_item110) { + this.compB_item110 = compB_item110; + } + public String getCompB_item111() { + return compB_item111; + } + public void setCompB_item111(String compB_item111) { + this.compB_item111 = compB_item111; + } + public String getCompB_item112() { + return compB_item112; + } + public void setCompB_item112(String compB_item112) { + this.compB_item112 = compB_item112; + } + public String getCompB_item113() { + return compB_item113; + } + public void setCompB_item113(String compB_item113) { + this.compB_item113 = compB_item113; + } + public String getCompB_item114() { + return compB_item114; + } + public void setCompB_item114(String compB_item114) { + this.compB_item114 = compB_item114; + } + public String getCompB_item115() { + return compB_item115; + } + public void setCompB_item115(String compB_item115) { + this.compB_item115 = compB_item115; + } + public String getCompB_item116() { + return compB_item116; + } + public void setCompB_item116(String compB_item116) { + this.compB_item116 = compB_item116; + } + public String getCompB_item117() { + return compB_item117; + } + public void setCompB_item117(String compB_item117) { + this.compB_item117 = compB_item117; + } + public String getCompB_item118() { + return compB_item118; + } + public void setCompB_item118(String compB_item118) { + this.compB_item118 = compB_item118; + } + public String getCompB_item119() { + return compB_item119; + } + public void setCompB_item119(String compB_item119) { + this.compB_item119 = compB_item119; + } + public String getCompB_item12() { + return compB_item12; + } + public void setCompB_item12(String compB_item12) { + this.compB_item12 = compB_item12; + } + public String getCompB_item120() { + return compB_item120; + } + public void setCompB_item120(String compB_item120) { + this.compB_item120 = compB_item120; + } + public String getCompB_item121() { + return compB_item121; + } + public void setCompB_item121(String compB_item121) { + this.compB_item121 = compB_item121; + } + public String getCompB_item122() { + return compB_item122; + } + public void setCompB_item122(String compB_item122) { + this.compB_item122 = compB_item122; + } + public String getCompB_item123() { + return compB_item123; + } + public void setCompB_item123(String compB_item123) { + this.compB_item123 = compB_item123; + } + public String getCompB_item124() { + return compB_item124; + } + public void setCompB_item124(String compB_item124) { + this.compB_item124 = compB_item124; + } + public String getCompB_item125() { + return compB_item125; + } + public void setCompB_item125(String compB_item125) { + this.compB_item125 = compB_item125; + } + public String getCompB_item126() { + return compB_item126; + } + public void setCompB_item126(String compB_item126) { + this.compB_item126 = compB_item126; + } + public String getCompB_item127() { + return compB_item127; + } + public void setCompB_item127(String compB_item127) { + this.compB_item127 = compB_item127; + } + public String getCompB_item13() { + return compB_item13; + } + public void setCompB_item13(String compB_item13) { + this.compB_item13 = compB_item13; + } + public String getCompB_item14() { + return compB_item14; + } + public void setCompB_item14(String compB_item14) { + this.compB_item14 = compB_item14; + } + public String getCompB_item15() { + return compB_item15; + } + public void setCompB_item15(String compB_item15) { + this.compB_item15 = compB_item15; + } + public String getCompB_item16() { + return compB_item16; + } + public void setCompB_item16(String compB_item16) { + this.compB_item16 = compB_item16; + } + public String getCompB_item17() { + return compB_item17; + } + public void setCompB_item17(String compB_item17) { + this.compB_item17 = compB_item17; + } + public String getCompB_item18() { + return compB_item18; + } + public void setCompB_item18(String compB_item18) { + this.compB_item18 = compB_item18; + } + public String getCompB_item19() { + return compB_item19; + } + public void setCompB_item19(String compB_item19) { + this.compB_item19 = compB_item19; + } + public String getCompB_item21() { + return compB_item21; + } + public void setCompB_item21(String compB_item21) { + this.compB_item21 = compB_item21; + } + public String getCompB_item210() { + return compB_item210; + } + public void setCompB_item210(String compB_item210) { + this.compB_item210 = compB_item210; + } + public String getCompB_item211() { + return compB_item211; + } + public void setCompB_item211(String compB_item211) { + this.compB_item211 = compB_item211; + } + public String getCompB_item212() { + return compB_item212; + } + public void setCompB_item212(String compB_item212) { + this.compB_item212 = compB_item212; + } + public String getCompB_item213() { + return compB_item213; + } + public void setCompB_item213(String compB_item213) { + this.compB_item213 = compB_item213; + } + public String getCompB_item214() { + return compB_item214; + } + public void setCompB_item214(String compB_item214) { + this.compB_item214 = compB_item214; + } + public String getCompB_item215() { + return compB_item215; + } + public void setCompB_item215(String compB_item215) { + this.compB_item215 = compB_item215; + } + public String getCompB_item216() { + return compB_item216; + } + public void setCompB_item216(String compB_item216) { + this.compB_item216 = compB_item216; + } + public String getCompB_item217() { + return compB_item217; + } + public void setCompB_item217(String compB_item217) { + this.compB_item217 = compB_item217; + } + public String getCompB_item218() { + return compB_item218; + } + public void setCompB_item218(String compB_item218) { + this.compB_item218 = compB_item218; + } + public String getCompB_item219() { + return compB_item219; + } + public void setCompB_item219(String compB_item219) { + this.compB_item219 = compB_item219; + } + public String getCompB_item22() { + return compB_item22; + } + public void setCompB_item22(String compB_item22) { + this.compB_item22 = compB_item22; + } + public String getCompB_item220() { + return compB_item220; + } + public void setCompB_item220(String compB_item220) { + this.compB_item220 = compB_item220; + } + public String getCompB_item221() { + return compB_item221; + } + public void setCompB_item221(String compB_item221) { + this.compB_item221 = compB_item221; + } + public String getCompB_item222() { + return compB_item222; + } + public void setCompB_item222(String compB_item222) { + this.compB_item222 = compB_item222; + } + public String getCompB_item223() { + return compB_item223; + } + public void setCompB_item223(String compB_item223) { + this.compB_item223 = compB_item223; + } + public String getCompB_item224() { + return compB_item224; + } + public void setCompB_item224(String compB_item224) { + this.compB_item224 = compB_item224; + } + public String getCompB_item225() { + return compB_item225; + } + public void setCompB_item225(String compB_item225) { + this.compB_item225 = compB_item225; + } + public String getCompB_item226() { + return compB_item226; + } + public void setCompB_item226(String compB_item226) { + this.compB_item226 = compB_item226; + } + public String getCompB_item227() { + return compB_item227; + } + public void setCompB_item227(String compB_item227) { + this.compB_item227 = compB_item227; + } + public String getCompB_item23() { + return compB_item23; + } + public void setCompB_item23(String compB_item23) { + this.compB_item23 = compB_item23; + } + public String getCompB_item24() { + return compB_item24; + } + public void setCompB_item24(String compB_item24) { + this.compB_item24 = compB_item24; + } + public String getCompB_item25() { + return compB_item25; + } + public void setCompB_item25(String compB_item25) { + this.compB_item25 = compB_item25; + } + public String getCompB_item26() { + return compB_item26; + } + public void setCompB_item26(String compB_item26) { + this.compB_item26 = compB_item26; + } + public String getCompB_item27() { + return compB_item27; + } + public void setCompB_item27(String compB_item27) { + this.compB_item27 = compB_item27; + } + public String getCompB_item28() { + return compB_item28; + } + public void setCompB_item28(String compB_item28) { + this.compB_item28 = compB_item28; + } + public String getCompB_item29() { + return compB_item29; + } + public void setCompB_item29(String compB_item29) { + this.compB_item29 = compB_item29; + } + public String getCompB_item31() { + return compB_item31; + } + public void setCompB_item31(String compB_item31) { + this.compB_item31 = compB_item31; + } + public String getCompB_item310() { + return compB_item310; + } + public void setCompB_item310(String compB_item310) { + this.compB_item310 = compB_item310; + } + public String getCompB_item311() { + return compB_item311; + } + public void setCompB_item311(String compB_item311) { + this.compB_item311 = compB_item311; + } + public String getCompB_item312() { + return compB_item312; + } + public void setCompB_item312(String compB_item312) { + this.compB_item312 = compB_item312; + } + public String getCompB_item313() { + return compB_item313; + } + public void setCompB_item313(String compB_item313) { + this.compB_item313 = compB_item313; + } + public String getCompB_item314() { + return compB_item314; + } + public void setCompB_item314(String compB_item314) { + this.compB_item314 = compB_item314; + } + public String getCompB_item315() { + return compB_item315; + } + public void setCompB_item315(String compB_item315) { + this.compB_item315 = compB_item315; + } + public String getCompB_item316() { + return compB_item316; + } + public void setCompB_item316(String compB_item316) { + this.compB_item316 = compB_item316; + } + public String getCompB_item317() { + return compB_item317; + } + public void setCompB_item317(String compB_item317) { + this.compB_item317 = compB_item317; + } + public String getCompB_item318() { + return compB_item318; + } + public void setCompB_item318(String compB_item318) { + this.compB_item318 = compB_item318; + } + public String getCompB_item319() { + return compB_item319; + } + public void setCompB_item319(String compB_item319) { + this.compB_item319 = compB_item319; + } + public String getCompB_item32() { + return compB_item32; + } + public void setCompB_item32(String compB_item32) { + this.compB_item32 = compB_item32; + } + public String getCompB_item320() { + return compB_item320; + } + public void setCompB_item320(String compB_item320) { + this.compB_item320 = compB_item320; + } + public String getCompB_item321() { + return compB_item321; + } + public void setCompB_item321(String compB_item321) { + this.compB_item321 = compB_item321; + } + public String getCompB_item322() { + return compB_item322; + } + public void setCompB_item322(String compB_item322) { + this.compB_item322 = compB_item322; + } + public String getCompB_item323() { + return compB_item323; + } + public void setCompB_item323(String compB_item323) { + this.compB_item323 = compB_item323; + } + public String getCompB_item324() { + return compB_item324; + } + public void setCompB_item324(String compB_item324) { + this.compB_item324 = compB_item324; + } + public String getCompB_item325() { + return compB_item325; + } + public void setCompB_item325(String compB_item325) { + this.compB_item325 = compB_item325; + } + public String getCompB_item326() { + return compB_item326; + } + public void setCompB_item326(String compB_item326) { + this.compB_item326 = compB_item326; + } + public String getCompB_item327() { + return compB_item327; + } + public void setCompB_item327(String compB_item327) { + this.compB_item327 = compB_item327; + } + public String getCompB_item33() { + return compB_item33; + } + public void setCompB_item33(String compB_item33) { + this.compB_item33 = compB_item33; + } + public String getCompB_item34() { + return compB_item34; + } + public void setCompB_item34(String compB_item34) { + this.compB_item34 = compB_item34; + } + public String getCompB_item35() { + return compB_item35; + } + public void setCompB_item35(String compB_item35) { + this.compB_item35 = compB_item35; + } + public String getCompB_item36() { + return compB_item36; + } + public void setCompB_item36(String compB_item36) { + this.compB_item36 = compB_item36; + } + public String getCompB_item37() { + return compB_item37; + } + public void setCompB_item37(String compB_item37) { + this.compB_item37 = compB_item37; + } + public String getCompB_item38() { + return compB_item38; + } + public void setCompB_item38(String compB_item38) { + this.compB_item38 = compB_item38; + } + public String getCompB_item39() { + return compB_item39; + } + public void setCompB_item39(String compB_item39) { + this.compB_item39 = compB_item39; + } + public String getCompB_laborOther() { + return compB_laborOther; + } + public void setCompB_laborOther(String compB_laborOther) { + this.compB_laborOther = compB_laborOther; + } + public String getCompB_laborOther1() { + return compB_laborOther1; + } + public void setCompB_laborOther1(String compB_laborOther1) { + this.compB_laborOther1 = compB_laborOther1; + } + public String getCompB_laborOther2() { + return compB_laborOther2; + } + public void setCompB_laborOther2(String compB_laborOther2) { + this.compB_laborOther2 = compB_laborOther2; + } + public String getCompB_laborOther3() { + return compB_laborOther3; + } + public void setCompB_laborOther3(String compB_laborOther3) { + this.compB_laborOther3 = compB_laborOther3; + } + public String getCompB_recovered() { + return compB_recovered; + } + public void setCompB_recovered(String compB_recovered) { + this.compB_recovered = compB_recovered; + } + public String getCompB_recovered1() { + return compB_recovered1; + } + public void setCompB_recovered1(String compB_recovered1) { + this.compB_recovered1 = compB_recovered1; + } + public String getCompB_recovered2() { + return compB_recovered2; + } + public void setCompB_recovered2(String compB_recovered2) { + this.compB_recovered2 = compB_recovered2; + } + public String getCompB_recovered3() { + return compB_recovered3; + } + public void setCompB_recovered3(String compB_recovered3) { + this.compB_recovered3 = compB_recovered3; + } + public String getCompB_sum11() { + return compB_sum11; + } + public void setCompB_sum11(String compB_sum11) { + this.compB_sum11 = compB_sum11; + } + public String getCompB_sum12() { + return compB_sum12; + } + public void setCompB_sum12(String compB_sum12) { + this.compB_sum12 = compB_sum12; + } + public String getCompB_sum13() { + return compB_sum13; + } + public void setCompB_sum13(String compB_sum13) { + this.compB_sum13 = compB_sum13; + } + public String getCompB_sum14() { + return compB_sum14; + } + public void setCompB_sum14(String compB_sum14) { + this.compB_sum14 = compB_sum14; + } + public String getCompB_sum15() { + return compB_sum15; + } + public void setCompB_sum15(String compB_sum15) { + this.compB_sum15 = compB_sum15; + } + public String getCompB_sum21() { + return compB_sum21; + } + public void setCompB_sum21(String compB_sum21) { + this.compB_sum21 = compB_sum21; + } + public String getCompB_sum22() { + return compB_sum22; + } + public void setCompB_sum22(String compB_sum22) { + this.compB_sum22 = compB_sum22; + } + public String getCompB_sum23() { + return compB_sum23; + } + public void setCompB_sum23(String compB_sum23) { + this.compB_sum23 = compB_sum23; + } + public String getCompB_sum24() { + return compB_sum24; + } + public void setCompB_sum24(String compB_sum24) { + this.compB_sum24 = compB_sum24; + } + public String getCompB_sum25() { + return compB_sum25; + } + public void setCompB_sum25(String compB_sum25) { + this.compB_sum25 = compB_sum25; + } + public String getCompB_sum31() { + return compB_sum31; + } + public void setCompB_sum31(String compB_sum31) { + this.compB_sum31 = compB_sum31; + } + public String getCompB_sum32() { + return compB_sum32; + } + public void setCompB_sum32(String compB_sum32) { + this.compB_sum32 = compB_sum32; + } + public String getCompB_sum33() { + return compB_sum33; + } + public void setCompB_sum33(String compB_sum33) { + this.compB_sum33 = compB_sum33; + } + public String getCompB_sum34() { + return compB_sum34; + } + public void setCompB_sum34(String compB_sum34) { + this.compB_sum34 = compB_sum34; + } + public String getCompB_sum35() { + return compB_sum35; + } + public void setCompB_sum35(String compB_sum35) { + this.compB_sum35 = compB_sum35; + } + public String getCompB_total() { + return compB_total; + } + public void setCompB_total(String compB_total) { + this.compB_total = compB_total; + } + public String getCompB_total1() { + return compB_total1; + } + public void setCompB_total1(String compB_total1) { + this.compB_total1 = compB_total1; + } + public String getCompB_total2() { + return compB_total2; + } + public void setCompB_total2(String compB_total2) { + this.compB_total2 = compB_total2; + } + public String getCompB_total3() { + return compB_total3; + } + public void setCompB_total3(String compB_total3) { + this.compB_total3 = compB_total3; + } + public String getCompH_accrued() { + return compH_accrued; + } + public void setCompH_accrued(String compH_accrued) { + this.compH_accrued = compH_accrued; + } + public String getCompH_accrued2() { + return compH_accrued2; + } + public void setCompH_accrued2(String compH_accrued2) { + this.compH_accrued2 = compH_accrued2; + } + public String getCompH_accrued3() { + return compH_accrued3; + } + public void setCompH_accrued3(String compH_accrued3) { + this.compH_accrued3 = compH_accrued3; + } + public String getCompH_accrued4() { + return compH_accrued4; + } + public void setCompH_accrued4(String compH_accrued4) { + this.compH_accrued4 = compH_accrued4; + } + public String getCompH_calc1() { + return compH_calc1; + } + public void setCompH_calc1(String compH_calc1) { + this.compH_calc1 = compH_calc1; + } + public String getCompH_calc10() { + return compH_calc10; + } + public void setCompH_calc10(String compH_calc10) { + this.compH_calc10 = compH_calc10; + } + public String getCompH_calc11() { + return compH_calc11; + } + public void setCompH_calc11(String compH_calc11) { + this.compH_calc11 = compH_calc11; + } + public String getCompH_calc12() { + return compH_calc12; + } + public void setCompH_calc12(String compH_calc12) { + this.compH_calc12 = compH_calc12; + } + public String getCompH_calc13() { + return compH_calc13; + } + public void setCompH_calc13(String compH_calc13) { + this.compH_calc13 = compH_calc13; + } + public String getCompH_calc14() { + return compH_calc14; + } + public void setCompH_calc14(String compH_calc14) { + this.compH_calc14 = compH_calc14; + } + public String getCompH_calc15() { + return compH_calc15; + } + public void setCompH_calc15(String compH_calc15) { + this.compH_calc15 = compH_calc15; + } + public String getCompH_calc16() { + return compH_calc16; + } + public void setCompH_calc16(String compH_calc16) { + this.compH_calc16 = compH_calc16; + } + public String getCompH_calc17() { + return compH_calc17; + } + public void setCompH_calc17(String compH_calc17) { + this.compH_calc17 = compH_calc17; + } + public String getCompH_calc18() { + return compH_calc18; + } + public void setCompH_calc18(String compH_calc18) { + this.compH_calc18 = compH_calc18; + } + public String getCompH_calc19() { + return compH_calc19; + } + public void setCompH_calc19(String compH_calc19) { + this.compH_calc19 = compH_calc19; + } + public String getCompH_calc2() { + return compH_calc2; + } + public void setCompH_calc2(String compH_calc2) { + this.compH_calc2 = compH_calc2; + } + public String getCompH_calc20() { + return compH_calc20; + } + public void setCompH_calc20(String compH_calc20) { + this.compH_calc20 = compH_calc20; + } + public String getCompH_calc21() { + return compH_calc21; + } + public void setCompH_calc21(String compH_calc21) { + this.compH_calc21 = compH_calc21; + } + public String getCompH_calc22() { + return compH_calc22; + } + public void setCompH_calc22(String compH_calc22) { + this.compH_calc22 = compH_calc22; + } + public String getCompH_calc23() { + return compH_calc23; + } + public void setCompH_calc23(String compH_calc23) { + this.compH_calc23 = compH_calc23; + } + public String getCompH_calc24() { + return compH_calc24; + } + public void setCompH_calc24(String compH_calc24) { + this.compH_calc24 = compH_calc24; + } + public String getCompH_calc25() { + return compH_calc25; + } + public void setCompH_calc25(String compH_calc25) { + this.compH_calc25 = compH_calc25; + } + public String getCompH_calc26() { + return compH_calc26; + } + public void setCompH_calc26(String compH_calc26) { + this.compH_calc26 = compH_calc26; + } + public String getCompH_calc27() { + return compH_calc27; + } + public void setCompH_calc27(String compH_calc27) { + this.compH_calc27 = compH_calc27; + } + public String getCompH_calc3() { + return compH_calc3; + } + public void setCompH_calc3(String compH_calc3) { + this.compH_calc3 = compH_calc3; + } + public String getCompH_calc4() { + return compH_calc4; + } + public void setCompH_calc4(String compH_calc4) { + this.compH_calc4 = compH_calc4; + } + public String getCompH_calc5() { + return compH_calc5; + } + public void setCompH_calc5(String compH_calc5) { + this.compH_calc5 = compH_calc5; + } + public String getCompH_calc6() { + return compH_calc6; + } + public void setCompH_calc6(String compH_calc6) { + this.compH_calc6 = compH_calc6; + } + public String getCompH_calc7() { + return compH_calc7; + } + public void setCompH_calc7(String compH_calc7) { + this.compH_calc7 = compH_calc7; + } + public String getCompH_calc8() { + return compH_calc8; + } + public void setCompH_calc8(String compH_calc8) { + this.compH_calc8 = compH_calc8; + } + public String getCompH_calc9() { + return compH_calc9; + } + public void setCompH_calc9(String compH_calc9) { + this.compH_calc9 = compH_calc9; + } + public String getCompH_calcsum1() { + return compH_calcsum1; + } + public void setCompH_calcsum1(String compH_calcsum1) { + this.compH_calcsum1 = compH_calcsum1; + } + public String getCompH_calcsum2() { + return compH_calcsum2; + } + public void setCompH_calcsum2(String compH_calcsum2) { + this.compH_calcsum2 = compH_calcsum2; + } + public String getCompH_calcsum3() { + return compH_calcsum3; + } + public void setCompH_calcsum3(String compH_calcsum3) { + this.compH_calcsum3 = compH_calcsum3; + } + public String getCompH_calcsum4() { + return compH_calcsum4; + } + public void setCompH_calcsum4(String compH_calcsum4) { + this.compH_calcsum4 = compH_calcsum4; + } + public String getCompH_calcsum5() { + return compH_calcsum5; + } + public void setCompH_calcsum5(String compH_calcsum5) { + this.compH_calcsum5 = compH_calcsum5; + } + public String getCompH_item11() { + return compH_item11; + } + public void setCompH_item11(String compH_item11) { + this.compH_item11 = compH_item11; + } + public String getCompH_item110() { + return compH_item110; + } + public void setCompH_item110(String compH_item110) { + this.compH_item110 = compH_item110; + } + public String getCompH_item111() { + return compH_item111; + } + public void setCompH_item111(String compH_item111) { + this.compH_item111 = compH_item111; + } + public String getCompH_item112() { + return compH_item112; + } + public void setCompH_item112(String compH_item112) { + this.compH_item112 = compH_item112; + } + public String getCompH_item113() { + return compH_item113; + } + public void setCompH_item113(String compH_item113) { + this.compH_item113 = compH_item113; + } + public String getCompH_item114() { + return compH_item114; + } + public void setCompH_item114(String compH_item114) { + this.compH_item114 = compH_item114; + } + public String getCompH_item115() { + return compH_item115; + } + public void setCompH_item115(String compH_item115) { + this.compH_item115 = compH_item115; + } + public String getCompH_item116() { + return compH_item116; + } + public void setCompH_item116(String compH_item116) { + this.compH_item116 = compH_item116; + } + public String getCompH_item117() { + return compH_item117; + } + public void setCompH_item117(String compH_item117) { + this.compH_item117 = compH_item117; + } + public String getCompH_item118() { + return compH_item118; + } + public void setCompH_item118(String compH_item118) { + this.compH_item118 = compH_item118; + } + public String getCompH_item119() { + return compH_item119; + } + public void setCompH_item119(String compH_item119) { + this.compH_item119 = compH_item119; + } + public String getCompH_item12() { + return compH_item12; + } + public void setCompH_item12(String compH_item12) { + this.compH_item12 = compH_item12; + } + public String getCompH_item120() { + return compH_item120; + } + public void setCompH_item120(String compH_item120) { + this.compH_item120 = compH_item120; + } + public String getCompH_item121() { + return compH_item121; + } + public void setCompH_item121(String compH_item121) { + this.compH_item121 = compH_item121; + } + public String getCompH_item122() { + return compH_item122; + } + public void setCompH_item122(String compH_item122) { + this.compH_item122 = compH_item122; + } + public String getCompH_item123() { + return compH_item123; + } + public void setCompH_item123(String compH_item123) { + this.compH_item123 = compH_item123; + } + public String getCompH_item124() { + return compH_item124; + } + public void setCompH_item124(String compH_item124) { + this.compH_item124 = compH_item124; + } + public String getCompH_item125() { + return compH_item125; + } + public void setCompH_item125(String compH_item125) { + this.compH_item125 = compH_item125; + } + public String getCompH_item126() { + return compH_item126; + } + public void setCompH_item126(String compH_item126) { + this.compH_item126 = compH_item126; + } + public String getCompH_item127() { + return compH_item127; + } + public void setCompH_item127(String compH_item127) { + this.compH_item127 = compH_item127; + } + public String getCompH_item13() { + return compH_item13; + } + public void setCompH_item13(String compH_item13) { + this.compH_item13 = compH_item13; + } + public String getCompH_item14() { + return compH_item14; + } + public void setCompH_item14(String compH_item14) { + this.compH_item14 = compH_item14; + } + public String getCompH_item15() { + return compH_item15; + } + public void setCompH_item15(String compH_item15) { + this.compH_item15 = compH_item15; + } + public String getCompH_item16() { + return compH_item16; + } + public void setCompH_item16(String compH_item16) { + this.compH_item16 = compH_item16; + } + public String getCompH_item17() { + return compH_item17; + } + public void setCompH_item17(String compH_item17) { + this.compH_item17 = compH_item17; + } + public String getCompH_item18() { + return compH_item18; + } + public void setCompH_item18(String compH_item18) { + this.compH_item18 = compH_item18; + } + public String getCompH_item19() { + return compH_item19; + } + public void setCompH_item19(String compH_item19) { + this.compH_item19 = compH_item19; + } + public String getCompH_item21() { + return compH_item21; + } + public void setCompH_item21(String compH_item21) { + this.compH_item21 = compH_item21; + } + public String getCompH_item210() { + return compH_item210; + } + public void setCompH_item210(String compH_item210) { + this.compH_item210 = compH_item210; + } + public String getCompH_item211() { + return compH_item211; + } + public void setCompH_item211(String compH_item211) { + this.compH_item211 = compH_item211; + } + public String getCompH_item212() { + return compH_item212; + } + public void setCompH_item212(String compH_item212) { + this.compH_item212 = compH_item212; + } + public String getCompH_item213() { + return compH_item213; + } + public void setCompH_item213(String compH_item213) { + this.compH_item213 = compH_item213; + } + public String getCompH_item214() { + return compH_item214; + } + public void setCompH_item214(String compH_item214) { + this.compH_item214 = compH_item214; + } + public String getCompH_item215() { + return compH_item215; + } + public void setCompH_item215(String compH_item215) { + this.compH_item215 = compH_item215; + } + public String getCompH_item216() { + return compH_item216; + } + public void setCompH_item216(String compH_item216) { + this.compH_item216 = compH_item216; + } + public String getCompH_item217() { + return compH_item217; + } + public void setCompH_item217(String compH_item217) { + this.compH_item217 = compH_item217; + } + public String getCompH_item218() { + return compH_item218; + } + public void setCompH_item218(String compH_item218) { + this.compH_item218 = compH_item218; + } + public String getCompH_item219() { + return compH_item219; + } + public void setCompH_item219(String compH_item219) { + this.compH_item219 = compH_item219; + } + public String getCompH_item22() { + return compH_item22; + } + public void setCompH_item22(String compH_item22) { + this.compH_item22 = compH_item22; + } + public String getCompH_item220() { + return compH_item220; + } + public void setCompH_item220(String compH_item220) { + this.compH_item220 = compH_item220; + } + public String getCompH_item221() { + return compH_item221; + } + public void setCompH_item221(String compH_item221) { + this.compH_item221 = compH_item221; + } + public String getCompH_item222() { + return compH_item222; + } + public void setCompH_item222(String compH_item222) { + this.compH_item222 = compH_item222; + } + public String getCompH_item223() { + return compH_item223; + } + public void setCompH_item223(String compH_item223) { + this.compH_item223 = compH_item223; + } + public String getCompH_item224() { + return compH_item224; + } + public void setCompH_item224(String compH_item224) { + this.compH_item224 = compH_item224; + } + public String getCompH_item225() { + return compH_item225; + } + public void setCompH_item225(String compH_item225) { + this.compH_item225 = compH_item225; + } + public String getCompH_item226() { + return compH_item226; + } + public void setCompH_item226(String compH_item226) { + this.compH_item226 = compH_item226; + } + public String getCompH_item227() { + return compH_item227; + } + public void setCompH_item227(String compH_item227) { + this.compH_item227 = compH_item227; + } + public String getCompH_item23() { + return compH_item23; + } + public void setCompH_item23(String compH_item23) { + this.compH_item23 = compH_item23; + } + public String getCompH_item24() { + return compH_item24; + } + public void setCompH_item24(String compH_item24) { + this.compH_item24 = compH_item24; + } + public String getCompH_item25() { + return compH_item25; + } + public void setCompH_item25(String compH_item25) { + this.compH_item25 = compH_item25; + } + public String getCompH_item26() { + return compH_item26; + } + public void setCompH_item26(String compH_item26) { + this.compH_item26 = compH_item26; + } + public String getCompH_item27() { + return compH_item27; + } + public void setCompH_item27(String compH_item27) { + this.compH_item27 = compH_item27; + } + public String getCompH_item28() { + return compH_item28; + } + public void setCompH_item28(String compH_item28) { + this.compH_item28 = compH_item28; + } + public String getCompH_item29() { + return compH_item29; + } + public void setCompH_item29(String compH_item29) { + this.compH_item29 = compH_item29; + } + public String getCompH_item31() { + return compH_item31; + } + public void setCompH_item31(String compH_item31) { + this.compH_item31 = compH_item31; + } + public String getCompH_item310() { + return compH_item310; + } + public void setCompH_item310(String compH_item310) { + this.compH_item310 = compH_item310; + } + public String getCompH_item311() { + return compH_item311; + } + public void setCompH_item311(String compH_item311) { + this.compH_item311 = compH_item311; + } + public String getCompH_item312() { + return compH_item312; + } + public void setCompH_item312(String compH_item312) { + this.compH_item312 = compH_item312; + } + public String getCompH_item313() { + return compH_item313; + } + public void setCompH_item313(String compH_item313) { + this.compH_item313 = compH_item313; + } + public String getCompH_item314() { + return compH_item314; + } + public void setCompH_item314(String compH_item314) { + this.compH_item314 = compH_item314; + } + public String getCompH_item315() { + return compH_item315; + } + public void setCompH_item315(String compH_item315) { + this.compH_item315 = compH_item315; + } + public String getCompH_item316() { + return compH_item316; + } + public void setCompH_item316(String compH_item316) { + this.compH_item316 = compH_item316; + } + public String getCompH_item317() { + return compH_item317; + } + public void setCompH_item317(String compH_item317) { + this.compH_item317 = compH_item317; + } + public String getCompH_item318() { + return compH_item318; + } + public void setCompH_item318(String compH_item318) { + this.compH_item318 = compH_item318; + } + public String getCompH_item319() { + return compH_item319; + } + public void setCompH_item319(String compH_item319) { + this.compH_item319 = compH_item319; + } + public String getCompH_item32() { + return compH_item32; + } + public void setCompH_item32(String compH_item32) { + this.compH_item32 = compH_item32; + } + public String getCompH_item320() { + return compH_item320; + } + public void setCompH_item320(String compH_item320) { + this.compH_item320 = compH_item320; + } + public String getCompH_item321() { + return compH_item321; + } + public void setCompH_item321(String compH_item321) { + this.compH_item321 = compH_item321; + } + public String getCompH_item322() { + return compH_item322; + } + public void setCompH_item322(String compH_item322) { + this.compH_item322 = compH_item322; + } + public String getCompH_item323() { + return compH_item323; + } + public void setCompH_item323(String compH_item323) { + this.compH_item323 = compH_item323; + } + public String getCompH_item324() { + return compH_item324; + } + public void setCompH_item324(String compH_item324) { + this.compH_item324 = compH_item324; + } + public String getCompH_item325() { + return compH_item325; + } + public void setCompH_item325(String compH_item325) { + this.compH_item325 = compH_item325; + } + public String getCompH_item326() { + return compH_item326; + } + public void setCompH_item326(String compH_item326) { + this.compH_item326 = compH_item326; + } + public String getCompH_item327() { + return compH_item327; + } + public void setCompH_item327(String compH_item327) { + this.compH_item327 = compH_item327; + } + public String getCompH_item33() { + return compH_item33; + } + public void setCompH_item33(String compH_item33) { + this.compH_item33 = compH_item33; + } + public String getCompH_item34() { + return compH_item34; + } + public void setCompH_item34(String compH_item34) { + this.compH_item34 = compH_item34; + } + public String getCompH_item35() { + return compH_item35; + } + public void setCompH_item35(String compH_item35) { + this.compH_item35 = compH_item35; + } + public String getCompH_item36() { + return compH_item36; + } + public void setCompH_item36(String compH_item36) { + this.compH_item36 = compH_item36; + } + public String getCompH_item37() { + return compH_item37; + } + public void setCompH_item37(String compH_item37) { + this.compH_item37 = compH_item37; + } + public String getCompH_item38() { + return compH_item38; + } + public void setCompH_item38(String compH_item38) { + this.compH_item38 = compH_item38; + } + public String getCompH_item39() { + return compH_item39; + } + public void setCompH_item39(String compH_item39) { + this.compH_item39 = compH_item39; + } + public String getCompH_PHP1() { + return compH_PHP1; + } + public void setCompH_PHP1(String compH_PHP1) { + this.compH_PHP1 = compH_PHP1; + } + public String getCompH_PHP10() { + return compH_PHP10; + } + public void setCompH_PHP10(String compH_PHP10) { + this.compH_PHP10 = compH_PHP10; + } + public String getCompH_PHP11() { + return compH_PHP11; + } + public void setCompH_PHP11(String compH_PHP11) { + this.compH_PHP11 = compH_PHP11; + } + public String getCompH_PHP12() { + return compH_PHP12; + } + public void setCompH_PHP12(String compH_PHP12) { + this.compH_PHP12 = compH_PHP12; + } + public String getCompH_PHP13() { + return compH_PHP13; + } + public void setCompH_PHP13(String compH_PHP13) { + this.compH_PHP13 = compH_PHP13; + } + public String getCompH_PHP14() { + return compH_PHP14; + } + public void setCompH_PHP14(String compH_PHP14) { + this.compH_PHP14 = compH_PHP14; + } + public String getCompH_PHP15() { + return compH_PHP15; + } + public void setCompH_PHP15(String compH_PHP15) { + this.compH_PHP15 = compH_PHP15; + } + public String getCompH_PHP16() { + return compH_PHP16; + } + public void setCompH_PHP16(String compH_PHP16) { + this.compH_PHP16 = compH_PHP16; + } + public String getCompH_PHP17() { + return compH_PHP17; + } + public void setCompH_PHP17(String compH_PHP17) { + this.compH_PHP17 = compH_PHP17; + } + public String getCompH_PHP18() { + return compH_PHP18; + } + public void setCompH_PHP18(String compH_PHP18) { + this.compH_PHP18 = compH_PHP18; + } + public String getCompH_PHP19() { + return compH_PHP19; + } + public void setCompH_PHP19(String compH_PHP19) { + this.compH_PHP19 = compH_PHP19; + } + public String getCompH_PHP2() { + return compH_PHP2; + } + public void setCompH_PHP2(String compH_PHP2) { + this.compH_PHP2 = compH_PHP2; + } + public String getCompH_PHP20() { + return compH_PHP20; + } + public void setCompH_PHP20(String compH_PHP20) { + this.compH_PHP20 = compH_PHP20; + } + public String getCompH_PHP21() { + return compH_PHP21; + } + public void setCompH_PHP21(String compH_PHP21) { + this.compH_PHP21 = compH_PHP21; + } + public String getCompH_PHP22() { + return compH_PHP22; + } + public void setCompH_PHP22(String compH_PHP22) { + this.compH_PHP22 = compH_PHP22; + } + public String getCompH_PHP23() { + return compH_PHP23; + } + public void setCompH_PHP23(String compH_PHP23) { + this.compH_PHP23 = compH_PHP23; + } + public String getCompH_PHP24() { + return compH_PHP24; + } + public void setCompH_PHP24(String compH_PHP24) { + this.compH_PHP24 = compH_PHP24; + } + public String getCompH_PHP25() { + return compH_PHP25; + } + public void setCompH_PHP25(String compH_PHP25) { + this.compH_PHP25 = compH_PHP25; + } + public String getCompH_PHP26() { + return compH_PHP26; + } + public void setCompH_PHP26(String compH_PHP26) { + this.compH_PHP26 = compH_PHP26; + } + public String getCompH_PHP27() { + return compH_PHP27; + } + public void setCompH_PHP27(String compH_PHP27) { + this.compH_PHP27 = compH_PHP27; + } + public String getCompH_PHP3() { + return compH_PHP3; + } + public void setCompH_PHP3(String compH_PHP3) { + this.compH_PHP3 = compH_PHP3; + } + public String getCompH_PHP4() { + return compH_PHP4; + } + public void setCompH_PHP4(String compH_PHP4) { + this.compH_PHP4 = compH_PHP4; + } + public String getCompH_PHP5() { + return compH_PHP5; + } + public void setCompH_PHP5(String compH_PHP5) { + this.compH_PHP5 = compH_PHP5; + } + public String getCompH_PHP6() { + return compH_PHP6; + } + public void setCompH_PHP6(String compH_PHP6) { + this.compH_PHP6 = compH_PHP6; + } + public String getCompH_PHP7() { + return compH_PHP7; + } + public void setCompH_PHP7(String compH_PHP7) { + this.compH_PHP7 = compH_PHP7; + } + public String getCompH_PHP8() { + return compH_PHP8; + } + public void setCompH_PHP8(String compH_PHP8) { + this.compH_PHP8 = compH_PHP8; + } + public String getCompH_PHP9() { + return compH_PHP9; + } + public void setCompH_PHP9(String compH_PHP9) { + this.compH_PHP9 = compH_PHP9; + } + public String getCompH_PHPsum1() { + return compH_PHPsum1; + } + public void setCompH_PHPsum1(String compH_PHPsum1) { + this.compH_PHPsum1 = compH_PHPsum1; + } + public String getCompH_PHPsum2() { + return compH_PHPsum2; + } + public void setCompH_PHPsum2(String compH_PHPsum2) { + this.compH_PHPsum2 = compH_PHPsum2; + } + public String getCompH_PHPsum3() { + return compH_PHPsum3; + } + public void setCompH_PHPsum3(String compH_PHPsum3) { + this.compH_PHPsum3 = compH_PHPsum3; + } + public String getCompH_PHPsum4() { + return compH_PHPsum4; + } + public void setCompH_PHPsum4(String compH_PHPsum4) { + this.compH_PHPsum4 = compH_PHPsum4; + } + public String getCompH_PHPsum5() { + return compH_PHPsum5; + } + public void setCompH_PHPsum5(String compH_PHPsum5) { + this.compH_PHPsum5 = compH_PHPsum5; + } + public String getCompH_sum11() { + return compH_sum11; + } + public void setCompH_sum11(String compH_sum11) { + this.compH_sum11 = compH_sum11; + } + public String getCompH_sum12() { + return compH_sum12; + } + public void setCompH_sum12(String compH_sum12) { + this.compH_sum12 = compH_sum12; + } + public String getCompH_sum13() { + return compH_sum13; + } + public void setCompH_sum13(String compH_sum13) { + this.compH_sum13 = compH_sum13; + } + public String getCompH_sum14() { + return compH_sum14; + } + public void setCompH_sum14(String compH_sum14) { + this.compH_sum14 = compH_sum14; + } + public String getCompH_sum15() { + return compH_sum15; + } + public void setCompH_sum15(String compH_sum15) { + this.compH_sum15 = compH_sum15; + } + public String getCompH_sum21() { + return compH_sum21; + } + public void setCompH_sum21(String compH_sum21) { + this.compH_sum21 = compH_sum21; + } + public String getCompH_sum22() { + return compH_sum22; + } + public void setCompH_sum22(String compH_sum22) { + this.compH_sum22 = compH_sum22; + } + public String getCompH_sum23() { + return compH_sum23; + } + public void setCompH_sum23(String compH_sum23) { + this.compH_sum23 = compH_sum23; + } + public String getCompH_sum24() { + return compH_sum24; + } + public void setCompH_sum24(String compH_sum24) { + this.compH_sum24 = compH_sum24; + } + public String getCompH_sum25() { + return compH_sum25; + } + public void setCompH_sum25(String compH_sum25) { + this.compH_sum25 = compH_sum25; + } + public String getCompH_sum31() { + return compH_sum31; + } + public void setCompH_sum31(String compH_sum31) { + this.compH_sum31 = compH_sum31; + } + public String getCompH_sum32() { + return compH_sum32; + } + public void setCompH_sum32(String compH_sum32) { + this.compH_sum32 = compH_sum32; + } + public String getCompH_sum33() { + return compH_sum33; + } + public void setCompH_sum33(String compH_sum33) { + this.compH_sum33 = compH_sum33; + } + public String getCompH_sum34() { + return compH_sum34; + } + public void setCompH_sum34(String compH_sum34) { + this.compH_sum34 = compH_sum34; + } + public String getCompH_sum35() { + return compH_sum35; + } + public void setCompH_sum35(String compH_sum35) { + this.compH_sum35 = compH_sum35; + } + public String getCompH_total() { + return compH_total; + } + public void setCompH_total(String compH_total) { + this.compH_total = compH_total; + } + public String getCompH_total1() { + return compH_total1; + } + public void setCompH_total1(String compH_total1) { + this.compH_total1 = compH_total1; + } + public String getCompH_total2() { + return compH_total2; + } + public void setCompH_total2(String compH_total2) { + this.compH_total2 = compH_total2; + } + public String getCompH_total3() { + return compH_total3; + } + public void setCompH_total3(String compH_total3) { + this.compH_total3 = compH_total3; + } + public String getCompH_total4() { + return compH_total4; + } + public void setCompH_total4(String compH_total4) { + this.compH_total4 = compH_total4; + } + public String getDirectCare_subtotal() { + return directCare_subtotal; + } + public void setDirectCare_subtotal(String directCare_subtotal) { + this.directCare_subtotal = directCare_subtotal; + } + public String getDirectCare_subtotal1() { + return directCare_subtotal1; + } + public void setDirectCare_subtotal1(String directCare_subtotal1) { + this.directCare_subtotal1 = directCare_subtotal1; + } + public String getDirectCare_subtotal2() { + return directCare_subtotal2; + } + public void setDirectCare_subtotal2(String directCare_subtotal2) { + this.directCare_subtotal2 = directCare_subtotal2; + } + public String getDirectCare_subtotal3() { + return directCare_subtotal3; + } + public void setDirectCare_subtotal3(String directCare_subtotal3) { + this.directCare_subtotal3 = directCare_subtotal3; + } + public String getEndPeriod() { + return endPeriod; + } + public void setEndPeriod(String endPeriod) { + this.endPeriod = endPeriod; + } + public String getFacilityName() { + return facilityName; + } + public void setFacilityName(String facilityName) { + this.facilityName = facilityName; + } + public Form getForm() { + return form; + } + public void setForm(Form form) { + this.form = form; + } + public String getInScopeBedTotal1() { + return inScopeBedTotal1; + } + public void setInScopeBedTotal1(String inScopeBedTotal1) { + this.inScopeBedTotal1 = inScopeBedTotal1; + } + public String getInScopeBedTotal2() { + return inScopeBedTotal2; + } + public void setInScopeBedTotal2(String inScopeBedTotal2) { + this.inScopeBedTotal2 = inScopeBedTotal2; + } + public String getInScopeBedTotal3() { + return inScopeBedTotal3; + } + public void setInScopeBedTotal3(String inScopeBedTotal3) { + this.inScopeBedTotal3 = inScopeBedTotal3; + } + public String getInScopeBedTotal4() { + return inScopeBedTotal4; + } + public void setInScopeBedTotal4(String inScopeBedTotal4) { + this.inScopeBedTotal4 = inScopeBedTotal4; + } + public String getInScopeBedTotalYTD() { + return inScopeBedTotalYTD; + } + public void setInScopeBedTotalYTD(String inScopeBedTotalYTD) { + this.inScopeBedTotalYTD = inScopeBedTotalYTD; + } + public String getInScopeMonth1() { + return inScopeMonth1; + } + public void setInScopeMonth1(String inScopeMonth1) { + this.inScopeMonth1 = inScopeMonth1; + } + public String getInScopeMonth10() { + return inScopeMonth10; + } + public void setInScopeMonth10(String inScopeMonth10) { + this.inScopeMonth10 = inScopeMonth10; + } + public String getInScopeMonth11() { + return inScopeMonth11; + } + public void setInScopeMonth11(String inScopeMonth11) { + this.inScopeMonth11 = inScopeMonth11; + } + public String getInScopeMonth12() { + return inScopeMonth12; + } + public void setInScopeMonth12(String inScopeMonth12) { + this.inScopeMonth12 = inScopeMonth12; + } + public String getInScopeMonth2() { + return inScopeMonth2; + } + public void setInScopeMonth2(String inScopeMonth2) { + this.inScopeMonth2 = inScopeMonth2; + } + public String getInScopeMonth3() { + return inScopeMonth3; + } + public void setInScopeMonth3(String inScopeMonth3) { + this.inScopeMonth3 = inScopeMonth3; + } + public String getInScopeMonth4() { + return inScopeMonth4; + } + public void setInScopeMonth4(String inScopeMonth4) { + this.inScopeMonth4 = inScopeMonth4; + } + public String getInScopeMonth5() { + return inScopeMonth5; + } + public void setInScopeMonth5(String inScopeMonth5) { + this.inScopeMonth5 = inScopeMonth5; + } + public String getInScopeMonth6() { + return inScopeMonth6; + } + public void setInScopeMonth6(String inScopeMonth6) { + this.inScopeMonth6 = inScopeMonth6; + } + public String getInScopeMonth7() { + return inScopeMonth7; + } + public void setInScopeMonth7(String inScopeMonth7) { + this.inScopeMonth7 = inScopeMonth7; + } + public String getInScopeMonth8() { + return inScopeMonth8; + } + public void setInScopeMonth8(String inScopeMonth8) { + this.inScopeMonth8 = inScopeMonth8; + } + public String getInScopeMonth9() { + return inScopeMonth9; + } + public void setInScopeMonth9(String inScopeMonth9) { + this.inScopeMonth9 = inScopeMonth9; + } + public String getInScopeOccupied1() { + return inScopeOccupied1; + } + public void setInScopeOccupied1(String inScopeOccupied1) { + this.inScopeOccupied1 = inScopeOccupied1; + } + public String getInScopeOccupied2() { + return inScopeOccupied2; + } + public void setInScopeOccupied2(String inScopeOccupied2) { + this.inScopeOccupied2 = inScopeOccupied2; + } + public String getInScopeOccupied3() { + return inScopeOccupied3; + } + public void setInScopeOccupied3(String inScopeOccupied3) { + this.inScopeOccupied3 = inScopeOccupied3; + } + public String getInScopeOccupied4() { + return inScopeOccupied4; + } + public void setInScopeOccupied4(String inScopeOccupied4) { + this.inScopeOccupied4 = inScopeOccupied4; + } + public String getInScopeOccupiedYTD() { + return inScopeOccupiedYTD; + } + public void setInScopeOccupiedYTD(String inScopeOccupiedYTD) { + this.inScopeOccupiedYTD = inScopeOccupiedYTD; + } + public String getInScopeTotalQ1() { + return inScopeTotalQ1; + } + public void setInScopeTotalQ1(String inScopeTotalQ1) { + this.inScopeTotalQ1 = inScopeTotalQ1; + } + public String getInScopeTotalQ2() { + return inScopeTotalQ2; + } + public void setInScopeTotalQ2(String inScopeTotalQ2) { + this.inScopeTotalQ2 = inScopeTotalQ2; + } + public String getInScopeTotalQ3() { + return inScopeTotalQ3; + } + public void setInScopeTotalQ3(String inScopeTotalQ3) { + this.inScopeTotalQ3 = inScopeTotalQ3; + } + public String getInScopeTotalQ4() { + return inScopeTotalQ4; + } + public void setInScopeTotalQ4(String inScopeTotalQ4) { + this.inScopeTotalQ4 = inScopeTotalQ4; + } + public String getNopEx_note1() { + return nopEx_note1; + } + public void setNopEx_note1(String nopEx_note1) { + this.nopEx_note1 = nopEx_note1; + } + public String getNopEx_note2() { + return nopEx_note2; + } + public void setNopEx_note2(String nopEx_note2) { + this.nopEx_note2 = nopEx_note2; + } + public String getNopEx_sub_note() { + return nopEx_sub_note; + } + public void setNopEx_sub_note(String nopEx_sub_note) { + this.nopEx_sub_note = nopEx_sub_note; + } + public String getNopEx_sum11() { + return nopEx_sum11; + } + public void setNopEx_sum11(String nopEx_sum11) { + this.nopEx_sum11 = nopEx_sum11; + } + public String getNopEx_YTD1() { + return nopEx_YTD1; + } + public void setNopEx_YTD1(String nopEx_YTD1) { + this.nopEx_YTD1 = nopEx_YTD1; + } + public String getNopEx_YTD2() { + return nopEx_YTD2; + } + public void setNopEx_YTD2(String nopEx_YTD2) { + this.nopEx_YTD2 = nopEx_YTD2; + } + public String getNopRev_note1() { + return nopRev_note1; + } + public void setNopRev_note1(String nopRev_note1) { + this.nopRev_note1 = nopRev_note1; + } + public String getNopRev_note2() { + return nopRev_note2; + } + public void setNopRev_note2(String nopRev_note2) { + this.nopRev_note2 = nopRev_note2; + } + public String getNopRev_sub_note() { + return nopRev_sub_note; + } + public void setNopRev_sub_note(String nopRev_sub_note) { + this.nopRev_sub_note = nopRev_sub_note; + } + public String getNopRev_sum11() { + return nopRev_sum11; + } + public void setNopRev_sum11(String nopRev_sum11) { + this.nopRev_sum11 = nopRev_sum11; + } + public String getNopRev_YTD1() { + return nopRev_YTD1; + } + public void setNopRev_YTD1(String nopRev_YTD1) { + this.nopRev_YTD1 = nopRev_YTD1; + } + public String getNopRev_YTD2() { + return nopRev_YTD2; + } + public void setNopRev_YTD2(String nopRev_YTD2) { + this.nopRev_YTD2 = nopRev_YTD2; + } + public String getNopSu_data1() { + return nopSu_data1; + } + public void setNopSu_data1(String nopSu_data1) { + this.nopSu_data1 = nopSu_data1; + } + public String getNopSu_note() { + return nopSu_note; + } + public void setNopSu_note(String nopSu_note) { + this.nopSu_note = nopSu_note; + } + public String getNoteInScopeQ1() { + return noteInScopeQ1; + } + public void setNoteInScopeQ1(String noteInScopeQ1) { + this.noteInScopeQ1 = noteInScopeQ1; + } + public String getNoteInScopeQ2() { + return noteInScopeQ2; + } + public void setNoteInScopeQ2(String noteInScopeQ2) { + this.noteInScopeQ2 = noteInScopeQ2; + } + public String getNoteInScopeQ3() { + return noteInScopeQ3; + } + public void setNoteInScopeQ3(String noteInScopeQ3) { + this.noteInScopeQ3 = noteInScopeQ3; + } + public String getNoteInScopeQ4() { + return noteInScopeQ4; + } + public void setNoteInScopeQ4(String noteInScopeQ4) { + this.noteInScopeQ4 = noteInScopeQ4; + } + public String getNumberOfDaysAccrued() { + return numberOfDaysAccrued; + } + public void setNumberOfDaysAccrued(String numberOfDaysAccrued) { + this.numberOfDaysAccrued = numberOfDaysAccrued; + } + public String getNumberOfTotalBeds() { + return numberOfTotalBeds; + } + public void setNumberOfTotalBeds(String numberOfTotalBeds) { + this.numberOfTotalBeds = numberOfTotalBeds; + } + public String getNumberOfTotalFundedBeds() { + return numberOfTotalFundedBeds; + } + public void setNumberOfTotalFundedBeds(String numberOfTotalFundedBeds) { + this.numberOfTotalFundedBeds = numberOfTotalFundedBeds; + } + public String getNursingContractRate_total() { + return nursingContractRate_total; + } + public void setNursingContractRate_total(String nursingContractRate_total) { + this.nursingContractRate_total = nursingContractRate_total; + } + public String getNursingContractRate1() { + return nursingContractRate1; + } + public void setNursingContractRate1(String nursingContractRate1) { + this.nursingContractRate1 = nursingContractRate1; + } + public String getNursingContractRate2() { + return nursingContractRate2; + } + public void setNursingContractRate2(String nursingContractRate2) { + this.nursingContractRate2 = nursingContractRate2; + } + public String getNursingContractRate3() { + return nursingContractRate3; + } + public void setNursingContractRate3(String nursingContractRate3) { + this.nursingContractRate3 = nursingContractRate3; + } + public String getNursingContractRate4() { + return nursingContractRate4; + } + public void setNursingContractRate4(String nursingContractRate4) { + this.nursingContractRate4 = nursingContractRate4; + } + public String getNursingCost_total() { + return nursingCost_total; + } + public void setNursingCost_total(String nursingCost_total) { + this.nursingCost_total = nursingCost_total; + } + public String getNursingCost1() { + return nursingCost1; + } + public void setNursingCost1(String nursingCost1) { + this.nursingCost1 = nursingCost1; + } + public String getNursingCost2() { + return nursingCost2; + } + public void setNursingCost2(String nursingCost2) { + this.nursingCost2 = nursingCost2; + } + public String getNursingCost3() { + return nursingCost3; + } + public void setNursingCost3(String nursingCost3) { + this.nursingCost3 = nursingCost3; + } + public String getNursingCost4() { + return nursingCost4; + } + public void setNursingCost4(String nursingCost4) { + this.nursingCost4 = nursingCost4; + } + public String getNursingNProdC_calc1() { + return nursingNProdC_calc1; + } + public void setNursingNProdC_calc1(String nursingNProdC_calc1) { + this.nursingNProdC_calc1 = nursingNProdC_calc1; + } + public String getNursingNProdC_calc2() { + return nursingNProdC_calc2; + } + public void setNursingNProdC_calc2(String nursingNProdC_calc2) { + this.nursingNProdC_calc2 = nursingNProdC_calc2; + } + public String getNursingNProdC_calc3() { + return nursingNProdC_calc3; + } + public void setNursingNProdC_calc3(String nursingNProdC_calc3) { + this.nursingNProdC_calc3 = nursingNProdC_calc3; + } + public String getNursingNProdC_calc4() { + return nursingNProdC_calc4; + } + public void setNursingNProdC_calc4(String nursingNProdC_calc4) { + this.nursingNProdC_calc4 = nursingNProdC_calc4; + } + public String getNursingNProdC_calcsum1() { + return nursingNProdC_calcsum1; + } + public void setNursingNProdC_calcsum1(String nursingNProdC_calcsum1) { + this.nursingNProdC_calcsum1 = nursingNProdC_calcsum1; + } + public String getNursingNProdC_item11() { + return nursingNProdC_item11; + } + public void setNursingNProdC_item11(String nursingNProdC_item11) { + this.nursingNProdC_item11 = nursingNProdC_item11; + } + public String getNursingNProdC_item12() { + return nursingNProdC_item12; + } + public void setNursingNProdC_item12(String nursingNProdC_item12) { + this.nursingNProdC_item12 = nursingNProdC_item12; + } + public String getNursingNProdC_item13() { + return nursingNProdC_item13; + } + public void setNursingNProdC_item13(String nursingNProdC_item13) { + this.nursingNProdC_item13 = nursingNProdC_item13; + } + public String getNursingNProdC_item14() { + return nursingNProdC_item14; + } + public void setNursingNProdC_item14(String nursingNProdC_item14) { + this.nursingNProdC_item14 = nursingNProdC_item14; + } + public String getNursingNProdC_item21() { + return nursingNProdC_item21; + } + public void setNursingNProdC_item21(String nursingNProdC_item21) { + this.nursingNProdC_item21 = nursingNProdC_item21; + } + public String getNursingNProdC_item22() { + return nursingNProdC_item22; + } + public void setNursingNProdC_item22(String nursingNProdC_item22) { + this.nursingNProdC_item22 = nursingNProdC_item22; + } + public String getNursingNProdC_item23() { + return nursingNProdC_item23; + } + public void setNursingNProdC_item23(String nursingNProdC_item23) { + this.nursingNProdC_item23 = nursingNProdC_item23; + } + public String getNursingNProdC_item24() { + return nursingNProdC_item24; + } + public void setNursingNProdC_item24(String nursingNProdC_item24) { + this.nursingNProdC_item24 = nursingNProdC_item24; + } + public String getNursingNProdC_item31() { + return nursingNProdC_item31; + } + public void setNursingNProdC_item31(String nursingNProdC_item31) { + this.nursingNProdC_item31 = nursingNProdC_item31; + } + public String getNursingNProdC_item32() { + return nursingNProdC_item32; + } + public void setNursingNProdC_item32(String nursingNProdC_item32) { + this.nursingNProdC_item32 = nursingNProdC_item32; + } + public String getNursingNProdC_item33() { + return nursingNProdC_item33; + } + public void setNursingNProdC_item33(String nursingNProdC_item33) { + this.nursingNProdC_item33 = nursingNProdC_item33; + } + public String getNursingNProdC_item34() { + return nursingNProdC_item34; + } + public void setNursingNProdC_item34(String nursingNProdC_item34) { + this.nursingNProdC_item34 = nursingNProdC_item34; + } + public String getNursingNProdC_sum11() { + return nursingNProdC_sum11; + } + public void setNursingNProdC_sum11(String nursingNProdC_sum11) { + this.nursingNProdC_sum11 = nursingNProdC_sum11; + } + public String getNursingNProdC_sum21() { + return nursingNProdC_sum21; + } + public void setNursingNProdC_sum21(String nursingNProdC_sum21) { + this.nursingNProdC_sum21 = nursingNProdC_sum21; + } + public String getNursingNProdC_sum31() { + return nursingNProdC_sum31; + } + public void setNursingNProdC_sum31(String nursingNProdC_sum31) { + this.nursingNProdC_sum31 = nursingNProdC_sum31; + } + public String getNursingNProdC_THP1() { + return nursingNProdC_THP1; + } + public void setNursingNProdC_THP1(String nursingNProdC_THP1) { + this.nursingNProdC_THP1 = nursingNProdC_THP1; + } + public String getNursingNProdC_THP2() { + return nursingNProdC_THP2; + } + public void setNursingNProdC_THP2(String nursingNProdC_THP2) { + this.nursingNProdC_THP2 = nursingNProdC_THP2; + } + public String getNursingNProdC_THP3() { + return nursingNProdC_THP3; + } + public void setNursingNProdC_THP3(String nursingNProdC_THP3) { + this.nursingNProdC_THP3 = nursingNProdC_THP3; + } + public String getNursingNProdC_THP4() { + return nursingNProdC_THP4; + } + public void setNursingNProdC_THP4(String nursingNProdC_THP4) { + this.nursingNProdC_THP4 = nursingNProdC_THP4; + } + public String getNursingNProdC_THPsum1() { + return nursingNProdC_THPsum1; + } + public void setNursingNProdC_THPsum1(String nursingNProdC_THPsum1) { + this.nursingNProdC_THPsum1 = nursingNProdC_THPsum1; + } + public String getNursingNProdH_calc1() { + return nursingNProdH_calc1; + } + public void setNursingNProdH_calc1(String nursingNProdH_calc1) { + this.nursingNProdH_calc1 = nursingNProdH_calc1; + } + public String getNursingNProdH_calc2() { + return nursingNProdH_calc2; + } + public void setNursingNProdH_calc2(String nursingNProdH_calc2) { + this.nursingNProdH_calc2 = nursingNProdH_calc2; + } + public String getNursingNProdH_calc3() { + return nursingNProdH_calc3; + } + public void setNursingNProdH_calc3(String nursingNProdH_calc3) { + this.nursingNProdH_calc3 = nursingNProdH_calc3; + } + public String getNursingNProdH_calc4() { + return nursingNProdH_calc4; + } + public void setNursingNProdH_calc4(String nursingNProdH_calc4) { + this.nursingNProdH_calc4 = nursingNProdH_calc4; + } + public String getNursingNProdH_calcsum1() { + return nursingNProdH_calcsum1; + } + public void setNursingNProdH_calcsum1(String nursingNProdH_calcsum1) { + this.nursingNProdH_calcsum1 = nursingNProdH_calcsum1; + } + public String getNursingNProdH_item11() { + return nursingNProdH_item11; + } + public void setNursingNProdH_item11(String nursingNProdH_item11) { + this.nursingNProdH_item11 = nursingNProdH_item11; + } + public String getNursingNProdH_item12() { + return nursingNProdH_item12; + } + public void setNursingNProdH_item12(String nursingNProdH_item12) { + this.nursingNProdH_item12 = nursingNProdH_item12; + } + public String getNursingNProdH_item13() { + return nursingNProdH_item13; + } + public void setNursingNProdH_item13(String nursingNProdH_item13) { + this.nursingNProdH_item13 = nursingNProdH_item13; + } + public String getNursingNProdH_item14() { + return nursingNProdH_item14; + } + public void setNursingNProdH_item14(String nursingNProdH_item14) { + this.nursingNProdH_item14 = nursingNProdH_item14; + } + public String getNursingNProdH_item21() { + return nursingNProdH_item21; + } + public void setNursingNProdH_item21(String nursingNProdH_item21) { + this.nursingNProdH_item21 = nursingNProdH_item21; + } + public String getNursingNProdH_item22() { + return nursingNProdH_item22; + } + public void setNursingNProdH_item22(String nursingNProdH_item22) { + this.nursingNProdH_item22 = nursingNProdH_item22; + } + public String getNursingNProdH_item23() { + return nursingNProdH_item23; + } + public void setNursingNProdH_item23(String nursingNProdH_item23) { + this.nursingNProdH_item23 = nursingNProdH_item23; + } + public String getNursingNProdH_item24() { + return nursingNProdH_item24; + } + public void setNursingNProdH_item24(String nursingNProdH_item24) { + this.nursingNProdH_item24 = nursingNProdH_item24; + } + public String getNursingNProdH_item31() { + return nursingNProdH_item31; + } + public void setNursingNProdH_item31(String nursingNProdH_item31) { + this.nursingNProdH_item31 = nursingNProdH_item31; + } + public String getNursingNProdH_item32() { + return nursingNProdH_item32; + } + public void setNursingNProdH_item32(String nursingNProdH_item32) { + this.nursingNProdH_item32 = nursingNProdH_item32; + } + public String getNursingNProdH_item33() { + return nursingNProdH_item33; + } + public void setNursingNProdH_item33(String nursingNProdH_item33) { + this.nursingNProdH_item33 = nursingNProdH_item33; + } + public String getNursingNProdH_item34() { + return nursingNProdH_item34; + } + public void setNursingNProdH_item34(String nursingNProdH_item34) { + this.nursingNProdH_item34 = nursingNProdH_item34; + } + public String getNursingNProdH_sum11() { + return nursingNProdH_sum11; + } + public void setNursingNProdH_sum11(String nursingNProdH_sum11) { + this.nursingNProdH_sum11 = nursingNProdH_sum11; + } + public String getNursingNProdH_sum21() { + return nursingNProdH_sum21; + } + public void setNursingNProdH_sum21(String nursingNProdH_sum21) { + this.nursingNProdH_sum21 = nursingNProdH_sum21; + } + public String getNursingNProdH_sum31() { + return nursingNProdH_sum31; + } + public void setNursingNProdH_sum31(String nursingNProdH_sum31) { + this.nursingNProdH_sum31 = nursingNProdH_sum31; + } + public String getNursingNProdH_THP1() { + return nursingNProdH_THP1; + } + public void setNursingNProdH_THP1(String nursingNProdH_THP1) { + this.nursingNProdH_THP1 = nursingNProdH_THP1; + } + public String getNursingNProdH_THP2() { + return nursingNProdH_THP2; + } + public void setNursingNProdH_THP2(String nursingNProdH_THP2) { + this.nursingNProdH_THP2 = nursingNProdH_THP2; + } + public String getNursingNProdH_THP3() { + return nursingNProdH_THP3; + } + public void setNursingNProdH_THP3(String nursingNProdH_THP3) { + this.nursingNProdH_THP3 = nursingNProdH_THP3; + } + public String getNursingNProdH_THP4() { + return nursingNProdH_THP4; + } + public void setNursingNProdH_THP4(String nursingNProdH_THP4) { + this.nursingNProdH_THP4 = nursingNProdH_THP4; + } + public String getNursingNProdH_THPsum1() { + return nursingNProdH_THPsum1; + } + public void setNursingNProdH_THPsum1(String nursingNProdH_THPsum1) { + this.nursingNProdH_THPsum1 = nursingNProdH_THPsum1; + } + public String getNursingPercentage1() { + return nursingPercentage1; + } + public void setNursingPercentage1(String nursingPercentage1) { + this.nursingPercentage1 = nursingPercentage1; + } + public String getNursingPercentage2() { + return nursingPercentage2; + } + public void setNursingPercentage2(String nursingPercentage2) { + this.nursingPercentage2 = nursingPercentage2; + } + public String getNursingPercentage3() { + return nursingPercentage3; + } + public void setNursingPercentage3(String nursingPercentage3) { + this.nursingPercentage3 = nursingPercentage3; + } + public String getNursingPercentage4() { + return nursingPercentage4; + } + public void setNursingPercentage4(String nursingPercentage4) { + this.nursingPercentage4 = nursingPercentage4; + } + public String getNursingProdC_calc1() { + return nursingProdC_calc1; + } + public void setNursingProdC_calc1(String nursingProdC_calc1) { + this.nursingProdC_calc1 = nursingProdC_calc1; + } + public String getNursingProdC_calc2() { + return nursingProdC_calc2; + } + public void setNursingProdC_calc2(String nursingProdC_calc2) { + this.nursingProdC_calc2 = nursingProdC_calc2; + } + public String getNursingProdC_calc3() { + return nursingProdC_calc3; + } + public void setNursingProdC_calc3(String nursingProdC_calc3) { + this.nursingProdC_calc3 = nursingProdC_calc3; + } + public String getNursingProdC_calc4() { + return nursingProdC_calc4; + } + public void setNursingProdC_calc4(String nursingProdC_calc4) { + this.nursingProdC_calc4 = nursingProdC_calc4; + } + public String getNursingProdC_calcsum1() { + return nursingProdC_calcsum1; + } + public void setNursingProdC_calcsum1(String nursingProdC_calcsum1) { + this.nursingProdC_calcsum1 = nursingProdC_calcsum1; + } + public String getNursingProdC_item11() { + return nursingProdC_item11; + } + public void setNursingProdC_item11(String nursingProdC_item11) { + this.nursingProdC_item11 = nursingProdC_item11; + } + public String getNursingProdC_item12() { + return nursingProdC_item12; + } + public void setNursingProdC_item12(String nursingProdC_item12) { + this.nursingProdC_item12 = nursingProdC_item12; + } + public String getNursingProdC_item13() { + return nursingProdC_item13; + } + public void setNursingProdC_item13(String nursingProdC_item13) { + this.nursingProdC_item13 = nursingProdC_item13; + } + public String getNursingProdC_item14() { + return nursingProdC_item14; + } + public void setNursingProdC_item14(String nursingProdC_item14) { + this.nursingProdC_item14 = nursingProdC_item14; + } + public String getNursingProdC_item21() { + return nursingProdC_item21; + } + public void setNursingProdC_item21(String nursingProdC_item21) { + this.nursingProdC_item21 = nursingProdC_item21; + } + public String getNursingProdC_item22() { + return nursingProdC_item22; + } + public void setNursingProdC_item22(String nursingProdC_item22) { + this.nursingProdC_item22 = nursingProdC_item22; + } + public String getNursingProdC_item23() { + return nursingProdC_item23; + } + public void setNursingProdC_item23(String nursingProdC_item23) { + this.nursingProdC_item23 = nursingProdC_item23; + } + public String getNursingProdC_item24() { + return nursingProdC_item24; + } + public void setNursingProdC_item24(String nursingProdC_item24) { + this.nursingProdC_item24 = nursingProdC_item24; + } + public String getNursingProdC_sub1() { + return nursingProdC_sub1; + } + public void setNursingProdC_sub1(String nursingProdC_sub1) { + this.nursingProdC_sub1 = nursingProdC_sub1; + } + public String getNursingProdC_sub2() { + return nursingProdC_sub2; + } + public void setNursingProdC_sub2(String nursingProdC_sub2) { + this.nursingProdC_sub2 = nursingProdC_sub2; + } + public String getNursingProdC_sub3() { + return nursingProdC_sub3; + } + public void setNursingProdC_sub3(String nursingProdC_sub3) { + this.nursingProdC_sub3 = nursingProdC_sub3; + } + public String getNursingProdC_sub4() { + return nursingProdC_sub4; + } + public void setNursingProdC_sub4(String nursingProdC_sub4) { + this.nursingProdC_sub4 = nursingProdC_sub4; + } + public String getNursingProdC_subsum1() { + return nursingProdC_subsum1; + } + public void setNursingProdC_subsum1(String nursingProdC_subsum1) { + this.nursingProdC_subsum1 = nursingProdC_subsum1; + } + public String getNursingProdC_sum11() { + return nursingProdC_sum11; + } + public void setNursingProdC_sum11(String nursingProdC_sum11) { + this.nursingProdC_sum11 = nursingProdC_sum11; + } + public String getNursingProdC_sum21() { + return nursingProdC_sum21; + } + public void setNursingProdC_sum21(String nursingProdC_sum21) { + this.nursingProdC_sum21 = nursingProdC_sum21; + } + public String getNursingProdC_THP1() { + return nursingProdC_THP1; + } + public void setNursingProdC_THP1(String nursingProdC_THP1) { + this.nursingProdC_THP1 = nursingProdC_THP1; + } + public String getNursingProdC_THP2() { + return nursingProdC_THP2; + } + public void setNursingProdC_THP2(String nursingProdC_THP2) { + this.nursingProdC_THP2 = nursingProdC_THP2; + } + public String getNursingProdC_THP3() { + return nursingProdC_THP3; + } + public void setNursingProdC_THP3(String nursingProdC_THP3) { + this.nursingProdC_THP3 = nursingProdC_THP3; + } + public String getNursingProdC_THP4() { + return nursingProdC_THP4; + } + public void setNursingProdC_THP4(String nursingProdC_THP4) { + this.nursingProdC_THP4 = nursingProdC_THP4; + } + public String getNursingProdC_THPsum1() { + return nursingProdC_THPsum1; + } + public void setNursingProdC_THPsum1(String nursingProdC_THPsum1) { + this.nursingProdC_THPsum1 = nursingProdC_THPsum1; + } + public String getNursingProdCCS_subsum1() { + return nursingProdCCS_subsum1; + } + public void setNursingProdCCS_subsum1(String nursingProdCCS_subsum1) { + this.nursingProdCCS_subsum1 = nursingProdCCS_subsum1; + } + public String getNursingProdCCS1() { + return nursingProdCCS1; + } + public void setNursingProdCCS1(String nursingProdCCS1) { + this.nursingProdCCS1 = nursingProdCCS1; + } + public String getNursingProdCCS2() { + return nursingProdCCS2; + } + public void setNursingProdCCS2(String nursingProdCCS2) { + this.nursingProdCCS2 = nursingProdCCS2; + } + public String getNursingProdCCS3() { + return nursingProdCCS3; + } + public void setNursingProdCCS3(String nursingProdCCS3) { + this.nursingProdCCS3 = nursingProdCCS3; + } + public String getNursingProdCCS4() { + return nursingProdCCS4; + } + public void setNursingProdCCS4(String nursingProdCCS4) { + this.nursingProdCCS4 = nursingProdCCS4; + } + public String getNursingProdH_calc1() { + return nursingProdH_calc1; + } + public void setNursingProdH_calc1(String nursingProdH_calc1) { + this.nursingProdH_calc1 = nursingProdH_calc1; + } + public String getNursingProdH_calc2() { + return nursingProdH_calc2; + } + public void setNursingProdH_calc2(String nursingProdH_calc2) { + this.nursingProdH_calc2 = nursingProdH_calc2; + } + public String getNursingProdH_calc3() { + return nursingProdH_calc3; + } + public void setNursingProdH_calc3(String nursingProdH_calc3) { + this.nursingProdH_calc3 = nursingProdH_calc3; + } + public String getNursingProdH_calc4() { + return nursingProdH_calc4; + } + public void setNursingProdH_calc4(String nursingProdH_calc4) { + this.nursingProdH_calc4 = nursingProdH_calc4; + } + public String getNursingProdH_calcsum1() { + return nursingProdH_calcsum1; + } + public void setNursingProdH_calcsum1(String nursingProdH_calcsum1) { + this.nursingProdH_calcsum1 = nursingProdH_calcsum1; + } + public String getNursingProdH_item11() { + return nursingProdH_item11; + } + public void setNursingProdH_item11(String nursingProdH_item11) { + this.nursingProdH_item11 = nursingProdH_item11; + } + public String getNursingProdH_item12() { + return nursingProdH_item12; + } + public void setNursingProdH_item12(String nursingProdH_item12) { + this.nursingProdH_item12 = nursingProdH_item12; + } + public String getNursingProdH_item13() { + return nursingProdH_item13; + } + public void setNursingProdH_item13(String nursingProdH_item13) { + this.nursingProdH_item13 = nursingProdH_item13; + } + public String getNursingProdH_item14() { + return nursingProdH_item14; + } + public void setNursingProdH_item14(String nursingProdH_item14) { + this.nursingProdH_item14 = nursingProdH_item14; + } + public String getNursingProdH_item21() { + return nursingProdH_item21; + } + public void setNursingProdH_item21(String nursingProdH_item21) { + this.nursingProdH_item21 = nursingProdH_item21; + } + public String getNursingProdH_item22() { + return nursingProdH_item22; + } + public void setNursingProdH_item22(String nursingProdH_item22) { + this.nursingProdH_item22 = nursingProdH_item22; + } + public String getNursingProdH_item23() { + return nursingProdH_item23; + } + public void setNursingProdH_item23(String nursingProdH_item23) { + this.nursingProdH_item23 = nursingProdH_item23; + } + public String getNursingProdH_item24() { + return nursingProdH_item24; + } + public void setNursingProdH_item24(String nursingProdH_item24) { + this.nursingProdH_item24 = nursingProdH_item24; + } + public String getNursingProdH_sub1() { + return nursingProdH_sub1; + } + public void setNursingProdH_sub1(String nursingProdH_sub1) { + this.nursingProdH_sub1 = nursingProdH_sub1; + } + public String getNursingProdH_sub2() { + return nursingProdH_sub2; + } + public void setNursingProdH_sub2(String nursingProdH_sub2) { + this.nursingProdH_sub2 = nursingProdH_sub2; + } + public String getNursingProdH_sub3() { + return nursingProdH_sub3; + } + public void setNursingProdH_sub3(String nursingProdH_sub3) { + this.nursingProdH_sub3 = nursingProdH_sub3; + } + public String getNursingProdH_sub4() { + return nursingProdH_sub4; + } + public void setNursingProdH_sub4(String nursingProdH_sub4) { + this.nursingProdH_sub4 = nursingProdH_sub4; + } + public String getNursingProdH_subsum1() { + return nursingProdH_subsum1; + } + public void setNursingProdH_subsum1(String nursingProdH_subsum1) { + this.nursingProdH_subsum1 = nursingProdH_subsum1; + } + public String getNursingProdH_sum11() { + return nursingProdH_sum11; + } + public void setNursingProdH_sum11(String nursingProdH_sum11) { + this.nursingProdH_sum11 = nursingProdH_sum11; + } + public String getNursingProdH_sum21() { + return nursingProdH_sum21; + } + public void setNursingProdH_sum21(String nursingProdH_sum21) { + this.nursingProdH_sum21 = nursingProdH_sum21; + } + public String getNursingProdH_THP1() { + return nursingProdH_THP1; + } + public void setNursingProdH_THP1(String nursingProdH_THP1) { + this.nursingProdH_THP1 = nursingProdH_THP1; + } + public String getNursingProdH_THP2() { + return nursingProdH_THP2; + } + public void setNursingProdH_THP2(String nursingProdH_THP2) { + this.nursingProdH_THP2 = nursingProdH_THP2; + } + public String getNursingProdH_THP3() { + return nursingProdH_THP3; + } + public void setNursingProdH_THP3(String nursingProdH_THP3) { + this.nursingProdH_THP3 = nursingProdH_THP3; + } + public String getNursingProdH_THP4() { + return nursingProdH_THP4; + } + public void setNursingProdH_THP4(String nursingProdH_THP4) { + this.nursingProdH_THP4 = nursingProdH_THP4; + } + public String getNursingProdH_THPsum1() { + return nursingProdH_THPsum1; + } + public void setNursingProdH_THPsum1(String nursingProdH_THPsum1) { + this.nursingProdH_THPsum1 = nursingProdH_THPsum1; + } + public String getNursingProdHCS_subsum1() { + return nursingProdHCS_subsum1; + } + public void setNursingProdHCS_subsum1(String nursingProdHCS_subsum1) { + this.nursingProdHCS_subsum1 = nursingProdHCS_subsum1; + } + public String getNursingProdHCS1() { + return nursingProdHCS1; + } + public void setNursingProdHCS1(String nursingProdHCS1) { + this.nursingProdHCS1 = nursingProdHCS1; + } + public String getNursingProdHCS2() { + return nursingProdHCS2; + } + public void setNursingProdHCS2(String nursingProdHCS2) { + this.nursingProdHCS2 = nursingProdHCS2; + } + public String getNursingProdHCS3() { + return nursingProdHCS3; + } + public void setNursingProdHCS3(String nursingProdHCS3) { + this.nursingProdHCS3 = nursingProdHCS3; + } + public String getNursingProdHCS4() { + return nursingProdHCS4; + } + public void setNursingProdHCS4(String nursingProdHCS4) { + this.nursingProdHCS4 = nursingProdHCS4; + } + public String getNursingProvider1() { + return nursingProvider1; + } + public void setNursingProvider1(String nursingProvider1) { + this.nursingProvider1 = nursingProvider1; + } + public String getNursingProvider2() { + return nursingProvider2; + } + public void setNursingProvider2(String nursingProvider2) { + this.nursingProvider2 = nursingProvider2; + } + public String getNursingProvider3() { + return nursingProvider3; + } + public void setNursingProvider3(String nursingProvider3) { + this.nursingProvider3 = nursingProvider3; + } + public String getNursingProvider4() { + return nursingProvider4; + } + public void setNursingProvider4(String nursingProvider4) { + this.nursingProvider4 = nursingProvider4; + } + public String getNursingStaffRate_total() { + return nursingStaffRate_total; + } + public void setNursingStaffRate_total(String nursingStaffRate_total) { + this.nursingStaffRate_total = nursingStaffRate_total; + } + public String getNursingStaffRate1() { + return nursingStaffRate1; + } + public void setNursingStaffRate1(String nursingStaffRate1) { + this.nursingStaffRate1 = nursingStaffRate1; + } + public String getNursingStaffRate2() { + return nursingStaffRate2; + } + public void setNursingStaffRate2(String nursingStaffRate2) { + this.nursingStaffRate2 = nursingStaffRate2; + } + public String getNursingStaffRate3() { + return nursingStaffRate3; + } + public void setNursingStaffRate3(String nursingStaffRate3) { + this.nursingStaffRate3 = nursingStaffRate3; + } + public String getNursingStaffRate4() { + return nursingStaffRate4; + } + public void setNursingStaffRate4(String nursingStaffRate4) { + this.nursingStaffRate4 = nursingStaffRate4; + } + public String getOccupiedPercentageInScopeQ1() { + return occupiedPercentageInScopeQ1; + } + public void setOccupiedPercentageInScopeQ1(String occupiedPercentageInScopeQ1) { + this.occupiedPercentageInScopeQ1 = occupiedPercentageInScopeQ1; + } + public String getOccupiedPercentageInScopeQ2() { + return occupiedPercentageInScopeQ2; + } + public void setOccupiedPercentageInScopeQ2(String occupiedPercentageInScopeQ2) { + this.occupiedPercentageInScopeQ2 = occupiedPercentageInScopeQ2; + } + public String getOccupiedPercentageInScopeQ3() { + return occupiedPercentageInScopeQ3; + } + public void setOccupiedPercentageInScopeQ3(String occupiedPercentageInScopeQ3) { + this.occupiedPercentageInScopeQ3 = occupiedPercentageInScopeQ3; + } + public String getOccupiedPercentageInScopeQ4() { + return occupiedPercentageInScopeQ4; + } + public void setOccupiedPercentageInScopeQ4(String occupiedPercentageInScopeQ4) { + this.occupiedPercentageInScopeQ4 = occupiedPercentageInScopeQ4; + } + public String getOccupiedPercentageOutScopeQ1() { + return occupiedPercentageOutScopeQ1; + } + public void setOccupiedPercentageOutScopeQ1(String occupiedPercentageOutScopeQ1) { + this.occupiedPercentageOutScopeQ1 = occupiedPercentageOutScopeQ1; + } + public String getOccupiedPercentageOutScopeQ2() { + return occupiedPercentageOutScopeQ2; + } + public void setOccupiedPercentageOutScopeQ2(String occupiedPercentageOutScopeQ2) { + this.occupiedPercentageOutScopeQ2 = occupiedPercentageOutScopeQ2; + } + public String getOccupiedPercentageOutScopeQ3() { + return occupiedPercentageOutScopeQ3; + } + public void setOccupiedPercentageOutScopeQ3(String occupiedPercentageOutScopeQ3) { + this.occupiedPercentageOutScopeQ3 = occupiedPercentageOutScopeQ3; + } + public String getOccupiedPercentageOutScopeQ4() { + return occupiedPercentageOutScopeQ4; + } + public void setOccupiedPercentageOutScopeQ4(String occupiedPercentageOutScopeQ4) { + this.occupiedPercentageOutScopeQ4 = occupiedPercentageOutScopeQ4; + } + public String getOccupiedPercentagePrivateQ1() { + return occupiedPercentagePrivateQ1; + } + public void setOccupiedPercentagePrivateQ1(String occupiedPercentagePrivateQ1) { + this.occupiedPercentagePrivateQ1 = occupiedPercentagePrivateQ1; + } + public String getOccupiedPercentagePrivateQ2() { + return occupiedPercentagePrivateQ2; + } + public void setOccupiedPercentagePrivateQ2(String occupiedPercentagePrivateQ2) { + this.occupiedPercentagePrivateQ2 = occupiedPercentagePrivateQ2; + } + public String getOccupiedPercentagePrivateQ3() { + return occupiedPercentagePrivateQ3; + } + public void setOccupiedPercentagePrivateQ3(String occupiedPercentagePrivateQ3) { + this.occupiedPercentagePrivateQ3 = occupiedPercentagePrivateQ3; + } + public String getOccupiedPercentagePrivateQ4() { + return occupiedPercentagePrivateQ4; + } + public void setOccupiedPercentagePrivateQ4(String occupiedPercentagePrivateQ4) { + this.occupiedPercentagePrivateQ4 = occupiedPercentagePrivateQ4; + } + public String getOccupiedPercentageTotalQ1() { + return occupiedPercentageTotalQ1; + } + public void setOccupiedPercentageTotalQ1(String occupiedPercentageTotalQ1) { + this.occupiedPercentageTotalQ1 = occupiedPercentageTotalQ1; + } + public String getOccupiedPercentageTotalQ2() { + return occupiedPercentageTotalQ2; + } + public void setOccupiedPercentageTotalQ2(String occupiedPercentageTotalQ2) { + this.occupiedPercentageTotalQ2 = occupiedPercentageTotalQ2; + } + public String getOccupiedPercentageTotalQ3() { + return occupiedPercentageTotalQ3; + } + public void setOccupiedPercentageTotalQ3(String occupiedPercentageTotalQ3) { + this.occupiedPercentageTotalQ3 = occupiedPercentageTotalQ3; + } + public String getOccupiedPercentageTotalQ4() { + return occupiedPercentageTotalQ4; + } + public void setOccupiedPercentageTotalQ4(String occupiedPercentageTotalQ4) { + this.occupiedPercentageTotalQ4 = occupiedPercentageTotalQ4; + } + public String getOccupiedQ1() { + return occupiedQ1; + } + public void setOccupiedQ1(String occupiedQ1) { + this.occupiedQ1 = occupiedQ1; + } + public String getOccupiedQ2() { + return occupiedQ2; + } + public void setOccupiedQ2(String occupiedQ2) { + this.occupiedQ2 = occupiedQ2; + } + public String getOccupiedQ3() { + return occupiedQ3; + } + public void setOccupiedQ3(String occupiedQ3) { + this.occupiedQ3 = occupiedQ3; + } + public String getOccupiedQ4() { + return occupiedQ4; + } + public void setOccupiedQ4(String occupiedQ4) { + this.occupiedQ4 = occupiedQ4; + } + public String getOccupiedTotal() { + return occupiedTotal; + } + public void setOccupiedTotal(String occupiedTotal) { + this.occupiedTotal = occupiedTotal; + } + public String getOpEx_calc38() { + return opEx_calc38; + } + public void setOpEx_calc38(String opEx_calc38) { + this.opEx_calc38 = opEx_calc38; + } + public String getOpEx_calc39() { + return opEx_calc39; + } + public void setOpEx_calc39(String opEx_calc39) { + this.opEx_calc39 = opEx_calc39; + } + public String getOpEx_data_total() { + return opEx_data_total; + } + public void setOpEx_data_total(String opEx_data_total) { + this.opEx_data_total = opEx_data_total; + } + public String getOpEx_item138() { + return opEx_item138; + } + public void setOpEx_item138(String opEx_item138) { + this.opEx_item138 = opEx_item138; + } + public String getOpEx_item139() { + return opEx_item139; + } + public void setOpEx_item139(String opEx_item139) { + this.opEx_item139 = opEx_item139; + } + public String getOpEx_note_sum6() { + return opEx_note_sum6; + } + public void setOpEx_note_sum6(String opEx_note_sum6) { + this.opEx_note_sum6 = opEx_note_sum6; + } + public String getOpEx_note1() { + return opEx_note1; + } + public void setOpEx_note1(String opEx_note1) { + this.opEx_note1 = opEx_note1; + } + public String getOpEx_note10() { + return opEx_note10; + } + public void setOpEx_note10(String opEx_note10) { + this.opEx_note10 = opEx_note10; + } + public String getOpEx_note11() { + return opEx_note11; + } + public void setOpEx_note11(String opEx_note11) { + this.opEx_note11 = opEx_note11; + } + public String getOpEx_note12() { + return opEx_note12; + } + public void setOpEx_note12(String opEx_note12) { + this.opEx_note12 = opEx_note12; + } + public String getOpEx_note13() { + return opEx_note13; + } + public void setOpEx_note13(String opEx_note13) { + this.opEx_note13 = opEx_note13; + } + public String getOpEx_note14() { + return opEx_note14; + } + public void setOpEx_note14(String opEx_note14) { + this.opEx_note14 = opEx_note14; + } + public String getOpEx_note15() { + return opEx_note15; + } + public void setOpEx_note15(String opEx_note15) { + this.opEx_note15 = opEx_note15; + } + public String getOpEx_note16() { + return opEx_note16; + } + public void setOpEx_note16(String opEx_note16) { + this.opEx_note16 = opEx_note16; + } + public String getOpEx_note17() { + return opEx_note17; + } + public void setOpEx_note17(String opEx_note17) { + this.opEx_note17 = opEx_note17; + } + public String getOpEx_note18() { + return opEx_note18; + } + public void setOpEx_note18(String opEx_note18) { + this.opEx_note18 = opEx_note18; + } + public String getOpEx_note19() { + return opEx_note19; + } + public void setOpEx_note19(String opEx_note19) { + this.opEx_note19 = opEx_note19; + } + public String getOpEx_note2() { + return opEx_note2; + } + public void setOpEx_note2(String opEx_note2) { + this.opEx_note2 = opEx_note2; + } + public String getOpEx_note20() { + return opEx_note20; + } + public void setOpEx_note20(String opEx_note20) { + this.opEx_note20 = opEx_note20; + } + public String getOpEx_note21() { + return opEx_note21; + } + public void setOpEx_note21(String opEx_note21) { + this.opEx_note21 = opEx_note21; + } + public String getOpEx_note22() { + return opEx_note22; + } + public void setOpEx_note22(String opEx_note22) { + this.opEx_note22 = opEx_note22; + } + public String getOpEx_note23() { + return opEx_note23; + } + public void setOpEx_note23(String opEx_note23) { + this.opEx_note23 = opEx_note23; + } + public String getOpEx_note24() { + return opEx_note24; + } + public void setOpEx_note24(String opEx_note24) { + this.opEx_note24 = opEx_note24; + } + public String getOpEx_note25() { + return opEx_note25; + } + public void setOpEx_note25(String opEx_note25) { + this.opEx_note25 = opEx_note25; + } + public String getOpEx_note26() { + return opEx_note26; + } + public void setOpEx_note26(String opEx_note26) { + this.opEx_note26 = opEx_note26; + } + public String getOpEx_note27() { + return opEx_note27; + } + public void setOpEx_note27(String opEx_note27) { + this.opEx_note27 = opEx_note27; + } + public String getOpEx_note28() { + return opEx_note28; + } + public void setOpEx_note28(String opEx_note28) { + this.opEx_note28 = opEx_note28; + } + public String getOpEx_note29() { + return opEx_note29; + } + public void setOpEx_note29(String opEx_note29) { + this.opEx_note29 = opEx_note29; + } + public String getOpEx_note3() { + return opEx_note3; + } + public void setOpEx_note3(String opEx_note3) { + this.opEx_note3 = opEx_note3; + } + public String getOpEx_note30() { + return opEx_note30; + } + public void setOpEx_note30(String opEx_note30) { + this.opEx_note30 = opEx_note30; + } + public String getOpEx_note31() { + return opEx_note31; + } + public void setOpEx_note31(String opEx_note31) { + this.opEx_note31 = opEx_note31; + } + public String getOpEx_note32() { + return opEx_note32; + } + public void setOpEx_note32(String opEx_note32) { + this.opEx_note32 = opEx_note32; + } + public String getOpEx_note33() { + return opEx_note33; + } + public void setOpEx_note33(String opEx_note33) { + this.opEx_note33 = opEx_note33; + } + public String getOpEx_note34() { + return opEx_note34; + } + public void setOpEx_note34(String opEx_note34) { + this.opEx_note34 = opEx_note34; + } + public String getOpEx_note35() { + return opEx_note35; + } + public void setOpEx_note35(String opEx_note35) { + this.opEx_note35 = opEx_note35; + } + public String getOpEx_note36() { + return opEx_note36; + } + public void setOpEx_note36(String opEx_note36) { + this.opEx_note36 = opEx_note36; + } + public String getOpEx_note38() { + return opEx_note38; + } + public void setOpEx_note38(String opEx_note38) { + this.opEx_note38 = opEx_note38; + } + public String getOpEx_note39() { + return opEx_note39; + } + public void setOpEx_note39(String opEx_note39) { + this.opEx_note39 = opEx_note39; + } + public String getOpEx_note4() { + return opEx_note4; + } + public void setOpEx_note4(String opEx_note4) { + this.opEx_note4 = opEx_note4; + } + public String getOpEx_note5() { + return opEx_note5; + } + public void setOpEx_note5(String opEx_note5) { + this.opEx_note5 = opEx_note5; + } + public String getOpEx_note6() { + return opEx_note6; + } + public void setOpEx_note6(String opEx_note6) { + this.opEx_note6 = opEx_note6; + } + public String getOpEx_note7() { + return opEx_note7; + } + public void setOpEx_note7(String opEx_note7) { + this.opEx_note7 = opEx_note7; + } + public String getOpEx_note8() { + return opEx_note8; + } + public void setOpEx_note8(String opEx_note8) { + this.opEx_note8 = opEx_note8; + } + public String getOpEx_note9() { + return opEx_note9; + } + public void setOpEx_note9(String opEx_note9) { + this.opEx_note9 = opEx_note9; + } + public String getOpEx_sub_note() { + return opEx_sub_note; + } + public void setOpEx_sub_note(String opEx_sub_note) { + this.opEx_sub_note = opEx_sub_note; + } + public String getOpEx_sub1() { + return opEx_sub1; + } + public void setOpEx_sub1(String opEx_sub1) { + this.opEx_sub1 = opEx_sub1; + } + public String getOpEx_sum_note1() { + return opEx_sum_note1; + } + public void setOpEx_sum_note1(String opEx_sum_note1) { + this.opEx_sum_note1 = opEx_sum_note1; + } + public String getOpEx_sum_note2() { + return opEx_sum_note2; + } + public void setOpEx_sum_note2(String opEx_sum_note2) { + this.opEx_sum_note2 = opEx_sum_note2; + } + public String getOpEx_sum_note3() { + return opEx_sum_note3; + } + public void setOpEx_sum_note3(String opEx_sum_note3) { + this.opEx_sum_note3 = opEx_sum_note3; + } + public String getOpEx_sum_note4() { + return opEx_sum_note4; + } + public void setOpEx_sum_note4(String opEx_sum_note4) { + this.opEx_sum_note4 = opEx_sum_note4; + } + public String getOpEx_sum_note5() { + return opEx_sum_note5; + } + public void setOpEx_sum_note5(String opEx_sum_note5) { + this.opEx_sum_note5 = opEx_sum_note5; + } + public String getOpEx_sum11() { + return opEx_sum11; + } + public void setOpEx_sum11(String opEx_sum11) { + this.opEx_sum11 = opEx_sum11; + } + public String getOpEx_sum12() { + return opEx_sum12; + } + public void setOpEx_sum12(String opEx_sum12) { + this.opEx_sum12 = opEx_sum12; + } + public String getOpEx_sum13() { + return opEx_sum13; + } + public void setOpEx_sum13(String opEx_sum13) { + this.opEx_sum13 = opEx_sum13; + } + public String getOpEx_sum14() { + return opEx_sum14; + } + public void setOpEx_sum14(String opEx_sum14) { + this.opEx_sum14 = opEx_sum14; + } + public String getOpEx_sum15() { + return opEx_sum15; + } + public void setOpEx_sum15(String opEx_sum15) { + this.opEx_sum15 = opEx_sum15; + } + public String getOpEx_sum16() { + return opEx_sum16; + } + public void setOpEx_sum16(String opEx_sum16) { + this.opEx_sum16 = opEx_sum16; + } + public String getOpEx_total_note() { + return opEx_total_note; + } + public void setOpEx_total_note(String opEx_total_note) { + this.opEx_total_note = opEx_total_note; + } + public String getOpEx_YTD1() { + return opEx_YTD1; + } + public void setOpEx_YTD1(String opEx_YTD1) { + this.opEx_YTD1 = opEx_YTD1; + } + public String getOpEx_YTD10() { + return opEx_YTD10; + } + public void setOpEx_YTD10(String opEx_YTD10) { + this.opEx_YTD10 = opEx_YTD10; + } + public String getOpEx_YTD11() { + return opEx_YTD11; + } + public void setOpEx_YTD11(String opEx_YTD11) { + this.opEx_YTD11 = opEx_YTD11; + } + public String getOpEx_YTD12() { + return opEx_YTD12; + } + public void setOpEx_YTD12(String opEx_YTD12) { + this.opEx_YTD12 = opEx_YTD12; + } + public String getOpEx_YTD13() { + return opEx_YTD13; + } + public void setOpEx_YTD13(String opEx_YTD13) { + this.opEx_YTD13 = opEx_YTD13; + } + public String getOpEx_YTD14() { + return opEx_YTD14; + } + public void setOpEx_YTD14(String opEx_YTD14) { + this.opEx_YTD14 = opEx_YTD14; + } + public String getOpEx_YTD15() { + return opEx_YTD15; + } + public void setOpEx_YTD15(String opEx_YTD15) { + this.opEx_YTD15 = opEx_YTD15; + } + public String getOpEx_YTD16() { + return opEx_YTD16; + } + public void setOpEx_YTD16(String opEx_YTD16) { + this.opEx_YTD16 = opEx_YTD16; + } + public String getOpEx_YTD17() { + return opEx_YTD17; + } + public void setOpEx_YTD17(String opEx_YTD17) { + this.opEx_YTD17 = opEx_YTD17; + } + public String getOpEx_YTD18() { + return opEx_YTD18; + } + public void setOpEx_YTD18(String opEx_YTD18) { + this.opEx_YTD18 = opEx_YTD18; + } + public String getOpEx_YTD19() { + return opEx_YTD19; + } + public void setOpEx_YTD19(String opEx_YTD19) { + this.opEx_YTD19 = opEx_YTD19; + } + public String getOpEx_YTD2() { + return opEx_YTD2; + } + public void setOpEx_YTD2(String opEx_YTD2) { + this.opEx_YTD2 = opEx_YTD2; + } + public String getOpEx_YTD20() { + return opEx_YTD20; + } + public void setOpEx_YTD20(String opEx_YTD20) { + this.opEx_YTD20 = opEx_YTD20; + } + public String getOpEx_YTD21() { + return opEx_YTD21; + } + public void setOpEx_YTD21(String opEx_YTD21) { + this.opEx_YTD21 = opEx_YTD21; + } + public String getOpEx_YTD22() { + return opEx_YTD22; + } + public void setOpEx_YTD22(String opEx_YTD22) { + this.opEx_YTD22 = opEx_YTD22; + } + public String getOpEx_YTD23() { + return opEx_YTD23; + } + public void setOpEx_YTD23(String opEx_YTD23) { + this.opEx_YTD23 = opEx_YTD23; + } + public String getOpEx_YTD24() { + return opEx_YTD24; + } + public void setOpEx_YTD24(String opEx_YTD24) { + this.opEx_YTD24 = opEx_YTD24; + } + public String getOpEx_YTD25() { + return opEx_YTD25; + } + public void setOpEx_YTD25(String opEx_YTD25) { + this.opEx_YTD25 = opEx_YTD25; + } + public String getOpEx_YTD26() { + return opEx_YTD26; + } + public void setOpEx_YTD26(String opEx_YTD26) { + this.opEx_YTD26 = opEx_YTD26; + } + public String getOpEx_YTD27() { + return opEx_YTD27; + } + public void setOpEx_YTD27(String opEx_YTD27) { + this.opEx_YTD27 = opEx_YTD27; + } + public String getOpEx_YTD28() { + return opEx_YTD28; + } + public void setOpEx_YTD28(String opEx_YTD28) { + this.opEx_YTD28 = opEx_YTD28; + } + public String getOpEx_YTD29() { + return opEx_YTD29; + } + public void setOpEx_YTD29(String opEx_YTD29) { + this.opEx_YTD29 = opEx_YTD29; + } + public String getOpEx_YTD3() { + return opEx_YTD3; + } + public void setOpEx_YTD3(String opEx_YTD3) { + this.opEx_YTD3 = opEx_YTD3; + } + public String getOpEx_YTD30() { + return opEx_YTD30; + } + public void setOpEx_YTD30(String opEx_YTD30) { + this.opEx_YTD30 = opEx_YTD30; + } + public String getOpEx_YTD31() { + return opEx_YTD31; + } + public void setOpEx_YTD31(String opEx_YTD31) { + this.opEx_YTD31 = opEx_YTD31; + } + public String getOpEx_YTD32() { + return opEx_YTD32; + } + public void setOpEx_YTD32(String opEx_YTD32) { + this.opEx_YTD32 = opEx_YTD32; + } + public String getOpEx_YTD33() { + return opEx_YTD33; + } + public void setOpEx_YTD33(String opEx_YTD33) { + this.opEx_YTD33 = opEx_YTD33; + } + public String getOpEx_YTD34() { + return opEx_YTD34; + } + public void setOpEx_YTD34(String opEx_YTD34) { + this.opEx_YTD34 = opEx_YTD34; + } + public String getOpEx_YTD35() { + return opEx_YTD35; + } + public void setOpEx_YTD35(String opEx_YTD35) { + this.opEx_YTD35 = opEx_YTD35; + } + public String getOpEx_YTD4() { + return opEx_YTD4; + } + public void setOpEx_YTD4(String opEx_YTD4) { + this.opEx_YTD4 = opEx_YTD4; + } + public String getOpEx_YTD5() { + return opEx_YTD5; + } + public void setOpEx_YTD5(String opEx_YTD5) { + this.opEx_YTD5 = opEx_YTD5; + } + public String getOpEx_YTD6() { + return opEx_YTD6; + } + public void setOpEx_YTD6(String opEx_YTD6) { + this.opEx_YTD6 = opEx_YTD6; + } + public String getOpEx_YTD7() { + return opEx_YTD7; + } + public void setOpEx_YTD7(String opEx_YTD7) { + this.opEx_YTD7 = opEx_YTD7; + } + public String getOpEx_YTD8() { + return opEx_YTD8; + } + public void setOpEx_YTD8(String opEx_YTD8) { + this.opEx_YTD8 = opEx_YTD8; + } + public String getOpEx_YTD9() { + return opEx_YTD9; + } + public void setOpEx_YTD9(String opEx_YTD9) { + this.opEx_YTD9 = opEx_YTD9; + } + public String getOpRev_note1() { + return opRev_note1; + } + public void setOpRev_note1(String opRev_note1) { + this.opRev_note1 = opRev_note1; + } + public String getOpRev_note10() { + return opRev_note10; + } + public void setOpRev_note10(String opRev_note10) { + this.opRev_note10 = opRev_note10; + } + public String getOpRev_note11() { + return opRev_note11; + } + public void setOpRev_note11(String opRev_note11) { + this.opRev_note11 = opRev_note11; + } + public String getOpRev_note12() { + return opRev_note12; + } + public void setOpRev_note12(String opRev_note12) { + this.opRev_note12 = opRev_note12; + } + public String getOpRev_note13() { + return opRev_note13; + } + public void setOpRev_note13(String opRev_note13) { + this.opRev_note13 = opRev_note13; + } + public String getOpRev_note14() { + return opRev_note14; + } + public void setOpRev_note14(String opRev_note14) { + this.opRev_note14 = opRev_note14; + } + public String getOpRev_note15() { + return opRev_note15; + } + public void setOpRev_note15(String opRev_note15) { + this.opRev_note15 = opRev_note15; + } + public String getOpRev_note16() { + return opRev_note16; + } + public void setOpRev_note16(String opRev_note16) { + this.opRev_note16 = opRev_note16; + } + public String getOpRev_note17() { + return opRev_note17; + } + public void setOpRev_note17(String opRev_note17) { + this.opRev_note17 = opRev_note17; + } + public String getOpRev_note18() { + return opRev_note18; + } + public void setOpRev_note18(String opRev_note18) { + this.opRev_note18 = opRev_note18; + } + public String getOpRev_note19() { + return opRev_note19; + } + public void setOpRev_note19(String opRev_note19) { + this.opRev_note19 = opRev_note19; + } + public String getOpRev_note2() { + return opRev_note2; + } + public void setOpRev_note2(String opRev_note2) { + this.opRev_note2 = opRev_note2; + } + public String getOpRev_note20() { + return opRev_note20; + } + public void setOpRev_note20(String opRev_note20) { + this.opRev_note20 = opRev_note20; + } + public String getOpRev_note3() { + return opRev_note3; + } + public void setOpRev_note3(String opRev_note3) { + this.opRev_note3 = opRev_note3; + } + public String getOpRev_note4() { + return opRev_note4; + } + public void setOpRev_note4(String opRev_note4) { + this.opRev_note4 = opRev_note4; + } + public String getOpRev_note5() { + return opRev_note5; + } + public void setOpRev_note5(String opRev_note5) { + this.opRev_note5 = opRev_note5; + } + public String getOpRev_note6() { + return opRev_note6; + } + public void setOpRev_note6(String opRev_note6) { + this.opRev_note6 = opRev_note6; + } + public String getOpRev_note7() { + return opRev_note7; + } + public void setOpRev_note7(String opRev_note7) { + this.opRev_note7 = opRev_note7; + } + public String getOpRev_note8() { + return opRev_note8; + } + public void setOpRev_note8(String opRev_note8) { + this.opRev_note8 = opRev_note8; + } + public String getOpRev_note9() { + return opRev_note9; + } + public void setOpRev_note9(String opRev_note9) { + this.opRev_note9 = opRev_note9; + } + public String getOpRev_sum_note1() { + return opRev_sum_note1; + } + public void setOpRev_sum_note1(String opRev_sum_note1) { + this.opRev_sum_note1 = opRev_sum_note1; + } + public String getOpRev_sum_note2() { + return opRev_sum_note2; + } + public void setOpRev_sum_note2(String opRev_sum_note2) { + this.opRev_sum_note2 = opRev_sum_note2; + } + public String getOpRev_sum_note3() { + return opRev_sum_note3; + } + public void setOpRev_sum_note3(String opRev_sum_note3) { + this.opRev_sum_note3 = opRev_sum_note3; + } + public String getOpRev_sum_note4() { + return opRev_sum_note4; + } + public void setOpRev_sum_note4(String opRev_sum_note4) { + this.opRev_sum_note4 = opRev_sum_note4; + } + public String getOpRev_sum_note5() { + return opRev_sum_note5; + } + public void setOpRev_sum_note5(String opRev_sum_note5) { + this.opRev_sum_note5 = opRev_sum_note5; + } + public String getOpRev_sum11() { + return opRev_sum11; + } + public void setOpRev_sum11(String opRev_sum11) { + this.opRev_sum11 = opRev_sum11; + } + public String getOpRev_sum12() { + return opRev_sum12; + } + public void setOpRev_sum12(String opRev_sum12) { + this.opRev_sum12 = opRev_sum12; + } + public String getOpRev_sum13() { + return opRev_sum13; + } + public void setOpRev_sum13(String opRev_sum13) { + this.opRev_sum13 = opRev_sum13; + } + public String getOpRev_sum14() { + return opRev_sum14; + } + public void setOpRev_sum14(String opRev_sum14) { + this.opRev_sum14 = opRev_sum14; + } + public String getOpRev_sum15() { + return opRev_sum15; + } + public void setOpRev_sum15(String opRev_sum15) { + this.opRev_sum15 = opRev_sum15; + } + public String getOpRev_total_note() { + return opRev_total_note; + } + public void setOpRev_total_note(String opRev_total_note) { + this.opRev_total_note = opRev_total_note; + } + public String getOpRev_YTD_total() { + return opRev_YTD_total; + } + public void setOpRev_YTD_total(String opRev_YTD_total) { + this.opRev_YTD_total = opRev_YTD_total; + } + public String getOpRev_YTD1() { + return opRev_YTD1; + } + public void setOpRev_YTD1(String opRev_YTD1) { + this.opRev_YTD1 = opRev_YTD1; + } + public String getOpRev_YTD10() { + return opRev_YTD10; + } + public void setOpRev_YTD10(String opRev_YTD10) { + this.opRev_YTD10 = opRev_YTD10; + } + public String getOpRev_YTD11() { + return opRev_YTD11; + } + public void setOpRev_YTD11(String opRev_YTD11) { + this.opRev_YTD11 = opRev_YTD11; + } + public String getOpRev_YTD12() { + return opRev_YTD12; + } + public void setOpRev_YTD12(String opRev_YTD12) { + this.opRev_YTD12 = opRev_YTD12; + } + public String getOpRev_YTD13() { + return opRev_YTD13; + } + public void setOpRev_YTD13(String opRev_YTD13) { + this.opRev_YTD13 = opRev_YTD13; + } + public String getOpRev_YTD14() { + return opRev_YTD14; + } + public void setOpRev_YTD14(String opRev_YTD14) { + this.opRev_YTD14 = opRev_YTD14; + } + public String getOpRev_YTD15() { + return opRev_YTD15; + } + public void setOpRev_YTD15(String opRev_YTD15) { + this.opRev_YTD15 = opRev_YTD15; + } + public String getOpRev_YTD16() { + return opRev_YTD16; + } + public void setOpRev_YTD16(String opRev_YTD16) { + this.opRev_YTD16 = opRev_YTD16; + } + public String getOpRev_YTD17() { + return opRev_YTD17; + } + public void setOpRev_YTD17(String opRev_YTD17) { + this.opRev_YTD17 = opRev_YTD17; + } + public String getOpRev_YTD18() { + return opRev_YTD18; + } + public void setOpRev_YTD18(String opRev_YTD18) { + this.opRev_YTD18 = opRev_YTD18; + } + public String getOpRev_YTD19() { + return opRev_YTD19; + } + public void setOpRev_YTD19(String opRev_YTD19) { + this.opRev_YTD19 = opRev_YTD19; + } + public String getOpRev_YTD2() { + return opRev_YTD2; + } + public void setOpRev_YTD2(String opRev_YTD2) { + this.opRev_YTD2 = opRev_YTD2; + } + public String getOpRev_YTD20() { + return opRev_YTD20; + } + public void setOpRev_YTD20(String opRev_YTD20) { + this.opRev_YTD20 = opRev_YTD20; + } + public String getOpRev_YTD3() { + return opRev_YTD3; + } + public void setOpRev_YTD3(String opRev_YTD3) { + this.opRev_YTD3 = opRev_YTD3; + } + public String getOpRev_YTD4() { + return opRev_YTD4; + } + public void setOpRev_YTD4(String opRev_YTD4) { + this.opRev_YTD4 = opRev_YTD4; + } + public String getOpRev_YTD5() { + return opRev_YTD5; + } + public void setOpRev_YTD5(String opRev_YTD5) { + this.opRev_YTD5 = opRev_YTD5; + } + public String getOpRev_YTD6() { + return opRev_YTD6; + } + public void setOpRev_YTD6(String opRev_YTD6) { + this.opRev_YTD6 = opRev_YTD6; + } + public String getOpRev_YTD7() { + return opRev_YTD7; + } + public void setOpRev_YTD7(String opRev_YTD7) { + this.opRev_YTD7 = opRev_YTD7; + } + public String getOpRev_YTD8() { + return opRev_YTD8; + } + public void setOpRev_YTD8(String opRev_YTD8) { + this.opRev_YTD8 = opRev_YTD8; + } + public String getOpRev_YTD9() { + return opRev_YTD9; + } + public void setOpRev_YTD9(String opRev_YTD9) { + this.opRev_YTD9 = opRev_YTD9; + } + public String getOpSu_data_total() { + return opSu_data_total; + } + public void setOpSu_data_total(String opSu_data_total) { + this.opSu_data_total = opSu_data_total; + } + public String getOpSu_data_total_note() { + return opSu_data_total_note; + } + public void setOpSu_data_total_note(String opSu_data_total_note) { + this.opSu_data_total_note = opSu_data_total_note; + } + public String getOpSuB_item11() { + return opSuB_item11; + } + public void setOpSuB_item11(String opSuB_item11) { + this.opSuB_item11 = opSuB_item11; + } + public String getOpSuB_note() { + return opSuB_note; + } + public void setOpSuB_note(String opSuB_note) { + this.opSuB_note = opSuB_note; + } + public String getOutScopeBedTotal1() { + return outScopeBedTotal1; + } + public void setOutScopeBedTotal1(String outScopeBedTotal1) { + this.outScopeBedTotal1 = outScopeBedTotal1; + } + public String getOutScopeBedTotal2() { + return outScopeBedTotal2; + } + public void setOutScopeBedTotal2(String outScopeBedTotal2) { + this.outScopeBedTotal2 = outScopeBedTotal2; + } + public String getOutScopeBedTotal3() { + return outScopeBedTotal3; + } + public void setOutScopeBedTotal3(String outScopeBedTotal3) { + this.outScopeBedTotal3 = outScopeBedTotal3; + } + public String getOutScopeBedTotal4() { + return outScopeBedTotal4; + } + public void setOutScopeBedTotal4(String outScopeBedTotal4) { + this.outScopeBedTotal4 = outScopeBedTotal4; + } + public String getOutScopeBedTotalYTD() { + return outScopeBedTotalYTD; + } + public void setOutScopeBedTotalYTD(String outScopeBedTotalYTD) { + this.outScopeBedTotalYTD = outScopeBedTotalYTD; + } + public String getOutScopeMonth1() { + return outScopeMonth1; + } + public void setOutScopeMonth1(String outScopeMonth1) { + this.outScopeMonth1 = outScopeMonth1; + } + public String getOutScopeMonth10() { + return outScopeMonth10; + } + public void setOutScopeMonth10(String outScopeMonth10) { + this.outScopeMonth10 = outScopeMonth10; + } + public String getOutScopeMonth11() { + return outScopeMonth11; + } + public void setOutScopeMonth11(String outScopeMonth11) { + this.outScopeMonth11 = outScopeMonth11; + } + public String getOutScopeMonth12() { + return outScopeMonth12; + } + public void setOutScopeMonth12(String outScopeMonth12) { + this.outScopeMonth12 = outScopeMonth12; + } + public String getOutScopeMonth2() { + return outScopeMonth2; + } + public void setOutScopeMonth2(String outScopeMonth2) { + this.outScopeMonth2 = outScopeMonth2; + } + public String getOutScopeMonth3() { + return outScopeMonth3; + } + public void setOutScopeMonth3(String outScopeMonth3) { + this.outScopeMonth3 = outScopeMonth3; + } + public String getOutScopeMonth4() { + return outScopeMonth4; + } + public void setOutScopeMonth4(String outScopeMonth4) { + this.outScopeMonth4 = outScopeMonth4; + } + public String getOutScopeMonth5() { + return outScopeMonth5; + } + public void setOutScopeMonth5(String outScopeMonth5) { + this.outScopeMonth5 = outScopeMonth5; + } + public String getOutScopeMonth6() { + return outScopeMonth6; + } + public void setOutScopeMonth6(String outScopeMonth6) { + this.outScopeMonth6 = outScopeMonth6; + } + public String getOutScopeMonth7() { + return outScopeMonth7; + } + public void setOutScopeMonth7(String outScopeMonth7) { + this.outScopeMonth7 = outScopeMonth7; + } + public String getOutScopeMonth8() { + return outScopeMonth8; + } + public void setOutScopeMonth8(String outScopeMonth8) { + this.outScopeMonth8 = outScopeMonth8; + } + public String getOutScopeMonth9() { + return outScopeMonth9; + } + public void setOutScopeMonth9(String outScopeMonth9) { + this.outScopeMonth9 = outScopeMonth9; + } + public String getOutScopeOccupied1() { + return outScopeOccupied1; + } + public void setOutScopeOccupied1(String outScopeOccupied1) { + this.outScopeOccupied1 = outScopeOccupied1; + } + public String getOutScopeOccupied2() { + return outScopeOccupied2; + } + public void setOutScopeOccupied2(String outScopeOccupied2) { + this.outScopeOccupied2 = outScopeOccupied2; + } + public String getOutScopeOccupied3() { + return outScopeOccupied3; + } + public void setOutScopeOccupied3(String outScopeOccupied3) { + this.outScopeOccupied3 = outScopeOccupied3; + } + public String getOutScopeOccupied4() { + return outScopeOccupied4; + } + public void setOutScopeOccupied4(String outScopeOccupied4) { + this.outScopeOccupied4 = outScopeOccupied4; + } + public String getOutScopeOccupiedYTD() { + return outScopeOccupiedYTD; + } + public void setOutScopeOccupiedYTD(String outScopeOccupiedYTD) { + this.outScopeOccupiedYTD = outScopeOccupiedYTD; + } + public String getOutScopeTotalQ1() { + return outScopeTotalQ1; + } + public void setOutScopeTotalQ1(String outScopeTotalQ1) { + this.outScopeTotalQ1 = outScopeTotalQ1; + } + public String getOutScopeTotalQ2() { + return outScopeTotalQ2; + } + public void setOutScopeTotalQ2(String outScopeTotalQ2) { + this.outScopeTotalQ2 = outScopeTotalQ2; + } + public String getOutScopeTotalQ3() { + return outScopeTotalQ3; + } + public void setOutScopeTotalQ3(String outScopeTotalQ3) { + this.outScopeTotalQ3 = outScopeTotalQ3; + } + public String getOutScopeTotalQ4() { + return outScopeTotalQ4; + } + public void setOutScopeTotalQ4(String outScopeTotalQ4) { + this.outScopeTotalQ4 = outScopeTotalQ4; + } + public String getPayrollEndDate() { + return payrollEndDate; + } + public void setPayrollEndDate(String payrollEndDate) { + this.payrollEndDate = payrollEndDate; + } + public String getPayrollStartDate() { + return payrollStartDate; + } + public void setPayrollStartDate(String payrollStartDate) { + this.payrollStartDate = payrollStartDate; + } + public String getPlannedInScope() { + return plannedInScope; + } + public void setPlannedInScope(String plannedInScope) { + this.plannedInScope = plannedInScope; + } + public String getPlannedInScope1() { + return plannedInScope1; + } + public void setPlannedInScope1(String plannedInScope1) { + this.plannedInScope1 = plannedInScope1; + } + public String getPlannedInScope2() { + return plannedInScope2; + } + public void setPlannedInScope2(String plannedInScope2) { + this.plannedInScope2 = plannedInScope2; + } + public String getPlannedInScope3() { + return plannedInScope3; + } + public void setPlannedInScope3(String plannedInScope3) { + this.plannedInScope3 = plannedInScope3; + } + public String getPlannedInScope4() { + return plannedInScope4; + } + public void setPlannedInScope4(String plannedInScope4) { + this.plannedInScope4 = plannedInScope4; + } + public String getPlannedOutScope() { + return plannedOutScope; + } + public void setPlannedOutScope(String plannedOutScope) { + this.plannedOutScope = plannedOutScope; + } + public String getPlannedOutScope1() { + return plannedOutScope1; + } + public void setPlannedOutScope1(String plannedOutScope1) { + this.plannedOutScope1 = plannedOutScope1; + } + public String getPlannedOutScope2() { + return plannedOutScope2; + } + public void setPlannedOutScope2(String plannedOutScope2) { + this.plannedOutScope2 = plannedOutScope2; + } + public String getPlannedOutScope3() { + return plannedOutScope3; + } + public void setPlannedOutScope3(String plannedOutScope3) { + this.plannedOutScope3 = plannedOutScope3; + } + public String getPlannedOutScope4() { + return plannedOutScope4; + } + public void setPlannedOutScope4(String plannedOutScope4) { + this.plannedOutScope4 = plannedOutScope4; + } + public String getPlannedPrivate() { + return plannedPrivate; + } + public void setPlannedPrivate(String plannedPrivate) { + this.plannedPrivate = plannedPrivate; + } + public String getPlannedPrivate1() { + return plannedPrivate1; + } + public void setPlannedPrivate1(String plannedPrivate1) { + this.plannedPrivate1 = plannedPrivate1; + } + public String getPlannedPrivate2() { + return plannedPrivate2; + } + public void setPlannedPrivate2(String plannedPrivate2) { + this.plannedPrivate2 = plannedPrivate2; + } + public String getPlannedPrivate3() { + return plannedPrivate3; + } + public void setPlannedPrivate3(String plannedPrivate3) { + this.plannedPrivate3 = plannedPrivate3; + } + public String getPlannedPrivate4() { + return plannedPrivate4; + } + public void setPlannedPrivate4(String plannedPrivate4) { + this.plannedPrivate4 = plannedPrivate4; + } + public String getPlannedTotal() { + return plannedTotal; + } + public void setPlannedTotal(String plannedTotal) { + this.plannedTotal = plannedTotal; + } + public String getPlannedTotal1() { + return plannedTotal1; + } + public void setPlannedTotal1(String plannedTotal1) { + this.plannedTotal1 = plannedTotal1; + } + public String getPlannedTotal2() { + return plannedTotal2; + } + public void setPlannedTotal2(String plannedTotal2) { + this.plannedTotal2 = plannedTotal2; + } + public String getPlannedTotal3() { + return plannedTotal3; + } + public void setPlannedTotal3(String plannedTotal3) { + this.plannedTotal3 = plannedTotal3; + } + public String getPlannedTotal4() { + return plannedTotal4; + } + public void setPlannedTotal4(String plannedTotal4) { + this.plannedTotal4 = plannedTotal4; + } + public String getPrivateBedTotal1() { + return privateBedTotal1; + } + public void setPrivateBedTotal1(String privateBedTotal1) { + this.privateBedTotal1 = privateBedTotal1; + } + public String getPrivateBedTotal2() { + return privateBedTotal2; + } + public void setPrivateBedTotal2(String privateBedTotal2) { + this.privateBedTotal2 = privateBedTotal2; + } + public String getPrivateBedTotal3() { + return privateBedTotal3; + } + public void setPrivateBedTotal3(String privateBedTotal3) { + this.privateBedTotal3 = privateBedTotal3; + } + public String getPrivateBedTotal4() { + return privateBedTotal4; + } + public void setPrivateBedTotal4(String privateBedTotal4) { + this.privateBedTotal4 = privateBedTotal4; + } + public String getPrivateBedTotalYTD() { + return privateBedTotalYTD; + } + public void setPrivateBedTotalYTD(String privateBedTotalYTD) { + this.privateBedTotalYTD = privateBedTotalYTD; + } + public String getPrivateMonth1() { + return privateMonth1; + } + public void setPrivateMonth1(String privateMonth1) { + this.privateMonth1 = privateMonth1; + } + public String getPrivateMonth10() { + return privateMonth10; + } + public void setPrivateMonth10(String privateMonth10) { + this.privateMonth10 = privateMonth10; + } + public String getPrivateMonth11() { + return privateMonth11; + } + public void setPrivateMonth11(String privateMonth11) { + this.privateMonth11 = privateMonth11; + } + public String getPrivateMonth12() { + return privateMonth12; + } + public void setPrivateMonth12(String privateMonth12) { + this.privateMonth12 = privateMonth12; + } + public String getPrivateMonth2() { + return privateMonth2; + } + public void setPrivateMonth2(String privateMonth2) { + this.privateMonth2 = privateMonth2; + } + public String getPrivateMonth3() { + return privateMonth3; + } + public void setPrivateMonth3(String privateMonth3) { + this.privateMonth3 = privateMonth3; + } + public String getPrivateMonth4() { + return privateMonth4; + } + public void setPrivateMonth4(String privateMonth4) { + this.privateMonth4 = privateMonth4; + } + public String getPrivateMonth5() { + return privateMonth5; + } + public void setPrivateMonth5(String privateMonth5) { + this.privateMonth5 = privateMonth5; + } + public String getPrivateMonth6() { + return privateMonth6; + } + public void setPrivateMonth6(String privateMonth6) { + this.privateMonth6 = privateMonth6; + } + public String getPrivateMonth7() { + return privateMonth7; + } + public void setPrivateMonth7(String privateMonth7) { + this.privateMonth7 = privateMonth7; + } + public String getPrivateMonth8() { + return privateMonth8; + } + public void setPrivateMonth8(String privateMonth8) { + this.privateMonth8 = privateMonth8; + } + public String getPrivateMonth9() { + return privateMonth9; + } + public void setPrivateMonth9(String privateMonth9) { + this.privateMonth9 = privateMonth9; + } + public String getPrivateOccupied1() { + return privateOccupied1; + } + public void setPrivateOccupied1(String privateOccupied1) { + this.privateOccupied1 = privateOccupied1; + } + public String getPrivateOccupied2() { + return privateOccupied2; + } + public void setPrivateOccupied2(String privateOccupied2) { + this.privateOccupied2 = privateOccupied2; + } + public String getPrivateOccupied3() { + return privateOccupied3; + } + public void setPrivateOccupied3(String privateOccupied3) { + this.privateOccupied3 = privateOccupied3; + } + public String getPrivateOccupied4() { + return privateOccupied4; + } + public void setPrivateOccupied4(String privateOccupied4) { + this.privateOccupied4 = privateOccupied4; + } + public String getPrivateOccupiedYTD() { + return privateOccupiedYTD; + } + public void setPrivateOccupiedYTD(String privateOccupiedYTD) { + this.privateOccupiedYTD = privateOccupiedYTD; + } + public String getPrivateTotalQ1() { + return privateTotalQ1; + } + public void setPrivateTotalQ1(String privateTotalQ1) { + this.privateTotalQ1 = privateTotalQ1; + } + public String getPrivateTotalQ2() { + return privateTotalQ2; + } + public void setPrivateTotalQ2(String privateTotalQ2) { + this.privateTotalQ2 = privateTotalQ2; + } + public String getPrivateTotalQ3() { + return privateTotalQ3; + } + public void setPrivateTotalQ3(String privateTotalQ3) { + this.privateTotalQ3 = privateTotalQ3; + } + public String getPrivateTotalQ4() { + return privateTotalQ4; + } + public void setPrivateTotalQ4(String privateTotalQ4) { + this.privateTotalQ4 = privateTotalQ4; + } + public String getQuarter() { + return quarter; + } + public void setQuarter(String quarter) { + this.quarter = quarter; + } + public String getStartPeriod() { + return startPeriod; + } + public void setStartPeriod(String startPeriod) { + this.startPeriod = startPeriod; + } + public String getSubmission() { + return submission; + } + public void setSubmission(String submission) { + this.submission = submission; + } + public String getThreshold() { + return threshold; + } + public void setThreshold(String threshold) { + this.threshold = threshold; + } + public String getTotalBed1() { + return totalBed1; + } + public void setTotalBed1(String totalBed1) { + this.totalBed1 = totalBed1; + } + public String getTotalBed2() { + return totalBed2; + } + public void setTotalBed2(String totalBed2) { + this.totalBed2 = totalBed2; + } + public String getTotalBed3() { + return totalBed3; + } + public void setTotalBed3(String totalBed3) { + this.totalBed3 = totalBed3; + } + public String getTotalBed4() { + return totalBed4; + } + public void setTotalBed4(String totalBed4) { + this.totalBed4 = totalBed4; + } + public String getTotalBedYTD() { + return totalBedYTD; + } + public void setTotalBedYTD(String totalBedYTD) { + this.totalBedYTD = totalBedYTD; + } + public String getTotalMonth1() { + return totalMonth1; + } + public void setTotalMonth1(String totalMonth1) { + this.totalMonth1 = totalMonth1; + } + public String getTotalMonth10() { + return totalMonth10; + } + public void setTotalMonth10(String totalMonth10) { + this.totalMonth10 = totalMonth10; + } + public String getTotalMonth11() { + return totalMonth11; + } + public void setTotalMonth11(String totalMonth11) { + this.totalMonth11 = totalMonth11; + } + public String getTotalMonth12() { + return totalMonth12; + } + public void setTotalMonth12(String totalMonth12) { + this.totalMonth12 = totalMonth12; + } + public String getTotalMonth2() { + return totalMonth2; + } + public void setTotalMonth2(String totalMonth2) { + this.totalMonth2 = totalMonth2; + } + public String getTotalMonth3() { + return totalMonth3; + } + public void setTotalMonth3(String totalMonth3) { + this.totalMonth3 = totalMonth3; + } + public String getTotalMonth4() { + return totalMonth4; + } + public void setTotalMonth4(String totalMonth4) { + this.totalMonth4 = totalMonth4; + } + public String getTotalMonth5() { + return totalMonth5; + } + public void setTotalMonth5(String totalMonth5) { + this.totalMonth5 = totalMonth5; + } + public String getTotalMonth6() { + return totalMonth6; + } + public void setTotalMonth6(String totalMonth6) { + this.totalMonth6 = totalMonth6; + } + public String getTotalMonth7() { + return totalMonth7; + } + public void setTotalMonth7(String totalMonth7) { + this.totalMonth7 = totalMonth7; + } + public String getTotalMonth8() { + return totalMonth8; + } + public void setTotalMonth8(String totalMonth8) { + this.totalMonth8 = totalMonth8; + } + public String getTotalMonth9() { + return totalMonth9; + } + public void setTotalMonth9(String totalMonth9) { + this.totalMonth9 = totalMonth9; + } + public String getTotalQ1() { + return totalQ1; + } + public void setTotalQ1(String totalQ1) { + this.totalQ1 = totalQ1; + } + public String getTotalQ2() { + return totalQ2; + } + public void setTotalQ2(String totalQ2) { + this.totalQ2 = totalQ2; + } + public String getTotalQ3() { + return totalQ3; + } + public void setTotalQ3(String totalQ3) { + this.totalQ3 = totalQ3; + } + public String getTotalQ4() { + return totalQ4; + } + public void setTotalQ4(String totalQ4) { + this.totalQ4 = totalQ4; + } + public String getyTDMaxInScopeQ1() { + return yTDMaxInScopeQ1; + } + public void setyTDMaxInScopeQ1(String yTDMaxInScopeQ1) { + this.yTDMaxInScopeQ1 = yTDMaxInScopeQ1; + } + public String getyTDMaxInScopeQ2() { + return yTDMaxInScopeQ2; + } + public void setyTDMaxInScopeQ2(String yTDMaxInScopeQ2) { + this.yTDMaxInScopeQ2 = yTDMaxInScopeQ2; + } + public String getyTDMaxInScopeQ3() { + return yTDMaxInScopeQ3; + } + public void setyTDMaxInScopeQ3(String yTDMaxInScopeQ3) { + this.yTDMaxInScopeQ3 = yTDMaxInScopeQ3; + } + public String getyTDMaxInScopeQ4() { + return yTDMaxInScopeQ4; + } + public void setyTDMaxInScopeQ4(String yTDMaxInScopeQ4) { + this.yTDMaxInScopeQ4 = yTDMaxInScopeQ4; + } + public String getyTDMaxOutScopeQ1() { + return yTDMaxOutScopeQ1; + } + public void setyTDMaxOutScopeQ1(String yTDMaxOutScopeQ1) { + this.yTDMaxOutScopeQ1 = yTDMaxOutScopeQ1; + } + public String getyTDMaxOutScopeQ2() { + return yTDMaxOutScopeQ2; + } + public void setyTDMaxOutScopeQ2(String yTDMaxOutScopeQ2) { + this.yTDMaxOutScopeQ2 = yTDMaxOutScopeQ2; + } + public String getyTDMaxOutScopeQ3() { + return yTDMaxOutScopeQ3; + } + public void setyTDMaxOutScopeQ3(String yTDMaxOutScopeQ3) { + this.yTDMaxOutScopeQ3 = yTDMaxOutScopeQ3; + } + public String getyTDMaxOutScopeQ4() { + return yTDMaxOutScopeQ4; + } + public void setyTDMaxOutScopeQ4(String yTDMaxOutScopeQ4) { + this.yTDMaxOutScopeQ4 = yTDMaxOutScopeQ4; + } + public String getyTDMaxPrivateQ1() { + return yTDMaxPrivateQ1; + } + public void setyTDMaxPrivateQ1(String yTDMaxPrivateQ1) { + this.yTDMaxPrivateQ1 = yTDMaxPrivateQ1; + } + public String getyTDMaxPrivateQ2() { + return yTDMaxPrivateQ2; + } + public void setyTDMaxPrivateQ2(String yTDMaxPrivateQ2) { + this.yTDMaxPrivateQ2 = yTDMaxPrivateQ2; + } + public String getyTDMaxPrivateQ3() { + return yTDMaxPrivateQ3; + } + public void setyTDMaxPrivateQ3(String yTDMaxPrivateQ3) { + this.yTDMaxPrivateQ3 = yTDMaxPrivateQ3; + } + public String getyTDMaxPrivateQ4() { + return yTDMaxPrivateQ4; + } + public void setyTDMaxPrivateQ4(String yTDMaxPrivateQ4) { + this.yTDMaxPrivateQ4 = yTDMaxPrivateQ4; + } + public String getyTDMaxTotalQ1() { + return yTDMaxTotalQ1; + } + public void setyTDMaxTotalQ1(String yTDMaxTotalQ1) { + this.yTDMaxTotalQ1 = yTDMaxTotalQ1; + } + public String getyTDMaxTotalQ2() { + return yTDMaxTotalQ2; + } + public void setyTDMaxTotalQ2(String yTDMaxTotalQ2) { + this.yTDMaxTotalQ2 = yTDMaxTotalQ2; + } + public String getyTDMaxTotalQ3() { + return yTDMaxTotalQ3; + } + public void setyTDMaxTotalQ3(String yTDMaxTotalQ3) { + this.yTDMaxTotalQ3 = yTDMaxTotalQ3; + } + public String getyTDMaxTotalQ4() { + return yTDMaxTotalQ4; + } + public void setyTDMaxTotalQ4(String yTDMaxTotalQ4) { + this.yTDMaxTotalQ4 = yTDMaxTotalQ4; + } + public String getyTDOccupiedInScopeQ1() { + return yTDOccupiedInScopeQ1; + } + public void setyTDOccupiedInScopeQ1(String yTDOccupiedInScopeQ1) { + this.yTDOccupiedInScopeQ1 = yTDOccupiedInScopeQ1; + } + public String getyTDOccupiedInScopeQ2() { + return yTDOccupiedInScopeQ2; + } + public void setyTDOccupiedInScopeQ2(String yTDOccupiedInScopeQ2) { + this.yTDOccupiedInScopeQ2 = yTDOccupiedInScopeQ2; + } + public String getyTDOccupiedInScopeQ3() { + return yTDOccupiedInScopeQ3; + } + public void setyTDOccupiedInScopeQ3(String yTDOccupiedInScopeQ3) { + this.yTDOccupiedInScopeQ3 = yTDOccupiedInScopeQ3; + } + public String getyTDOccupiedInScopeQ4() { + return yTDOccupiedInScopeQ4; + } + public void setyTDOccupiedInScopeQ4(String yTDOccupiedInScopeQ4) { + this.yTDOccupiedInScopeQ4 = yTDOccupiedInScopeQ4; + } + public String getyTDOccupiedOutScopeQ1() { + return yTDOccupiedOutScopeQ1; + } + public void setyTDOccupiedOutScopeQ1(String yTDOccupiedOutScopeQ1) { + this.yTDOccupiedOutScopeQ1 = yTDOccupiedOutScopeQ1; + } + public String getyTDOccupiedOutScopeQ2() { + return yTDOccupiedOutScopeQ2; + } + public void setyTDOccupiedOutScopeQ2(String yTDOccupiedOutScopeQ2) { + this.yTDOccupiedOutScopeQ2 = yTDOccupiedOutScopeQ2; + } + public String getyTDOccupiedOutScopeQ3() { + return yTDOccupiedOutScopeQ3; + } + public void setyTDOccupiedOutScopeQ3(String yTDOccupiedOutScopeQ3) { + this.yTDOccupiedOutScopeQ3 = yTDOccupiedOutScopeQ3; + } + public String getyTDOccupiedOutScopeQ4() { + return yTDOccupiedOutScopeQ4; + } + public void setyTDOccupiedOutScopeQ4(String yTDOccupiedOutScopeQ4) { + this.yTDOccupiedOutScopeQ4 = yTDOccupiedOutScopeQ4; + } + public String getyTDOccupiedPrivateQ1() { + return yTDOccupiedPrivateQ1; + } + public void setyTDOccupiedPrivateQ1(String yTDOccupiedPrivateQ1) { + this.yTDOccupiedPrivateQ1 = yTDOccupiedPrivateQ1; + } + public String getyTDOccupiedPrivateQ2() { + return yTDOccupiedPrivateQ2; + } + public void setyTDOccupiedPrivateQ2(String yTDOccupiedPrivateQ2) { + this.yTDOccupiedPrivateQ2 = yTDOccupiedPrivateQ2; + } + public String getyTDOccupiedPrivateQ3() { + return yTDOccupiedPrivateQ3; + } + public void setyTDOccupiedPrivateQ3(String yTDOccupiedPrivateQ3) { + this.yTDOccupiedPrivateQ3 = yTDOccupiedPrivateQ3; + } + public String getyTDOccupiedPrivateQ4() { + return yTDOccupiedPrivateQ4; + } + public void setyTDOccupiedPrivateQ4(String yTDOccupiedPrivateQ4) { + this.yTDOccupiedPrivateQ4 = yTDOccupiedPrivateQ4; + } + public String getyTDOccupiedTotalQ1() { + return yTDOccupiedTotalQ1; + } + public void setyTDOccupiedTotalQ1(String yTDOccupiedTotalQ1) { + this.yTDOccupiedTotalQ1 = yTDOccupiedTotalQ1; + } + public String getyTDOccupiedTotalQ2() { + return yTDOccupiedTotalQ2; + } + public void setyTDOccupiedTotalQ2(String yTDOccupiedTotalQ2) { + this.yTDOccupiedTotalQ2 = yTDOccupiedTotalQ2; + } + public String getyTDOccupiedTotalQ3() { + return yTDOccupiedTotalQ3; + } + public void setyTDOccupiedTotalQ3(String yTDOccupiedTotalQ3) { + this.yTDOccupiedTotalQ3 = yTDOccupiedTotalQ3; + } + public String getyTDOccupiedTotalQ4() { + return yTDOccupiedTotalQ4; + } + public void setyTDOccupiedTotalQ4(String yTDOccupiedTotalQ4) { + this.yTDOccupiedTotalQ4 = yTDOccupiedTotalQ4; + } + public String getYtdPayrollDays() { + return ytdPayrollDays; + } + public void setYtdPayrollDays(String ytdPayrollDays) { + this.ytdPayrollDays = ytdPayrollDays; + } + public String getyTDPlannedInScopeQ1() { + return yTDPlannedInScopeQ1; + } + public void setyTDPlannedInScopeQ1(String yTDPlannedInScopeQ1) { + this.yTDPlannedInScopeQ1 = yTDPlannedInScopeQ1; + } + public String getyTDPlannedInScopeQ2() { + return yTDPlannedInScopeQ2; + } + public void setyTDPlannedInScopeQ2(String yTDPlannedInScopeQ2) { + this.yTDPlannedInScopeQ2 = yTDPlannedInScopeQ2; + } + public String getyTDPlannedInScopeQ3() { + return yTDPlannedInScopeQ3; + } + public void setyTDPlannedInScopeQ3(String yTDPlannedInScopeQ3) { + this.yTDPlannedInScopeQ3 = yTDPlannedInScopeQ3; + } + public String getyTDPlannedInScopeQ4() { + return yTDPlannedInScopeQ4; + } + public void setyTDPlannedInScopeQ4(String yTDPlannedInScopeQ4) { + this.yTDPlannedInScopeQ4 = yTDPlannedInScopeQ4; + } + public String getyTDPlannedOutScopeQ1() { + return yTDPlannedOutScopeQ1; + } + public void setyTDPlannedOutScopeQ1(String yTDPlannedOutScopeQ1) { + this.yTDPlannedOutScopeQ1 = yTDPlannedOutScopeQ1; + } + public String getyTDPlannedOutScopeQ2() { + return yTDPlannedOutScopeQ2; + } + public void setyTDPlannedOutScopeQ2(String yTDPlannedOutScopeQ2) { + this.yTDPlannedOutScopeQ2 = yTDPlannedOutScopeQ2; + } + public String getyTDPlannedOutScopeQ3() { + return yTDPlannedOutScopeQ3; + } + public void setyTDPlannedOutScopeQ3(String yTDPlannedOutScopeQ3) { + this.yTDPlannedOutScopeQ3 = yTDPlannedOutScopeQ3; + } + public String getyTDPlannedOutScopeQ4() { + return yTDPlannedOutScopeQ4; + } + public void setyTDPlannedOutScopeQ4(String yTDPlannedOutScopeQ4) { + this.yTDPlannedOutScopeQ4 = yTDPlannedOutScopeQ4; + } + public String getyTDPlannedPrivateQ1() { + return yTDPlannedPrivateQ1; + } + public void setyTDPlannedPrivateQ1(String yTDPlannedPrivateQ1) { + this.yTDPlannedPrivateQ1 = yTDPlannedPrivateQ1; + } + public String getyTDPlannedPrivateQ2() { + return yTDPlannedPrivateQ2; + } + public void setyTDPlannedPrivateQ2(String yTDPlannedPrivateQ2) { + this.yTDPlannedPrivateQ2 = yTDPlannedPrivateQ2; + } + public String getyTDPlannedPrivateQ3() { + return yTDPlannedPrivateQ3; + } + public void setyTDPlannedPrivateQ3(String yTDPlannedPrivateQ3) { + this.yTDPlannedPrivateQ3 = yTDPlannedPrivateQ3; + } + public String getyTDPlannedPrivateQ4() { + return yTDPlannedPrivateQ4; + } + public void setyTDPlannedPrivateQ4(String yTDPlannedPrivateQ4) { + this.yTDPlannedPrivateQ4 = yTDPlannedPrivateQ4; + } + public String getyTDPlannedTotalQ1() { + return yTDPlannedTotalQ1; + } + public void setyTDPlannedTotalQ1(String yTDPlannedTotalQ1) { + this.yTDPlannedTotalQ1 = yTDPlannedTotalQ1; + } + public String getyTDPlannedTotalQ2() { + return yTDPlannedTotalQ2; + } + public void setyTDPlannedTotalQ2(String yTDPlannedTotalQ2) { + this.yTDPlannedTotalQ2 = yTDPlannedTotalQ2; + } + public String getyTDPlannedTotalQ3() { + return yTDPlannedTotalQ3; + } + public void setyTDPlannedTotalQ3(String yTDPlannedTotalQ3) { + this.yTDPlannedTotalQ3 = yTDPlannedTotalQ3; + } + public String getyTDPlannedTotalQ4() { + return yTDPlannedTotalQ4; + } + public void setyTDPlannedTotalQ4(String yTDPlannedTotalQ4) { + this.yTDPlannedTotalQ4 = yTDPlannedTotalQ4; + } + @Override + public String toString() { + return "Root [alliedNPContractRate_total=" + alliedNPContractRate_total + ", alliedNPContractRate1=" + + alliedNPContractRate1 + ", alliedNPContractRate2=" + alliedNPContractRate2 + + ", alliedNPContractRate3=" + alliedNPContractRate3 + ", alliedNPContractRate4=" + + alliedNPContractRate4 + ", alliedNPContractRate5=" + alliedNPContractRate5 + + ", alliedNPContractRate6=" + alliedNPContractRate6 + ", alliedNPCost_total=" + alliedNPCost_total + + ", alliedNPCost1=" + alliedNPCost1 + ", alliedNPCost2=" + alliedNPCost2 + ", alliedNPCost3=" + + alliedNPCost3 + ", alliedNPCost4=" + alliedNPCost4 + ", alliedNPCost5=" + alliedNPCost5 + + ", alliedNPCost6=" + alliedNPCost6 + ", alliedNPNProdC_calc1=" + alliedNPNProdC_calc1 + + ", alliedNPNProdC_calc2=" + alliedNPNProdC_calc2 + ", alliedNPNProdC_calc3=" + alliedNPNProdC_calc3 + + ", alliedNPNProdC_calc4=" + alliedNPNProdC_calc4 + ", alliedNPNProdC_calc5=" + alliedNPNProdC_calc5 + + ", alliedNPNProdC_calc6=" + alliedNPNProdC_calc6 + ", alliedNPNProdC_calcsum1=" + + alliedNPNProdC_calcsum1 + ", alliedNPNProdC_item11=" + alliedNPNProdC_item11 + + ", alliedNPNProdC_item12=" + alliedNPNProdC_item12 + ", alliedNPNProdC_item13=" + + alliedNPNProdC_item13 + ", alliedNPNProdC_item14=" + alliedNPNProdC_item14 + + ", alliedNPNProdC_item15=" + alliedNPNProdC_item15 + ", alliedNPNProdC_item16=" + + alliedNPNProdC_item16 + ", alliedNPNProdC_item21=" + alliedNPNProdC_item21 + + ", alliedNPNProdC_item22=" + alliedNPNProdC_item22 + ", alliedNPNProdC_item23=" + + alliedNPNProdC_item23 + ", alliedNPNProdC_item24=" + alliedNPNProdC_item24 + + ", alliedNPNProdC_item25=" + alliedNPNProdC_item25 + ", alliedNPNProdC_item26=" + + alliedNPNProdC_item26 + ", alliedNPNProdC_item31=" + alliedNPNProdC_item31 + + ", alliedNPNProdC_item32=" + alliedNPNProdC_item32 + ", alliedNPNProdC_item33=" + + alliedNPNProdC_item33 + ", alliedNPNProdC_item34=" + alliedNPNProdC_item34 + + ", alliedNPNProdC_item35=" + alliedNPNProdC_item35 + ", alliedNPNProdC_item36=" + + alliedNPNProdC_item36 + ", alliedNPNProdC_sum11=" + alliedNPNProdC_sum11 + ", alliedNPNProdC_sum21=" + + alliedNPNProdC_sum21 + ", alliedNPNProdC_sum31=" + alliedNPNProdC_sum31 + ", alliedNPNProdC_THP1=" + + alliedNPNProdC_THP1 + ", alliedNPNProdC_THP2=" + alliedNPNProdC_THP2 + ", alliedNPNProdC_THP3=" + + alliedNPNProdC_THP3 + ", alliedNPNProdC_THP4=" + alliedNPNProdC_THP4 + ", alliedNPNProdC_THP5=" + + alliedNPNProdC_THP5 + ", alliedNPNProdC_THP6=" + alliedNPNProdC_THP6 + ", alliedNPNProdC_THPsum1=" + + alliedNPNProdC_THPsum1 + ", alliedNPNProdH_calc1=" + alliedNPNProdH_calc1 + ", alliedNPNProdH_calc2=" + + alliedNPNProdH_calc2 + ", alliedNPNProdH_calc3=" + alliedNPNProdH_calc3 + ", alliedNPNProdH_calc4=" + + alliedNPNProdH_calc4 + ", alliedNPNProdH_calc5=" + alliedNPNProdH_calc5 + ", alliedNPNProdH_calc6=" + + alliedNPNProdH_calc6 + ", alliedNPNProdH_calcsum1=" + alliedNPNProdH_calcsum1 + + ", alliedNPNProdH_item11=" + alliedNPNProdH_item11 + ", alliedNPNProdH_item12=" + + alliedNPNProdH_item12 + ", alliedNPNProdH_item13=" + alliedNPNProdH_item13 + + ", alliedNPNProdH_item14=" + alliedNPNProdH_item14 + ", alliedNPNProdH_item15=" + + alliedNPNProdH_item15 + ", alliedNPNProdH_item16=" + alliedNPNProdH_item16 + + ", alliedNPNProdH_item21=" + alliedNPNProdH_item21 + ", alliedNPNProdH_item22=" + + alliedNPNProdH_item22 + ", alliedNPNProdH_item23=" + alliedNPNProdH_item23 + + ", alliedNPNProdH_item24=" + alliedNPNProdH_item24 + ", alliedNPNProdH_item25=" + + alliedNPNProdH_item25 + ", alliedNPNProdH_item26=" + alliedNPNProdH_item26 + + ", alliedNPNProdH_item31=" + alliedNPNProdH_item31 + ", alliedNPNProdH_item32=" + + alliedNPNProdH_item32 + ", alliedNPNProdH_item33=" + alliedNPNProdH_item33 + + ", alliedNPNProdH_item34=" + alliedNPNProdH_item34 + ", alliedNPNProdH_item35=" + + alliedNPNProdH_item35 + ", alliedNPNProdH_item36=" + alliedNPNProdH_item36 + ", alliedNPNProdH_sum11=" + + alliedNPNProdH_sum11 + ", alliedNPNProdH_sum21=" + alliedNPNProdH_sum21 + ", alliedNPNProdH_sum31=" + + alliedNPNProdH_sum31 + ", alliedNPNProdH_THP1=" + alliedNPNProdH_THP1 + ", alliedNPNProdH_THP2=" + + alliedNPNProdH_THP2 + ", alliedNPNProdH_THP3=" + alliedNPNProdH_THP3 + ", alliedNPNProdH_THP4=" + + alliedNPNProdH_THP4 + ", alliedNPNProdH_THP5=" + alliedNPNProdH_THP5 + ", alliedNPNProdH_THP6=" + + alliedNPNProdH_THP6 + ", alliedNPNProdH_THPsum1=" + alliedNPNProdH_THPsum1 + ", alliedNPPercentage1=" + + alliedNPPercentage1 + ", alliedNPPercentage2=" + alliedNPPercentage2 + ", alliedNPPercentage3=" + + alliedNPPercentage3 + ", alliedNPPercentage4=" + alliedNPPercentage4 + ", alliedNPPercentage5=" + + alliedNPPercentage5 + ", alliedNPPercentage6=" + alliedNPPercentage6 + ", alliedNPProdC_calc1=" + + alliedNPProdC_calc1 + ", alliedNPProdC_calc2=" + alliedNPProdC_calc2 + ", alliedNPProdC_calc3=" + + alliedNPProdC_calc3 + ", alliedNPProdC_calc4=" + alliedNPProdC_calc4 + ", alliedNPProdC_calc5=" + + alliedNPProdC_calc5 + ", alliedNPProdC_calc6=" + alliedNPProdC_calc6 + ", alliedNPProdC_calcsum1=" + + alliedNPProdC_calcsum1 + ", alliedNPProdC_item11=" + alliedNPProdC_item11 + ", alliedNPProdC_item12=" + + alliedNPProdC_item12 + ", alliedNPProdC_item13=" + alliedNPProdC_item13 + ", alliedNPProdC_item14=" + + alliedNPProdC_item14 + ", alliedNPProdC_item15=" + alliedNPProdC_item15 + ", alliedNPProdC_item16=" + + alliedNPProdC_item16 + ", alliedNPProdC_item21=" + alliedNPProdC_item21 + ", alliedNPProdC_item22=" + + alliedNPProdC_item22 + ", alliedNPProdC_item23=" + alliedNPProdC_item23 + ", alliedNPProdC_item24=" + + alliedNPProdC_item24 + ", alliedNPProdC_item25=" + alliedNPProdC_item25 + ", alliedNPProdC_item26=" + + alliedNPProdC_item26 + ", alliedNPProdC_sub1=" + alliedNPProdC_sub1 + ", alliedNPProdC_sub2=" + + alliedNPProdC_sub2 + ", alliedNPProdC_sub3=" + alliedNPProdC_sub3 + ", alliedNPProdC_sub4=" + + alliedNPProdC_sub4 + ", alliedNPProdC_sub5=" + alliedNPProdC_sub5 + ", alliedNPProdC_sub6=" + + alliedNPProdC_sub6 + ", alliedNPProdC_subsum1=" + alliedNPProdC_subsum1 + ", alliedNPProdC_sum11=" + + alliedNPProdC_sum11 + ", alliedNPProdC_sum21=" + alliedNPProdC_sum21 + ", alliedNPProdC_THP1=" + + alliedNPProdC_THP1 + ", alliedNPProdC_THP2=" + alliedNPProdC_THP2 + ", alliedNPProdC_THP3=" + + alliedNPProdC_THP3 + ", alliedNPProdC_THP4=" + alliedNPProdC_THP4 + ", alliedNPProdC_THP5=" + + alliedNPProdC_THP5 + ", alliedNPProdC_THP6=" + alliedNPProdC_THP6 + ", alliedNPProdC_THPsum1=" + + alliedNPProdC_THPsum1 + ", alliedNPProdCCS_subsum1=" + alliedNPProdCCS_subsum1 + ", alliedNPProdCCS1=" + + alliedNPProdCCS1 + ", alliedNPProdCCS2=" + alliedNPProdCCS2 + ", alliedNPProdCCS3=" + alliedNPProdCCS3 + + ", alliedNPProdCCS4=" + alliedNPProdCCS4 + ", alliedNPProdCCS5=" + alliedNPProdCCS5 + + ", alliedNPProdCCS6=" + alliedNPProdCCS6 + ", alliedNPProdH_calc1=" + alliedNPProdH_calc1 + + ", alliedNPProdH_calc2=" + alliedNPProdH_calc2 + ", alliedNPProdH_calc3=" + alliedNPProdH_calc3 + + ", alliedNPProdH_calc4=" + alliedNPProdH_calc4 + ", alliedNPProdH_calc5=" + alliedNPProdH_calc5 + + ", alliedNPProdH_calc6=" + alliedNPProdH_calc6 + ", alliedNPProdH_calcsum1=" + alliedNPProdH_calcsum1 + + ", alliedNPProdH_item11=" + alliedNPProdH_item11 + ", alliedNPProdH_item12=" + alliedNPProdH_item12 + + ", alliedNPProdH_item13=" + alliedNPProdH_item13 + ", alliedNPProdH_item14=" + alliedNPProdH_item14 + + ", alliedNPProdH_item15=" + alliedNPProdH_item15 + ", alliedNPProdH_item16=" + alliedNPProdH_item16 + + ", alliedNPProdH_item21=" + alliedNPProdH_item21 + ", alliedNPProdH_item22=" + alliedNPProdH_item22 + + ", alliedNPProdH_item23=" + alliedNPProdH_item23 + ", alliedNPProdH_item24=" + alliedNPProdH_item24 + + ", alliedNPProdH_item25=" + alliedNPProdH_item25 + ", alliedNPProdH_item26=" + alliedNPProdH_item26 + + ", alliedNPProdH_sub1=" + alliedNPProdH_sub1 + ", alliedNPProdH_sub2=" + alliedNPProdH_sub2 + + ", alliedNPProdH_sub3=" + alliedNPProdH_sub3 + ", alliedNPProdH_sub4=" + alliedNPProdH_sub4 + + ", alliedNPProdH_sub5=" + alliedNPProdH_sub5 + ", alliedNPProdH_sub6=" + alliedNPProdH_sub6 + + ", alliedNPProdH_subsum1=" + alliedNPProdH_subsum1 + ", alliedNPProdH_sum11=" + alliedNPProdH_sum11 + + ", alliedNPProdH_sum21=" + alliedNPProdH_sum21 + ", alliedNPProdH_THP1=" + alliedNPProdH_THP1 + + ", alliedNPProdH_THP2=" + alliedNPProdH_THP2 + ", alliedNPProdH_THP3=" + alliedNPProdH_THP3 + + ", alliedNPProdH_THP4=" + alliedNPProdH_THP4 + ", alliedNPProdH_THP5=" + alliedNPProdH_THP5 + + ", alliedNPProdH_THP6=" + alliedNPProdH_THP6 + ", alliedNPProdH_THPsum1=" + alliedNPProdH_THPsum1 + + ", alliedNPProdHCS_subsum1=" + alliedNPProdHCS_subsum1 + ", alliedNPProdHCS1=" + alliedNPProdHCS1 + + ", alliedNPProdHCS2=" + alliedNPProdHCS2 + ", alliedNPProdHCS3=" + alliedNPProdHCS3 + + ", alliedNPProdHCS4=" + alliedNPProdHCS4 + ", alliedNPProdHCS5=" + alliedNPProdHCS5 + + ", alliedNPProdHCS6=" + alliedNPProdHCS6 + ", alliedNPProvider1=" + alliedNPProvider1 + + ", alliedNPProvider2=" + alliedNPProvider2 + ", alliedNPProvider3=" + alliedNPProvider3 + + ", alliedNPProvider4=" + alliedNPProvider4 + ", alliedNPProvider5=" + alliedNPProvider5 + + ", alliedNPProvider6=" + alliedNPProvider6 + ", alliedNProdC_sum21=" + alliedNProdC_sum21 + + ", alliedNProdH_sum21=" + alliedNProdH_sum21 + ", alliedNPStaffRate_total=" + alliedNPStaffRate_total + + ", alliedNPStaffRate1=" + alliedNPStaffRate1 + ", alliedNPStaffRate2=" + alliedNPStaffRate2 + + ", alliedNPStaffRate3=" + alliedNPStaffRate3 + ", alliedNPStaffRate4=" + alliedNPStaffRate4 + + ", alliedNPStaffRate5=" + alliedNPStaffRate5 + ", alliedNPStaffRate6=" + alliedNPStaffRate6 + + ", alliedProfContractRate_total=" + alliedProfContractRate_total + ", alliedProfContractRate1=" + + alliedProfContractRate1 + ", alliedProfContractRate2=" + alliedProfContractRate2 + + ", alliedProfContractRate3=" + alliedProfContractRate3 + ", alliedProfContractRate4=" + + alliedProfContractRate4 + ", alliedProfContractRate5=" + alliedProfContractRate5 + + ", alliedProfCost_total=" + alliedProfCost_total + ", alliedProfCost1=" + alliedProfCost1 + + ", alliedProfCost2=" + alliedProfCost2 + ", alliedProfCost3=" + alliedProfCost3 + ", alliedProfCost4=" + + alliedProfCost4 + ", alliedProfCost5=" + alliedProfCost5 + ", alliedProfNProdC_calc1=" + + alliedProfNProdC_calc1 + ", alliedProfNProdC_calc2=" + alliedProfNProdC_calc2 + + ", alliedProfNProdC_calc3=" + alliedProfNProdC_calc3 + ", alliedProfNProdC_calc4=" + + alliedProfNProdC_calc4 + ", alliedProfNProdC_calc5=" + alliedProfNProdC_calc5 + + ", alliedProfNProdC_calcsum1=" + alliedProfNProdC_calcsum1 + ", alliedProfNProdC_item11=" + + alliedProfNProdC_item11 + ", alliedProfNProdC_item12=" + alliedProfNProdC_item12 + + ", alliedProfNProdC_item13=" + alliedProfNProdC_item13 + ", alliedProfNProdC_item14=" + + alliedProfNProdC_item14 + ", alliedProfNProdC_item15=" + alliedProfNProdC_item15 + + ", alliedProfNProdC_item21=" + alliedProfNProdC_item21 + ", alliedProfNProdC_item22=" + + alliedProfNProdC_item22 + ", alliedProfNProdC_item23=" + alliedProfNProdC_item23 + + ", alliedProfNProdC_item24=" + alliedProfNProdC_item24 + ", alliedProfNProdC_item25=" + + alliedProfNProdC_item25 + ", alliedProfNProdC_item31=" + alliedProfNProdC_item31 + + ", alliedProfNProdC_item32=" + alliedProfNProdC_item32 + ", alliedProfNProdC_item33=" + + alliedProfNProdC_item33 + ", alliedProfNProdC_item34=" + alliedProfNProdC_item34 + + ", alliedProfNProdC_item35=" + alliedProfNProdC_item35 + ", alliedProfNProdC_sum11=" + + alliedProfNProdC_sum11 + ", alliedProfNProdC_sum31=" + alliedProfNProdC_sum31 + + ", alliedProfNProdC_THP1=" + alliedProfNProdC_THP1 + ", alliedProfNProdC_THP2=" + + alliedProfNProdC_THP2 + ", alliedProfNProdC_THP3=" + alliedProfNProdC_THP3 + + ", alliedProfNProdC_THP4=" + alliedProfNProdC_THP4 + ", alliedProfNProdC_THP5=" + + alliedProfNProdC_THP5 + ", alliedProfNProdC_THPsum1=" + alliedProfNProdC_THPsum1 + + ", alliedProfNProdH_calc1=" + alliedProfNProdH_calc1 + ", alliedProfNProdH_calc2=" + + alliedProfNProdH_calc2 + ", alliedProfNProdH_calc3=" + alliedProfNProdH_calc3 + + ", alliedProfNProdH_calc4=" + alliedProfNProdH_calc4 + ", alliedProfNProdH_calc5=" + + alliedProfNProdH_calc5 + ", alliedProfNProdH_calcsum1=" + alliedProfNProdH_calcsum1 + + ", alliedProfNProdH_item11=" + alliedProfNProdH_item11 + ", alliedProfNProdH_item12=" + + alliedProfNProdH_item12 + ", alliedProfNProdH_item13=" + alliedProfNProdH_item13 + + ", alliedProfNProdH_item14=" + alliedProfNProdH_item14 + ", alliedProfNProdH_item15=" + + alliedProfNProdH_item15 + ", alliedProfNProdH_item21=" + alliedProfNProdH_item21 + + ", alliedProfNProdH_item22=" + alliedProfNProdH_item22 + ", alliedProfNProdH_item23=" + + alliedProfNProdH_item23 + ", alliedProfNProdH_item24=" + alliedProfNProdH_item24 + + ", alliedProfNProdH_item25=" + alliedProfNProdH_item25 + ", alliedProfNProdH_item31=" + + alliedProfNProdH_item31 + ", alliedProfNProdH_item32=" + alliedProfNProdH_item32 + + ", alliedProfNProdH_item33=" + alliedProfNProdH_item33 + ", alliedProfNProdH_item34=" + + alliedProfNProdH_item34 + ", alliedProfNProdH_item35=" + alliedProfNProdH_item35 + + ", alliedProfNProdH_sum11=" + alliedProfNProdH_sum11 + ", alliedProfNProdH_sum31=" + + alliedProfNProdH_sum31 + ", alliedProfNProdH_THP1=" + alliedProfNProdH_THP1 + + ", alliedProfNProdH_THP2=" + alliedProfNProdH_THP2 + ", alliedProfNProdH_THP3=" + + alliedProfNProdH_THP3 + ", alliedProfNProdH_THP4=" + alliedProfNProdH_THP4 + + ", alliedProfNProdH_THP5=" + alliedProfNProdH_THP5 + ", alliedProfNProdH_THPsum1=" + + alliedProfNProdH_THPsum1 + ", alliedProfPercentage1=" + alliedProfPercentage1 + + ", alliedProfPercentage2=" + alliedProfPercentage2 + ", alliedProfPercentage3=" + + alliedProfPercentage3 + ", alliedProfPercentage4=" + alliedProfPercentage4 + + ", alliedProfPercentage5=" + alliedProfPercentage5 + ", alliedProfProdC_calc1=" + + alliedProfProdC_calc1 + ", alliedProfProdC_calc2=" + alliedProfProdC_calc2 + + ", alliedProfProdC_calc3=" + alliedProfProdC_calc3 + ", alliedProfProdC_calc4=" + + alliedProfProdC_calc4 + ", alliedProfProdC_calc5=" + alliedProfProdC_calc5 + + ", alliedProfProdC_calcsum1=" + alliedProfProdC_calcsum1 + ", alliedProfProdC_item11=" + + alliedProfProdC_item11 + ", alliedProfProdC_item12=" + alliedProfProdC_item12 + + ", alliedProfProdC_item13=" + alliedProfProdC_item13 + ", alliedProfProdC_item14=" + + alliedProfProdC_item14 + ", alliedProfProdC_item15=" + alliedProfProdC_item15 + + ", alliedProfProdC_item21=" + alliedProfProdC_item21 + ", alliedProfProdC_item22=" + + alliedProfProdC_item22 + ", alliedProfProdC_item23=" + alliedProfProdC_item23 + + ", alliedProfProdC_item24=" + alliedProfProdC_item24 + ", alliedProfProdC_item25=" + + alliedProfProdC_item25 + ", alliedProfProdC_sub1=" + alliedProfProdC_sub1 + ", alliedProfProdC_sub2=" + + alliedProfProdC_sub2 + ", alliedProfProdC_sub3=" + alliedProfProdC_sub3 + ", alliedProfProdC_sub4=" + + alliedProfProdC_sub4 + ", alliedProfProdC_sub5=" + alliedProfProdC_sub5 + ", alliedProfProdC_subsum1=" + + alliedProfProdC_subsum1 + ", alliedProfProdC_sum11=" + alliedProfProdC_sum11 + + ", alliedProfProdC_sum21=" + alliedProfProdC_sum21 + ", alliedProfProdC_THP1=" + alliedProfProdC_THP1 + + ", alliedProfProdC_THP2=" + alliedProfProdC_THP2 + ", alliedProfProdC_THP3=" + alliedProfProdC_THP3 + + ", alliedProfProdC_THP4=" + alliedProfProdC_THP4 + ", alliedProfProdC_THP5=" + alliedProfProdC_THP5 + + ", alliedProfProdC_THPsum1=" + alliedProfProdC_THPsum1 + ", alliedProfProdCCS_subsum1=" + + alliedProfProdCCS_subsum1 + ", alliedProfProdCCS1=" + alliedProfProdCCS1 + ", alliedProfProdCCS2=" + + alliedProfProdCCS2 + ", alliedProfProdCCS3=" + alliedProfProdCCS3 + ", alliedProfProdCCS4=" + + alliedProfProdCCS4 + ", alliedProfProdCCS5=" + alliedProfProdCCS5 + ", alliedProfProdH_calc1=" + + alliedProfProdH_calc1 + ", alliedProfProdH_calc2=" + alliedProfProdH_calc2 + + ", alliedProfProdH_calc3=" + alliedProfProdH_calc3 + ", alliedProfProdH_calc4=" + + alliedProfProdH_calc4 + ", alliedProfProdH_calc5=" + alliedProfProdH_calc5 + + ", alliedProfProdH_calcsum1=" + alliedProfProdH_calcsum1 + ", alliedProfProdH_item11=" + + alliedProfProdH_item11 + ", alliedProfProdH_item12=" + alliedProfProdH_item12 + + ", alliedProfProdH_item13=" + alliedProfProdH_item13 + ", alliedProfProdH_item14=" + + alliedProfProdH_item14 + ", alliedProfProdH_item15=" + alliedProfProdH_item15 + + ", alliedProfProdH_item21=" + alliedProfProdH_item21 + ", alliedProfProdH_item22=" + + alliedProfProdH_item22 + ", alliedProfProdH_item23=" + alliedProfProdH_item23 + + ", alliedProfProdH_item24=" + alliedProfProdH_item24 + ", alliedProfProdH_item25=" + + alliedProfProdH_item25 + ", alliedProfProdH_sub1=" + alliedProfProdH_sub1 + ", alliedProfProdH_sub2=" + + alliedProfProdH_sub2 + ", alliedProfProdH_sub3=" + alliedProfProdH_sub3 + ", alliedProfProdH_sub4=" + + alliedProfProdH_sub4 + ", alliedProfProdH_sub5=" + alliedProfProdH_sub5 + ", alliedProfProdH_subsum1=" + + alliedProfProdH_subsum1 + ", alliedProfProdH_sum11=" + alliedProfProdH_sum11 + + ", alliedProfProdH_sum21=" + alliedProfProdH_sum21 + ", alliedProfProdH_THP1=" + alliedProfProdH_THP1 + + ", alliedProfProdH_THP2=" + alliedProfProdH_THP2 + ", alliedProfProdH_THP3=" + alliedProfProdH_THP3 + + ", alliedProfProdH_THP4=" + alliedProfProdH_THP4 + ", alliedProfProdH_THP5=" + alliedProfProdH_THP5 + + ", alliedProfProdH_THPsum1=" + alliedProfProdH_THPsum1 + ", alliedProfProdHCS_subsum1=" + + alliedProfProdHCS_subsum1 + ", alliedProfProdHCS1=" + alliedProfProdHCS1 + ", alliedProfProdHCS2=" + + alliedProfProdHCS2 + ", alliedProfProdHCS3=" + alliedProfProdHCS3 + ", alliedProfProdHCS4=" + + alliedProfProdHCS4 + ", alliedProfProdHCS5=" + alliedProfProdHCS5 + ", alliedProfProvider1=" + + alliedProfProvider1 + ", alliedProfProvider2=" + alliedProfProvider2 + ", alliedProfProvider3=" + + alliedProfProvider3 + ", alliedProfProvider4=" + alliedProfProvider4 + ", alliedProfProvider5=" + + alliedProfProvider5 + ", alliedProfStaffRate_total=" + alliedProfStaffRate_total + + ", alliedProfStaffRate1=" + alliedProfStaffRate1 + ", alliedProfStaffRate2=" + alliedProfStaffRate2 + + ", alliedProfStaffRate3=" + alliedProfStaffRate3 + ", alliedProfStaffRate4=" + alliedProfStaffRate4 + + ", alliedProfStaffRate5=" + alliedProfStaffRate5 + ", bedGrid0=" + bedGrid0 + ", bedGrid1=" + bedGrid1 + + ", bedGrid2=" + bedGrid2 + ", bedGrid3=" + bedGrid3 + ", bedGrid4=" + bedGrid4 + + ", benefit_percentage_rec=" + benefit_percentage_rec + ", benefit_percentage_sub=" + + benefit_percentage_sub + ", benefit_percentage_total=" + benefit_percentage_total + + ", benefit_percentage1=" + benefit_percentage1 + ", benefit_percentage2=" + benefit_percentage2 + + ", benefit_percentage3=" + benefit_percentage3 + ", benefit_percentage4=" + benefit_percentage4 + + ", benefit_percentage5=" + benefit_percentage5 + ", benefit_percentage6=" + benefit_percentage6 + + ", benefit_percentage7=" + benefit_percentage7 + ", benefit_percentage8=" + benefit_percentage8 + + ", benefit_value_rec=" + benefit_value_rec + ", benefit_value_sub=" + benefit_value_sub + + ", benefit_value_total=" + benefit_value_total + ", benefit_value1=" + benefit_value1 + + ", benefit_value11=" + benefit_value11 + ", benefit_value2=" + benefit_value2 + ", benefit_value3=" + + benefit_value3 + ", benefit_value4=" + benefit_value4 + ", benefit_value5=" + benefit_value5 + + ", benefit_value6=" + benefit_value6 + ", benefit_value7=" + benefit_value7 + ", benefit_value8=" + + benefit_value8 + ", bTotal_accruedSalaryWage=" + bTotal_accruedSalaryWage + ", bTotal_benefits=" + + bTotal_benefits + ", bTotal_recSalaryWage=" + bTotal_recSalaryWage + ", bTotal_salaryWage=" + + bTotal_salaryWage + ", bTotal_value_sum1=" + bTotal_value_sum1 + ", bTotal_YTDSalaryWage=" + + bTotal_YTDSalaryWage + ", ccmisId=" + ccmisId + ", compB_accrued=" + compB_accrued + + ", compB_accrued1=" + compB_accrued1 + ", compB_accrued2=" + compB_accrued2 + ", compB_accrued3=" + + compB_accrued3 + ", compB_calc1=" + compB_calc1 + ", compB_calc10=" + compB_calc10 + ", compB_calc11=" + + compB_calc11 + ", compB_calc12=" + compB_calc12 + ", compB_calc13=" + compB_calc13 + ", compB_calc14=" + + compB_calc14 + ", compB_calc15=" + compB_calc15 + ", compB_calc16=" + compB_calc16 + ", compB_calc17=" + + compB_calc17 + ", compB_calc18=" + compB_calc18 + ", compB_calc19=" + compB_calc19 + ", compB_calc2=" + + compB_calc2 + ", compB_calc20=" + compB_calc20 + ", compB_calc21=" + compB_calc21 + ", compB_calc22=" + + compB_calc22 + ", compB_calc23=" + compB_calc23 + ", compB_calc24=" + compB_calc24 + ", compB_calc25=" + + compB_calc25 + ", compB_calc26=" + compB_calc26 + ", compB_calc27=" + compB_calc27 + ", compB_calc3=" + + compB_calc3 + ", compB_calc4=" + compB_calc4 + ", compB_calc5=" + compB_calc5 + ", compB_calc6=" + + compB_calc6 + ", compB_calc7=" + compB_calc7 + ", compB_calc8=" + compB_calc8 + ", compB_calc9=" + + compB_calc9 + ", compB_calcsum1=" + compB_calcsum1 + ", compB_calcsum2=" + compB_calcsum2 + + ", compB_calcsum3=" + compB_calcsum3 + ", compB_calcsum4=" + compB_calcsum4 + ", compB_calcsum5=" + + compB_calcsum5 + ", compB_item11=" + compB_item11 + ", compB_item110=" + compB_item110 + + ", compB_item111=" + compB_item111 + ", compB_item112=" + compB_item112 + ", compB_item113=" + + compB_item113 + ", compB_item114=" + compB_item114 + ", compB_item115=" + compB_item115 + + ", compB_item116=" + compB_item116 + ", compB_item117=" + compB_item117 + ", compB_item118=" + + compB_item118 + ", compB_item119=" + compB_item119 + ", compB_item12=" + compB_item12 + + ", compB_item120=" + compB_item120 + ", compB_item121=" + compB_item121 + ", compB_item122=" + + compB_item122 + ", compB_item123=" + compB_item123 + ", compB_item124=" + compB_item124 + + ", compB_item125=" + compB_item125 + ", compB_item126=" + compB_item126 + ", compB_item127=" + + compB_item127 + ", compB_item13=" + compB_item13 + ", compB_item14=" + compB_item14 + + ", compB_item15=" + compB_item15 + ", compB_item16=" + compB_item16 + ", compB_item17=" + compB_item17 + + ", compB_item18=" + compB_item18 + ", compB_item19=" + compB_item19 + ", compB_item21=" + compB_item21 + + ", compB_item210=" + compB_item210 + ", compB_item211=" + compB_item211 + ", compB_item212=" + + compB_item212 + ", compB_item213=" + compB_item213 + ", compB_item214=" + compB_item214 + + ", compB_item215=" + compB_item215 + ", compB_item216=" + compB_item216 + ", compB_item217=" + + compB_item217 + ", compB_item218=" + compB_item218 + ", compB_item219=" + compB_item219 + + ", compB_item22=" + compB_item22 + ", compB_item220=" + compB_item220 + ", compB_item221=" + + compB_item221 + ", compB_item222=" + compB_item222 + ", compB_item223=" + compB_item223 + + ", compB_item224=" + compB_item224 + ", compB_item225=" + compB_item225 + ", compB_item226=" + + compB_item226 + ", compB_item227=" + compB_item227 + ", compB_item23=" + compB_item23 + + ", compB_item24=" + compB_item24 + ", compB_item25=" + compB_item25 + ", compB_item26=" + compB_item26 + + ", compB_item27=" + compB_item27 + ", compB_item28=" + compB_item28 + ", compB_item29=" + compB_item29 + + ", compB_item31=" + compB_item31 + ", compB_item310=" + compB_item310 + ", compB_item311=" + + compB_item311 + ", compB_item312=" + compB_item312 + ", compB_item313=" + compB_item313 + + ", compB_item314=" + compB_item314 + ", compB_item315=" + compB_item315 + ", compB_item316=" + + compB_item316 + ", compB_item317=" + compB_item317 + ", compB_item318=" + compB_item318 + + ", compB_item319=" + compB_item319 + ", compB_item32=" + compB_item32 + ", compB_item320=" + + compB_item320 + ", compB_item321=" + compB_item321 + ", compB_item322=" + compB_item322 + + ", compB_item323=" + compB_item323 + ", compB_item324=" + compB_item324 + ", compB_item325=" + + compB_item325 + ", compB_item326=" + compB_item326 + ", compB_item327=" + compB_item327 + + ", compB_item33=" + compB_item33 + ", compB_item34=" + compB_item34 + ", compB_item35=" + compB_item35 + + ", compB_item36=" + compB_item36 + ", compB_item37=" + compB_item37 + ", compB_item38=" + compB_item38 + + ", compB_item39=" + compB_item39 + ", compB_laborOther=" + compB_laborOther + ", compB_laborOther1=" + + compB_laborOther1 + ", compB_laborOther2=" + compB_laborOther2 + ", compB_laborOther3=" + + compB_laborOther3 + ", compB_recovered=" + compB_recovered + ", compB_recovered1=" + compB_recovered1 + + ", compB_recovered2=" + compB_recovered2 + ", compB_recovered3=" + compB_recovered3 + ", compB_sum11=" + + compB_sum11 + ", compB_sum12=" + compB_sum12 + ", compB_sum13=" + compB_sum13 + ", compB_sum14=" + + compB_sum14 + ", compB_sum15=" + compB_sum15 + ", compB_sum21=" + compB_sum21 + ", compB_sum22=" + + compB_sum22 + ", compB_sum23=" + compB_sum23 + ", compB_sum24=" + compB_sum24 + ", compB_sum25=" + + compB_sum25 + ", compB_sum31=" + compB_sum31 + ", compB_sum32=" + compB_sum32 + ", compB_sum33=" + + compB_sum33 + ", compB_sum34=" + compB_sum34 + ", compB_sum35=" + compB_sum35 + ", compB_total=" + + compB_total + ", compB_total1=" + compB_total1 + ", compB_total2=" + compB_total2 + ", compB_total3=" + + compB_total3 + ", compH_accrued=" + compH_accrued + ", compH_accrued2=" + compH_accrued2 + + ", compH_accrued3=" + compH_accrued3 + ", compH_accrued4=" + compH_accrued4 + ", compH_calc1=" + + compH_calc1 + ", compH_calc10=" + compH_calc10 + ", compH_calc11=" + compH_calc11 + ", compH_calc12=" + + compH_calc12 + ", compH_calc13=" + compH_calc13 + ", compH_calc14=" + compH_calc14 + ", compH_calc15=" + + compH_calc15 + ", compH_calc16=" + compH_calc16 + ", compH_calc17=" + compH_calc17 + ", compH_calc18=" + + compH_calc18 + ", compH_calc19=" + compH_calc19 + ", compH_calc2=" + compH_calc2 + ", compH_calc20=" + + compH_calc20 + ", compH_calc21=" + compH_calc21 + ", compH_calc22=" + compH_calc22 + ", compH_calc23=" + + compH_calc23 + ", compH_calc24=" + compH_calc24 + ", compH_calc25=" + compH_calc25 + ", compH_calc26=" + + compH_calc26 + ", compH_calc27=" + compH_calc27 + ", compH_calc3=" + compH_calc3 + ", compH_calc4=" + + compH_calc4 + ", compH_calc5=" + compH_calc5 + ", compH_calc6=" + compH_calc6 + ", compH_calc7=" + + compH_calc7 + ", compH_calc8=" + compH_calc8 + ", compH_calc9=" + compH_calc9 + ", compH_calcsum1=" + + compH_calcsum1 + ", compH_calcsum2=" + compH_calcsum2 + ", compH_calcsum3=" + compH_calcsum3 + + ", compH_calcsum4=" + compH_calcsum4 + ", compH_calcsum5=" + compH_calcsum5 + ", compH_item11=" + + compH_item11 + ", compH_item110=" + compH_item110 + ", compH_item111=" + compH_item111 + + ", compH_item112=" + compH_item112 + ", compH_item113=" + compH_item113 + ", compH_item114=" + + compH_item114 + ", compH_item115=" + compH_item115 + ", compH_item116=" + compH_item116 + + ", compH_item117=" + compH_item117 + ", compH_item118=" + compH_item118 + ", compH_item119=" + + compH_item119 + ", compH_item12=" + compH_item12 + ", compH_item120=" + compH_item120 + + ", compH_item121=" + compH_item121 + ", compH_item122=" + compH_item122 + ", compH_item123=" + + compH_item123 + ", compH_item124=" + compH_item124 + ", compH_item125=" + compH_item125 + + ", compH_item126=" + compH_item126 + ", compH_item127=" + compH_item127 + ", compH_item13=" + + compH_item13 + ", compH_item14=" + compH_item14 + ", compH_item15=" + compH_item15 + ", compH_item16=" + + compH_item16 + ", compH_item17=" + compH_item17 + ", compH_item18=" + compH_item18 + ", compH_item19=" + + compH_item19 + ", compH_item21=" + compH_item21 + ", compH_item210=" + compH_item210 + + ", compH_item211=" + compH_item211 + ", compH_item212=" + compH_item212 + ", compH_item213=" + + compH_item213 + ", compH_item214=" + compH_item214 + ", compH_item215=" + compH_item215 + + ", compH_item216=" + compH_item216 + ", compH_item217=" + compH_item217 + ", compH_item218=" + + compH_item218 + ", compH_item219=" + compH_item219 + ", compH_item22=" + compH_item22 + + ", compH_item220=" + compH_item220 + ", compH_item221=" + compH_item221 + ", compH_item222=" + + compH_item222 + ", compH_item223=" + compH_item223 + ", compH_item224=" + compH_item224 + + ", compH_item225=" + compH_item225 + ", compH_item226=" + compH_item226 + ", compH_item227=" + + compH_item227 + ", compH_item23=" + compH_item23 + ", compH_item24=" + compH_item24 + + ", compH_item25=" + compH_item25 + ", compH_item26=" + compH_item26 + ", compH_item27=" + compH_item27 + + ", compH_item28=" + compH_item28 + ", compH_item29=" + compH_item29 + ", compH_item31=" + compH_item31 + + ", compH_item310=" + compH_item310 + ", compH_item311=" + compH_item311 + ", compH_item312=" + + compH_item312 + ", compH_item313=" + compH_item313 + ", compH_item314=" + compH_item314 + + ", compH_item315=" + compH_item315 + ", compH_item316=" + compH_item316 + ", compH_item317=" + + compH_item317 + ", compH_item318=" + compH_item318 + ", compH_item319=" + compH_item319 + + ", compH_item32=" + compH_item32 + ", compH_item320=" + compH_item320 + ", compH_item321=" + + compH_item321 + ", compH_item322=" + compH_item322 + ", compH_item323=" + compH_item323 + + ", compH_item324=" + compH_item324 + ", compH_item325=" + compH_item325 + ", compH_item326=" + + compH_item326 + ", compH_item327=" + compH_item327 + ", compH_item33=" + compH_item33 + + ", compH_item34=" + compH_item34 + ", compH_item35=" + compH_item35 + ", compH_item36=" + compH_item36 + + ", compH_item37=" + compH_item37 + ", compH_item38=" + compH_item38 + ", compH_item39=" + compH_item39 + + ", compH_PHP1=" + compH_PHP1 + ", compH_PHP10=" + compH_PHP10 + ", compH_PHP11=" + compH_PHP11 + + ", compH_PHP12=" + compH_PHP12 + ", compH_PHP13=" + compH_PHP13 + ", compH_PHP14=" + compH_PHP14 + + ", compH_PHP15=" + compH_PHP15 + ", compH_PHP16=" + compH_PHP16 + ", compH_PHP17=" + compH_PHP17 + + ", compH_PHP18=" + compH_PHP18 + ", compH_PHP19=" + compH_PHP19 + ", compH_PHP2=" + compH_PHP2 + + ", compH_PHP20=" + compH_PHP20 + ", compH_PHP21=" + compH_PHP21 + ", compH_PHP22=" + compH_PHP22 + + ", compH_PHP23=" + compH_PHP23 + ", compH_PHP24=" + compH_PHP24 + ", compH_PHP25=" + compH_PHP25 + + ", compH_PHP26=" + compH_PHP26 + ", compH_PHP27=" + compH_PHP27 + ", compH_PHP3=" + compH_PHP3 + + ", compH_PHP4=" + compH_PHP4 + ", compH_PHP5=" + compH_PHP5 + ", compH_PHP6=" + compH_PHP6 + + ", compH_PHP7=" + compH_PHP7 + ", compH_PHP8=" + compH_PHP8 + ", compH_PHP9=" + compH_PHP9 + + ", compH_PHPsum1=" + compH_PHPsum1 + ", compH_PHPsum2=" + compH_PHPsum2 + ", compH_PHPsum3=" + + compH_PHPsum3 + ", compH_PHPsum4=" + compH_PHPsum4 + ", compH_PHPsum5=" + compH_PHPsum5 + + ", compH_sum11=" + compH_sum11 + ", compH_sum12=" + compH_sum12 + ", compH_sum13=" + compH_sum13 + + ", compH_sum14=" + compH_sum14 + ", compH_sum15=" + compH_sum15 + ", compH_sum21=" + compH_sum21 + + ", compH_sum22=" + compH_sum22 + ", compH_sum23=" + compH_sum23 + ", compH_sum24=" + compH_sum24 + + ", compH_sum25=" + compH_sum25 + ", compH_sum31=" + compH_sum31 + ", compH_sum32=" + compH_sum32 + + ", compH_sum33=" + compH_sum33 + ", compH_sum34=" + compH_sum34 + ", compH_sum35=" + compH_sum35 + + ", compH_total=" + compH_total + ", compH_total1=" + compH_total1 + ", compH_total2=" + compH_total2 + + ", compH_total3=" + compH_total3 + ", compH_total4=" + compH_total4 + ", directCare_subtotal=" + + directCare_subtotal + ", directCare_subtotal1=" + directCare_subtotal1 + ", directCare_subtotal2=" + + directCare_subtotal2 + ", directCare_subtotal3=" + directCare_subtotal3 + ", endPeriod=" + endPeriod + + ", facilityName=" + facilityName + ", form=" + form + ", inScopeBedTotal1=" + inScopeBedTotal1 + + ", inScopeBedTotal2=" + inScopeBedTotal2 + ", inScopeBedTotal3=" + inScopeBedTotal3 + + ", inScopeBedTotal4=" + inScopeBedTotal4 + ", inScopeBedTotalYTD=" + inScopeBedTotalYTD + + ", inScopeMonth1=" + inScopeMonth1 + ", inScopeMonth10=" + inScopeMonth10 + ", inScopeMonth11=" + + inScopeMonth11 + ", inScopeMonth12=" + inScopeMonth12 + ", inScopeMonth2=" + inScopeMonth2 + + ", inScopeMonth3=" + inScopeMonth3 + ", inScopeMonth4=" + inScopeMonth4 + ", inScopeMonth5=" + + inScopeMonth5 + ", inScopeMonth6=" + inScopeMonth6 + ", inScopeMonth7=" + inScopeMonth7 + + ", inScopeMonth8=" + inScopeMonth8 + ", inScopeMonth9=" + inScopeMonth9 + ", inScopeOccupied1=" + + inScopeOccupied1 + ", inScopeOccupied2=" + inScopeOccupied2 + ", inScopeOccupied3=" + inScopeOccupied3 + + ", inScopeOccupied4=" + inScopeOccupied4 + ", inScopeOccupiedYTD=" + inScopeOccupiedYTD + + ", inScopeTotalQ1=" + inScopeTotalQ1 + ", inScopeTotalQ2=" + inScopeTotalQ2 + ", inScopeTotalQ3=" + + inScopeTotalQ3 + ", inScopeTotalQ4=" + inScopeTotalQ4 + ", nopEx_note1=" + nopEx_note1 + + ", nopEx_note2=" + nopEx_note2 + ", nopEx_sub_note=" + nopEx_sub_note + ", nopEx_sum11=" + nopEx_sum11 + + ", nopEx_YTD1=" + nopEx_YTD1 + ", nopEx_YTD2=" + nopEx_YTD2 + ", nopRev_note1=" + nopRev_note1 + + ", nopRev_note2=" + nopRev_note2 + ", nopRev_sub_note=" + nopRev_sub_note + ", nopRev_sum11=" + + nopRev_sum11 + ", nopRev_YTD1=" + nopRev_YTD1 + ", nopRev_YTD2=" + nopRev_YTD2 + ", nopSu_data1=" + + nopSu_data1 + ", nopSu_note=" + nopSu_note + ", noteInScopeQ1=" + noteInScopeQ1 + ", noteInScopeQ2=" + + noteInScopeQ2 + ", noteInScopeQ3=" + noteInScopeQ3 + ", noteInScopeQ4=" + noteInScopeQ4 + + ", numberOfDaysAccrued=" + numberOfDaysAccrued + ", numberOfTotalBeds=" + numberOfTotalBeds + + ", numberOfTotalFundedBeds=" + numberOfTotalFundedBeds + ", nursingContractRate_total=" + + nursingContractRate_total + ", nursingContractRate1=" + nursingContractRate1 + + ", nursingContractRate2=" + nursingContractRate2 + ", nursingContractRate3=" + nursingContractRate3 + + ", nursingContractRate4=" + nursingContractRate4 + ", nursingCost_total=" + nursingCost_total + + ", nursingCost1=" + nursingCost1 + ", nursingCost2=" + nursingCost2 + ", nursingCost3=" + nursingCost3 + + ", nursingCost4=" + nursingCost4 + ", nursingNProdC_calc1=" + nursingNProdC_calc1 + + ", nursingNProdC_calc2=" + nursingNProdC_calc2 + ", nursingNProdC_calc3=" + nursingNProdC_calc3 + + ", nursingNProdC_calc4=" + nursingNProdC_calc4 + ", nursingNProdC_calcsum1=" + nursingNProdC_calcsum1 + + ", nursingNProdC_item11=" + nursingNProdC_item11 + ", nursingNProdC_item12=" + nursingNProdC_item12 + + ", nursingNProdC_item13=" + nursingNProdC_item13 + ", nursingNProdC_item14=" + nursingNProdC_item14 + + ", nursingNProdC_item21=" + nursingNProdC_item21 + ", nursingNProdC_item22=" + nursingNProdC_item22 + + ", nursingNProdC_item23=" + nursingNProdC_item23 + ", nursingNProdC_item24=" + nursingNProdC_item24 + + ", nursingNProdC_item31=" + nursingNProdC_item31 + ", nursingNProdC_item32=" + nursingNProdC_item32 + + ", nursingNProdC_item33=" + nursingNProdC_item33 + ", nursingNProdC_item34=" + nursingNProdC_item34 + + ", nursingNProdC_sum11=" + nursingNProdC_sum11 + ", nursingNProdC_sum21=" + nursingNProdC_sum21 + + ", nursingNProdC_sum31=" + nursingNProdC_sum31 + ", nursingNProdC_THP1=" + nursingNProdC_THP1 + + ", nursingNProdC_THP2=" + nursingNProdC_THP2 + ", nursingNProdC_THP3=" + nursingNProdC_THP3 + + ", nursingNProdC_THP4=" + nursingNProdC_THP4 + ", nursingNProdC_THPsum1=" + nursingNProdC_THPsum1 + + ", nursingNProdH_calc1=" + nursingNProdH_calc1 + ", nursingNProdH_calc2=" + nursingNProdH_calc2 + + ", nursingNProdH_calc3=" + nursingNProdH_calc3 + ", nursingNProdH_calc4=" + nursingNProdH_calc4 + + ", nursingNProdH_calcsum1=" + nursingNProdH_calcsum1 + ", nursingNProdH_item11=" + + nursingNProdH_item11 + ", nursingNProdH_item12=" + nursingNProdH_item12 + ", nursingNProdH_item13=" + + nursingNProdH_item13 + ", nursingNProdH_item14=" + nursingNProdH_item14 + ", nursingNProdH_item21=" + + nursingNProdH_item21 + ", nursingNProdH_item22=" + nursingNProdH_item22 + ", nursingNProdH_item23=" + + nursingNProdH_item23 + ", nursingNProdH_item24=" + nursingNProdH_item24 + ", nursingNProdH_item31=" + + nursingNProdH_item31 + ", nursingNProdH_item32=" + nursingNProdH_item32 + ", nursingNProdH_item33=" + + nursingNProdH_item33 + ", nursingNProdH_item34=" + nursingNProdH_item34 + ", nursingNProdH_sum11=" + + nursingNProdH_sum11 + ", nursingNProdH_sum21=" + nursingNProdH_sum21 + ", nursingNProdH_sum31=" + + nursingNProdH_sum31 + ", nursingNProdH_THP1=" + nursingNProdH_THP1 + ", nursingNProdH_THP2=" + + nursingNProdH_THP2 + ", nursingNProdH_THP3=" + nursingNProdH_THP3 + ", nursingNProdH_THP4=" + + nursingNProdH_THP4 + ", nursingNProdH_THPsum1=" + nursingNProdH_THPsum1 + ", nursingPercentage1=" + + nursingPercentage1 + ", nursingPercentage2=" + nursingPercentage2 + ", nursingPercentage3=" + + nursingPercentage3 + ", nursingPercentage4=" + nursingPercentage4 + ", nursingProdC_calc1=" + + nursingProdC_calc1 + ", nursingProdC_calc2=" + nursingProdC_calc2 + ", nursingProdC_calc3=" + + nursingProdC_calc3 + ", nursingProdC_calc4=" + nursingProdC_calc4 + ", nursingProdC_calcsum1=" + + nursingProdC_calcsum1 + ", nursingProdC_item11=" + nursingProdC_item11 + ", nursingProdC_item12=" + + nursingProdC_item12 + ", nursingProdC_item13=" + nursingProdC_item13 + ", nursingProdC_item14=" + + nursingProdC_item14 + ", nursingProdC_item21=" + nursingProdC_item21 + ", nursingProdC_item22=" + + nursingProdC_item22 + ", nursingProdC_item23=" + nursingProdC_item23 + ", nursingProdC_item24=" + + nursingProdC_item24 + ", nursingProdC_sub1=" + nursingProdC_sub1 + ", nursingProdC_sub2=" + + nursingProdC_sub2 + ", nursingProdC_sub3=" + nursingProdC_sub3 + ", nursingProdC_sub4=" + + nursingProdC_sub4 + ", nursingProdC_subsum1=" + nursingProdC_subsum1 + ", nursingProdC_sum11=" + + nursingProdC_sum11 + ", nursingProdC_sum21=" + nursingProdC_sum21 + ", nursingProdC_THP1=" + + nursingProdC_THP1 + ", nursingProdC_THP2=" + nursingProdC_THP2 + ", nursingProdC_THP3=" + + nursingProdC_THP3 + ", nursingProdC_THP4=" + nursingProdC_THP4 + ", nursingProdC_THPsum1=" + + nursingProdC_THPsum1 + ", nursingProdCCS_subsum1=" + nursingProdCCS_subsum1 + ", nursingProdCCS1=" + + nursingProdCCS1 + ", nursingProdCCS2=" + nursingProdCCS2 + ", nursingProdCCS3=" + nursingProdCCS3 + + ", nursingProdCCS4=" + nursingProdCCS4 + ", nursingProdH_calc1=" + nursingProdH_calc1 + + ", nursingProdH_calc2=" + nursingProdH_calc2 + ", nursingProdH_calc3=" + nursingProdH_calc3 + + ", nursingProdH_calc4=" + nursingProdH_calc4 + ", nursingProdH_calcsum1=" + nursingProdH_calcsum1 + + ", nursingProdH_item11=" + nursingProdH_item11 + ", nursingProdH_item12=" + nursingProdH_item12 + + ", nursingProdH_item13=" + nursingProdH_item13 + ", nursingProdH_item14=" + nursingProdH_item14 + + ", nursingProdH_item21=" + nursingProdH_item21 + ", nursingProdH_item22=" + nursingProdH_item22 + + ", nursingProdH_item23=" + nursingProdH_item23 + ", nursingProdH_item24=" + nursingProdH_item24 + + ", nursingProdH_sub1=" + nursingProdH_sub1 + ", nursingProdH_sub2=" + nursingProdH_sub2 + + ", nursingProdH_sub3=" + nursingProdH_sub3 + ", nursingProdH_sub4=" + nursingProdH_sub4 + + ", nursingProdH_subsum1=" + nursingProdH_subsum1 + ", nursingProdH_sum11=" + nursingProdH_sum11 + + ", nursingProdH_sum21=" + nursingProdH_sum21 + ", nursingProdH_THP1=" + nursingProdH_THP1 + + ", nursingProdH_THP2=" + nursingProdH_THP2 + ", nursingProdH_THP3=" + nursingProdH_THP3 + + ", nursingProdH_THP4=" + nursingProdH_THP4 + ", nursingProdH_THPsum1=" + nursingProdH_THPsum1 + + ", nursingProdHCS_subsum1=" + nursingProdHCS_subsum1 + ", nursingProdHCS1=" + nursingProdHCS1 + + ", nursingProdHCS2=" + nursingProdHCS2 + ", nursingProdHCS3=" + nursingProdHCS3 + ", nursingProdHCS4=" + + nursingProdHCS4 + ", nursingProvider1=" + nursingProvider1 + ", nursingProvider2=" + nursingProvider2 + + ", nursingProvider3=" + nursingProvider3 + ", nursingProvider4=" + nursingProvider4 + + ", nursingStaffRate_total=" + nursingStaffRate_total + ", nursingStaffRate1=" + nursingStaffRate1 + + ", nursingStaffRate2=" + nursingStaffRate2 + ", nursingStaffRate3=" + nursingStaffRate3 + + ", nursingStaffRate4=" + nursingStaffRate4 + ", occupiedPercentageInScopeQ1=" + + occupiedPercentageInScopeQ1 + ", occupiedPercentageInScopeQ2=" + occupiedPercentageInScopeQ2 + + ", occupiedPercentageInScopeQ3=" + occupiedPercentageInScopeQ3 + ", occupiedPercentageInScopeQ4=" + + occupiedPercentageInScopeQ4 + ", occupiedPercentageOutScopeQ1=" + occupiedPercentageOutScopeQ1 + + ", occupiedPercentageOutScopeQ2=" + occupiedPercentageOutScopeQ2 + ", occupiedPercentageOutScopeQ3=" + + occupiedPercentageOutScopeQ3 + ", occupiedPercentageOutScopeQ4=" + occupiedPercentageOutScopeQ4 + + ", occupiedPercentagePrivateQ1=" + occupiedPercentagePrivateQ1 + ", occupiedPercentagePrivateQ2=" + + occupiedPercentagePrivateQ2 + ", occupiedPercentagePrivateQ3=" + occupiedPercentagePrivateQ3 + + ", occupiedPercentagePrivateQ4=" + occupiedPercentagePrivateQ4 + ", occupiedPercentageTotalQ1=" + + occupiedPercentageTotalQ1 + ", occupiedPercentageTotalQ2=" + occupiedPercentageTotalQ2 + + ", occupiedPercentageTotalQ3=" + occupiedPercentageTotalQ3 + ", occupiedPercentageTotalQ4=" + + occupiedPercentageTotalQ4 + ", occupiedQ1=" + occupiedQ1 + ", occupiedQ2=" + occupiedQ2 + + ", occupiedQ3=" + occupiedQ3 + ", occupiedQ4=" + occupiedQ4 + ", occupiedTotal=" + occupiedTotal + + ", opEx_calc38=" + opEx_calc38 + ", opEx_calc39=" + opEx_calc39 + ", opEx_data_total=" + + opEx_data_total + ", opEx_item138=" + opEx_item138 + ", opEx_item139=" + opEx_item139 + + ", opEx_note_sum6=" + opEx_note_sum6 + ", opEx_note1=" + opEx_note1 + ", opEx_note10=" + opEx_note10 + + ", opEx_note11=" + opEx_note11 + ", opEx_note12=" + opEx_note12 + ", opEx_note13=" + opEx_note13 + + ", opEx_note14=" + opEx_note14 + ", opEx_note15=" + opEx_note15 + ", opEx_note16=" + opEx_note16 + + ", opEx_note17=" + opEx_note17 + ", opEx_note18=" + opEx_note18 + ", opEx_note19=" + opEx_note19 + + ", opEx_note2=" + opEx_note2 + ", opEx_note20=" + opEx_note20 + ", opEx_note21=" + opEx_note21 + + ", opEx_note22=" + opEx_note22 + ", opEx_note23=" + opEx_note23 + ", opEx_note24=" + opEx_note24 + + ", opEx_note25=" + opEx_note25 + ", opEx_note26=" + opEx_note26 + ", opEx_note27=" + opEx_note27 + + ", opEx_note28=" + opEx_note28 + ", opEx_note29=" + opEx_note29 + ", opEx_note3=" + opEx_note3 + + ", opEx_note30=" + opEx_note30 + ", opEx_note31=" + opEx_note31 + ", opEx_note32=" + opEx_note32 + + ", opEx_note33=" + opEx_note33 + ", opEx_note34=" + opEx_note34 + ", opEx_note35=" + opEx_note35 + + ", opEx_note36=" + opEx_note36 + ", opEx_note38=" + opEx_note38 + ", opEx_note39=" + opEx_note39 + + ", opEx_note4=" + opEx_note4 + ", opEx_note5=" + opEx_note5 + ", opEx_note6=" + opEx_note6 + + ", opEx_note7=" + opEx_note7 + ", opEx_note8=" + opEx_note8 + ", opEx_note9=" + opEx_note9 + + ", opEx_sub_note=" + opEx_sub_note + ", opEx_sub1=" + opEx_sub1 + ", opEx_sum_note1=" + opEx_sum_note1 + + ", opEx_sum_note2=" + opEx_sum_note2 + ", opEx_sum_note3=" + opEx_sum_note3 + ", opEx_sum_note4=" + + opEx_sum_note4 + ", opEx_sum_note5=" + opEx_sum_note5 + ", opEx_sum11=" + opEx_sum11 + ", opEx_sum12=" + + opEx_sum12 + ", opEx_sum13=" + opEx_sum13 + ", opEx_sum14=" + opEx_sum14 + ", opEx_sum15=" + + opEx_sum15 + ", opEx_sum16=" + opEx_sum16 + ", opEx_total_note=" + opEx_total_note + ", opEx_YTD1=" + + opEx_YTD1 + ", opEx_YTD10=" + opEx_YTD10 + ", opEx_YTD11=" + opEx_YTD11 + ", opEx_YTD12=" + opEx_YTD12 + + ", opEx_YTD13=" + opEx_YTD13 + ", opEx_YTD14=" + opEx_YTD14 + ", opEx_YTD15=" + opEx_YTD15 + + ", opEx_YTD16=" + opEx_YTD16 + ", opEx_YTD17=" + opEx_YTD17 + ", opEx_YTD18=" + opEx_YTD18 + + ", opEx_YTD19=" + opEx_YTD19 + ", opEx_YTD2=" + opEx_YTD2 + ", opEx_YTD20=" + opEx_YTD20 + + ", opEx_YTD21=" + opEx_YTD21 + ", opEx_YTD22=" + opEx_YTD22 + ", opEx_YTD23=" + opEx_YTD23 + + ", opEx_YTD24=" + opEx_YTD24 + ", opEx_YTD25=" + opEx_YTD25 + ", opEx_YTD26=" + opEx_YTD26 + + ", opEx_YTD27=" + opEx_YTD27 + ", opEx_YTD28=" + opEx_YTD28 + ", opEx_YTD29=" + opEx_YTD29 + + ", opEx_YTD3=" + opEx_YTD3 + ", opEx_YTD30=" + opEx_YTD30 + ", opEx_YTD31=" + opEx_YTD31 + + ", opEx_YTD32=" + opEx_YTD32 + ", opEx_YTD33=" + opEx_YTD33 + ", opEx_YTD34=" + opEx_YTD34 + + ", opEx_YTD35=" + opEx_YTD35 + ", opEx_YTD4=" + opEx_YTD4 + ", opEx_YTD5=" + opEx_YTD5 + + ", opEx_YTD6=" + opEx_YTD6 + ", opEx_YTD7=" + opEx_YTD7 + ", opEx_YTD8=" + opEx_YTD8 + ", opEx_YTD9=" + + opEx_YTD9 + ", opRev_note1=" + opRev_note1 + ", opRev_note10=" + opRev_note10 + ", opRev_note11=" + + opRev_note11 + ", opRev_note12=" + opRev_note12 + ", opRev_note13=" + opRev_note13 + ", opRev_note14=" + + opRev_note14 + ", opRev_note15=" + opRev_note15 + ", opRev_note16=" + opRev_note16 + ", opRev_note17=" + + opRev_note17 + ", opRev_note18=" + opRev_note18 + ", opRev_note19=" + opRev_note19 + ", opRev_note2=" + + opRev_note2 + ", opRev_note20=" + opRev_note20 + ", opRev_note3=" + opRev_note3 + ", opRev_note4=" + + opRev_note4 + ", opRev_note5=" + opRev_note5 + ", opRev_note6=" + opRev_note6 + ", opRev_note7=" + + opRev_note7 + ", opRev_note8=" + opRev_note8 + ", opRev_note9=" + opRev_note9 + ", opRev_sum_note1=" + + opRev_sum_note1 + ", opRev_sum_note2=" + opRev_sum_note2 + ", opRev_sum_note3=" + opRev_sum_note3 + + ", opRev_sum_note4=" + opRev_sum_note4 + ", opRev_sum_note5=" + opRev_sum_note5 + ", opRev_sum11=" + + opRev_sum11 + ", opRev_sum12=" + opRev_sum12 + ", opRev_sum13=" + opRev_sum13 + ", opRev_sum14=" + + opRev_sum14 + ", opRev_sum15=" + opRev_sum15 + ", opRev_total_note=" + opRev_total_note + + ", opRev_YTD_total=" + opRev_YTD_total + ", opRev_YTD1=" + opRev_YTD1 + ", opRev_YTD10=" + opRev_YTD10 + + ", opRev_YTD11=" + opRev_YTD11 + ", opRev_YTD12=" + opRev_YTD12 + ", opRev_YTD13=" + opRev_YTD13 + + ", opRev_YTD14=" + opRev_YTD14 + ", opRev_YTD15=" + opRev_YTD15 + ", opRev_YTD16=" + opRev_YTD16 + + ", opRev_YTD17=" + opRev_YTD17 + ", opRev_YTD18=" + opRev_YTD18 + ", opRev_YTD19=" + opRev_YTD19 + + ", opRev_YTD2=" + opRev_YTD2 + ", opRev_YTD20=" + opRev_YTD20 + ", opRev_YTD3=" + opRev_YTD3 + + ", opRev_YTD4=" + opRev_YTD4 + ", opRev_YTD5=" + opRev_YTD5 + ", opRev_YTD6=" + opRev_YTD6 + + ", opRev_YTD7=" + opRev_YTD7 + ", opRev_YTD8=" + opRev_YTD8 + ", opRev_YTD9=" + opRev_YTD9 + + ", opSu_data_total=" + opSu_data_total + ", opSu_data_total_note=" + opSu_data_total_note + + ", opSuB_item11=" + opSuB_item11 + ", opSuB_note=" + opSuB_note + ", outScopeBedTotal1=" + + outScopeBedTotal1 + ", outScopeBedTotal2=" + outScopeBedTotal2 + ", outScopeBedTotal3=" + + outScopeBedTotal3 + ", outScopeBedTotal4=" + outScopeBedTotal4 + ", outScopeBedTotalYTD=" + + outScopeBedTotalYTD + ", outScopeMonth1=" + outScopeMonth1 + ", outScopeMonth10=" + outScopeMonth10 + + ", outScopeMonth11=" + outScopeMonth11 + ", outScopeMonth12=" + outScopeMonth12 + ", outScopeMonth2=" + + outScopeMonth2 + ", outScopeMonth3=" + outScopeMonth3 + ", outScopeMonth4=" + outScopeMonth4 + + ", outScopeMonth5=" + outScopeMonth5 + ", outScopeMonth6=" + outScopeMonth6 + ", outScopeMonth7=" + + outScopeMonth7 + ", outScopeMonth8=" + outScopeMonth8 + ", outScopeMonth9=" + outScopeMonth9 + + ", outScopeOccupied1=" + outScopeOccupied1 + ", outScopeOccupied2=" + outScopeOccupied2 + + ", outScopeOccupied3=" + outScopeOccupied3 + ", outScopeOccupied4=" + outScopeOccupied4 + + ", outScopeOccupiedYTD=" + outScopeOccupiedYTD + ", outScopeTotalQ1=" + outScopeTotalQ1 + + ", outScopeTotalQ2=" + outScopeTotalQ2 + ", outScopeTotalQ3=" + outScopeTotalQ3 + ", outScopeTotalQ4=" + + outScopeTotalQ4 + ", payrollEndDate=" + payrollEndDate + ", payrollStartDate=" + payrollStartDate + + ", plannedInScope=" + plannedInScope + ", plannedInScope1=" + plannedInScope1 + ", plannedInScope2=" + + plannedInScope2 + ", plannedInScope3=" + plannedInScope3 + ", plannedInScope4=" + plannedInScope4 + + ", plannedOutScope=" + plannedOutScope + ", plannedOutScope1=" + plannedOutScope1 + + ", plannedOutScope2=" + plannedOutScope2 + ", plannedOutScope3=" + plannedOutScope3 + + ", plannedOutScope4=" + plannedOutScope4 + ", plannedPrivate=" + plannedPrivate + ", plannedPrivate1=" + + plannedPrivate1 + ", plannedPrivate2=" + plannedPrivate2 + ", plannedPrivate3=" + plannedPrivate3 + + ", plannedPrivate4=" + plannedPrivate4 + ", plannedTotal=" + plannedTotal + ", plannedTotal1=" + + plannedTotal1 + ", plannedTotal2=" + plannedTotal2 + ", plannedTotal3=" + plannedTotal3 + + ", plannedTotal4=" + plannedTotal4 + ", privateBedTotal1=" + privateBedTotal1 + ", privateBedTotal2=" + + privateBedTotal2 + ", privateBedTotal3=" + privateBedTotal3 + ", privateBedTotal4=" + privateBedTotal4 + + ", privateBedTotalYTD=" + privateBedTotalYTD + ", privateMonth1=" + privateMonth1 + + ", privateMonth10=" + privateMonth10 + ", privateMonth11=" + privateMonth11 + ", privateMonth12=" + + privateMonth12 + ", privateMonth2=" + privateMonth2 + ", privateMonth3=" + privateMonth3 + + ", privateMonth4=" + privateMonth4 + ", privateMonth5=" + privateMonth5 + ", privateMonth6=" + + privateMonth6 + ", privateMonth7=" + privateMonth7 + ", privateMonth8=" + privateMonth8 + + ", privateMonth9=" + privateMonth9 + ", privateOccupied1=" + privateOccupied1 + ", privateOccupied2=" + + privateOccupied2 + ", privateOccupied3=" + privateOccupied3 + ", privateOccupied4=" + privateOccupied4 + + ", privateOccupiedYTD=" + privateOccupiedYTD + ", privateTotalQ1=" + privateTotalQ1 + + ", privateTotalQ2=" + privateTotalQ2 + ", privateTotalQ3=" + privateTotalQ3 + ", privateTotalQ4=" + + privateTotalQ4 + ", quarter=" + quarter + ", startPeriod=" + startPeriod + ", submission=" + + submission + ", threshold=" + threshold + ", totalBed1=" + totalBed1 + ", totalBed2=" + totalBed2 + + ", totalBed3=" + totalBed3 + ", totalBed4=" + totalBed4 + ", totalBedYTD=" + totalBedYTD + + ", totalMonth1=" + totalMonth1 + ", totalMonth10=" + totalMonth10 + ", totalMonth11=" + totalMonth11 + + ", totalMonth12=" + totalMonth12 + ", totalMonth2=" + totalMonth2 + ", totalMonth3=" + totalMonth3 + + ", totalMonth4=" + totalMonth4 + ", totalMonth5=" + totalMonth5 + ", totalMonth6=" + totalMonth6 + + ", totalMonth7=" + totalMonth7 + ", totalMonth8=" + totalMonth8 + ", totalMonth9=" + totalMonth9 + + ", totalQ1=" + totalQ1 + ", totalQ2=" + totalQ2 + ", totalQ3=" + totalQ3 + ", totalQ4=" + totalQ4 + + ", yTDMaxInScopeQ1=" + yTDMaxInScopeQ1 + ", yTDMaxInScopeQ2=" + yTDMaxInScopeQ2 + ", yTDMaxInScopeQ3=" + + yTDMaxInScopeQ3 + ", yTDMaxInScopeQ4=" + yTDMaxInScopeQ4 + ", yTDMaxOutScopeQ1=" + yTDMaxOutScopeQ1 + + ", yTDMaxOutScopeQ2=" + yTDMaxOutScopeQ2 + ", yTDMaxOutScopeQ3=" + yTDMaxOutScopeQ3 + + ", yTDMaxOutScopeQ4=" + yTDMaxOutScopeQ4 + ", yTDMaxPrivateQ1=" + yTDMaxPrivateQ1 + + ", yTDMaxPrivateQ2=" + yTDMaxPrivateQ2 + ", yTDMaxPrivateQ3=" + yTDMaxPrivateQ3 + ", yTDMaxPrivateQ4=" + + yTDMaxPrivateQ4 + ", yTDMaxTotalQ1=" + yTDMaxTotalQ1 + ", yTDMaxTotalQ2=" + yTDMaxTotalQ2 + + ", yTDMaxTotalQ3=" + yTDMaxTotalQ3 + ", yTDMaxTotalQ4=" + yTDMaxTotalQ4 + ", yTDOccupiedInScopeQ1=" + + yTDOccupiedInScopeQ1 + ", yTDOccupiedInScopeQ2=" + yTDOccupiedInScopeQ2 + ", yTDOccupiedInScopeQ3=" + + yTDOccupiedInScopeQ3 + ", yTDOccupiedInScopeQ4=" + yTDOccupiedInScopeQ4 + ", yTDOccupiedOutScopeQ1=" + + yTDOccupiedOutScopeQ1 + ", yTDOccupiedOutScopeQ2=" + yTDOccupiedOutScopeQ2 + + ", yTDOccupiedOutScopeQ3=" + yTDOccupiedOutScopeQ3 + ", yTDOccupiedOutScopeQ4=" + + yTDOccupiedOutScopeQ4 + ", yTDOccupiedPrivateQ1=" + yTDOccupiedPrivateQ1 + ", yTDOccupiedPrivateQ2=" + + yTDOccupiedPrivateQ2 + ", yTDOccupiedPrivateQ3=" + yTDOccupiedPrivateQ3 + ", yTDOccupiedPrivateQ4=" + + yTDOccupiedPrivateQ4 + ", yTDOccupiedTotalQ1=" + yTDOccupiedTotalQ1 + ", yTDOccupiedTotalQ2=" + + yTDOccupiedTotalQ2 + ", yTDOccupiedTotalQ3=" + yTDOccupiedTotalQ3 + ", yTDOccupiedTotalQ4=" + + yTDOccupiedTotalQ4 + ", ytdPayrollDays=" + ytdPayrollDays + ", yTDPlannedInScopeQ1=" + + yTDPlannedInScopeQ1 + ", yTDPlannedInScopeQ2=" + yTDPlannedInScopeQ2 + ", yTDPlannedInScopeQ3=" + + yTDPlannedInScopeQ3 + ", yTDPlannedInScopeQ4=" + yTDPlannedInScopeQ4 + ", yTDPlannedOutScopeQ1=" + + yTDPlannedOutScopeQ1 + ", yTDPlannedOutScopeQ2=" + yTDPlannedOutScopeQ2 + ", yTDPlannedOutScopeQ3=" + + yTDPlannedOutScopeQ3 + ", yTDPlannedOutScopeQ4=" + yTDPlannedOutScopeQ4 + ", yTDPlannedPrivateQ1=" + + yTDPlannedPrivateQ1 + ", yTDPlannedPrivateQ2=" + yTDPlannedPrivateQ2 + ", yTDPlannedPrivateQ3=" + + yTDPlannedPrivateQ3 + ", yTDPlannedPrivateQ4=" + yTDPlannedPrivateQ4 + ", yTDPlannedTotalQ1=" + + yTDPlannedTotalQ1 + ", yTDPlannedTotalQ2=" + yTDPlannedTotalQ2 + ", yTDPlannedTotalQ3=" + + yTDPlannedTotalQ3 + ", yTDPlannedTotalQ4=" + yTDPlannedTotalQ4 + "]"; + } + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java new file mode 100644 index 00000000..447f1e86 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java @@ -0,0 +1,107 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcBedYtdMaxOccupancy implements IModel { + + private String confirmationId; + private String quarterInventory; + private String bedFundingType; + private String bedSubype; + private String startDate; + private String endDate; + private String numberOfBeds; + private String maximumBedDays; + private String notes; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getQuarterInventory() { + return quarterInventory; + } + public void setQuarterInventory(String quarterInventory) { + this.quarterInventory = quarterInventory; + } + public String getBedFundingType() { + return bedFundingType; + } + public void setBedFundingType(String bedFundingType) { + this.bedFundingType = bedFundingType; + } + public String getBedSubype() { + return bedSubype; + } + public void setBedSubype(String bedSubype) { + this.bedSubype = bedSubype; + } + public String getStartDate() { + return startDate; + } + public void setStartDate(String startDate) { + this.startDate = startDate; + } + public String getEndDate() { + return endDate; + } + public void setEndDate(String endDate) { + this.endDate = endDate; + } + public String getNumberOfBeds() { + return numberOfBeds; + } + public void setNumberOfBeds(String numberOfBeds) { + this.numberOfBeds = numberOfBeds; + } + public String getMaximumBedDays() { + return maximumBedDays; + } + public void setMaximumBedDays(String maximumBedDays) { + this.maximumBedDays = maximumBedDays; + } + + public String getNotes() { + return notes; + } + public void setNotes(String notes) { + this.notes = notes; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + // TODO Auto-generated method stub + return null; + } + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.getConfirmationId()); + elements.add(this.getQuarterInventory()); + elements.add(this.getBedFundingType()); + elements.add(this.getBedSubype()); + elements.add(this.getStartDate()); + elements.add(this.getEndDate()); + elements.add(this.getNumberOfBeds()); + elements.add(this.getMaximumBedDays()); + elements.add(this.getNotes()); + return elements; + } + @Override + public List getObjects() { + // TODO Auto-generated method stub + return new ArrayList<>(); + } + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java new file mode 100644 index 00000000..c7470f50 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java @@ -0,0 +1,113 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcBedYtdMaxOccupancyTotals implements IModel { + + private String confirmationID; + private String bedFundingType; + private String occupancyType; + private String totalBedQuarter1; + private String totalBedQuarter2; + private String totalBedQuarter3; + private String totalBedQuarter4; + private String totalBedDays; + + public String getConfirmationID() { + return confirmationID; + } + + public void setConfirmationID(String confirmationID) { + this.confirmationID = confirmationID; + } + + public String getBedFundingType() { + return bedFundingType; + } + + public void setBedFundingType(String bedFundingType) { + this.bedFundingType = bedFundingType; + } + + public String getTotalBedQuarter1() { + return totalBedQuarter1; + } + + public void setTotalBedQuarter1(String totalBedQuarter1) { + this.totalBedQuarter1 = totalBedQuarter1; + } + + public String getTotalBedQuarter2() { + return totalBedQuarter2; + } + + public void setTotalBedQuarter2(String totalBedQuarter2) { + this.totalBedQuarter2 = totalBedQuarter2; + } + + public String getTotalBedQuarter3() { + return totalBedQuarter3; + } + + public void setTotalBedQuarter3(String totalBedQuarter3) { + this.totalBedQuarter3 = totalBedQuarter3; + } + + public String getTotalBedQuarter4() { + return totalBedQuarter4; + } + + public void setTotalBedQuarter4(String totalBedQuarter4) { + this.totalBedQuarter4 = totalBedQuarter4; + } + + public String getTotalBedDays() { + return totalBedDays; + } + + public void setTotalBedDays(String totalBedDays) { + this.totalBedDays = totalBedDays; + } + + public String getOccupancyType() { + return occupancyType; + } + + public void setOccupancyType(String occupancyType) { + this.occupancyType = occupancyType; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + return Constants.LTC_BED_YTD_MAX_OCCUPANCY_TOTALS; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationID()); + elements.add(this.getBedFundingType()); + elements.add(this.getTotalBedQuarter1()); + elements.add(this.getTotalBedQuarter2()); + elements.add(this.getTotalBedQuarter3()); + elements.add(this.getTotalBedQuarter4()); + elements.add(this.getTotalBedDays()); + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRate.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRate.java new file mode 100644 index 00000000..e4b451d7 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRate.java @@ -0,0 +1,99 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcBedYtdOccupancyRate implements IModel { + + private String confirmationID; + private String occRateQuarter; + private String occRateBedTypes; + private String planMaxOccDays; + private String ytdMaxOccDays; + private String ytdOccDays; + private String percentOcc; + private String occRateNotes; + + + public String getConfirmationID() { + return confirmationID; + } + public void setConfirmationID(String confirmationID) { + this.confirmationID = confirmationID; + } + public String getOccRateQuarter() { + return occRateQuarter; + } + public void setOccRateQuarter(String occRateQuarter) { + this.occRateQuarter = occRateQuarter; + } + public String getOccRateBedTypes() { + return occRateBedTypes; + } + public void setOccRateBedTypes(String occRateBedTypes) { + this.occRateBedTypes = occRateBedTypes; + } + public String getPlanMaxOccDays() { + return planMaxOccDays; + } + public void setPlanMaxOccDays(String planMaxOccDays) { + this.planMaxOccDays = planMaxOccDays; + } + public String getYtdMaxOccDays() { + return ytdMaxOccDays; + } + public void setYtdMaxOccDays(String ytdMaxOccDays) { + this.ytdMaxOccDays = ytdMaxOccDays; + } + public String getYtdOccDays() { + return ytdOccDays; + } + public void setYtdOccDays(String ytdOccDays) { + this.ytdOccDays = ytdOccDays; + } + public String getPercentOcc() { + return percentOcc; + } + public void setPercentOcc(String percentOcc) { + this.percentOcc = percentOcc; + } + public String getOccRateNotes() { + return occRateNotes; + } + public void setOccRateNotes(String occRateNotes) { + this.occRateNotes = occRateNotes; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_BED_YTD_OCCUPANCY_RATE; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationID()); + elements.add(this.getOccRateQuarter()); + elements.add(this.getOccRateBedTypes()); + elements.add(this.getPlanMaxOccDays()); + elements.add(this.getYtdMaxOccDays()); + elements.add(this.getYtdOccDays()); + elements.add(this.getPercentOcc()); + elements.add(this.getOccRateNotes()); + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRateTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRateTotals.java new file mode 100644 index 00000000..fcd1f393 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRateTotals.java @@ -0,0 +1,94 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcBedYtdOccupancyRateTotals implements IModel { + + private String confirmationID; + private String occRateQuarter; + private String totalPlanMaxOccDays; + private String totalYTDMaxOccDays; + private String totalYTDOccDays; + private String totalPercentOcc; + + public String getConfirmationID() { + return confirmationID; + } + + public void setConfirmationID(String confirmationID) { + this.confirmationID = confirmationID; + } + + public String getOccRateQuarter() { + return occRateQuarter; + } + + public void setOccRateQuarter(String occRateQuarter) { + this.occRateQuarter = occRateQuarter; + } + + public String getTotalPlanMaxOccDays() { + return totalPlanMaxOccDays; + } + + public void setTotalPlanMaxOccDays(String totalPlanMaxOccDays) { + this.totalPlanMaxOccDays = totalPlanMaxOccDays; + } + + public String getTotalYTDMaxOccDays() { + return totalYTDMaxOccDays; + } + + public void setTotalYTDMaxOccDays(String totalYTDMaxOccDays) { + this.totalYTDMaxOccDays = totalYTDMaxOccDays; + } + + public String getTotalYTDOccDays() { + return totalYTDOccDays; + } + + public void setTotalYTDOccDays(String totalYTDOccDays) { + this.totalYTDOccDays = totalYTDOccDays; + } + + public String getTotalPercentOcc() { + return totalPercentOcc; + } + + public void setTotalPercentOcc(String totalPercentOcc) { + this.totalPercentOcc = totalPercentOcc; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + return Constants.LTC_BED_YTD_OCCUPANCY_RATE_TOTALS; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationID()); + elements.add(this.getOccRateQuarter()); + elements.add(this.getTotalPlanMaxOccDays()); + elements.add(this.getTotalYTDMaxOccDays()); + elements.add(this.getTotalYTDOccDays()); + elements.add(this.getTotalPercentOcc()); + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java new file mode 100644 index 00000000..1f785d84 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java @@ -0,0 +1,90 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcBedYtdOccupiedDays implements IModel{ + + private String confirmationId; + private String occQuarter; + private String occMonth; + private String occDaysYTDInScopePublic; + private String occDaysYTOutScopePublic; + private String occDaysYtdTotalDays; + private String occDaysYTDPrivate; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getOccQuarter() { + return occQuarter; + } + public void setOccQuarter(String occQuarter) { + this.occQuarter = occQuarter; + } + public String getOccMonth() { + return occMonth; + } + public void setOccMonth(String occMonth) { + this.occMonth = occMonth; + } + public String getOccDaysYTDInScopePublic() { + return occDaysYTDInScopePublic; + } + public void setOccDaysYTDInScopePublic(String occDaysYTDInScopePublic) { + this.occDaysYTDInScopePublic = occDaysYTDInScopePublic; + } + public String getOccDaysYTOutScopePublic() { + return occDaysYTOutScopePublic; + } + public void setOccDaysYTOutScopePublic(String occDaysYTOutScopePublic) { + this.occDaysYTOutScopePublic = occDaysYTOutScopePublic; + } + public String getOccDaysYTDPrivate() { + return occDaysYTDPrivate; + } + public void setOccDaysYTDPrivate(String occDaysYTDPrivate) { + this.occDaysYTDPrivate = occDaysYTDPrivate; + } + + public String getOccDaysYtdTotalDays() { + return occDaysYtdTotalDays; + } + public void setOccDaysYtdTotalDays(String occDaysYtdTotalDays) { + this.occDaysYtdTotalDays = occDaysYtdTotalDays; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_BED_YTD_OCCUPIED_DAYS; + } + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.getConfirmationId()); + elements.add(this.getOccQuarter()); + elements.add(this.getOccMonth()); + elements.add(this.getOccDaysYTDInScopePublic()); + elements.add(this.getOccDaysYTOutScopePublic()); + elements.add(this.getOccDaysYtdTotalDays()); + elements.add(this.getOccDaysYTDPrivate()); + return elements; + } + @Override + public List getObjects() { + // TODO Auto-generated method stub + return new ArrayList<>(); + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDaysTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDaysTotals.java new file mode 100644 index 00000000..f2e030da --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDaysTotals.java @@ -0,0 +1,83 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcBedYtdOccupiedDaysTotals implements IModel { + private String ConfirmationID; + private String occQuarter; + private String occDaysYTDInScopePublic; + private String occDaysYTDOutScopePublic; + private String occDaysYTDTotalDays; + private String occDaysYTDPrivate; + + public String getConfirmationID() { + return ConfirmationID; + } + public void setConfirmationID(String confirmationID) { + ConfirmationID = confirmationID; + } + public String getOccQuarter() { + return occQuarter; + } + public void setOccQuarter(String occQuarter) { + this.occQuarter = occQuarter; + } + public String getOccDaysYTDInScopePublic() { + return occDaysYTDInScopePublic; + } + public void setOccDaysYTDInScopePublic(String occDaysYTDInScopePublic) { + this.occDaysYTDInScopePublic = occDaysYTDInScopePublic; + } + public String getOccDaysYTDOutScopePublic() { + return occDaysYTDOutScopePublic; + } + public void setOccDaysYTDOutScopePublic(String occDaysYTDOutScopePublic) { + this.occDaysYTDOutScopePublic = occDaysYTDOutScopePublic; + } + public String getOccDaysYTDTotalDays() { + return occDaysYTDTotalDays; + } + public void setOccDaysYTDTotalDays(String occDaysYTDTotalDays) { + this.occDaysYTDTotalDays = occDaysYTDTotalDays; + } + public String getOccDaysYTDPrivate() { + return occDaysYTDPrivate; + } + public void setOccDaysYTDPrivate(String occDaysYTDPrivate) { + this.occDaysYTDPrivate = occDaysYTDPrivate; + } + + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_BED_YTD_OCCUPIED_DAYS_TOTALS; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationID()); + elements.add(this.getOccDaysYTDInScopePublic()); + elements.add(this.getOccDaysYTDOutScopePublic()); + elements.add(this.getOccDaysYTDPrivate()); + elements.add(this.getOccDaysYTDTotalDays()); + elements.add(this.getOccQuarter()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java new file mode 100644 index 00000000..722af361 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java @@ -0,0 +1,82 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdCompAddPos implements IModel{ + + private String confirmationId; + private String addPosType; + private String addPosName; + private String addPosContractedOutYtd; + private String addPosLegalNameContractServiceYtd; + private String addPosPercentServiceContractOutYtd; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getAddPosType() { + return addPosType; + } + public void setAddPosType(String addPosType) { + this.addPosType = addPosType; + } + public String getAddPosName() { + return addPosName; + } + public void setAddPosName(String addPosName) { + this.addPosName = addPosName; + } + public String getAddPosContractedOutYtd() { + return addPosContractedOutYtd; + } + public void setAddPosContractedOutYtd(String addPosContractedOutYtd) { + this.addPosContractedOutYtd = addPosContractedOutYtd; + } + public String getAddPosLegalNameContractServiceYtd() { + return addPosLegalNameContractServiceYtd; + } + public void setAddPosLegalNameContractServiceYtd(String addPosLegalNameContractServiceYtd) { + this.addPosLegalNameContractServiceYtd = addPosLegalNameContractServiceYtd; + } + public String getAddPosPercentServiceContractOutYtd() { + return addPosPercentServiceContractOutYtd; + } + public void setAddPosPercentServiceContractOutYtd(String addPosPercentServiceContractOutYtd) { + this.addPosPercentServiceContractOutYtd = addPosPercentServiceContractOutYtd; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_COMP_ADD_POS; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add(this.getAddPosType()); + elements.add(this.getAddPosName()); + elements.add(this.getAddPosContractedOutYtd()); + elements.add(this.getAddPosLegalNameContractServiceYtd()); + elements.add(this.getAddPosPercentServiceContractOutYtd()); + + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java new file mode 100644 index 00000000..63f2559d --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java @@ -0,0 +1,68 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdCompBenefits implements IModel { + + private String confirmationId; + private String benefitsType; + private String benefitsAmountYtd; + private String benefitsPercentageAlloc; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getBenefitsType() { + return benefitsType; + } + public void setBenefitsType(String benefitsType) { + this.benefitsType = benefitsType; + } + public String getBenefitsAmountYtd() { + return benefitsAmountYtd; + } + public void setBenefitsAmountYtd(String benefitsAmountYtd) { + this.benefitsAmountYtd = benefitsAmountYtd; + } + + + + public String getBenefitsPercentageAlloc() { + return benefitsPercentageAlloc; + } + public void setBenefitsPercentageAlloc(String benefitsPercentageAlloc) { + this.benefitsPercentageAlloc = benefitsPercentageAlloc; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_COMP_BENEFITS; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add(this.getBenefitsType()); + elements.add(this.getBenefitsAmountYtd()); + elements.add(this.getBenefitsPercentageAlloc()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java new file mode 100644 index 00000000..305e6678 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java @@ -0,0 +1,97 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdCompHrs implements IModel { + + private String confirmationId; + private String compHrsType; + private String compHrsName; + private String compHrsPerPayrollYtd; + private String compHrsStaffYtd; + private String compHrsContractServicesYtd; + private String compHrsOfficeAllocYtd; + private String compTotalWorkedHrsYtd; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getCompHrsType() { + return compHrsType; + } + public void setCompHrsType(String compHrsType) { + this.compHrsType = compHrsType; + } + public String getCompHrsName() { + return compHrsName; + } + public void setCompHrsName(String compHrsName) { + this.compHrsName = compHrsName; + } + public String getCompHrsPerPayrollYtd() { + return compHrsPerPayrollYtd; + } + public void setCompHrsPerPayrollYtd(String compHrsPerPayrollYtd) { + this.compHrsPerPayrollYtd = compHrsPerPayrollYtd; + } + public String getCompHrsStaffYtd() { + return compHrsStaffYtd; + } + public void setCompHrsStaffYtd(String compHrsStaffYtd) { + this.compHrsStaffYtd = compHrsStaffYtd; + } + public String getCompHrsContractServicesYtd() { + return compHrsContractServicesYtd; + } + public void setCompHrsContractServicesYtd(String compHrsContractServicesYtd) { + this.compHrsContractServicesYtd = compHrsContractServicesYtd; + } + public String getCompHrsOfficeAllocYtd() { + return compHrsOfficeAllocYtd; + } + public void setCompHrsOfficeAllocYtd(String compHrsOfficeAllocYtd) { + this.compHrsOfficeAllocYtd = compHrsOfficeAllocYtd; + } + + public String getCompTotalWorkedHrsYtd() { + return compTotalWorkedHrsYtd; + } + public void setCompTotalWorkedHrsYtd(String compTotalWorkedHrsYtd) { + this.compTotalWorkedHrsYtd = compTotalWorkedHrsYtd; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_COMP_HRS; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add(this.getCompHrsType()); + elements.add(this.getCompHrsName()); + elements.add(this.getCompHrsPerPayrollYtd()); + elements.add(this.getCompHrsStaffYtd()); + elements.add(this.getCompHrsContractServicesYtd()); + elements.add(this.getCompHrsOfficeAllocYtd()); + elements.add(this.getCompTotalWorkedHrsYtd()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java new file mode 100644 index 00000000..57354d50 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java @@ -0,0 +1,81 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdCompHrsSubtotals implements IModel { + + private String confirmationID; + private String compHrsType; + private String subTotalCompHrsStaffYTD; + private String subTotalCompHrsContractServicesYTD; + private String subTotalCompHrsOfficeAllocYTD; + private String subTotalCompTotalWorkedHrsYTD; + + public String getConfirmationID() { + return confirmationID; + } + public void setConfirmationID(String confirmationID) { + this.confirmationID = confirmationID; + } + public String getCompHrsType() { + return compHrsType; + } + public void setCompHrsType(String compHrsType) { + this.compHrsType = compHrsType; + } + public String getSubTotalCompHrsStaffYTD() { + return subTotalCompHrsStaffYTD; + } + public void setSubTotalCompHrsStaffYTD(String subTotalCompHrsStaffYTD) { + this.subTotalCompHrsStaffYTD = subTotalCompHrsStaffYTD; + } + public String getSubTotalCompHrsContractServicesYTD() { + return subTotalCompHrsContractServicesYTD; + } + public void setSubTotalCompHrsContractServicesYTD(String subTotalCompHrsContractServicesYTD) { + this.subTotalCompHrsContractServicesYTD = subTotalCompHrsContractServicesYTD; + } + public String getSubTotalCompHrsOfficeAllocYTD() { + return subTotalCompHrsOfficeAllocYTD; + } + public void setSubTotalCompHrsOfficeAllocYTD(String subTotalCompHrsOfficeAllocYTD) { + this.subTotalCompHrsOfficeAllocYTD = subTotalCompHrsOfficeAllocYTD; + } + public String getSubTotalCompTotalWorkedHrsYTD() { + return subTotalCompTotalWorkedHrsYTD; + } + public void setSubTotalCompTotalWorkedHrsYTD(String subTotalCompTotalWorkedHrsYTD) { + this.subTotalCompTotalWorkedHrsYTD = subTotalCompTotalWorkedHrsYTD; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return "LTC_YTD_COMP_HRS_SUB_TOTALS"; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationID()); + elements.add(this.getCompHrsType()); + elements.add(this.getSubTotalCompHrsStaffYTD()); + elements.add(this.getSubTotalCompHrsContractServicesYTD()); + elements.add(this.getSubTotalCompHrsOfficeAllocYTD()); + elements.add(this.getSubTotalCompTotalWorkedHrsYTD()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java new file mode 100644 index 00000000..972614ec --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java @@ -0,0 +1,108 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdCompHrsTotals implements IModel{ + + private String confirmationID; + private String compHrsTotalType; + private String totalCompHrsPerPayrollYTD; + private String totalCompHrsStaffYTD; + private String totalCompHrsContractServicesYTD; + private String totalCompHrsOfficeAllocYTD; + private String totalCompTotalWorkedHrsYTD; + + + + public String getConfirmationID() { + return confirmationID; + } + + public void setConfirmationID(String confirmationID) { + this.confirmationID = confirmationID; + } + + public String getCompHrsTotalType() { + return compHrsTotalType; + } + + public void setCompHrsTotalType(String compHrsTotalType) { + this.compHrsTotalType = compHrsTotalType; + } + + public String getTotalCompHrsPerPayrollYTD() { + return totalCompHrsPerPayrollYTD; + } + + public void setTotalCompHrsPerPayrollYTD(String totalCompHrsPerPayrollYTD) { + this.totalCompHrsPerPayrollYTD = totalCompHrsPerPayrollYTD; + } + + public String getTotalCompHrsStaffYTD() { + return totalCompHrsStaffYTD; + } + + public void setTotalCompHrsStaffYTD(String totalCompHrsStaffYTD) { + this.totalCompHrsStaffYTD = totalCompHrsStaffYTD; + } + + public String getTotalCompHrsContractServicesYTD() { + return totalCompHrsContractServicesYTD; + } + + public void setTotalCompHrsContractServicesYTD(String totalCompHrsContractServicesYTD) { + this.totalCompHrsContractServicesYTD = totalCompHrsContractServicesYTD; + } + + public String getTotalCompHrsOfficeAllocYTD() { + return totalCompHrsOfficeAllocYTD; + } + + public void setTotalCompHrsOfficeAllocYTD(String totalCompHrsOfficeAllocYTD) { + this.totalCompHrsOfficeAllocYTD = totalCompHrsOfficeAllocYTD; + } + + public String getTotalCompTotalWorkedHrsYTD() { + return totalCompTotalWorkedHrsYTD; + } + + public void setTotalCompTotalWorkedHrsYTD(String totalCompTotalWorkedHrsYTD) { + this.totalCompTotalWorkedHrsYTD = totalCompTotalWorkedHrsYTD; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.getConfirmationID()); + elements.add(this.getCompHrsTotalType()); + elements.add(this.getTotalCompHrsPerPayrollYTD()); + elements.add(this.getTotalCompHrsStaffYTD()); + elements.add(this.getTotalCompHrsContractServicesYTD()); + elements.add(this.getTotalCompHrsOfficeAllocYTD()); + elements.add(this.getTotalCompTotalWorkedHrsYTD()); + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java new file mode 100644 index 00000000..dac2cb84 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java @@ -0,0 +1,87 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdCompSal implements IModel{ + + private String confirmationId; + private String compSalType; + private String compSalName; + private String compSalStaffYtd; + private String compSalContractServicesYtd; + private String compSalOfficeAllocYtd; + private String compSalTotalCostYtd; + public String getCompSalTotalCostYtd() { + return compSalTotalCostYtd; + } + public void setCompSalTotalCostYtd(String compSalTotalCostYtd) { + this.compSalTotalCostYtd = compSalTotalCostYtd; + } + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getCompSalType() { + return compSalType; + } + public void setCompSalType(String compSalType) { + this.compSalType = compSalType; + } + public String getCompSalName() { + return compSalName; + } + public void setCompSalName(String compSalName) { + this.compSalName = compSalName; + } + public String getCompSalStaffYtd() { + return compSalStaffYtd; + } + public void setCompSalStaffYtd(String compSalStaffYtd) { + this.compSalStaffYtd = compSalStaffYtd; + } + public String getCompSalContractServicesYtd() { + return compSalContractServicesYtd; + } + public void setCompSalContractServicesYtd(String compSalContractServicesYtd) { + this.compSalContractServicesYtd = compSalContractServicesYtd; + } + public String getCompSalOfficeAllocYtd() { + return compSalOfficeAllocYtd; + } + public void setCompSalOfficeAllocYtd(String compSalOfficeAllocYtd) { + this.compSalOfficeAllocYtd = compSalOfficeAllocYtd; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_COMP_SAL; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add(this.getCompSalType()); + elements.add(this.getCompSalName()); + elements.add(this.getCompSalStaffYtd()); + elements.add(this.getCompSalContractServicesYtd()); + elements.add(this.getCompSalOfficeAllocYtd()); + elements.add(this.getCompSalTotalCostYtd()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java new file mode 100644 index 00000000..90af7dc4 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java @@ -0,0 +1,95 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdCompSalSubtotals implements IModel { + + private String confirmationId; + private String compSalType; + private String subTotalCompSalStaffYTD; + private String subTotalCompSalContractServicesYTD; + private String subTotalCompSalOfficeAllocYTD; + private String subTotalCompSalTotalCostYTD; + + public String getConfirmationId() { + return confirmationId; + } + + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + + public String getCompSalType() { + return compSalType; + } + + public void setCompSalType(String compSalType) { + this.compSalType = compSalType; + } + + public String getSubTotalCompSalStaffYTD() { + return subTotalCompSalStaffYTD; + } + + public void setSubTotalCompSalStaffYTD(String subTotalCompSalStaffYTD) { + this.subTotalCompSalStaffYTD = subTotalCompSalStaffYTD; + } + + public String getSubTotalCompSalContractServicesYTD() { + return subTotalCompSalContractServicesYTD; + } + + public void setSubTotalCompSalContractServicesYTD(String subTotalCompSalContractServicesYTD) { + this.subTotalCompSalContractServicesYTD = subTotalCompSalContractServicesYTD; + } + + public String getSubTotalCompSalOfficeAllocYTD() { + return subTotalCompSalOfficeAllocYTD; + } + + public void setSubTotalCompSalOfficeAllocYTD(String subTotalCompSalOfficeAllocYTD) { + this.subTotalCompSalOfficeAllocYTD = subTotalCompSalOfficeAllocYTD; + } + + public String getSubTotalCompSalTotalCostYTD() { + return subTotalCompSalTotalCostYTD; + } + + public void setSubTotalCompSalTotalCostYTD(String subTotalCompSalTotalCostYTD) { + this.subTotalCompSalTotalCostYTD = subTotalCompSalTotalCostYTD; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + return Constants.LTC_YTD_COMP_SAL_SUBTOTALS; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.getConfirmationId()); + elements.add(this.getCompSalType()); + elements.add(this.getSubTotalCompSalStaffYTD()); + elements.add(this.getSubTotalCompSalContractServicesYTD()); + elements.add(this.getSubTotalCompSalOfficeAllocYTD()); + elements.add(this.getSubTotalCompSalTotalCostYTD()); + + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java new file mode 100644 index 00000000..20e17884 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java @@ -0,0 +1,95 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdCompSalTotals implements IModel { + + private String confirmationId; + private String compSalType; + private String totalCompSalStaffYTD; + private String totalCompSalContractServicesYTD; + private String totalCompSalOfficeAllocYTD; + private String totalCompSalTotalCostYTD; + + public String getConfirmationId() { + return confirmationId; + } + + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + + public String getCompSalType() { + return compSalType; + } + + public void setCompSalType(String compSalType) { + this.compSalType = compSalType; + } + + public String getTotalCompSalStaffYTD() { + return totalCompSalStaffYTD; + } + + public void setTotalCompSalStaffYTD(String totalCompSalStaffYTD) { + this.totalCompSalStaffYTD = totalCompSalStaffYTD; + } + + public String getTotalCompSalContractServicesYTD() { + return totalCompSalContractServicesYTD; + } + + public void setTotalCompSalContractServicesYTD(String totalCompSalContractServicesYTD) { + this.totalCompSalContractServicesYTD = totalCompSalContractServicesYTD; + } + + public String getTotalCompSalOfficeAllocYTD() { + return totalCompSalOfficeAllocYTD; + } + + public void setTotalCompSalOfficeAllocYTD(String totalCompSalOfficeAllocYTD) { + this.totalCompSalOfficeAllocYTD = totalCompSalOfficeAllocYTD; + } + + public String getTotalCompSalTotalCostYTD() { + return totalCompSalTotalCostYTD; + } + + public void setTotalCompSalTotalCostYTD(String totalCompSalTotalCostYTD) { + this.totalCompSalTotalCostYTD = totalCompSalTotalCostYTD; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + return Constants.LTC_YTD_COMP_SAL_TOTALS; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.getConfirmationId()); + elements.add(this.getCompSalType()); + elements.add(this.getTotalCompSalStaffYTD()); + elements.add(this.getTotalCompSalContractServicesYTD()); + elements.add(this.getTotalCompSalOfficeAllocYTD()); + elements.add(this.getTotalCompSalTotalCostYTD()); + + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java new file mode 100644 index 00000000..32bb04bf --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java @@ -0,0 +1,161 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdDirectCareCost implements IModel{ + private String confirmationId; + private String dirCareCostType; + private String dirCareCostName; + private String dirCareCostProdHrsRegYtd; + private String dirCareCostProdHrsOtYtd; + private String dirCareCostProdHrsContractedYtd; + private String dirCareCostProdHrsSubtotalYtd; + private String dirCareCostProdHrsTotalYtd; + private String dirCareCostNonProdHrsVacYtd; + private String dirCareCostNonProdHrsSickYtd; + private String dirCareCostNonProdHrsOtherYtd; + private String dirCareCostNonProdHrsTotalYtd; + private String dirCareCostTotalHrsPaidYtd; + private String dirCareCostHourlyRateStaffYtd; + private String dirCareCostHourlyRateContractedYtd; + + private String dirCareCostYtdNotes; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getDirCareCostType() { + return dirCareCostType; + } + public void setDirCareCostType(String dirCareCostType) { + this.dirCareCostType = dirCareCostType; + } + public String getDirCareCostName() { + return dirCareCostName; + } + public void setDirCareCostName(String dirCareCostName) { + this.dirCareCostName = dirCareCostName; + } + public String getDirCareCostProdHrsRegYtd() { + return dirCareCostProdHrsRegYtd; + } + public void setDirCareCostProdHrsRegYtd(String dirCareCostProdHrsRegYtd) { + this.dirCareCostProdHrsRegYtd = dirCareCostProdHrsRegYtd; + } + public String getDirCareCostProdHrsOtYtd() { + return dirCareCostProdHrsOtYtd; + } + public void setDirCareCostProdHrsOtYtd(String dirCareCostProdHrsOtYtd) { + this.dirCareCostProdHrsOtYtd = dirCareCostProdHrsOtYtd; + } + public String getDirCareCostProdHrsContractedYtd() { + return dirCareCostProdHrsContractedYtd; + } + public void setDirCareCostProdHrsContractedYtd(String dirCareCostProdHrsContractedYtd) { + this.dirCareCostProdHrsContractedYtd = dirCareCostProdHrsContractedYtd; + } + public String getDirCareCostNonProdHrsVacYtd() { + return dirCareCostNonProdHrsVacYtd; + } + public void setDirCareCostNonProdHrsVacYtd(String dirCareCostNonProdHrsVacYtd) { + this.dirCareCostNonProdHrsVacYtd = dirCareCostNonProdHrsVacYtd; + } + public String getDirCareCostNonProdHrsSickYtd() { + return dirCareCostNonProdHrsSickYtd; + } + public void setDirCareCostNonProdHrsSickYtd(String dirCareCostNonProdHrsSickYtd) { + this.dirCareCostNonProdHrsSickYtd = dirCareCostNonProdHrsSickYtd; + } + public String getDirCareCostNonProdHrsOtherYtd() { + return dirCareCostNonProdHrsOtherYtd; + } + public void setDirCareCostNonProdHrsOtherYtd(String dirCareCostNonProdHrsOtherYtd) { + this.dirCareCostNonProdHrsOtherYtd = dirCareCostNonProdHrsOtherYtd; + } + public String getDirCareCostYtdNotes() { + return dirCareCostYtdNotes; + } + public void setDirCareCostYtdNotes(String dirCareCostYtdNotes) { + this.dirCareCostYtdNotes = dirCareCostYtdNotes; + } + + public String getDirCareCostProdHrsSubtotalYtd() { + return dirCareCostProdHrsSubtotalYtd; + } + public void setDirCareCostProdHrsSubtotalYtd(String dirCareCostProdHrsSubtotalYtd) { + this.dirCareCostProdHrsSubtotalYtd = dirCareCostProdHrsSubtotalYtd; + } + public String getDirCareCostProdHrsTotalYtd() { + return dirCareCostProdHrsTotalYtd; + } + public void setDirCareCostProdHrsTotalYtd(String dirCareCostProdHrsTotalYtd) { + this.dirCareCostProdHrsTotalYtd = dirCareCostProdHrsTotalYtd; + } + public String getDirCareCostNonProdHrsTotalYtd() { + return dirCareCostNonProdHrsTotalYtd; + } + public void setDirCareCostNonProdHrsTotalYtd(String dirCareCostNonProdHrsTotalYtd) { + this.dirCareCostNonProdHrsTotalYtd = dirCareCostNonProdHrsTotalYtd; + } + public String getDirCareCostTotalHrsPaidYtd() { + return dirCareCostTotalHrsPaidYtd; + } + public void setDirCareCostTotalHrsPaidYtd(String dirCareCostTotalHrsPaidYtd) { + this.dirCareCostTotalHrsPaidYtd = dirCareCostTotalHrsPaidYtd; + } + public String getDirCareCostHourlyRateStaffYtd() { + return dirCareCostHourlyRateStaffYtd; + } + public void setDirCareCostHourlyRateStaffYtd(String dirCareCostHourlyRateStaffYtd) { + this.dirCareCostHourlyRateStaffYtd = dirCareCostHourlyRateStaffYtd; + } + public String getDirCareCostHourlyRateContractedYtd() { + return dirCareCostHourlyRateContractedYtd; + } + public void setDirCareCostHourlyRateContractedYtd(String dirCareCostHourlyRateContractedYtd) { + this.dirCareCostHourlyRateContractedYtd = dirCareCostHourlyRateContractedYtd; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_DIRECT_CARE_COST; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add(this.getDirCareCostType()); + elements.add(this.getDirCareCostName()); + elements.add(this.getDirCareCostProdHrsRegYtd()); + elements.add(this.getDirCareCostProdHrsOtYtd()); + elements.add(this.getDirCareCostProdHrsContractedYtd()); + elements.add(this.getDirCareCostProdHrsSubtotalYtd()); + elements.add(this.getDirCareCostProdHrsTotalYtd()); + elements.add(this.getDirCareCostNonProdHrsVacYtd()); + elements.add(this.getDirCareCostNonProdHrsSickYtd()); + elements.add(this.getDirCareCostNonProdHrsOtherYtd()); + elements.add(this.getDirCareCostNonProdHrsTotalYtd()); + elements.add(this.getDirCareCostTotalHrsPaidYtd()); + elements.add(this.getDirCareCostHourlyRateStaffYtd()); + elements.add(this.getDirCareCostHourlyRateContractedYtd()); + elements.add(this.getDirCareCostYtdNotes()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCostSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCostSubtotals.java new file mode 100644 index 00000000..cce534b1 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCostSubtotals.java @@ -0,0 +1,175 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdDirectCareCostSubtotals implements IModel{ + + private String confirmationID; + private String dirCareType; + private String subTotalDirCareCostProdHrsRegularYTD; + private String subTotalDirCareCostProdHrsOTYTD; + private String subTotalDirCareCostProdHrsSubtotalYTD; + private String subTotalDirCareCostProdHrsContServYTD; + private String subTotalDirCareCostProdHrsTotalYTD; + private String subTotalDirCareCostNonProdHrsVacYTD; + private String subTotalDirCareCostNonProdHrsSickYTD; + private String subTotalDirCareCostNonProdHrsOtherServYTD; + private String subTotalDirCareCostNonProdHrsTotalYTD; + private String subTotalDirCareCostTotalHrsPaidYTD; + private String subTotalDirCareCostHourlyRateStaffYTD; + private String subTotalDirCareCostHourlyRateContractedYTD; + + + public String getConfirmationID() { + return confirmationID; + } + + public void setConfirmationID(String confirmationID) { + this.confirmationID = confirmationID; + } + + public String getDirCareType() { + return dirCareType; + } + + public void setDirCareType(String dirCareType) { + this.dirCareType = dirCareType; + } + + public String getSubTotalDirCareCostProdHrsRegularYTD() { + return subTotalDirCareCostProdHrsRegularYTD; + } + + public void setSubTotalDirCareCostProdHrsRegularYTD(String subTotalDirCareCostProdHrsRegularYTD) { + this.subTotalDirCareCostProdHrsRegularYTD = subTotalDirCareCostProdHrsRegularYTD; + } + + public String getSubTotalDirCareCostProdHrsOTYTD() { + return subTotalDirCareCostProdHrsOTYTD; + } + + public void setSubTotalDirCareCostProdHrsOTYTD(String subTotalDirCareCostProdHrsOTYTD) { + this.subTotalDirCareCostProdHrsOTYTD = subTotalDirCareCostProdHrsOTYTD; + } + + public String getSubTotalDirCareCostProdHrsSubtotalYTD() { + return subTotalDirCareCostProdHrsSubtotalYTD; + } + + public void setSubTotalDirCareCostProdHrsSubtotalYTD(String subTotalDirCareCostProdHrsSubtotalYTD) { + this.subTotalDirCareCostProdHrsSubtotalYTD = subTotalDirCareCostProdHrsSubtotalYTD; + } + + public String getSubTotalDirCareCostProdHrsContServYTD() { + return subTotalDirCareCostProdHrsContServYTD; + } + + public void setSubTotalDirCareCostProdHrsContServYTD(String subTotalDirCareCostProdHrsContServYTD) { + this.subTotalDirCareCostProdHrsContServYTD = subTotalDirCareCostProdHrsContServYTD; + } + + public String getSubTotalDirCareCostProdHrsTotalYTD() { + return subTotalDirCareCostProdHrsTotalYTD; + } + + public void setSubTotalDirCareCostProdHrsTotalYTD(String subTotalDirCareCostProdHrsTotalYTD) { + this.subTotalDirCareCostProdHrsTotalYTD = subTotalDirCareCostProdHrsTotalYTD; + } + + public String getSubTotalDirCareCostNonProdHrsVacYTD() { + return subTotalDirCareCostNonProdHrsVacYTD; + } + + public void setSubTotalDirCareCostNonProdHrsVacYTD(String subTotalDirCareCostNonProdHrsVacYTD) { + this.subTotalDirCareCostNonProdHrsVacYTD = subTotalDirCareCostNonProdHrsVacYTD; + } + + public String getSubTotalDirCareCostNonProdHrsSickYTD() { + return subTotalDirCareCostNonProdHrsSickYTD; + } + + public void setSubTotalDirCareCostNonProdHrsSickYTD(String subTotalDirCareCostNonProdHrsSickYTD) { + this.subTotalDirCareCostNonProdHrsSickYTD = subTotalDirCareCostNonProdHrsSickYTD; + } + + public String getSubTotalDirCareCostNonProdHrsOtherServYTD() { + return subTotalDirCareCostNonProdHrsOtherServYTD; + } + + public void setSubTotalDirCareCostNonProdHrsOtherServYTD(String subTotalDirCareCostNonProdHrsOtherServYTD) { + this.subTotalDirCareCostNonProdHrsOtherServYTD = subTotalDirCareCostNonProdHrsOtherServYTD; + } + + public String getSubTotalDirCareCostNonProdHrsTotalYTD() { + return subTotalDirCareCostNonProdHrsTotalYTD; + } + + public void setSubTotalDirCareCostNonProdHrsTotalYTD(String subTotalDirCareCostNonProdHrsTotalYTD) { + this.subTotalDirCareCostNonProdHrsTotalYTD = subTotalDirCareCostNonProdHrsTotalYTD; + } + + public String getSubTotalDirCareCostTotalHrsPaidYTD() { + return subTotalDirCareCostTotalHrsPaidYTD; + } + + public void setSubTotalDirCareCostTotalHrsPaidYTD(String subTotalDirCareCostTotalHrsPaidYTD) { + this.subTotalDirCareCostTotalHrsPaidYTD = subTotalDirCareCostTotalHrsPaidYTD; + } + + public String getSubTotalDirCareCostHourlyRateStaffYTD() { + return subTotalDirCareCostHourlyRateStaffYTD; + } + + public void setSubTotalDirCareCostHourlyRateStaffYTD(String subTotalDirCareCostHourlyRateStaffYTD) { + this.subTotalDirCareCostHourlyRateStaffYTD = subTotalDirCareCostHourlyRateStaffYTD; + } + + public String getSubTotalDirCareCostHourlyRateContractedYTD() { + return subTotalDirCareCostHourlyRateContractedYTD; + } + + public void setSubTotalDirCareCostHourlyRateContractedYTD(String subTotalDirCareCostHourlyRateContractedYTD) { + this.subTotalDirCareCostHourlyRateContractedYTD = subTotalDirCareCostHourlyRateContractedYTD; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + return Constants.LTC_YTD_DIRECT_CARE_COST_SUBTOTALS; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationID()); + elements.add(this.getDirCareType()); + elements.add(this.getSubTotalDirCareCostProdHrsRegularYTD()); + elements.add(this.getSubTotalDirCareCostProdHrsOTYTD()); + elements.add(this.getSubTotalDirCareCostProdHrsSubtotalYTD()); + elements.add(this.getSubTotalDirCareCostProdHrsContServYTD()); + elements.add(this.getSubTotalDirCareCostProdHrsTotalYTD()); + elements.add(this.getSubTotalDirCareCostNonProdHrsVacYTD()); + elements.add(this.getSubTotalDirCareCostNonProdHrsSickYTD()); + elements.add(this.getSubTotalDirCareCostNonProdHrsOtherServYTD()); + elements.add(this.getSubTotalDirCareCostNonProdHrsTotalYTD()); + elements.add(this.getSubTotalDirCareCostTotalHrsPaidYTD()); + elements.add(this.getSubTotalDirCareCostHourlyRateStaffYTD()); + elements.add(this.getSubTotalDirCareCostHourlyRateContractedYTD()); + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java new file mode 100644 index 00000000..ea287c15 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java @@ -0,0 +1,147 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdDirectCareHrs implements IModel{ + + private String confirmationId; + private String dirCareType; // nursing, allied, etc + private String dirCareName; // RN, OcP etc + private String dirCareProdHrsRegYtd; + private String dirCareProdHrsOtYtd; + private String dirCareProdHrsContractedYtd; + private String dirCareProdHrsSubtotalYtd; + private String dirCareProdHrsTotalYtd; + private String dirCareNonProdHrsVacYtd; + private String dirCareNonProdHrsSickYtd; + private String dirCareNonProdHrsOtherYtd; + private String dirCareNonProdHrsTotalYtd; + private String dirCareTotalHrsPaidYtd; + private String dirCareYtdNotes; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getDirCareType() { + return dirCareType; + } + public void setDirCareType(String dirCareType) { + this.dirCareType = dirCareType; + } + public String getDirCareName() { + return dirCareName; + } + public void setDirCareName(String dirCareName) { + this.dirCareName = dirCareName; + } + public String getDirCareProdHrsRegYtd() { + return dirCareProdHrsRegYtd; + } + public void setDirCareProdHrsRegYtd(String dirCareProdHrsRegYtd) { + this.dirCareProdHrsRegYtd = dirCareProdHrsRegYtd; + } + public String getDirCareProdHrsOtYtd() { + return dirCareProdHrsOtYtd; + } + public void setDirCareProdHrsOtYtd(String dirCareProdHrsOtYtd) { + this.dirCareProdHrsOtYtd = dirCareProdHrsOtYtd; + } + public String getDirCareProdHrsContractedYtd() { + return dirCareProdHrsContractedYtd; + } + public void setDirCareProdHrsContractedYtd(String dirCareProdHrsContractedYtd) { + this.dirCareProdHrsContractedYtd = dirCareProdHrsContractedYtd; + } + public String getDirCareNonProdHrsVacYtd() { + return dirCareNonProdHrsVacYtd; + } + public void setDirCareNonProdHrsVacYtd(String dirCareNonProdHrsVacYtd) { + this.dirCareNonProdHrsVacYtd = dirCareNonProdHrsVacYtd; + } + public String getDirCareNonProdHrsSickYtd() { + return dirCareNonProdHrsSickYtd; + } + public void setDirCareNonProdHrsSickYtd(String dirCareNonProdHrsSickYtd) { + this.dirCareNonProdHrsSickYtd = dirCareNonProdHrsSickYtd; + } + public String getDirCareNonProdHrsOtherYtd() { + return dirCareNonProdHrsOtherYtd; + } + public void setDirCareNonProdHrsOtherYtd(String dirCareNonProdHrsOtherYtd) { + this.dirCareNonProdHrsOtherYtd = dirCareNonProdHrsOtherYtd; + } + public String getDirCareYtdNotes() { + return dirCareYtdNotes; + } + public void setDirCareYtdNotes(String dirCareYtdNotes) { + this.dirCareYtdNotes = dirCareYtdNotes; + } + + public String getDirCareProdHrsSubtotalYtd() { + return dirCareProdHrsSubtotalYtd; + } + public void setDirCareProdHrsSubtotalYtd(String dirCareProdHrsSubtotalYtd) { + this.dirCareProdHrsSubtotalYtd = dirCareProdHrsSubtotalYtd; + } + public String getDirCareProdHrsTotalYtd() { + return dirCareProdHrsTotalYtd; + } + public void setDirCareProdHrsTotalYtd(String dirCareProdHrsTotalYtd) { + this.dirCareProdHrsTotalYtd = dirCareProdHrsTotalYtd; + } + public String getDirCareNonProdHrsTotalYtd() { + return dirCareNonProdHrsTotalYtd; + } + public void setDirCareNonProdHrsTotalYtd(String dirCareNonProdHrsTotalYtd) { + this.dirCareNonProdHrsTotalYtd = dirCareNonProdHrsTotalYtd; + } + public String getDirCareTotalHrsPaidYtd() { + return dirCareTotalHrsPaidYtd; + } + public void setDirCareTotalHrsPaidYtd(String dirCareTotalHrsPaidYtd) { + this.dirCareTotalHrsPaidYtd = dirCareTotalHrsPaidYtd; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_DIRECT_CARE_HRS; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add(this.getDirCareType()); + elements.add(this.getDirCareName()); + elements.add(this.getDirCareProdHrsRegYtd()); + elements.add(this.getDirCareProdHrsOtYtd()); + elements.add(this.getDirCareProdHrsContractedYtd()); + elements.add(this.getDirCareProdHrsSubtotalYtd()); + elements.add(this.getDirCareProdHrsTotalYtd()); + elements.add(this.getDirCareNonProdHrsVacYtd()); + elements.add(this.getDirCareNonProdHrsSickYtd()); + elements.add(this.getDirCareNonProdHrsOtherYtd()); + elements.add(this.getDirCareNonProdHrsTotalYtd()); + elements.add(this.getDirCareTotalHrsPaidYtd()); + elements.add(this.getDirCareYtdNotes()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrsSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrsSubTotals.java new file mode 100644 index 00000000..ce24c968 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrsSubTotals.java @@ -0,0 +1,155 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdDirectCareHrsSubTotals implements IModel{ + + private String confirmationID; + private String dirCareType; + private String subTotalDirCareProdHrsRegularYTD; + private String subTotalDirCareProdHrsOTYTD; + private String subTotalDirCareProdHrsSubtotalYTD; + private String subTotalDirCareProdHrsContServYTD; + private String subTotalDirCareProdHrsTotalYTD; + private String subTotalDirCareNonProdHrsVacYTD; + private String subTotalDirCareNonProdHrsSickYTD; + private String subTotalDirCareNonProdHrsOtherServYTD; + private String subTotalDirCareNonProdHrsTotalYTD; + private String subTotalDirCareTotalHrsPaidYTD; + + + public String getConfirmationID() { + return confirmationID; + } + + public void setConfirmationID(String confirmationID) { + this.confirmationID = confirmationID; + } + + public String getDirCareType() { + return dirCareType; + } + + public void setDirCareType(String dirCareType) { + this.dirCareType = dirCareType; + } + + public String getSubTotalDirCareProdHrsRegularYTD() { + return subTotalDirCareProdHrsRegularYTD; + } + + public void setSubTotalDirCareProdHrsRegularYTD(String subTotalDirCareProdHrsRegularYTD) { + this.subTotalDirCareProdHrsRegularYTD = subTotalDirCareProdHrsRegularYTD; + } + + public String getSubTotalDirCareProdHrsOTYTD() { + return subTotalDirCareProdHrsOTYTD; + } + + public void setSubTotalDirCareProdHrsOTYTD(String subTotalDirCareProdHrsOTYTD) { + this.subTotalDirCareProdHrsOTYTD = subTotalDirCareProdHrsOTYTD; + } + + public String getSubTotalDirCareProdHrsSubtotalYTD() { + return subTotalDirCareProdHrsSubtotalYTD; + } + + public void setSubTotalDirCareProdHrsSubtotalYTD(String subTotalDirCareProdHrsSubtotalYTD) { + this.subTotalDirCareProdHrsSubtotalYTD = subTotalDirCareProdHrsSubtotalYTD; + } + + public String getSubTotalDirCareProdHrsContServYTD() { + return subTotalDirCareProdHrsContServYTD; + } + + public void setSubTotalDirCareProdHrsContServYTD(String subTotalDirCareProdHrsContServYTD) { + this.subTotalDirCareProdHrsContServYTD = subTotalDirCareProdHrsContServYTD; + } + + public String getSubTotalDirCareProdHrsTotalYTD() { + return subTotalDirCareProdHrsTotalYTD; + } + + public void setSubTotalDirCareProdHrsTotalYTD(String subTotalDirCareProdHrsTotalYTD) { + this.subTotalDirCareProdHrsTotalYTD = subTotalDirCareProdHrsTotalYTD; + } + + public String getSubTotalDirCareNonProdHrsVacYTD() { + return subTotalDirCareNonProdHrsVacYTD; + } + + public void setSubTotalDirCareNonProdHrsVacYTD(String subTotalDirCareNonProdHrsVacYTD) { + this.subTotalDirCareNonProdHrsVacYTD = subTotalDirCareNonProdHrsVacYTD; + } + + public String getSubTotalDirCareNonProdHrsSickYTD() { + return subTotalDirCareNonProdHrsSickYTD; + } + + public void setSubTotalDirCareNonProdHrsSickYTD(String subTotalDirCareNonProdHrsSickYTD) { + this.subTotalDirCareNonProdHrsSickYTD = subTotalDirCareNonProdHrsSickYTD; + } + + public String getSubTotalDirCareNonProdHrsOtherServYTD() { + return subTotalDirCareNonProdHrsOtherServYTD; + } + + public void setSubTotalDirCareNonProdHrsOtherServYTD(String subTotalDirCareNonProdHrsOtherServYTD) { + this.subTotalDirCareNonProdHrsOtherServYTD = subTotalDirCareNonProdHrsOtherServYTD; + } + + public String getSubTotalDirCareNonProdHrsTotalYTD() { + return subTotalDirCareNonProdHrsTotalYTD; + } + + public void setSubTotalDirCareNonProdHrsTotalYTD(String subTotalDirCareNonProdHrsTotalYTD) { + this.subTotalDirCareNonProdHrsTotalYTD = subTotalDirCareNonProdHrsTotalYTD; + } + + public String getSubTotalDirCareTotalHrsPaidYTD() { + return subTotalDirCareTotalHrsPaidYTD; + } + + public void setSubTotalDirCareTotalHrsPaidYTD(String subTotalDirCareTotalHrsPaidYTD) { + this.subTotalDirCareTotalHrsPaidYTD = subTotalDirCareTotalHrsPaidYTD; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + return Constants.LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationID()); + elements.add(this.getDirCareType()); + elements.add(this.getSubTotalDirCareProdHrsRegularYTD()); + elements.add(this.getSubTotalDirCareProdHrsOTYTD()); + elements.add(this.getSubTotalDirCareProdHrsSubtotalYTD()); + elements.add(this.getSubTotalDirCareProdHrsContServYTD()); + elements.add(this.getSubTotalDirCareProdHrsTotalYTD()); + elements.add(this.getSubTotalDirCareNonProdHrsVacYTD()); + elements.add(this.getSubTotalDirCareNonProdHrsSickYTD()); + elements.add(this.getSubTotalDirCareNonProdHrsTotalYTD()); + elements.add(this.getSubTotalDirCareTotalHrsPaidYTD()); + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java new file mode 100644 index 00000000..637e7651 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java @@ -0,0 +1,71 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdExp implements IModel { + + private String confirmationId; + private String expType; + private String expName; + private String revYtd; + private String revNotes; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getExpType() { + return expType; + } + public void setExpType(String expType) { + this.expType = expType; + } + public String getExpName() { + return expName; + } + public void setExpName(String expName) { + this.expName = expName; + } + public String getRevYtd() { + return revYtd; + } + public void setRevYtd(String revYtd) { + this.revYtd = revYtd; + } + public String getRevNotes() { + return revNotes; + } + public void setRevNotes(String revNotes) { + this.revNotes = revNotes; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_EXP; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add(this.getExpType()); + elements.add(this.getExpName()); + elements.add(this.getRevYtd()); + elements.add(this.getRevNotes()); + + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExpSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExpSubTotals.java new file mode 100644 index 00000000..7117b263 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExpSubTotals.java @@ -0,0 +1,58 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdExpSubTotals implements IModel { + + private String confirmationId; + private String expType; + private String subTotalRevYtd; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getExpType() { + return expType; + } + public void setExpType(String expType) { + this.expType = expType; + } + public String getSubTotalRevYtd() { + return subTotalRevYtd; + } + public void setSubTotalRevYtd(String subTotalRevYtd) { + this.subTotalRevYtd = subTotalRevYtd; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_EXP_SUB_TOTALS; + } + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.getConfirmationId()); + elements.add(this.getExpType()); + elements.add(this.getSubTotalRevYtd()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java new file mode 100644 index 00000000..e11ec65d --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java @@ -0,0 +1,73 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdRev implements IModel { + + private String confirmationId; + private String revType; + private String revName; + private String revYTD; + private String revNotes; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getRevType() { + return revType; + } + public void setRevType(String revType) { + this.revType = revType; + } + public String getRevName() { + return revName; + } + public void setRevName(String revName) { + this.revName = revName; + } + public String getRevYTD() { + return revYTD; + } + public void setRevYTD(String revYTD) { + this.revYTD = revYTD; + } + public String getRevNotes() { + return revNotes; + } + public void setRevNotes(String revNotes) { + this.revNotes = revNotes; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_REV; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add(this.getRevType()); + elements.add(this.getRevName()); + elements.add(this.getRevYTD()); + elements.add(this.getRevNotes()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRevSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRevSubTotals.java new file mode 100644 index 00000000..0eb31581 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRevSubTotals.java @@ -0,0 +1,59 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdRevSubTotals implements IModel { + + private String confirmationId; + private String revType; + private String subTotalRevYtd; + + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getRevType() { + return revType; + } + public void setRevType(String revType) { + this.revType = revType; + } + public String getSubTotalRevYtd() { + return subTotalRevYtd; + } + public void setSubTotalRevYtd(String subTotalRevYtd) { + this.subTotalRevYtd = subTotalRevYtd; + } + + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_REV_SUB_TOTALS; + } + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.getConfirmationId()); + elements.add(this.getRevType()); + elements.add(this.getSubTotalRevYtd()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java new file mode 100644 index 00000000..0719c28b --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java @@ -0,0 +1,251 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; + +import java.util.List; +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LtcYtdSubmission implements IModel { + + /* + * Main Entity + */ + + private String confirmationId; + private String submissionDate; + private String submittedBy; + private String facilitySubId; + private String period; + private String submissionFy; + private String nbTotalBeds; + private String nbFundedBeds; + private String occRateThreshold; + private String isDeleted; + + private List ltcBedYtdMaxOccupancy; + private List ltcBedYtdOccupancyRate; + private List ltcBedYtdOccupiedDays; + private List ltcYtdCompAddPos; + private List ltcYtdCompBenefits; + private List ltcYtdCompHrs; + private List ltcYtdCompSal; + private List ltcYtdDirectCareCost; + private List ltcYtdDirectCareHrs; + private List ltcYtdExp; + private List ltcYtdRev; + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + return Constants.LTC_YTD_SUBMISSION; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add(this.getIsDeleted()); + elements.add(this.getSubmissionDate()); + elements.add(this.getSubmittedBy()); + elements.add(this.getFacilitySubId()); + elements.add(this.getPeriod()); + elements.add(this.getSubmissionFy()); + elements.add(this.getNbTotalBeds()); + elements.add(this.getNbFundedBeds()); + elements.add(this.getOccRateThreshold()); + return elements; + } + + @Override + public List getObjects() { + List ltcQtdInstances = new ArrayList<>(); + ltcQtdInstances.addAll(this.getLtcBedYtdMaxOccupancy()); + ltcQtdInstances.addAll(this.getLtcBedYtdOccupancyRate()); + ltcQtdInstances.addAll(this.getLtcBedYtdOccupiedDays()); + ltcQtdInstances.addAll(this.getLtcYtdCompAddPos()); + ltcQtdInstances.addAll(this.getLtcYtdCompBenefits()); + ltcQtdInstances.addAll(this.getLtcYtdCompHrs()); + ltcQtdInstances.addAll(this.getLtcYtdCompSal()); + ltcQtdInstances.addAll(this.getLtcYtdDirectCareCost()); + ltcQtdInstances.addAll(this.getLtcYtdDirectCareHrs()); + ltcQtdInstances.addAll(this.getLtcYtdExp()); + ltcQtdInstances.addAll(this.getLtcYtdRev()); + + return ltcQtdInstances; + } + + public String getConfirmationId() { + return confirmationId; + } + + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + + public String getSubmissionDate() { + return submissionDate; + } + + public void setSubmissionDate(String submissionDate) { + this.submissionDate = submissionDate; + } + + public String getSubmittedBy() { + return submittedBy; + } + + public void setSubmittedBy(String submittedBy) { + this.submittedBy = submittedBy; + } + + public String getFacilitySubId() { + return facilitySubId; + } + + public void setFacilitySubId(String facilitySubId) { + this.facilitySubId = facilitySubId; + } + + public String getPeriod() { + return period; + } + + public void setPeriod(String period) { + this.period = period; + } + + public String getSubmissionFy() { + return submissionFy; + } + + public void setSubmissionFy(String submissionFy) { + this.submissionFy = submissionFy; + } + + public String getNbTotalBeds() { + return nbTotalBeds; + } + + public void setNbTotalBeds(String nbTotalBeds) { + this.nbTotalBeds = nbTotalBeds; + } + + public String getNbFundedBeds() { + return nbFundedBeds; + } + + public void setNbFundedBeds(String nbFundedBeds) { + this.nbFundedBeds = nbFundedBeds; + } + + public String getOccRateThreshold() { + return occRateThreshold; + } + + public void setOccRateThreshold(String occRateThreshold) { + this.occRateThreshold = occRateThreshold; + } + + public String getIsDeleted() { + return isDeleted; + } + + public void setIsDeleted(String isDeleted) { + this.isDeleted = isDeleted; + } + + public List getLtcBedYtdMaxOccupancy() { + return ltcBedYtdMaxOccupancy; + } + + public void setLtcBedYtdMaxOccupancy(List ltcBedYtdMaxOccupancy) { + this.ltcBedYtdMaxOccupancy = ltcBedYtdMaxOccupancy; + } + + public List getLtcBedYtdOccupancyRate() { + return ltcBedYtdOccupancyRate; + } + + public void setLtcBedYtdOccupancyRate(List ltcBedYtdOccupancyRate) { + this.ltcBedYtdOccupancyRate = ltcBedYtdOccupancyRate; + } + + public List getLtcBedYtdOccupiedDays() { + return ltcBedYtdOccupiedDays; + } + + public void setLtcBedYtdOccupiedDays(List ltcBedYtdOccupiedDays) { + this.ltcBedYtdOccupiedDays = ltcBedYtdOccupiedDays; + } + + public List getLtcYtdCompAddPos() { + return ltcYtdCompAddPos; + } + + public void setLtcYtdCompAddPos(List ltcYtdCompAddPos) { + this.ltcYtdCompAddPos = ltcYtdCompAddPos; + } + + public List getLtcYtdCompBenefits() { + return ltcYtdCompBenefits; + } + + public void setLtcYtdCompBenefits(List ltcYtdCompBenefits) { + this.ltcYtdCompBenefits = ltcYtdCompBenefits; + } + + public List getLtcYtdCompHrs() { + return ltcYtdCompHrs; + } + + public void setLtcYtdCompHrs(List ltcYtdCompHrs) { + this.ltcYtdCompHrs = ltcYtdCompHrs; + } + + public List getLtcYtdCompSal() { + return ltcYtdCompSal; + } + + public void setLtcYtdCompSal(List ltcYtdCompSal) { + this.ltcYtdCompSal = ltcYtdCompSal; + } + + public List getLtcYtdDirectCareCost() { + return ltcYtdDirectCareCost; + } + + public void setLtcYtdDirectCareCost(List ltcYtdDirectCareCost) { + this.ltcYtdDirectCareCost = ltcYtdDirectCareCost; + } + + public List getLtcYtdDirectCareHrs() { + return ltcYtdDirectCareHrs; + } + + public void setLtcYtdDirectCareHrs(List ltcYtdDirectCareHrs) { + this.ltcYtdDirectCareHrs = ltcYtdDirectCareHrs; + } + + public List getLtcYtdExp() { + return ltcYtdExp; + } + + public void setLtcYtdExp(List ltcYtdExp) { + this.ltcYtdExp = ltcYtdExp; + } + + public List getLtcYtdRev() { + return ltcYtdRev; + } + + public void setLtcYtdRev(List ltcYtdRev) { + this.ltcYtdRev = ltcYtdRev; + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java new file mode 100644 index 00000000..2ea26ab6 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java @@ -0,0 +1,20 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.util.AuthUtil; +import ca.bc.gov.chefs.etl.util.PropertiesUtil; + +public class LtcQuaterlyYtdApiProcessor implements Processor{ + + @Override + public void process(Exchange exchange) throws Exception { + exchange.getIn().setHeader("CamelHttpMethod", "GET"); + exchange.getIn().setHeader("Content-Type", "application/json"); + exchange.getIn().setHeader("accept", "application/json"); + exchange.getIn().setHeader("Authorization", AuthUtil.getBasicAuth(PropertiesUtil.getValue(Constants.LTC_YTD_USERNAME), PropertiesUtil.getValue(Constants.LTC_YTD_PASSWORD))); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java new file mode 100644 index 00000000..d0ae60f5 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -0,0 +1,2609 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid0; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid1; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid2; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid3; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid4; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.Root; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdMaxOccupancy; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdMaxOccupancyTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdOccupancyRate; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdOccupancyRateTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdOccupiedDays; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdOccupiedDaysTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompAddPos; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompBenefits; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompHrs; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompHrsSubtotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompHrsTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompSal; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompSalSubtotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompSalTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDirectCareCost; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDirectCareCostSubtotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDirectCareHrs; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDirectCareHrsSubTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdExp; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdExpSubTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdRev; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdRevSubTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdSubmission; +import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.util.CSVUtil; +import ca.bc.gov.chefs.etl.util.FileUtil; + +public class LtcQuaterlyYtdApiResponseProcessor implements Processor { + + + @Override + @SuppressWarnings("unchecked") + public void process(Exchange exchange) throws Exception { + String payload = exchange.getIn().getBody(String.class); + System.out.println(payload); + ObjectMapper mapper = new ObjectMapper(); + List ltcYtdForms = mapper.readValue(payload, new TypeReference>() { + }); + List parsedLtycYtdSubmissions = parseYtdQuaterlyRequest(ltcYtdForms); + List iModels = (List)(List) parsedLtycYtdSubmissions; + Map>> map = CSVUtil.provider(iModels); + FileUtil.writeToCSVFile(map); + + } + + private List parseYtdQuaterlyRequest(List ltcQuarterlyYTDSubmissions) { + List ltcYtdSubmissions = new ArrayList<>(); + for (Root root : ltcQuarterlyYTDSubmissions) { + LtcYtdSubmission ltcYtdSubmission = new LtcYtdSubmission(); + List ltcYtdDcHrs = new ArrayList<>(); + List ltcYtdDcHrsSubttls = new ArrayList<>(); + List ltcYtdDcCost = new ArrayList<>(); + List ltcYtdDcCostSubttls = new ArrayList<>(); + List ltcYtdCompSal = new ArrayList<>(); + List ltcYtdCompSalSubttls = new ArrayList<>(); + List ltcYtdCompsalTtls = new ArrayList<>(); + List ltcYtdCompHrs = new ArrayList<>(); + List ltcYtdCompHrsSubttls = new ArrayList<>(); + List ltcYtdCompHrsTtls = new ArrayList<>(); + List ltcYtdCompAddPos = new ArrayList<>(); + List ltcYtdCompBenefits = new ArrayList<>(); + List ltcYtdRev = new ArrayList<>(); + List ltcYtdRevSubTtls = new ArrayList(); + //List ltcYtdExpSubttls = new ArrayList(); + List ltcYtdExp = new ArrayList<>(); + List ltcBedYtdOccupancyRates = new ArrayList<>(); + List ltcBedYtdMaxOccupancies = new ArrayList<>(); + List ltcBedYtdMaxOccTtls = new ArrayList<>(); + List ltcBedYtdOccupiedDays = new ArrayList<>(); + List ltcBedYtdOccDaysTtls = new ArrayList<>(); + List ltcBedYtdOccRateTtls = new ArrayList<>(); + + + /* Form Meta */ + ltcYtdSubmission.setConfirmationId(root.getForm().getConfirmationId()); + ltcYtdSubmission.setFacilitySubId(root.getCcmisId()); + ltcYtdSubmission.setIsDeleted(""); + ltcYtdSubmission.setNbFundedBeds(root.getNumberOfTotalFundedBeds()); + ltcYtdSubmission.setNbTotalBeds(root.getNumberOfTotalBeds()); + ltcYtdSubmission.setOccRateThreshold(root.getThreshold()); + ltcYtdSubmission.setPeriod(root.getQuarter()); + ltcYtdSubmission.setSubmissionDate(root.getForm().getCreatedAt()); + ltcYtdSubmission.setSubmissionFy(""); // not sure + ltcYtdSubmission.setSubmittedBy(root.getForm().getFullName()); + + + /* START : Direct Care Hours */ + /* Productive and NP Nursing */ // why no subtotal and total? + LtcYtdDirectCareHrs nursingRNProdH = new LtcYtdDirectCareHrs(); + nursingRNProdH.setDirCareProdHrsRegYtd(root.getNursingProdH_item11()); + nursingRNProdH.setDirCareProdHrsOtYtd(root.getNursingProdH_item21()); + nursingRNProdH.setDirCareProdHrsContractedYtd(root.getNursingProdHCS1()); + nursingRNProdH.setDirCareNonProdHrsVacYtd(root.getNursingNProdH_item11()); + nursingRNProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item21()); + nursingRNProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item31()); + nursingRNProdH.setConfirmationId(root.getForm().getConfirmationId()); + nursingRNProdH.setDirCareName("Nursing"); + nursingRNProdH.setDirCareType("RN"); + nursingRNProdH.setDirCareYtdNotes(""); // not known. + nursingRNProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc1()); + nursingRNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub1()); + nursingRNProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP1()); + nursingRNProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc1()); + + LtcYtdDirectCareHrs nursingLPNProdH = new LtcYtdDirectCareHrs(); + nursingLPNProdH.setDirCareProdHrsRegYtd(root.getNursingProdH_item12()); + nursingLPNProdH.setDirCareProdHrsOtYtd(root.getNursingProdH_item22()); + nursingLPNProdH.setDirCareProdHrsContractedYtd(root.getNursingProdHCS2()); + nursingLPNProdH.setDirCareNonProdHrsVacYtd(root.getNursingNProdH_item12()); + nursingLPNProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item22()); + nursingLPNProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item32()); + nursingLPNProdH.setConfirmationId(root.getForm().getConfirmationId()); + nursingLPNProdH.setDirCareName("Nursing"); + nursingLPNProdH.setDirCareType("LPN"); + nursingLPNProdH.setDirCareYtdNotes(""); // not known. + nursingLPNProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc2()); + nursingLPNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub2()); + nursingLPNProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP2()); + nursingLPNProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc2()); + + + LtcYtdDirectCareHrs nursingHCAProdH = new LtcYtdDirectCareHrs(); + nursingHCAProdH.setDirCareProdHrsRegYtd(root.getNursingProdH_item13()); + nursingHCAProdH.setDirCareProdHrsOtYtd(root.getNursingProdH_item23()); + nursingHCAProdH.setDirCareProdHrsContractedYtd(root.getNursingProdHCS3()); + nursingHCAProdH.setDirCareNonProdHrsVacYtd(root.getNursingNProdH_item13()); + nursingHCAProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item23()); + nursingHCAProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item33()); + nursingHCAProdH.setConfirmationId(root.getForm().getConfirmationId()); + nursingHCAProdH.setDirCareName("Nursing"); + nursingHCAProdH.setDirCareType("Care Aides (HCA)"); + nursingHCAProdH.setDirCareYtdNotes(""); // not known. + nursingHCAProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc3()); + nursingHCAProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub3()); + nursingHCAProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP3()); + nursingHCAProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc3()); + + LtcYtdDirectCareHrs nursingOthProdH = new LtcYtdDirectCareHrs(); + nursingOthProdH.setDirCareProdHrsRegYtd(root.getNursingProdH_item14()); + nursingOthProdH.setDirCareProdHrsOtYtd(root.getNursingProdH_item24()); + nursingOthProdH.setDirCareProdHrsContractedYtd(root.getNursingProdHCS4()); + nursingOthProdH.setDirCareNonProdHrsVacYtd(root.getNursingNProdH_item14()); + nursingOthProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item24()); + nursingOthProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item34()); + nursingOthProdH.setConfirmationId(root.getForm().getConfirmationId()); + nursingOthProdH.setDirCareName("Nursing"); + nursingOthProdH.setDirCareType("Other"); + nursingOthProdH.setDirCareYtdNotes(""); // not known. + nursingOthProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc4()); + nursingOthProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub4()); + nursingOthProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP4()); + nursingOthProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc4()); + + // to check what is with the subtotal fields + + /* Productive and NP Allied Prof */ + LtcYtdDirectCareHrs alliedOTProfH = new LtcYtdDirectCareHrs(); + alliedOTProfH.setDirCareProdHrsRegYtd(root.getAlliedProfProdH_item11()); + alliedOTProfH.setDirCareProdHrsOtYtd(root.getAlliedProfProdH_item21()); + alliedOTProfH.setDirCareProdHrsContractedYtd(root.getAlliedProfProdHCS1()); + alliedOTProfH.setDirCareNonProdHrsVacYtd(root.getAlliedProfNProdH_item11()); + alliedOTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item21()); + alliedOTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item31()); + alliedOTProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedOTProfH.setDirCareName("Allied"); + alliedOTProfH.setDirCareType("Occupational Therapist"); + alliedOTProfH.setDirCareYtdNotes(""); // not known. + alliedOTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc1()); + alliedOTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub1()); + alliedOTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP1()); + alliedOTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc1()); + + + LtcYtdDirectCareHrs alliedPTProfH = new LtcYtdDirectCareHrs(); + alliedPTProfH.setDirCareProdHrsRegYtd(root.getAlliedProfProdH_item12()); + alliedPTProfH.setDirCareProdHrsOtYtd(root.getAlliedProfProdH_item22()); + alliedPTProfH.setDirCareProdHrsContractedYtd(root.getAlliedProfProdHCS2()); + alliedPTProfH.setDirCareNonProdHrsVacYtd(root.getAlliedProfNProdH_item12()); + alliedPTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item22()); + alliedPTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item32()); + alliedPTProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedPTProfH.setDirCareName("Allied"); + alliedPTProfH.setDirCareType("Physiotherapist"); + alliedPTProfH.setDirCareYtdNotes(""); // not known. + alliedPTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc2()); + alliedPTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub2()); + alliedPTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP2()); + alliedPTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc2()); + + LtcYtdDirectCareHrs alliedDTProfH = new LtcYtdDirectCareHrs(); + alliedDTProfH.setDirCareProdHrsRegYtd(root.getAlliedProfProdH_item13()); + alliedDTProfH.setDirCareProdHrsOtYtd(root.getAlliedProfProdH_item23()); + alliedDTProfH.setDirCareProdHrsContractedYtd(root.getAlliedProfProdHCS3()); + alliedDTProfH.setDirCareNonProdHrsVacYtd(root.getAlliedProfNProdH_item13()); + alliedDTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item23()); + alliedDTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item33()); + alliedDTProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedDTProfH.setDirCareName("Allied"); + alliedDTProfH.setDirCareType("Dietitian"); + alliedDTProfH.setDirCareYtdNotes(""); // not known. + alliedDTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc3()); + alliedDTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub3()); + alliedDTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP3()); + alliedDTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc3()); + + + LtcYtdDirectCareHrs alliedSWProfH = new LtcYtdDirectCareHrs(); + alliedSWProfH.setDirCareProdHrsRegYtd(root.getAlliedProfProdH_item14()); + alliedSWProfH.setDirCareProdHrsOtYtd(root.getAlliedProfProdH_item24()); + alliedSWProfH.setDirCareProdHrsContractedYtd(root.getAlliedProfProdHCS4()); + alliedSWProfH.setDirCareNonProdHrsVacYtd(root.getAlliedProfNProdH_item14()); + alliedSWProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item24()); + alliedSWProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item34()); + alliedSWProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedSWProfH.setDirCareName("Allied"); + alliedSWProfH.setDirCareType("Social Worker"); + alliedSWProfH.setDirCareYtdNotes(""); // not known. + alliedSWProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc4()); + alliedSWProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub4()); + alliedSWProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP4()); + alliedSWProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc4()); + + LtcYtdDirectCareHrs alliedOTHProfH = new LtcYtdDirectCareHrs(); + alliedOTHProfH.setDirCareProdHrsRegYtd(root.getAlliedProfProdH_item15()); + alliedOTHProfH.setDirCareProdHrsOtYtd(root.getAlliedProfProdH_item25()); + alliedOTHProfH.setDirCareProdHrsContractedYtd(root.getAlliedProfProdHCS5()); + alliedOTHProfH.setDirCareNonProdHrsVacYtd(root.getAlliedProfNProdH_item15()); + alliedOTHProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item25()); + alliedOTHProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item35()); + alliedOTHProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedOTHProfH.setDirCareName("Allied"); + alliedOTHProfH.setDirCareType("Social Worker"); + alliedOTHProfH.setDirCareYtdNotes(""); // not known. + alliedOTHProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc5()); + alliedOTHProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub5()); + alliedOTHProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP5()); + alliedOTHProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc5()); + + /* Allied Non Professional */ + LtcYtdDirectCareHrs alliedNPRTProfH = new LtcYtdDirectCareHrs(); + alliedNPRTProfH.setDirCareProdHrsRegYtd(root.getAlliedNPProdH_item11()); + alliedNPRTProfH.setDirCareProdHrsOtYtd(root.getAlliedNPProdH_item21()); + alliedNPRTProfH.setDirCareProdHrsContractedYtd(root.getAlliedNPProdHCS1()); + alliedNPRTProfH.setDirCareNonProdHrsVacYtd(root.getAlliedNPNProdH_item11()); + alliedNPRTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item21()); + alliedNPRTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item31()); + alliedNPRTProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRTProfH.setDirCareName("Recreation Therapist"); + alliedNPRTProfH.setDirCareType("Allied Non Professional"); + alliedNPRTProfH.setDirCareYtdNotes(""); // not known. + alliedNPRTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc1()); + alliedNPRTProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub1()); + alliedNPRTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP1()); + alliedNPRTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc1()); + + + LtcYtdDirectCareHrs alliedNPRAProfH = new LtcYtdDirectCareHrs(); + alliedNPRAProfH.setDirCareProdHrsRegYtd(root.getAlliedNPProdH_item12()); + alliedNPRAProfH.setDirCareProdHrsOtYtd(root.getAlliedNPProdH_item22()); + alliedNPRAProfH.setDirCareProdHrsContractedYtd(root.getAlliedNPProdHCS2()); + alliedNPRAProfH.setDirCareNonProdHrsVacYtd(root.getAlliedNPNProdH_item12()); + alliedNPRAProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item22()); + alliedNPRAProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item32()); + alliedNPRAProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRAProfH.setDirCareName("Rehab Assistant"); + alliedNPRAProfH.setDirCareType("Allied Non Professional"); + alliedNPRAProfH.setDirCareYtdNotes(""); // not known. + alliedNPRAProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc2()); + alliedNPRAProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub2()); + alliedNPRAProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP2()); + alliedNPRAProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc2()); + + + LtcYtdDirectCareHrs alliedNPAWProfH = new LtcYtdDirectCareHrs(); + alliedNPAWProfH.setDirCareProdHrsRegYtd(root.getAlliedNPProdH_item13()); + alliedNPAWProfH.setDirCareProdHrsOtYtd(root.getAlliedNPProdH_item23()); + alliedNPAWProfH.setDirCareProdHrsContractedYtd(root.getAlliedNPProdHCS3()); + alliedNPAWProfH.setDirCareNonProdHrsVacYtd(root.getAlliedNPNProdH_item13()); + alliedNPAWProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item23()); + alliedNPAWProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item33()); + alliedNPAWProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPAWProfH.setDirCareName("Activity Worker"); + alliedNPAWProfH.setDirCareType("Allied Non Professional"); + alliedNPAWProfH.setDirCareYtdNotes(""); // not known. + alliedNPAWProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc3()); + alliedNPAWProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub3()); + alliedNPAWProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP3()); + alliedNPAWProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc3()); + + + LtcYtdDirectCareHrs alliedNPMTProfH = new LtcYtdDirectCareHrs(); + alliedNPMTProfH.setDirCareProdHrsRegYtd(root.getAlliedNPProdH_item14()); + alliedNPMTProfH.setDirCareProdHrsOtYtd(root.getAlliedNPProdH_item24()); + alliedNPMTProfH.setDirCareProdHrsContractedYtd(root.getAlliedNPProdHCS4()); + alliedNPMTProfH.setDirCareNonProdHrsVacYtd(root.getAlliedNPNProdH_item14()); + alliedNPMTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item24()); + alliedNPMTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item34()); + alliedNPMTProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPMTProfH.setDirCareName("Music Therapist"); + alliedNPMTProfH.setDirCareType("Allied Non Professional"); + alliedNPMTProfH.setDirCareYtdNotes(""); // not known. + alliedNPMTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc4()); + alliedNPMTProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub4()); + alliedNPMTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP4()); + alliedNPMTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc4()); + + + LtcYtdDirectCareHrs alliedNPATProfH = new LtcYtdDirectCareHrs(); + alliedNPATProfH.setDirCareProdHrsRegYtd(root.getAlliedNPProdH_item15()); + alliedNPATProfH.setDirCareProdHrsOtYtd(root.getAlliedNPProdH_item25()); + alliedNPATProfH.setDirCareProdHrsContractedYtd(root.getAlliedNPProdHCS5()); + alliedNPATProfH.setDirCareNonProdHrsVacYtd(root.getAlliedNPNProdH_item15()); + alliedNPATProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item25()); + alliedNPATProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item35()); + alliedNPATProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPATProfH.setDirCareName("Art Therapist"); + alliedNPATProfH.setDirCareType("Allied Non Professional"); + alliedNPATProfH.setDirCareYtdNotes(""); // not known. + alliedNPATProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc5()); + alliedNPATProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub5()); + alliedNPATProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP5()); + alliedNPATProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc5()); + + LtcYtdDirectCareHrs alliedNPOTHProfH = new LtcYtdDirectCareHrs(); + alliedNPOTHProfH.setDirCareProdHrsRegYtd(root.getAlliedNPProdH_item16()); + alliedNPOTHProfH.setDirCareProdHrsOtYtd(root.getAlliedNPProdH_item26()); + alliedNPOTHProfH.setDirCareProdHrsContractedYtd(root.getAlliedNPProdHCS6()); + alliedNPOTHProfH.setDirCareNonProdHrsVacYtd(root.getAlliedNPNProdH_item16()); + alliedNPOTHProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item26()); + alliedNPOTHProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item36()); + alliedNPOTHProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPOTHProfH.setDirCareName("Art Therapist"); + alliedNPOTHProfH.setDirCareType("Allied Non Professional"); + alliedNPOTHProfH.setDirCareYtdNotes(""); // not known. + alliedNPOTHProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc6()); + alliedNPOTHProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub6()); + alliedNPOTHProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP6()); + alliedNPOTHProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc6()); + + + Collections.addAll(ltcYtdDcHrs, nursingRNProdH, nursingLPNProdH, nursingHCAProdH, alliedOTProfH, + alliedPTProfH, alliedDTProfH, alliedSWProfH, alliedNPRTProfH, alliedNPRAProfH, alliedNPAWProfH, + alliedNPMTProfH, alliedNPATProfH,nursingOthProdH, + alliedOTHProfH, + alliedNPOTHProfH); + + /* END : Direct Care Hours */ + + /* Direct Care Hours Subtotals */ + LtcYtdDirectCareHrsSubTotals nursingDirCareHrsSubTotal = new LtcYtdDirectCareHrsSubTotals(); + nursingDirCareHrsSubTotal.setDirCareType("Nursing"); + nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsRegularYTD(root.getNursingProdH_sum11()); + nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsOTYTD(root.getNursingProdH_sum21()); + nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsSubtotalYTD(root.getNursingProdH_calcsum1()); + nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsContServYTD(root.getNursingProdHCS_subsum1()); + nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsTotalYTD(root.getNursingProdH_subsum1()); + nursingDirCareHrsSubTotal.setSubTotalDirCareTotalHrsPaidYTD(root.getNursingProdH_THPsum1()); + nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsVacYTD(root.getNursingNProdH_sum11()); + nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsSickYTD(root.getNursingNProdH_sum21()); + nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsOtherServYTD(root.getNursingNProdH_sum31()); + nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsTotalYTD(root.getNursingNProdH_calcsum1()); + + LtcYtdDirectCareHrsSubTotals alliedDirCareHrsSubTotal = new LtcYtdDirectCareHrsSubTotals(); + alliedDirCareHrsSubTotal.setDirCareType("Allied Professional"); + alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsRegularYTD(root.getAlliedProfProdH_sum11()); + alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsOTYTD(root.getAlliedProfProdH_sum21()); + alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsSubtotalYTD(root.getAlliedProfProdH_calcsum1()); + alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsContServYTD(root.getAlliedProfProdHCS_subsum1()); + alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsTotalYTD(root.getAlliedProfProdH_subsum1()); + alliedDirCareHrsSubTotal.setSubTotalDirCareTotalHrsPaidYTD(root.getAlliedProfProdH_THPsum1()); + alliedDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsVacYTD(root.getAlliedProfNProdH_sum11()); + alliedDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsSickYTD(root.getAlliedNProdH_sum21()); + alliedDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsOtherServYTD(root.getAlliedProfNProdH_sum31()); + alliedDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsTotalYTD(root.getAlliedProfNProdH_calcsum1()); + + LtcYtdDirectCareHrsSubTotals alliedNPDirCareHrsSubTotal = new LtcYtdDirectCareHrsSubTotals(); + alliedNPDirCareHrsSubTotal.setDirCareType("Allied Non-professional"); + alliedNPDirCareHrsSubTotal.setSubTotalDirCareProdHrsRegularYTD(root.getAlliedNPProdH_sum11()); + alliedNPDirCareHrsSubTotal.setSubTotalDirCareProdHrsOTYTD(root.getAlliedNPProdH_sum21()); + alliedNPDirCareHrsSubTotal.setSubTotalDirCareProdHrsSubtotalYTD(root.getAlliedNPProdH_calcsum1()); + alliedNPDirCareHrsSubTotal.setSubTotalDirCareProdHrsContServYTD(root.getAlliedNPProdHCS_subsum1()); + alliedNPDirCareHrsSubTotal.setSubTotalDirCareProdHrsTotalYTD(root.getAlliedNPProdH_subsum1()); + alliedNPDirCareHrsSubTotal.setSubTotalDirCareTotalHrsPaidYTD(root.getAlliedNPProdH_THPsum1()); + alliedNPDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsVacYTD(root.getAlliedNPNProdH_sum11()); + alliedNPDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsSickYTD(root.getAlliedNPNProdH_sum21()); + alliedNPDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsOtherServYTD(root.getAlliedNPNProdH_sum31()); + alliedNPDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsTotalYTD(root.getAlliedNPNProdH_calcsum1()); + + Collections.addAll(ltcYtdDcHrsSubttls, nursingDirCareHrsSubTotal,alliedDirCareHrsSubTotal,alliedNPDirCareHrsSubTotal); + /* END */ + + + /* START : Direct Care Cost */ + LtcYtdDirectCareCost nursingRNProdC = new LtcYtdDirectCareCost(); + nursingRNProdC.setDirCareCostProdHrsRegYtd(root.getNursingProdC_item11()); + nursingRNProdC.setDirCareCostProdHrsOtYtd(root.getNursingProdC_item21()); + nursingRNProdC.setDirCareCostProdHrsContractedYtd(root.getNursingProdCCS1()); + nursingRNProdC.setDirCareCostNonProdHrsVacYtd(root.getNursingNProdC_item11()); + nursingRNProdC.setDirCareCostNonProdHrsSickYtd(root.getNursingNProdC_item21()); + nursingRNProdC.setDirCareCostNonProdHrsOtherYtd(root.getNursingNProdC_item31()); + nursingRNProdC.setConfirmationId(root.getForm().getConfirmationId()); + nursingRNProdC.setDirCareCostName("Nursing"); + nursingRNProdC.setDirCareCostType("RN"); + nursingRNProdC.setDirCareCostYtdNotes(""); // not known. + nursingRNProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc1()); + nursingRNProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub1()); + nursingRNProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP1()); + nursingRNProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc1()); + nursingRNProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate1()); + nursingRNProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate1()); + /* END : Direct Care Cost */ + + LtcYtdDirectCareCost nursingLPNProdC = new LtcYtdDirectCareCost(); + nursingLPNProdC.setDirCareCostProdHrsRegYtd(root.getNursingProdC_item12()); + nursingLPNProdC.setDirCareCostProdHrsOtYtd(root.getNursingProdC_item22()); + nursingLPNProdC.setDirCareCostProdHrsContractedYtd(root.getNursingProdCCS2()); + nursingLPNProdC.setDirCareCostNonProdHrsVacYtd(root.getNursingNProdC_item12()); + nursingLPNProdC.setDirCareCostNonProdHrsSickYtd(root.getNursingNProdC_item22()); + nursingLPNProdC.setDirCareCostNonProdHrsOtherYtd(root.getNursingNProdC_item32()); + nursingLPNProdC.setConfirmationId(root.getForm().getConfirmationId()); + nursingLPNProdC.setDirCareCostName("Nursing"); + nursingLPNProdC.setDirCareCostType("LPN"); + nursingLPNProdC.setDirCareCostYtdNotes(""); // not known. + nursingLPNProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc2()); + nursingLPNProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub2()); + nursingLPNProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP2()); + nursingLPNProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc2()); + nursingLPNProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate2()); + nursingLPNProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate2()); + + + + LtcYtdDirectCareCost nursingHCAProdC = new LtcYtdDirectCareCost(); + nursingHCAProdC.setDirCareCostProdHrsRegYtd(root.getNursingProdC_item13()); + nursingHCAProdC.setDirCareCostProdHrsOtYtd(root.getNursingProdC_item23()); + nursingHCAProdC.setDirCareCostProdHrsContractedYtd(root.getNursingProdCCS3()); + nursingHCAProdC.setDirCareCostNonProdHrsVacYtd(root.getNursingNProdC_item13()); + nursingHCAProdC.setDirCareCostNonProdHrsSickYtd(root.getNursingNProdC_item23()); + nursingHCAProdC.setDirCareCostNonProdHrsOtherYtd(root.getNursingNProdC_item33()); + nursingHCAProdC.setConfirmationId(root.getForm().getConfirmationId()); + nursingHCAProdC.setDirCareCostName("Nursing"); + nursingHCAProdC.setDirCareCostType("Care Aides (HCA)"); + nursingHCAProdC.setDirCareCostYtdNotes(""); // not known. + nursingHCAProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc3()); + nursingHCAProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub3()); + nursingHCAProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP3()); + nursingHCAProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc3()); + nursingHCAProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate3()); + nursingHCAProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate3()); + + + LtcYtdDirectCareCost nursingOthProdC = new LtcYtdDirectCareCost(); + nursingOthProdC.setDirCareCostProdHrsRegYtd(root.getNursingProdC_item14()); + nursingOthProdC.setDirCareCostProdHrsOtYtd(root.getNursingProdC_item24()); + nursingOthProdC.setDirCareCostProdHrsContractedYtd(root.getNursingProdCCS4()); + nursingOthProdC.setDirCareCostNonProdHrsVacYtd(root.getNursingNProdC_item14()); + nursingOthProdC.setDirCareCostNonProdHrsSickYtd(root.getNursingNProdC_item24()); + nursingOthProdC.setDirCareCostNonProdHrsOtherYtd(root.getNursingNProdC_item34()); + nursingOthProdC.setConfirmationId(root.getForm().getConfirmationId()); + nursingOthProdC.setDirCareCostName("Nursing"); + nursingOthProdC.setDirCareCostType("Other (specify)"); + nursingOthProdC.setDirCareCostYtdNotes(""); // not known. + nursingOthProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc4()); + nursingOthProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub4()); + nursingOthProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP4()); + nursingOthProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc4()); + nursingOthProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate4()); + nursingOthProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate4()); + + + + + // Allied Prof + LtcYtdDirectCareCost alliedOTProfC = new LtcYtdDirectCareCost(); + alliedOTProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item11()); + alliedOTProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item21()); + alliedOTProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS1()); + alliedOTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item11()); + alliedOTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item21()); + alliedOTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item31()); + alliedOTProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedOTProfC.setDirCareCostName("Occupational Therapist"); + alliedOTProfC.setDirCareCostType("Allied Professional"); + alliedOTProfC.setDirCareCostYtdNotes(""); // not known. + alliedOTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc1()); + alliedOTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub1()); + alliedOTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP1()); + alliedOTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPProdC_calc1()); + alliedOTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate1()); + alliedOTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate1()); + + + LtcYtdDirectCareCost alliedPTProfC = new LtcYtdDirectCareCost(); + alliedPTProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item12()); + alliedPTProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item22()); + alliedPTProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS2()); + alliedPTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item22()); + alliedPTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item22()); + alliedPTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item32()); + alliedPTProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedPTProfC.setDirCareCostName("Physiotherapist"); + alliedPTProfC.setDirCareCostType("Allied Professional"); + alliedPTProfC.setDirCareCostYtdNotes(""); // not known. + alliedPTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc2()); + alliedPTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub2()); + alliedPTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP2()); + alliedPTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPProdC_calc2()); + alliedPTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate2()); + alliedPTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate2()); + + + + LtcYtdDirectCareCost alliedDTProfC = new LtcYtdDirectCareCost(); + alliedDTProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item13()); + alliedDTProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item23()); + alliedDTProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS3()); + alliedDTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item23()); + alliedDTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item23()); + alliedDTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item33()); + alliedDTProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedDTProfC.setDirCareCostName("Dietitian"); + alliedDTProfC.setDirCareCostType("Allied Professional"); + alliedDTProfC.setDirCareCostYtdNotes(""); // not known. + alliedDTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc3()); + alliedDTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub3()); + alliedDTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP3()); + alliedDTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPProdC_calc3()); + alliedDTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate3()); + alliedDTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate3()); + + + + LtcYtdDirectCareCost alliedSWProfC = new LtcYtdDirectCareCost(); + alliedSWProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item14()); + alliedSWProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item24()); + alliedSWProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS4()); + alliedSWProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item24()); + alliedSWProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item24()); + alliedSWProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item34()); + alliedSWProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedSWProfC.setDirCareCostName("Physiotherapist"); + alliedSWProfC.setDirCareCostType("Allied Professional"); + alliedSWProfC.setDirCareCostYtdNotes(""); // not known. + alliedSWProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc4()); + alliedSWProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub4()); + alliedSWProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP4()); + alliedSWProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPProdC_calc4()); + alliedSWProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate4()); + alliedSWProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate4()); + + + LtcYtdDirectCareCost alliedOTHProfC = new LtcYtdDirectCareCost(); + alliedOTHProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item15()); + alliedOTHProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item25()); + alliedOTHProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS5()); + alliedOTHProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item25()); + alliedOTHProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item25()); + alliedOTHProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item35()); + alliedOTHProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedOTHProfC.setDirCareCostName("Physiotherapist"); + alliedOTHProfC.setDirCareCostType("Allied Professional"); + alliedOTHProfC.setDirCareCostYtdNotes(""); // not known. + alliedOTHProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc5()); + alliedOTHProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub5()); + alliedOTHProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP5()); + alliedOTHProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPProdC_calc5()); + alliedOTHProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate5()); + alliedOTHProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate5()); + + + // Allied Non Professional + LtcYtdDirectCareCost alliedNPRTProfC = new LtcYtdDirectCareCost(); + alliedNPRTProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item11()); + alliedNPRTProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item21()); + alliedNPRTProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS1()); + alliedNPRTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item11()); + alliedNPRTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item21()); + alliedNPRTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item31()); + alliedNPRTProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRTProfC.setDirCareCostName("Recreation Therapist"); + alliedNPRTProfC.setDirCareCostType("Allied Non-professional"); + alliedNPRTProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPRTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc1()); + alliedNPRTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub1()); + alliedNPRTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP1()); + alliedNPRTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc1()); + alliedNPRTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate1()); + alliedNPRTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate1()); + + + LtcYtdDirectCareCost alliedNPRAProfC = new LtcYtdDirectCareCost(); + alliedNPRAProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item12()); + alliedNPRAProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item22()); + alliedNPRAProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS2()); + alliedNPRAProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item12()); + alliedNPRAProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item22()); + alliedNPRAProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item32()); + alliedNPRAProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRAProfC.setDirCareCostName("Rehab Assistant"); + alliedNPRAProfC.setDirCareCostType("Allied Non-professional"); + alliedNPRAProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPRAProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc2()); + alliedNPRAProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub2()); + alliedNPRAProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP2()); + alliedNPRAProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc2()); + alliedNPRAProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate2()); + alliedNPRAProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate2()); + + + + LtcYtdDirectCareCost alliedNPAWProfC = new LtcYtdDirectCareCost(); + alliedNPAWProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item13()); + alliedNPAWProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item23()); + alliedNPAWProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS3()); + alliedNPAWProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item13()); + alliedNPAWProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item23()); + alliedNPAWProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item33()); + alliedNPAWProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPAWProfC.setDirCareCostName("Activity Worker"); + alliedNPAWProfC.setDirCareCostType("Allied Non-professional"); + alliedNPAWProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPAWProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc3()); + alliedNPAWProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub3()); + alliedNPAWProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP3()); + alliedNPAWProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc3()); + alliedNPAWProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate3()); + alliedNPAWProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate3()); + + + + LtcYtdDirectCareCost alliedNPMTProfC = new LtcYtdDirectCareCost(); + alliedNPMTProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item13()); + alliedNPMTProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item23()); + alliedNPMTProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS3()); + alliedNPMTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item13()); + alliedNPMTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item23()); + alliedNPMTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item33()); + alliedNPMTProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPMTProfC.setDirCareCostName("Music Therapist"); + alliedNPMTProfC.setDirCareCostType("Allied Non-professional"); + alliedNPMTProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPMTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc4()); + alliedNPMTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub4()); + alliedNPMTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP4()); + alliedNPMTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc4()); + alliedNPMTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate4()); + alliedNPMTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate4()); + + + + LtcYtdDirectCareCost alliedNPATProfC = new LtcYtdDirectCareCost(); + alliedNPATProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item14()); + alliedNPATProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item24()); + alliedNPATProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS4()); + alliedNPATProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item14()); + alliedNPATProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item24()); + alliedNPATProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item34()); + alliedNPATProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPATProfC.setDirCareCostName("Art Therapist"); + alliedNPATProfC.setDirCareCostType("Allied Non-professional"); + alliedNPATProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPATProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc5()); + alliedNPATProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub5()); + alliedNPATProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP5()); + alliedNPATProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc5()); + alliedNPATProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate5()); + alliedNPATProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate5()); + + + + LtcYtdDirectCareCost alliedNPOTHProfC = new LtcYtdDirectCareCost(); + alliedNPOTHProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item14()); + alliedNPOTHProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item24()); + alliedNPOTHProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS4()); + alliedNPOTHProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item14()); + alliedNPOTHProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item24()); + alliedNPOTHProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item34()); + alliedNPOTHProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPOTHProfC.setDirCareCostName("Art Therapist"); + alliedNPOTHProfC.setDirCareCostType("Allied Non-professional"); + alliedNPOTHProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPOTHProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc6()); + alliedNPOTHProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub6()); + alliedNPOTHProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP6()); + alliedNPOTHProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc6()); + alliedNPOTHProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate6()); + alliedNPOTHProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate6()); + + Collections.addAll(ltcYtdDcCost, nursingRNProdC, nursingLPNProdC, nursingHCAProdC,nursingOthProdC, alliedOTProfC, + alliedPTProfC, alliedDTProfC, alliedSWProfC, alliedNPRTProfC, alliedNPRAProfC, alliedNPAWProfC, + alliedNPMTProfC, alliedNPATProfC,alliedOTHProfC, + alliedNPOTHProfC); + + /* Direct Care Cost Subtotals */ + LtcYtdDirectCareCostSubtotals nursingCareCostSubtotals = new LtcYtdDirectCareCostSubtotals(); + nursingCareCostSubtotals.setConfirmationID(root.getForm().getConfirmationId()); + nursingCareCostSubtotals.setDirCareType("Nursing"); + nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsRegularYTD(root.getNursingProdC_sum11()); + nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsOTYTD(root.getNursingProdC_sum21()); + nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getNursingProdC_calc1()); + nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsContServYTD(root.getNursingProdCCS_subsum1()); + nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsTotalYTD(root.getNursingProdC_subsum1()); + nursingCareCostSubtotals.setSubTotalDirCareCostTotalHrsPaidYTD(root.getNursingProdC_sum11()); + nursingCareCostSubtotals.setSubTotalDirCareCostNonProdHrsVacYTD(root.getNursingNProdC_sum11()); + nursingCareCostSubtotals.setSubTotalDirCareCostNonProdHrsSickYTD(root.getNursingNProdC_sum21()); + nursingCareCostSubtotals.setSubTotalDirCareCostNonProdHrsOtherServYTD(root.getNursingNProdC_sum31()); + nursingCareCostSubtotals.setSubTotalDirCareCostNonProdHrsTotalYTD(root.getNursingNProdC_calcsum1()); + nursingCareCostSubtotals.setSubTotalDirCareCostHourlyRateStaffYTD(root.getNursingStaffRate1()); + nursingCareCostSubtotals.setSubTotalDirCareCostHourlyRateContractedYTD(root.getNursingContractRate1()); + + LtcYtdDirectCareCostSubtotals alliedCareCostSubtotals = new LtcYtdDirectCareCostSubtotals(); + alliedCareCostSubtotals.setConfirmationID(root.getForm().getConfirmationId()); + alliedCareCostSubtotals.setDirCareType("Allied Professional"); + alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsRegularYTD(root.getAlliedProfProdC_sum11()); + alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsOTYTD(root.getAlliedProfProdC_sum21()); + alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getAlliedProfProdC_calc1()); + alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsContServYTD(root.getAlliedProfProdCCS_subsum1()); + alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsTotalYTD(root.getAlliedProfProdC_subsum1()); + alliedCareCostSubtotals.setSubTotalDirCareCostTotalHrsPaidYTD(root.getAlliedProfProdC_sum11()); + alliedCareCostSubtotals.setSubTotalDirCareCostNonProdHrsVacYTD(root.getAlliedProfNProdC_sum11()); + alliedCareCostSubtotals.setSubTotalDirCareCostNonProdHrsSickYTD(root.getAlliedNProdC_sum21()); + alliedCareCostSubtotals.setSubTotalDirCareCostNonProdHrsOtherServYTD(root.getAlliedProfNProdC_sum31()); + alliedCareCostSubtotals.setSubTotalDirCareCostNonProdHrsTotalYTD(root.getAlliedProfNProdC_calcsum1()); + alliedCareCostSubtotals.setSubTotalDirCareCostHourlyRateStaffYTD(root.getAlliedProfStaffRate_total()); + alliedCareCostSubtotals.setSubTotalDirCareCostHourlyRateContractedYTD(root.getAlliedProfContractRate_total()); + + LtcYtdDirectCareCostSubtotals alliedNProfCareCostSubtotals = new LtcYtdDirectCareCostSubtotals(); + alliedNProfCareCostSubtotals.setConfirmationID(root.getForm().getConfirmationId()); + alliedNProfCareCostSubtotals.setDirCareType("Allied Non-professional"); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsRegularYTD(root.getAlliedNPProdC_sum11()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsOTYTD(root.getAlliedNPProdC_sum21()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getAlliedNPProdC_calc1()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsContServYTD(root.getAlliedNPProdCCS_subsum1()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsTotalYTD(root.getAlliedNPProdC_subsum1()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostTotalHrsPaidYTD(root.getAlliedNPProdC_sum11()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostNonProdHrsVacYTD(root.getAlliedNPNProdC_sum11()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostNonProdHrsSickYTD(root.getAlliedNPNProdC_sum21()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostNonProdHrsOtherServYTD(root.getAlliedNPNProdC_sum31()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostNonProdHrsTotalYTD(root.getAlliedNPNProdC_calcsum1()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostHourlyRateStaffYTD(root.getAlliedNPStaffRate_total()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostHourlyRateContractedYTD(root.getAlliedNPContractRate_total()); + + Collections.addAll(ltcYtdDcCostSubttls,nursingCareCostSubtotals,alliedCareCostSubtotals,alliedNProfCareCostSubtotals); + + /* + * START Compensation & Benefits Budget => Direct Care => Salaries, Wages and + * Contracted Services. + */ + LtcYtdCompSal supportFoodServices = new LtcYtdCompSal(); + supportFoodServices.setCompSalStaffYtd(root.getCompB_item11()); + supportFoodServices.setCompSalContractServicesYtd(root.getCompB_item21()); + supportFoodServices.setCompSalOfficeAllocYtd(root.getCompB_item31()); + supportFoodServices.setCompSalName("Food Services"); + supportFoodServices.setCompSalType("Support"); + supportFoodServices.setConfirmationId(root.getForm().getConfirmationId()); + supportFoodServices.setCompSalTotalCostYtd(root.getCompB_calc1()); + + LtcYtdCompSal supportLaundryServices = new LtcYtdCompSal(); + supportLaundryServices.setCompSalStaffYtd(root.getCompB_item12()); + supportLaundryServices.setCompSalContractServicesYtd(root.getCompB_item22()); + supportLaundryServices.setCompSalOfficeAllocYtd(root.getCompB_item32()); + supportLaundryServices.setCompSalName("Laundry Services"); + supportLaundryServices.setCompSalType("Support/Administration"); + supportLaundryServices.setConfirmationId(root.getForm().getConfirmationId()); + supportLaundryServices.setCompSalTotalCostYtd(root.getCompB_calc2()); + + LtcYtdCompSal supportHousekeeping = new LtcYtdCompSal(); + supportHousekeeping.setCompSalStaffYtd(root.getCompB_item13()); + supportHousekeeping.setCompSalContractServicesYtd(root.getCompB_item23()); + supportHousekeeping.setCompSalOfficeAllocYtd(root.getCompB_item33()); + supportHousekeeping.setCompSalName("Housekeeping Services"); + supportHousekeeping.setCompSalType("Support/Administration"); + supportHousekeeping.setConfirmationId(root.getForm().getConfirmationId()); + supportHousekeeping.setCompSalTotalCostYtd(root.getCompB_calc3()); + + LtcYtdCompSal supportPlantMntnce = new LtcYtdCompSal(); + supportPlantMntnce.setCompSalStaffYtd(root.getCompB_item14()); + supportPlantMntnce.setCompSalContractServicesYtd(root.getCompB_item24()); + supportPlantMntnce.setCompSalOfficeAllocYtd(root.getCompB_item34()); + supportPlantMntnce.setCompSalName("Plant Maintenance & Op. Staffins"); + supportPlantMntnce.setCompSalType("Support/Administration"); + supportPlantMntnce.setConfirmationId(root.getForm().getConfirmationId()); + supportPlantMntnce.setCompSalTotalCostYtd(root.getCompB_calc4()); + // Administration + + LtcYtdCompSal adminAdministrator = new LtcYtdCompSal(); + adminAdministrator.setCompSalStaffYtd(root.getCompB_item15()); + adminAdministrator.setCompSalContractServicesYtd(root.getCompB_item25()); + adminAdministrator.setCompSalOfficeAllocYtd(root.getCompB_item35()); + adminAdministrator.setCompSalName("Administrator"); + adminAdministrator.setCompSalType("Support/Administration"); + adminAdministrator.setConfirmationId(root.getForm().getConfirmationId()); + adminAdministrator.setCompSalTotalCostYtd(root.getCompB_calc5()); + + LtcYtdCompSal adminDirOfCare = new LtcYtdCompSal(); + adminDirOfCare.setCompSalStaffYtd(root.getCompB_item16()); + adminDirOfCare.setCompSalContractServicesYtd(root.getCompB_item26()); + adminDirOfCare.setCompSalOfficeAllocYtd(root.getCompB_item36()); + adminDirOfCare.setCompSalName("Director of Care"); + adminDirOfCare.setCompSalType("Support/Administration"); + adminDirOfCare.setConfirmationId(root.getForm().getConfirmationId()); + adminDirOfCare.setCompSalTotalCostYtd(root.getCompB_calc6()); + + LtcYtdCompSal adminDeptManagers = new LtcYtdCompSal(); + adminDeptManagers.setCompSalStaffYtd(root.getCompB_item17()); + adminDeptManagers.setCompSalContractServicesYtd(root.getCompB_item27()); + adminDeptManagers.setCompSalOfficeAllocYtd(root.getCompB_item37()); + adminDeptManagers.setCompSalName("Dept Managers"); + adminDeptManagers.setCompSalType("Support/Administration"); + adminDeptManagers.setConfirmationId(root.getForm().getConfirmationId()); + adminDeptManagers.setCompSalTotalCostYtd(root.getCompB_calc7()); + + LtcYtdCompSal adminSupport = new LtcYtdCompSal(); + adminSupport.setCompSalStaffYtd(root.getCompB_item18()); + adminSupport.setCompSalContractServicesYtd(root.getCompB_item28()); + adminSupport.setCompSalOfficeAllocYtd(root.getCompB_item38()); + adminSupport.setCompSalName("Administrative Support"); + adminSupport.setCompSalType("Support/Administration"); + adminSupport.setConfirmationId(root.getForm().getConfirmationId()); + adminSupport.setCompSalTotalCostYtd(root.getCompB_calc8()); + + LtcYtdCompSal adminPastoCareWrkr = new LtcYtdCompSal(); + adminPastoCareWrkr.setCompSalStaffYtd(root.getCompB_item19()); + adminPastoCareWrkr.setCompSalContractServicesYtd(root.getCompB_item29()); + adminPastoCareWrkr.setCompSalOfficeAllocYtd(root.getCompB_item39()); + adminPastoCareWrkr.setCompSalName("Pastoral Care Worker"); + adminPastoCareWrkr.setCompSalType("Support/Administration"); + adminPastoCareWrkr.setConfirmationId(root.getForm().getConfirmationId()); + adminPastoCareWrkr.setCompSalTotalCostYtd(root.getCompB_calc9()); + + LtcYtdCompSal adminClrks = new LtcYtdCompSal(); + adminClrks.setCompSalStaffYtd(root.getCompB_item110()); + adminClrks.setCompSalContractServicesYtd(root.getCompB_item210()); + adminClrks.setCompSalOfficeAllocYtd(root.getCompB_item310()); + adminClrks.setCompSalName("Clerical Clerks"); + adminClrks.setCompSalType("Support/Administration"); + adminClrks.setConfirmationId(root.getForm().getConfirmationId()); + adminClrks.setCompSalTotalCostYtd(root.getCompB_calc10()); + + LtcYtdCompSal adminClncCrdinator = new LtcYtdCompSal(); + adminClncCrdinator.setCompSalStaffYtd(root.getCompB_item111()); + adminClncCrdinator.setCompSalContractServicesYtd(root.getCompB_item211()); + adminClncCrdinator.setCompSalOfficeAllocYtd(root.getCompB_item311()); + adminClncCrdinator.setCompSalName("Clinical Coordinator"); + adminClncCrdinator.setCompSalType("Support/Administration"); + adminClncCrdinator.setConfirmationId(root.getForm().getConfirmationId()); + adminClncCrdinator.setCompSalTotalCostYtd(root.getCompB_calc11()); + + LtcYtdCompSal adminOther = new LtcYtdCompSal(); + adminOther.setCompSalStaffYtd(root.getCompB_item112()); + adminOther.setCompSalContractServicesYtd(root.getCompB_item212()); + adminOther.setCompSalOfficeAllocYtd(root.getCompB_item312()); + adminOther.setCompSalName("Other"); + adminOther.setCompSalType("Support/Administration"); + adminOther.setConfirmationId(root.getForm().getConfirmationId()); + adminOther.setCompSalTotalCostYtd(root.getCompB_calc12()); + + /* Direct Care Nursing */ + LtcYtdCompSal nursingRNSal = new LtcYtdCompSal(); + nursingRNSal.setCompSalStaffYtd(root.getCompB_item113()); + nursingRNSal.setCompSalContractServicesYtd(root.getCompB_item213()); + nursingRNSal.setCompSalOfficeAllocYtd(root.getCompB_item313()); + nursingRNSal.setCompSalName("RN"); + nursingRNSal.setCompSalType("Nursing"); + nursingRNSal.setConfirmationId(root.getForm().getConfirmationId()); + nursingRNSal.setCompSalTotalCostYtd(root.getCompB_calc13()); + + + LtcYtdCompSal nursingLPNSal = new LtcYtdCompSal(); + nursingLPNSal.setCompSalStaffYtd(root.getCompB_item114()); + nursingLPNSal.setCompSalContractServicesYtd(root.getCompB_item214()); + nursingLPNSal.setCompSalOfficeAllocYtd(root.getCompB_item314()); + nursingLPNSal.setCompSalName("LPN"); + nursingLPNSal.setCompSalType("Nursing"); + nursingLPNSal.setConfirmationId(root.getForm().getConfirmationId()); + nursingLPNSal.setCompSalTotalCostYtd(root.getCompB_calc14()); + + LtcYtdCompSal nursingHCASal = new LtcYtdCompSal(); + nursingHCASal.setCompSalStaffYtd(root.getCompB_item115()); + nursingHCASal.setCompSalContractServicesYtd(root.getCompB_item215()); + nursingHCASal.setCompSalOfficeAllocYtd(root.getCompB_item315()); + nursingHCASal.setCompSalName("Care Aides (HCA)"); + nursingHCASal.setCompSalType("Nursing"); + nursingHCASal.setConfirmationId(root.getForm().getConfirmationId()); + nursingHCASal.setCompSalTotalCostYtd(root.getCompB_calc15()); + + + LtcYtdCompSal nursingOthSal = new LtcYtdCompSal(); + nursingOthSal.setCompSalStaffYtd(root.getCompB_item116()); + nursingOthSal.setCompSalContractServicesYtd(root.getCompB_item216()); + nursingOthSal.setCompSalOfficeAllocYtd(root.getCompB_item316()); + nursingOthSal.setCompSalName("Other (specify)"); + nursingOthSal.setCompSalType("Nursing"); + nursingOthSal.setConfirmationId(root.getForm().getConfirmationId()); + nursingOthSal.setCompSalTotalCostYtd(root.getCompB_calc16()); + + /* Allied Professional */ + LtcYtdCompSal alliedProfOTSal = new LtcYtdCompSal(); + alliedProfOTSal.setCompSalStaffYtd(root.getCompB_item117()); + alliedProfOTSal.setCompSalContractServicesYtd(root.getCompB_item217()); + alliedProfOTSal.setCompSalOfficeAllocYtd(root.getCompB_item317()); + alliedProfOTSal.setCompSalName("Occupational Therapist"); + alliedProfOTSal.setCompSalType("Allied Non-professional"); + alliedProfOTSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfOTSal.setCompSalTotalCostYtd(root.getCompB_calc17()); + + LtcYtdCompSal alliedProfPTSal = new LtcYtdCompSal(); + alliedProfPTSal.setCompSalStaffYtd(root.getCompB_item118()); + alliedProfPTSal.setCompSalContractServicesYtd(root.getCompB_item218()); + alliedProfPTSal.setCompSalOfficeAllocYtd(root.getCompB_item318()); + alliedProfPTSal.setCompSalName("Physiotherapist"); + alliedProfPTSal.setCompSalType("Allied Non-professional"); + alliedProfPTSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfPTSal.setCompSalTotalCostYtd(root.getCompB_calc18()); + + LtcYtdCompSal alliedProfDTSal = new LtcYtdCompSal(); + alliedProfDTSal.setCompSalStaffYtd(root.getCompB_item119()); + alliedProfDTSal.setCompSalContractServicesYtd(root.getCompB_item219()); + alliedProfDTSal.setCompSalOfficeAllocYtd(root.getCompB_item319()); + alliedProfDTSal.setCompSalName("Dietitian"); + alliedProfDTSal.setCompSalType("Allied Non-professional"); + alliedProfDTSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfDTSal.setCompSalTotalCostYtd(root.getCompB_calc19()); + + LtcYtdCompSal alliedProfSWSal = new LtcYtdCompSal(); + alliedProfSWSal.setCompSalStaffYtd(root.getCompB_item120()); + alliedProfSWSal.setCompSalContractServicesYtd(root.getCompB_item220()); + alliedProfSWSal.setCompSalOfficeAllocYtd(root.getCompB_item320()); + alliedProfSWSal.setCompSalName("Dietitian"); + alliedProfSWSal.setCompSalType("Allied Non-professional"); + alliedProfSWSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfSWSal.setCompSalTotalCostYtd(root.getCompB_calc20()); + + LtcYtdCompSal alliedProfOTHSal = new LtcYtdCompSal(); + alliedProfOTHSal.setCompSalStaffYtd(root.getCompB_item121()); + alliedProfOTHSal.setCompSalContractServicesYtd(root.getCompB_item221()); + alliedProfOTHSal.setCompSalOfficeAllocYtd(root.getCompB_item321()); + alliedProfOTHSal.setCompSalName("Other (specify)"); + alliedProfOTHSal.setCompSalType("Allied Non-professional"); + alliedProfOTHSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfOTHSal.setCompSalTotalCostYtd(root.getCompB_calc21()); + + /* Allied Non Professional */ + LtcYtdCompSal alliedNPRTSal = new LtcYtdCompSal(); + alliedNPRTSal.setCompSalStaffYtd(root.getCompB_item122()); + alliedNPRTSal.setCompSalContractServicesYtd(root.getCompB_item222()); + alliedNPRTSal.setCompSalOfficeAllocYtd(root.getCompB_item322()); + alliedNPRTSal.setCompSalName("Recreation Therapist"); + alliedNPRTSal.setCompSalType("Allied Non-professional"); + alliedNPRTSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRTSal.setCompSalTotalCostYtd(root.getCompB_calc22()); + + LtcYtdCompSal alliedNPRASal = new LtcYtdCompSal(); + alliedNPRASal.setCompSalStaffYtd(root.getCompB_item123()); + alliedNPRASal.setCompSalContractServicesYtd(root.getCompB_item223()); + alliedNPRASal.setCompSalOfficeAllocYtd(root.getCompB_item323()); + alliedNPRASal.setCompSalName("Rehab Assistant"); + alliedNPRASal.setCompSalType("Allied Non-professional"); + alliedNPRASal.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRASal.setCompSalTotalCostYtd(root.getCompB_calc23()); + + LtcYtdCompSal alliedNPAWSal = new LtcYtdCompSal(); + alliedProfOTHSal.setCompSalStaffYtd(root.getCompB_item124()); + alliedProfOTHSal.setCompSalContractServicesYtd(root.getCompB_item224()); + alliedProfOTHSal.setCompSalOfficeAllocYtd(root.getCompB_item324()); + alliedProfOTHSal.setCompSalName("Activity Worker"); + alliedProfOTHSal.setCompSalType("Allied Non-professional"); + alliedProfOTHSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfOTHSal.setCompSalTotalCostYtd(root.getCompB_calc24()); + + LtcYtdCompSal alliedNPMTSal = new LtcYtdCompSal(); + alliedNPMTSal.setCompSalStaffYtd(root.getCompB_item125()); + alliedNPMTSal.setCompSalContractServicesYtd(root.getCompB_item225()); + alliedNPMTSal.setCompSalOfficeAllocYtd(root.getCompB_item325()); + alliedNPMTSal.setCompSalName("Music Therapist"); + alliedNPMTSal.setCompSalType("Allied Non-professional"); + alliedNPMTSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPMTSal.setCompSalTotalCostYtd(root.getCompB_calc25()); + + LtcYtdCompSal alliedNPATSal = new LtcYtdCompSal(); + alliedNPATSal.setCompSalStaffYtd(root.getCompB_item126()); + alliedNPATSal.setCompSalContractServicesYtd(root.getCompB_item226()); + alliedNPATSal.setCompSalOfficeAllocYtd(root.getCompB_item326()); + alliedNPATSal.setCompSalName("Art Therapist"); + alliedNPATSal.setCompSalType("Allied Non-professional"); + alliedNPATSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPATSal.setCompSalTotalCostYtd(root.getCompB_calc26()); + + LtcYtdCompSal alliedNPOTHSal = new LtcYtdCompSal(); + alliedNPOTHSal.setCompSalStaffYtd(root.getCompB_item127()); + alliedNPOTHSal.setCompSalContractServicesYtd(root.getCompB_item227()); + alliedNPOTHSal.setCompSalOfficeAllocYtd(root.getCompB_item327()); + alliedNPOTHSal.setCompSalName("Other (specify)"); + alliedNPOTHSal.setCompSalType("Allied Non-professional"); + alliedNPOTHSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPOTHSal.setCompSalTotalCostYtd(root.getCompB_calc27()); + + Collections.addAll(ltcYtdCompSal, supportFoodServices, supportLaundryServices, supportHousekeeping, + supportPlantMntnce, adminAdministrator, adminDirOfCare, adminDeptManagers, adminSupport, + adminPastoCareWrkr, adminClrks, adminClncCrdinator, adminOther, nursingRNSal, nursingLPNSal, + nursingHCASal, nursingOthSal, alliedProfOTSal, alliedProfPTSal, alliedProfDTSal, alliedProfSWSal, + alliedProfOTHSal, alliedNPRTSal, alliedNPRASal, alliedNPAWSal, alliedNPMTSal, alliedNPATSal, + alliedNPOTHSal); + + + LtcYtdCompSalSubtotals supportSalSubtotal = new LtcYtdCompSalSubtotals(); + supportSalSubtotal.setCompSalType("Support"); + supportSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); + supportSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum11()); + supportSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum21()); + supportSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum31()); + supportSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum1()); + + LtcYtdCompSalSubtotals administrationSalSubtotal = new LtcYtdCompSalSubtotals(); + administrationSalSubtotal.setCompSalType("Administration"); + administrationSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); + administrationSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum12()); + administrationSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum22()); + administrationSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum32()); + administrationSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum2()); + + LtcYtdCompSalSubtotals nursingSalSubtotal = new LtcYtdCompSalSubtotals(); + nursingSalSubtotal.setCompSalType("Nursing"); + nursingSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); + nursingSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum13()); + nursingSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum23()); + nursingSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum33()); + nursingSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum3()); + + LtcYtdCompSalSubtotals alliedSalSubtotal = new LtcYtdCompSalSubtotals(); + alliedSalSubtotal.setCompSalType("Allied Professional"); + alliedSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); + alliedSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum14()); + alliedSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum24()); + alliedSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum34()); + alliedSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum4()); + + LtcYtdCompSalSubtotals alliedNPSalSubtotal = new LtcYtdCompSalSubtotals(); + alliedNPSalSubtotal.setCompSalType("Allied Non-professional"); + alliedNPSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum15()); + alliedNPSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum25()); + alliedNPSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum35()); + alliedNPSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum5()); + + Collections.addAll(ltcYtdCompSalSubttls,administrationSalSubtotal,nursingSalSubtotal,supportSalSubtotal,alliedSalSubtotal,alliedNPSalSubtotal); + + LtcYtdCompSalTotals totalPerPayrollSal = new LtcYtdCompSalTotals(); + totalPerPayrollSal.setCompSalType("Total Per Payroll"); + totalPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); + totalPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_total1()); + totalPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_total2()); + totalPerPayrollSal.setTotalCompSalOfficeAllocYTD(root.getCompB_total3()); + totalPerPayrollSal.setTotalCompSalTotalCostYTD(root.getCompB_total()); + + LtcYtdCompSalTotals recoveredPerPayrollSal = new LtcYtdCompSalTotals(); + recoveredPerPayrollSal.setCompSalType("Recovered Salaries and Wages"); + recoveredPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); + recoveredPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_recovered1()); + recoveredPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_recovered2()); + recoveredPerPayrollSal.setTotalCompSalOfficeAllocYTD(root.getCompB_recovered3()); + recoveredPerPayrollSal.setTotalCompSalTotalCostYTD(root.getCompB_recovered()); + + LtcYtdCompSalTotals accruedPerPayrollSal = new LtcYtdCompSalTotals(); + accruedPerPayrollSal.setCompSalType("Accrued Salaries and Wages"); + accruedPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); + accruedPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_accrued1()); + accruedPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_accrued2()); + accruedPerPayrollSal.setTotalCompSalOfficeAllocYTD(root.getCompB_accrued3()); + accruedPerPayrollSal.setTotalCompSalTotalCostYTD(root.getCompB_accrued()); + + LtcYtdCompSalTotals otherPerPayrollSal = new LtcYtdCompSalTotals(); + otherPerPayrollSal.setCompSalType("Other labour costs - Specify"); + otherPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); + otherPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_laborOther1()); + otherPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_laborOther2()); + otherPerPayrollSal.setTotalCompSalOfficeAllocYTD(root.getCompB_laborOther3()); + otherPerPayrollSal.setTotalCompSalTotalCostYTD(root.getCompB_laborOther()); + + Collections.addAll(ltcYtdCompsalTtls,totalPerPayrollSal,recoveredPerPayrollSal,accruedPerPayrollSal,otherPerPayrollSal); + + /* Hours for Staff and Contracted Services */ + LtcYtdCompHrs supportFoodServicesHrs = new LtcYtdCompHrs(); + supportFoodServicesHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP1()); + supportFoodServicesHrs.setCompHrsStaffYtd(root.getCompH_item11()); + supportFoodServicesHrs.setCompHrsContractServicesYtd(root.getCompH_item21()); + supportFoodServicesHrs.setCompHrsOfficeAllocYtd(root.getCompH_item31()); + supportFoodServicesHrs.setCompHrsName("Food Services"); + supportFoodServicesHrs.setCompHrsType("Support/Administration"); + supportFoodServicesHrs.setConfirmationId(root.getForm().getConfirmationId()); + supportFoodServicesHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc1()); + + LtcYtdCompHrs supportLaundryServicesHrs = new LtcYtdCompHrs(); + supportLaundryServicesHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP2()); + supportLaundryServicesHrs.setCompHrsStaffYtd(root.getCompH_item12()); + supportLaundryServicesHrs.setCompHrsContractServicesYtd(root.getCompH_item22()); + supportLaundryServicesHrs.setCompHrsOfficeAllocYtd(root.getCompH_item32()); + supportLaundryServicesHrs.setCompHrsName("Laundry Services"); + supportLaundryServicesHrs.setCompHrsType("Support/Administration"); + supportLaundryServicesHrs.setConfirmationId(root.getForm().getConfirmationId()); + supportLaundryServicesHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc2()); + + LtcYtdCompHrs supportHousekeepingHrs = new LtcYtdCompHrs(); + supportHousekeepingHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP3()); + supportHousekeepingHrs.setCompHrsStaffYtd(root.getCompH_item13()); + supportHousekeepingHrs.setCompHrsContractServicesYtd(root.getCompH_item23()); + supportHousekeepingHrs.setCompHrsOfficeAllocYtd(root.getCompH_item33()); + supportHousekeepingHrs.setCompHrsName("Housekeeping Services"); + supportHousekeepingHrs.setCompHrsType("Support/Administration"); + supportHousekeepingHrs.setConfirmationId(root.getForm().getConfirmationId()); + supportHousekeepingHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc3()); + + LtcYtdCompHrs supportPlantMntnceHrs = new LtcYtdCompHrs(); + supportPlantMntnceHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP4()); + supportPlantMntnceHrs.setCompHrsStaffYtd(root.getCompH_item14()); + supportPlantMntnceHrs.setCompHrsContractServicesYtd(root.getCompH_item24()); + supportPlantMntnceHrs.setCompHrsOfficeAllocYtd(root.getCompH_item34()); + supportPlantMntnceHrs.setCompHrsName("Plant Maintenance & Op. Staffing"); + supportPlantMntnceHrs.setCompHrsType("Support/Administration"); + supportPlantMntnceHrs.setConfirmationId(root.getForm().getConfirmationId()); + supportPlantMntnceHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc4()); + + // sum remaining + LtcYtdCompHrs adminAdministratorHrs = new LtcYtdCompHrs(); + adminAdministratorHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP5()); + adminAdministratorHrs.setCompHrsStaffYtd(root.getCompH_item15()); + adminAdministratorHrs.setCompHrsContractServicesYtd(root.getCompH_item25()); + adminAdministratorHrs.setCompHrsOfficeAllocYtd(root.getCompH_item35()); + adminAdministratorHrs.setCompHrsName("Administrator"); + adminAdministratorHrs.setCompHrsType("Support/Administration"); + adminAdministratorHrs.setConfirmationId(root.getForm().getConfirmationId()); + adminAdministratorHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc5()); + + + LtcYtdCompHrs adminDirOfCareHrs = new LtcYtdCompHrs(); + adminDirOfCareHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP6()); + adminDirOfCareHrs.setCompHrsStaffYtd(root.getCompH_item16()); + adminDirOfCareHrs.setCompHrsContractServicesYtd(root.getCompH_item26()); + adminDirOfCareHrs.setCompHrsOfficeAllocYtd(root.getCompH_item36()); + adminDirOfCareHrs.setCompHrsName("Administrator"); + adminDirOfCareHrs.setCompHrsType("Support/Administration"); + adminDirOfCareHrs.setConfirmationId(root.getForm().getConfirmationId()); + adminDirOfCareHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc6()); + + LtcYtdCompHrs adminDeptManagersHrs = new LtcYtdCompHrs(); + adminDeptManagersHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP7()); + adminDeptManagersHrs.setCompHrsStaffYtd(root.getCompH_item17()); + adminDeptManagersHrs.setCompHrsContractServicesYtd(root.getCompH_item27()); + adminDeptManagersHrs.setCompHrsOfficeAllocYtd(root.getCompH_item37()); + adminDeptManagersHrs.setCompHrsName("Dept Managers"); + adminDeptManagersHrs.setCompHrsType("Support/Administration"); + adminDeptManagersHrs.setConfirmationId(root.getForm().getConfirmationId()); + adminDeptManagersHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc7()); + + LtcYtdCompHrs adminSupportHrs = new LtcYtdCompHrs(); + adminSupportHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP8()); + adminSupportHrs.setCompHrsStaffYtd(root.getCompH_item18()); + adminSupportHrs.setCompHrsContractServicesYtd(root.getCompH_item28()); + adminSupportHrs.setCompHrsOfficeAllocYtd(root.getCompH_item38()); + adminSupportHrs.setCompHrsName("Administrative Support"); + adminSupportHrs.setCompHrsType("Support/Administration"); + adminSupportHrs.setConfirmationId(root.getForm().getConfirmationId()); + adminSupportHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc8()); + + LtcYtdCompHrs adminPastoCareWrkrHrs = new LtcYtdCompHrs(); + adminPastoCareWrkrHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP9()); + adminPastoCareWrkrHrs.setCompHrsStaffYtd(root.getCompH_item19()); + adminPastoCareWrkrHrs.setCompHrsContractServicesYtd(root.getCompH_item29()); + adminPastoCareWrkrHrs.setCompHrsOfficeAllocYtd(root.getCompH_item39()); + adminPastoCareWrkrHrs.setCompHrsName("Pastoral Care Worker"); + adminPastoCareWrkrHrs.setCompHrsType("Support/Administration"); + adminPastoCareWrkrHrs.setConfirmationId(root.getForm().getConfirmationId()); + adminPastoCareWrkrHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc9()); + + LtcYtdCompHrs adminClrksHrs = new LtcYtdCompHrs(); + adminClrksHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP10()); + adminClrksHrs.setCompHrsStaffYtd(root.getCompH_item110()); + adminClrksHrs.setCompHrsContractServicesYtd(root.getCompH_item210()); + adminClrksHrs.setCompHrsOfficeAllocYtd(root.getCompH_item310()); + adminClrksHrs.setCompHrsName("Clerical Clerks"); + adminClrksHrs.setCompHrsType("Support/Administration"); + adminClrksHrs.setConfirmationId(root.getForm().getConfirmationId()); + adminClrksHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc10()); + + LtcYtdCompHrs adminClncCrdinatorHrs = new LtcYtdCompHrs(); + adminClncCrdinatorHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP11()); + adminClncCrdinatorHrs.setCompHrsStaffYtd(root.getCompH_item111()); + adminClncCrdinatorHrs.setCompHrsContractServicesYtd(root.getCompH_item211()); + adminClncCrdinatorHrs.setCompHrsOfficeAllocYtd(root.getCompH_item311()); + adminClncCrdinatorHrs.setCompHrsName("Clinical Coordiantor"); + adminClncCrdinatorHrs.setCompHrsType("Support/Administration"); + adminClncCrdinatorHrs.setConfirmationId(root.getForm().getConfirmationId()); + adminClncCrdinatorHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc11()); + + LtcYtdCompHrs adminOtherHrs = new LtcYtdCompHrs(); + adminOtherHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP12()); + adminOtherHrs.setCompHrsStaffYtd(root.getCompH_item112()); + adminOtherHrs.setCompHrsContractServicesYtd(root.getCompH_item212()); + adminOtherHrs.setCompHrsOfficeAllocYtd(root.getCompH_item312()); + adminOtherHrs.setCompHrsName("Other (specify)"); + adminOtherHrs.setCompHrsType("Support/Administration"); + adminOtherHrs.setConfirmationId(root.getForm().getConfirmationId()); + adminOtherHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc12()); + + /* Nursing, Allied, Non Allied Hours */ + LtcYtdCompHrs nursingRNHrs = new LtcYtdCompHrs(); + nursingRNHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP13()); + nursingRNHrs.setCompHrsStaffYtd(root.getCompH_item113()); + nursingRNHrs.setCompHrsContractServicesYtd(root.getCompH_item213()); + nursingRNHrs.setCompHrsOfficeAllocYtd(root.getCompH_item313()); + nursingRNHrs.setCompHrsName("RN"); + nursingRNHrs.setCompHrsType("Nursing"); + nursingRNHrs.setConfirmationId(root.getForm().getConfirmationId()); + nursingRNHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc13()); + + LtcYtdCompHrs nursingLPNHrs = new LtcYtdCompHrs(); + nursingLPNHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP14()); + nursingLPNHrs.setCompHrsStaffYtd(root.getCompH_item114()); + nursingLPNHrs.setCompHrsContractServicesYtd(root.getCompH_item214()); + nursingLPNHrs.setCompHrsOfficeAllocYtd(root.getCompH_item314()); + nursingLPNHrs.setCompHrsName("LPN"); + nursingLPNHrs.setCompHrsType("Nursing"); + nursingLPNHrs.setConfirmationId(root.getForm().getConfirmationId()); + nursingLPNHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc14()); + + LtcYtdCompHrs nursingHCAHrs = new LtcYtdCompHrs(); + nursingHCAHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP15()); + nursingHCAHrs.setCompHrsStaffYtd(root.getCompH_item115()); + nursingHCAHrs.setCompHrsContractServicesYtd(root.getCompH_item215()); + nursingHCAHrs.setCompHrsOfficeAllocYtd(root.getCompH_item315()); + nursingHCAHrs.setCompHrsName("HCA"); + nursingHCAHrs.setCompHrsType("Nursing"); + nursingHCAHrs.setConfirmationId(root.getForm().getConfirmationId()); + nursingHCAHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc15()); + + LtcYtdCompHrs nursingOthHrs = new LtcYtdCompHrs(); + nursingOthHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP16()); + nursingOthHrs.setCompHrsStaffYtd(root.getCompH_item116()); + nursingOthHrs.setCompHrsContractServicesYtd(root.getCompH_item216()); + nursingOthHrs.setCompHrsOfficeAllocYtd(root.getCompH_item316()); + nursingOthHrs.setCompHrsName("Other (specify)"); + nursingOthHrs.setCompHrsType("Nursing"); + nursingOthHrs.setConfirmationId(root.getForm().getConfirmationId()); + nursingOthHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc16()); + + LtcYtdCompHrs alliedProfOTHrs = new LtcYtdCompHrs(); + alliedProfOTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP17()); + alliedProfOTHrs.setCompHrsStaffYtd(root.getCompH_item117()); + alliedProfOTHrs.setCompHrsContractServicesYtd(root.getCompH_item217()); + alliedProfOTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item317()); + alliedProfOTHrs.setCompHrsName("Occupational Therapist"); + alliedProfOTHrs.setCompHrsType("Allied Professional"); + alliedProfOTHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfOTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc17()); + + LtcYtdCompHrs alliedProfPTHrs = new LtcYtdCompHrs(); + alliedProfPTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP18()); + alliedProfPTHrs.setCompHrsStaffYtd(root.getCompH_item118()); + alliedProfPTHrs.setCompHrsContractServicesYtd(root.getCompH_item218()); + alliedProfPTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item318()); + alliedProfPTHrs.setCompHrsName("Physiotherapist"); + alliedProfPTHrs.setCompHrsType("Allied Professional"); + alliedProfPTHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfPTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc18()); + + LtcYtdCompHrs alliedProfDTHrs = new LtcYtdCompHrs(); + alliedProfDTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP19()); + alliedProfDTHrs.setCompHrsStaffYtd(root.getCompH_item119()); + alliedProfDTHrs.setCompHrsContractServicesYtd(root.getCompH_item219()); + alliedProfDTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item319()); + alliedProfDTHrs.setCompHrsName("Dietitian"); + alliedProfDTHrs.setCompHrsType("Allied Professional"); + alliedProfDTHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfDTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc19()); + + LtcYtdCompHrs alliedProfSWHrs = new LtcYtdCompHrs(); + alliedProfSWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP20()); + alliedProfSWHrs.setCompHrsStaffYtd(root.getCompH_item120()); + alliedProfSWHrs.setCompHrsContractServicesYtd(root.getCompH_item220()); + alliedProfSWHrs.setCompHrsOfficeAllocYtd(root.getCompH_item320()); + alliedProfSWHrs.setCompHrsName("Social Worker"); + alliedProfSWHrs.setCompHrsType("Allied Professional"); + alliedProfSWHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfSWHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc20()); + + LtcYtdCompHrs alliedProfOTHHrs = new LtcYtdCompHrs(); + alliedProfOTHHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP21()); + alliedProfOTHHrs.setCompHrsStaffYtd(root.getCompH_item121()); + alliedProfOTHHrs.setCompHrsContractServicesYtd(root.getCompH_item221()); + alliedProfOTHHrs.setCompHrsOfficeAllocYtd(root.getCompH_item321()); + alliedProfOTHHrs.setCompHrsName("Other (specify)"); + alliedProfOTHHrs.setCompHrsType("Allied Professional"); + alliedProfOTHHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfOTHHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc21()); + + LtcYtdCompHrs alliedNPRTHrs = new LtcYtdCompHrs(); + alliedNPRTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP22()); + alliedNPRTHrs.setCompHrsStaffYtd(root.getCompH_item122()); + alliedNPRTHrs.setCompHrsContractServicesYtd(root.getCompH_item222()); + alliedNPRTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item322()); + alliedNPRTHrs.setCompHrsName("Recreation Therapist"); + alliedNPRTHrs.setCompHrsType("Allied Non-professional"); + alliedNPRTHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc22()); + + LtcYtdCompHrs alliedNPRAHrs = new LtcYtdCompHrs(); + alliedNPRAHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP23()); + alliedNPRAHrs.setCompHrsStaffYtd(root.getCompH_item123()); + alliedNPRAHrs.setCompHrsContractServicesYtd(root.getCompH_item223()); + alliedNPRAHrs.setCompHrsOfficeAllocYtd(root.getCompH_item323()); + alliedNPRAHrs.setCompHrsName("Rehab Assistant"); + alliedNPRAHrs.setCompHrsType("Allied Non-professional"); + alliedNPRAHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRAHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc23()); + + LtcYtdCompHrs alliedNPAWHrs = new LtcYtdCompHrs(); + alliedNPAWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP24()); + alliedNPAWHrs.setCompHrsStaffYtd(root.getCompH_item124()); + alliedNPAWHrs.setCompHrsContractServicesYtd(root.getCompH_item224()); + alliedNPAWHrs.setCompHrsOfficeAllocYtd(root.getCompH_item324()); + alliedNPAWHrs.setCompHrsName("Activity Worker"); + alliedNPAWHrs.setCompHrsType("Allied Non-professional"); + alliedNPAWHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPAWHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc24()); + + LtcYtdCompHrs alliedNPMTHrs = new LtcYtdCompHrs(); + alliedNPMTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP25()); + alliedNPMTHrs.setCompHrsStaffYtd(root.getCompH_item125()); + alliedNPMTHrs.setCompHrsContractServicesYtd(root.getCompH_item225()); + alliedNPMTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item325()); + alliedNPMTHrs.setCompHrsName("Music Therapist"); + alliedNPMTHrs.setCompHrsType("Allied Non-professional"); + alliedNPMTHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPMTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc25()); + + LtcYtdCompHrs alliedNPATHrs = new LtcYtdCompHrs(); + alliedNPATHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP26()); + alliedNPATHrs.setCompHrsStaffYtd(root.getCompH_item126()); + alliedNPATHrs.setCompHrsContractServicesYtd(root.getCompH_item226()); + alliedNPATHrs.setCompHrsOfficeAllocYtd(root.getCompH_item326()); + alliedNPATHrs.setCompHrsName("Art Therapist"); + alliedNPATHrs.setCompHrsType("Allied Non-professional"); + alliedNPATHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPATHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc26()); + + LtcYtdCompHrs alliedNPOTHHrs = new LtcYtdCompHrs(); + alliedNPOTHHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP27()); + alliedNPOTHHrs.setCompHrsStaffYtd(root.getCompH_item127()); + alliedNPOTHHrs.setCompHrsContractServicesYtd(root.getCompH_item227()); + alliedNPOTHHrs.setCompHrsOfficeAllocYtd(root.getCompH_item327()); + alliedNPOTHHrs.setCompHrsName("Other (specify)"); + alliedNPOTHHrs.setCompHrsType("Allied Non-professional"); + alliedNPOTHHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPOTHHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc27()); + + Collections.addAll(ltcYtdCompHrs, supportFoodServicesHrs, supportLaundryServicesHrs, supportHousekeepingHrs, + supportPlantMntnceHrs, adminAdministratorHrs, adminDirOfCareHrs, adminDeptManagersHrs, + adminSupportHrs, adminPastoCareWrkrHrs, adminClrksHrs, adminClncCrdinatorHrs, adminOtherHrs, + nursingRNHrs, nursingLPNHrs, nursingHCAHrs, nursingOthHrs, alliedProfOTHrs, alliedProfPTHrs, + alliedProfDTHrs, alliedProfSWHrs, alliedProfOTHHrs, alliedNPRTHrs, alliedNPRAHrs, alliedNPAWHrs, + alliedNPMTHrs, alliedNPATHrs, alliedNPOTHHrs); + + /* Subtotals */ + LtcYtdCompHrsSubtotals supportHrsSubtotals = new LtcYtdCompHrsSubtotals(); + supportHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); + supportHrsSubtotals.setCompHrsType("Support"); + supportHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum11()); + supportHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum21()); + supportHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum31()); + supportHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getCompH_calcsum1()); + + LtcYtdCompHrsSubtotals adminHrsSubtotals = new LtcYtdCompHrsSubtotals(); + adminHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); + adminHrsSubtotals.setCompHrsType("Administration"); + adminHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum12()); + adminHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum22()); + adminHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum32()); + adminHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getCompH_calcsum2()); + + LtcYtdCompHrsSubtotals nursingHrsSubtotals = new LtcYtdCompHrsSubtotals(); + nursingHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); + nursingHrsSubtotals.setCompHrsType("Nursing"); + nursingHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum13()); + nursingHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum23()); + nursingHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum33()); + nursingHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getCompH_calcsum3()); + + LtcYtdCompHrsSubtotals alliedHrsSubtotals = new LtcYtdCompHrsSubtotals(); + alliedHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); + alliedHrsSubtotals.setCompHrsType("Allied Professional"); + alliedHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum14()); + alliedHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum24()); + alliedHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum34()); + alliedHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getCompH_calcsum4()); + + LtcYtdCompHrsSubtotals alliedNPHrsSubtotals = new LtcYtdCompHrsSubtotals(); + alliedNPHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); + alliedNPHrsSubtotals.setCompHrsType("Allied Non-professional"); + alliedNPHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum15()); + alliedNPHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum25()); + alliedNPHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum35()); + alliedNPHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getCompH_calcsum5()); + + Collections.addAll(ltcYtdCompHrsSubttls, supportHrsSubtotals,adminHrsSubtotals,nursingHrsSubtotals,alliedHrsSubtotals,alliedNPHrsSubtotals); + + /* Totals */ + LtcYtdCompHrsTotals totalPerPayrollHrsTotals = new LtcYtdCompHrsTotals(); + totalPerPayrollHrsTotals.setCompHrsTotalType("Total Per Payroll"); + totalPerPayrollHrsTotals.setTotalCompHrsStaffYTD(root.getCompH_total1()); + totalPerPayrollHrsTotals.setTotalCompHrsContractServicesYTD(root.getCompH_total2()); + totalPerPayrollHrsTotals.setTotalCompHrsOfficeAllocYTD(root.getCompH_total3()); + totalPerPayrollHrsTotals.setTotalCompTotalWorkedHrsYTD(root.getCompH_total()); + + LtcYtdCompHrsTotals accuredHrsTotals = new LtcYtdCompHrsTotals(); + accuredHrsTotals.setCompHrsTotalType("Accured Hours"); + accuredHrsTotals.setTotalCompHrsStaffYTD(root.getCompH_accrued2()); + accuredHrsTotals.setTotalCompHrsContractServicesYTD(root.getCompH_accrued3()); + accuredHrsTotals.setTotalCompHrsOfficeAllocYTD(root.getCompH_accrued3()); + accuredHrsTotals.setTotalCompTotalWorkedHrsYTD(root.getCompH_accrued()); + + Collections.addAll(ltcYtdCompHrsTtls,totalPerPayrollHrsTotals,accuredHrsTotals); + + /* Add Pos Hrs */ + LtcYtdCompAddPos nursingRNAddPos = new LtcYtdCompAddPos(); + nursingRNAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider1()); + nursingRNAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage1()); + // nursingRNAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + nursingRNAddPos.setAddPosName("RN"); + nursingRNAddPos.setAddPosType("Nursing"); + nursingRNAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos nursingLPNAddPos = new LtcYtdCompAddPos(); + nursingLPNAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider2()); + nursingLPNAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage2()); + // nursingLPNAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + nursingLPNAddPos.setAddPosName("LPN"); + nursingLPNAddPos.setAddPosType("Nursing"); + nursingLPNAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos nursingHCAAddPos = new LtcYtdCompAddPos(); + nursingHCAAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider3()); + nursingHCAAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage3()); + // nursingHCAAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + nursingHCAAddPos.setAddPosName("Care Aides (HCA)"); + nursingHCAAddPos.setAddPosType("Nursing"); + nursingHCAAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos nursingOTHAddPos = new LtcYtdCompAddPos(); + nursingOTHAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider4()); + nursingOTHAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage4()); + // nursingOTHAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + nursingOTHAddPos.setAddPosName("Other (specify)"); + nursingOTHAddPos.setAddPosType("Nursing"); + nursingOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos alliedProfOTAddPos = new LtcYtdCompAddPos(); + alliedProfOTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider1()); + alliedProfOTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage1()); + // alliedProfOTAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + alliedProfOTAddPos.setAddPosName("Occupational Therapist"); + alliedProfOTAddPos.setAddPosType("Allied Professional"); + alliedProfOTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos alliedProfPTAddPos = new LtcYtdCompAddPos(); + alliedProfPTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider2()); + alliedProfPTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage2()); + // alliedProfPTAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + alliedProfPTAddPos.setAddPosName("Physiotherapist"); + alliedProfPTAddPos.setAddPosType("Allied Professional"); + alliedProfPTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos alliedProfDTAddPos = new LtcYtdCompAddPos(); + alliedProfDTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider3()); + alliedProfDTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage3()); + // alliedProfDTAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + alliedProfDTAddPos.setAddPosName("Dietitian"); + alliedProfDTAddPos.setAddPosType("Allied Professional"); + alliedProfDTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos alliedProfSWAddPos = new LtcYtdCompAddPos(); + alliedProfSWAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider4()); + alliedProfSWAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage4()); + // alliedProfSWAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + alliedProfSWAddPos.setAddPosName("Social Worker"); + alliedProfSWAddPos.setAddPosType("Allied Professional"); + alliedProfSWAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos alliedProfOTHAddPos = new LtcYtdCompAddPos(); + alliedProfOTHAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider5()); + alliedProfOTHAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage5()); + // alliedProfOTHAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + alliedProfOTHAddPos.setAddPosName("Other (specify)"); + alliedProfOTHAddPos.setAddPosType("Allied Professional"); + alliedProfOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos alliedNPRTAddPos = new LtcYtdCompAddPos(); + alliedNPRTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider1()); + alliedNPRTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage1()); + // alliedNPRTAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + alliedNPRTAddPos.setAddPosName("Recreation Therapist"); + alliedNPRTAddPos.setAddPosType("Allied Non-professional"); + alliedNPRTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos alliedNPRAAddPos = new LtcYtdCompAddPos(); + alliedNPRAAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider2()); + alliedNPRAAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage2()); + // alliedNPRAAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + alliedNPRAAddPos.setAddPosName("Rehab Assistant"); + alliedNPRAAddPos.setAddPosType("Allied Non-professional"); + alliedNPRAAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos alliedNPAWAddPos = new LtcYtdCompAddPos(); + alliedNPAWAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider3()); + alliedNPAWAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage3()); + // alliedNPAWAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + alliedNPAWAddPos.setAddPosName("Activity Worker"); + alliedNPAWAddPos.setAddPosType("Allied Non-professional"); + alliedNPAWAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos alliedNPMTAddPos = new LtcYtdCompAddPos(); + alliedNPMTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider4()); + alliedNPMTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage4()); + // alliedNPMTAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + alliedNPMTAddPos.setAddPosName("Music Therapist"); + alliedNPMTAddPos.setAddPosType("Allied Non-professional"); + alliedNPMTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos alliedNPATAddPos = new LtcYtdCompAddPos(); + alliedNPATAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider5()); + alliedNPATAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage5()); + // alliedNPATAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + alliedNPATAddPos.setAddPosName("Art Therapist"); + alliedNPATAddPos.setAddPosType("Allied Non-professional"); + alliedNPATAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompAddPos alliedNPOTHAddPos = new LtcYtdCompAddPos(); + alliedNPOTHAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider6()); + alliedNPOTHAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage6()); + // alliedNPOTHAddPos.setAddPosContractedOutYtd(payload); // NOT SURE + alliedNPOTHAddPos.setAddPosName("Other (specify)"); + alliedNPOTHAddPos.setAddPosType("Allied Non-professional"); + alliedNPOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); + + Collections.addAll(ltcYtdCompAddPos, nursingRNAddPos, nursingLPNAddPos, nursingHCAAddPos, nursingOTHAddPos, + alliedProfOTAddPos, alliedProfPTAddPos, alliedProfDTAddPos, alliedProfSWAddPos, alliedProfOTHAddPos, + alliedNPRTAddPos, alliedNPRAAddPos, alliedNPAWAddPos, alliedNPMTAddPos, alliedNPATAddPos, + alliedNPOTHAddPos); + + /* Benefits Where is %Allocation stored */ + LtcYtdCompBenefits empInsBenefit = new LtcYtdCompBenefits(); + empInsBenefit.setBenefitsAmountYtd(root.getBenefit_value1()); + empInsBenefit.setBenefitsType("Employment Insurance"); + empInsBenefit.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompBenefits canPenPlnBenefit = new LtcYtdCompBenefits(); + canPenPlnBenefit.setBenefitsAmountYtd(root.getBenefit_value2()); + canPenPlnBenefit.setBenefitsType("Canada Pension Plan"); + canPenPlnBenefit.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompBenefits wrkrCompBoardBenefit = new LtcYtdCompBenefits(); + wrkrCompBoardBenefit.setBenefitsAmountYtd(root.getBenefit_value3()); + wrkrCompBoardBenefit.setBenefitsType("Workers Compensation Board"); + wrkrCompBoardBenefit.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompBenefits empHlthTaxBenefit = new LtcYtdCompBenefits(); + empHlthTaxBenefit.setBenefitsAmountYtd(root.getBenefit_value4()); + empHlthTaxBenefit.setBenefitsType("Employer Health Tax"); + empHlthTaxBenefit.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompBenefits penPlanBenefit = new LtcYtdCompBenefits(); + penPlanBenefit.setBenefitsAmountYtd(root.getBenefit_value5()); + penPlanBenefit.setBenefitsType("Pension Plan"); + penPlanBenefit.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompBenefits exHlthDntlBenefit = new LtcYtdCompBenefits(); + exHlthDntlBenefit.setBenefitsAmountYtd(root.getBenefit_value6()); + exHlthDntlBenefit.setBenefitsType("Extended Health & Dental"); + exHlthDntlBenefit.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompBenefits grpLifeBenefit = new LtcYtdCompBenefits(); + grpLifeBenefit.setBenefitsAmountYtd(root.getBenefit_value7()); + grpLifeBenefit.setBenefitsType("Group Life, AD&D, LTD"); + grpLifeBenefit.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdCompBenefits otherBenefit = new LtcYtdCompBenefits(); + otherBenefit.setBenefitsAmountYtd(root.getBenefit_value8()); + otherBenefit.setBenefitsType("Other Benefits specify"); + otherBenefit.setConfirmationId(root.getForm().getConfirmationId()); + + Collections.addAll(ltcYtdCompBenefits, empInsBenefit, canPenPlnBenefit, wrkrCompBoardBenefit, + empHlthTaxBenefit, penPlanBenefit, exHlthDntlBenefit, grpLifeBenefit, otherBenefit); + /* Are we setting the subtotal and total things? */ + + /* Summary of Rev & Exp Budget */ + LtcYtdRev revFrmHA1Adj = new LtcYtdRev(); + revFrmHA1Adj.setRevYTD(root.getOpRev_YTD1()); + revFrmHA1Adj.setRevNotes(root.getOpRev_note1()); + revFrmHA1Adj.setRevName("Adjustments"); + revFrmHA1Adj.setRevType("Revenue from HA (1)"); + revFrmHA1Adj.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev revFrmHA1DirCare = new LtcYtdRev(); + revFrmHA1DirCare.setRevYTD(root.getOpRev_YTD2()); + revFrmHA1DirCare.setRevNotes(root.getOpRev_note2()); + revFrmHA1DirCare.setRevName("Direct care hours"); + revFrmHA1DirCare.setRevType("Revenue from HA (1)"); + revFrmHA1DirCare.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev revFrmHA1Others = new LtcYtdRev(); + revFrmHA1Others.setRevYTD(root.getOpRev_YTD3()); + revFrmHA1Others.setRevNotes(root.getOpRev_note3()); + revFrmHA1Others.setRevName("Others"); + revFrmHA1Others.setRevType("Revenue from HA (1)"); + revFrmHA1Others.setConfirmationId(root.getForm().getConfirmationId()); + + // TODO: add non-operating revenue and expense + + // skipping subtotal for now + + LtcYtdRev revFrmHA2OpFundMinEq = new LtcYtdRev(); + revFrmHA2OpFundMinEq.setRevYTD(root.getOpRev_YTD4()); + revFrmHA2OpFundMinEq.setRevNotes(root.getOpRev_note4()); + revFrmHA2OpFundMinEq.setRevName("HA Operating Funding - Minor Equipment"); + revFrmHA2OpFundMinEq.setRevType("Revenue from HA (2)"); + revFrmHA2OpFundMinEq.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev revFrmHA2OpFundOth = new LtcYtdRev(); + revFrmHA2OpFundOth.setRevYTD(root.getOpRev_YTD5()); + revFrmHA2OpFundOth.setRevNotes(root.getOpRev_note5()); + revFrmHA2OpFundOth.setRevName("HA Operating Funding - Other"); + revFrmHA2OpFundOth.setRevType("Revenue from HA (2)"); + revFrmHA2OpFundOth.setConfirmationId(root.getForm().getConfirmationId()); + + // skipping subtotal + + LtcYtdRev revFrmHA3 = new LtcYtdRev(); + revFrmHA3.setRevYTD(root.getOpRev_YTD6()); + revFrmHA3.setRevNotes(root.getOpRev_note6()); + revFrmHA3.setRevName("HA Capital Contribution Funding"); + revFrmHA3.setRevType("Revenue from HA (3)"); + revFrmHA3.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev revFrmHA4OccThld = new LtcYtdRev(); + revFrmHA4OccThld.setRevYTD(root.getOpRev_YTD7()); + revFrmHA4OccThld.setRevNotes(root.getOpRev_note7()); + revFrmHA4OccThld.setRevName("Occupancy threshold"); + revFrmHA4OccThld.setRevType("Revenue from HA (4)"); + revFrmHA4OccThld.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev revFrmHA4CliConReconc = new LtcYtdRev(); + revFrmHA4CliConReconc.setRevYTD(root.getOpRev_YTD8()); + revFrmHA4CliConReconc.setRevNotes(root.getOpRev_note8()); + revFrmHA4CliConReconc.setRevName("Client Contribution Reconciliation"); + revFrmHA4CliConReconc.setRevType("Revenue from HA (4)"); + revFrmHA4CliConReconc.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev revFrmHA4DirCare = new LtcYtdRev(); + revFrmHA4DirCare.setRevYTD(root.getOpRev_YTD9()); + revFrmHA4DirCare.setRevNotes(root.getOpRev_note9()); + revFrmHA4DirCare.setRevName("Direct Care Hours"); + revFrmHA4DirCare.setRevType("Revenue from HA (4)"); + revFrmHA4DirCare.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev revFrmHA4Oth = new LtcYtdRev(); + revFrmHA4Oth.setRevYTD(root.getOpRev_YTD10()); + revFrmHA4Oth.setRevNotes(root.getOpRev_note10()); + revFrmHA4Oth.setRevName("Others - specify"); + revFrmHA4Oth.setRevType("Revenue from HA (4)"); + revFrmHA4Oth.setConfirmationId(root.getForm().getConfirmationId()); + + // skipping subtotal for now + + LtcYtdRev clntRvnHAClient = new LtcYtdRev(); + clntRvnHAClient.setRevYTD(root.getOpRev_YTD11()); + clntRvnHAClient.setRevNotes(root.getOpRev_note11()); + clntRvnHAClient.setRevName("HA Client User Fees Paid by the Client"); + clntRvnHAClient.setRevType("Client Revenue"); + clntRvnHAClient.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev clntRvnFeePaidParties = new LtcYtdRev(); + clntRvnFeePaidParties.setRevYTD(root.getOpRev_YTD12()); + clntRvnFeePaidParties.setRevNotes(root.getOpRev_note12()); + clntRvnFeePaidParties.setRevName("Client user fee paid by their parties"); + clntRvnFeePaidParties.setRevType("Client Revenue"); + clntRvnFeePaidParties.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev clntRvnFeePaidNonEligible = new LtcYtdRev(); + clntRvnFeePaidNonEligible.setRevYTD(root.getOpRev_YTD13()); + clntRvnFeePaidNonEligible.setRevNotes(root.getOpRev_note13()); + clntRvnFeePaidNonEligible.setRevName("Client user fee paid ~ for non-eligible residents"); + clntRvnFeePaidNonEligible.setRevType("Client Revenue"); + clntRvnFeePaidNonEligible.setConfirmationId(root.getForm().getConfirmationId()); + + // skipping subtotal for now + LtcYtdRev othRevInvstOpFund = new LtcYtdRev(); + othRevInvstOpFund.setRevYTD(root.getOpRev_YTD14()); + othRevInvstOpFund.setRevNotes(root.getOpRev_note14()); + othRevInvstOpFund.setRevName("Investments Revenue on operating funds"); + othRevInvstOpFund.setRevType("Other Revenue"); + othRevInvstOpFund.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev othRevInvstCmBcFund = new LtcYtdRev(); + othRevInvstCmBcFund.setRevYTD(root.getOpRev_YTD15()); + othRevInvstCmBcFund.setRevNotes(root.getOpRev_note15()); + othRevInvstCmBcFund.setRevName("CMHC/BCHMC funding"); + othRevInvstCmBcFund.setRevType("Other Revenue"); + othRevInvstCmBcFund.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev othRevFoodServ = new LtcYtdRev(); + othRevFoodServ.setRevYTD(root.getOpRev_YTD16()); + othRevFoodServ.setRevNotes(root.getOpRev_note16()); + othRevFoodServ.setRevName("food services"); + othRevFoodServ.setRevType("Other Revenue"); + othRevFoodServ.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev othRevLdryServ = new LtcYtdRev(); + othRevLdryServ.setRevYTD(root.getOpRev_YTD17()); + othRevLdryServ.setRevNotes(root.getOpRev_note17()); + othRevLdryServ.setRevName("laundry services"); + othRevLdryServ.setRevType("Other Revenue"); + othRevLdryServ.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev othRevCabl = new LtcYtdRev(); + othRevCabl.setRevYTD(root.getOpRev_YTD18()); + othRevCabl.setRevNotes(root.getOpRev_note18()); + othRevCabl.setRevName("cablevision"); + othRevCabl.setRevType("Other Revenue"); + othRevCabl.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev othRevOthRec = new LtcYtdRev(); + othRevOthRec.setRevYTD(root.getOpRev_YTD19()); + othRevOthRec.setRevNotes(root.getOpRev_note19()); + othRevOthRec.setRevName("other recoveries"); + othRevOthRec.setRevType("Other Revenue"); + othRevOthRec.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev othRevOthSpcfy = new LtcYtdRev(); + othRevOthSpcfy.setRevYTD(root.getOpRev_YTD20()); + othRevOthSpcfy.setRevNotes(root.getOpRev_note20()); + othRevOthSpcfy.setRevName("Others ~ specify"); + othRevOthSpcfy.setRevType("Other Revenue"); + othRevOthSpcfy.setConfirmationId(root.getForm().getConfirmationId()); + Collections.addAll(ltcYtdRev, revFrmHA1Adj, revFrmHA1DirCare, revFrmHA1Others, revFrmHA2OpFundMinEq, + revFrmHA2OpFundOth, revFrmHA3, revFrmHA4OccThld, revFrmHA4CliConReconc, revFrmHA4DirCare, + revFrmHA4Oth, clntRvnHAClient, clntRvnFeePaidParties, clntRvnFeePaidNonEligible, othRevInvstOpFund, + othRevInvstCmBcFund, othRevFoodServ, othRevLdryServ, othRevCabl, othRevOthRec, othRevOthSpcfy); + // skipping total field for now + + /* Subtotals */ + LtcYtdRevSubTotals revFromHA1Subttl = new LtcYtdRevSubTotals(); + revFromHA1Subttl.setConfirmationId(root.getForm().getConfirmationId()); + revFromHA1Subttl.setRevType("Revenue from HA(1)"); + revFromHA1Subttl.setSubTotalRevYtd(root.getOpRev_sum11()); + + LtcYtdRevSubTotals revFromHA2Subttl = new LtcYtdRevSubTotals(); + revFromHA2Subttl.setConfirmationId(root.getForm().getConfirmationId()); + revFromHA2Subttl.setRevType("Revenue from HA(2)"); + revFromHA2Subttl.setSubTotalRevYtd(root.getOpRev_sum12()); + + LtcYtdRevSubTotals revFromHA4Subttl = new LtcYtdRevSubTotals(); + revFromHA4Subttl.setConfirmationId(root.getForm().getConfirmationId()); + revFromHA4Subttl.setRevType("Revenue from HA(4)"); + revFromHA4Subttl.setSubTotalRevYtd(root.getOpRev_sum13()); + + LtcYtdRevSubTotals clntRevSubttl = new LtcYtdRevSubTotals(); + clntRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); + clntRevSubttl.setRevType("Client Revenue"); + clntRevSubttl.setSubTotalRevYtd(root.getOpRev_sum14()); + + LtcYtdRevSubTotals othRevSubttl = new LtcYtdRevSubTotals(); + othRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); + othRevSubttl.setRevType("Other Revenue"); + othRevSubttl.setSubTotalRevYtd(root.getOpRev_sum15()); + + LtcYtdRevSubTotals opRevSubttl = new LtcYtdRevSubTotals(); + opRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); + opRevSubttl.setRevType("Operating Revenue"); + opRevSubttl.setSubTotalRevYtd(root.getOpRev_YTD_total()); + + Collections.addAll(ltcYtdRevSubTtls, revFromHA1Subttl,revFromHA2Subttl,revFromHA4Subttl,clntRevSubttl,othRevSubttl,opRevSubttl); + + LtcYtdExp dirCareCostExp = new LtcYtdExp(); + dirCareCostExp.setRevYtd(root.getOpEx_YTD1()); + dirCareCostExp.setRevNotes(root.getOpEx_note1()); + dirCareCostExp.setExpName("Direct Care"); + dirCareCostExp.setExpType("Staffing Cost (1A)"); + dirCareCostExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp foodCostExp = new LtcYtdExp(); + foodCostExp.setRevYtd(root.getOpEx_YTD2()); + foodCostExp.setRevNotes(root.getOpEx_note2()); + foodCostExp.setExpName("Food Services"); + foodCostExp.setExpType("Staffing Cost (1A)"); + foodCostExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp ldryServExp = new LtcYtdExp(); + ldryServExp.setRevYtd(root.getOpEx_YTD3()); + ldryServExp.setRevNotes(root.getOpEx_note3()); + ldryServExp.setExpName("Laundry Services"); + ldryServExp.setExpType("Staffing Cost (1A)"); + ldryServExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp housekeepingCostExp = new LtcYtdExp(); + housekeepingCostExp.setRevYtd(root.getOpEx_YTD4()); + housekeepingCostExp.setRevNotes(root.getOpEx_note4()); + housekeepingCostExp.setExpName("Housekeeping Services"); + housekeepingCostExp.setExpType("Staffing Cost (1A)"); + housekeepingCostExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp adminServCostExp = new LtcYtdExp(); + adminServCostExp.setRevYtd(root.getOpEx_YTD5()); + adminServCostExp.setRevNotes(root.getOpEx_note5()); + adminServCostExp.setExpName("Administration Services"); + adminServCostExp.setExpType("Staffing Cost (1A)"); + adminServCostExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp plantMainOpStaffExp = new LtcYtdExp(); + plantMainOpStaffExp.setRevYtd(root.getOpEx_YTD6()); + plantMainOpStaffExp.setRevNotes(root.getOpEx_YTD6()); + plantMainOpStaffExp.setExpName("Plant Maintenance & Op. Staffing"); + plantMainOpStaffExp.setExpType("Staffing Cost (1A)"); + plantMainOpStaffExp.setConfirmationId(root.getForm().getConfirmationId()); + + // subtotal before salary and wages - omitted + LtcYtdExp salWagRecvExp = new LtcYtdExp(); + salWagRecvExp.setRevYtd(root.getOpEx_YTD7()); + salWagRecvExp.setRevNotes(root.getOpEx_YTD7()); + salWagRecvExp.setExpName("Salary & wages recovered"); + salWagRecvExp.setExpType("Staffing Cost (1A)"); + salWagRecvExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp salWagAccExp = new LtcYtdExp(); + salWagAccExp.setRevYtd(root.getOpEx_YTD8()); + salWagAccExp.setRevNotes(root.getOpEx_YTD8()); + salWagAccExp.setExpName("Salaries and wages accrual"); + salWagAccExp.setExpType("Staffing Cost (1A)"); + salWagAccExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp othLabCostExp = new LtcYtdExp(); + othLabCostExp.setRevYtd(root.getOpEx_YTD8()); + othLabCostExp.setRevNotes(root.getOpEx_YTD8()); + othLabCostExp.setExpName("Salary & wages recovered"); + othLabCostExp.setExpType("Staffing Cost (1A)"); + othLabCostExp.setConfirmationId(root.getForm().getConfirmationId()); + + // subtotal + + LtcYtdExp bnftCostExp = new LtcYtdExp(); + bnftCostExp.setRevYtd(root.getOpEx_YTD9()); + bnftCostExp.setRevNotes(root.getOpEx_YTD9()); + bnftCostExp.setExpName("Benefits"); + bnftCostExp.setExpType("Staffing Cost (1B)"); + bnftCostExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp sickSevrnceAccExp = new LtcYtdExp(); + sickSevrnceAccExp.setRevYtd(root.getOpEx_YTD10()); + sickSevrnceAccExp.setRevNotes(root.getOpEx_YTD10()); + sickSevrnceAccExp.setExpName("Sick, severance and other accrual"); + sickSevrnceAccExp.setExpType("Staffing Cost (1B)"); + sickSevrnceAccExp.setConfirmationId(root.getForm().getConfirmationId()); + + // subtotal + LtcYtdExp buildingRentExp = new LtcYtdExp(); + buildingRentExp.setRevYtd(root.getOpEx_YTD11()); + buildingRentExp.setRevNotes(root.getOpEx_YTD11()); + buildingRentExp.setExpName("Building rent/lease cost"); + buildingRentExp.setExpType("Property Cost"); + buildingRentExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp intrstMortgageLngTrmExp = new LtcYtdExp(); + intrstMortgageLngTrmExp.setRevYtd(root.getOpEx_YTD12()); + intrstMortgageLngTrmExp.setRevNotes(root.getOpEx_YTD12()); + intrstMortgageLngTrmExp.setExpName("Interest on mortgage or long-term debt"); + intrstMortgageLngTrmExp.setExpType("Property Cost"); + intrstMortgageLngTrmExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp propertyTaxesExp = new LtcYtdExp(); + propertyTaxesExp.setRevYtd(root.getOpEx_YTD13()); + propertyTaxesExp.setRevNotes(root.getOpEx_YTD13()); + propertyTaxesExp.setExpName("Property taxes"); + propertyTaxesExp.setExpType("Property Cost"); + propertyTaxesExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp mntnceExp = new LtcYtdExp(); + mntnceExp.setRevYtd(root.getOpEx_YTD14()); + mntnceExp.setRevNotes(root.getOpEx_YTD14()); + mntnceExp.setExpName("Maintenance & Repairs - building, ground & equip."); + mntnceExp.setExpType("Property Cost"); + mntnceExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp suppliesExp = new LtcYtdExp(); + suppliesExp.setRevYtd(root.getOpEx_YTD15()); + suppliesExp.setRevNotes(root.getOpEx_YTD15()); + suppliesExp.setExpName("Supplies ~ for building, ground & equipment"); + suppliesExp.setExpType("Property Cost"); + suppliesExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp utilitiesExp = new LtcYtdExp(); + utilitiesExp.setRevYtd(root.getOpEx_YTD16()); + utilitiesExp.setRevNotes(root.getOpEx_YTD16()); + utilitiesExp.setExpName("Utilities"); + utilitiesExp.setExpType("Property Cost"); + utilitiesExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp wasteMgmntExp = new LtcYtdExp(); + wasteMgmntExp.setRevYtd(root.getOpEx_YTD17()); + wasteMgmntExp.setRevNotes(root.getOpEx_YTD17()); + wasteMgmntExp.setExpName("Waste management"); + wasteMgmntExp.setExpType("Property Cost"); + wasteMgmntExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp resTranServExp = new LtcYtdExp(); + resTranServExp.setRevYtd(root.getOpEx_YTD18()); + resTranServExp.setRevNotes(root.getOpEx_YTD18()); + resTranServExp.setExpName("Resident Transportation Services"); + resTranServExp.setExpType("Property Cost"); + resTranServExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp othExp = new LtcYtdExp(); + othExp.setRevYtd(root.getOpEx_YTD19()); + othExp.setRevNotes(root.getOpEx_YTD19()); + othExp.setExpName("Others - Operating"); + othExp.setExpType("Property Cost"); + othExp.setConfirmationId(root.getForm().getConfirmationId()); + + // skipping subtotal for now + + LtcYtdExp medSupExp = new LtcYtdExp(); + medSupExp.setRevYtd(root.getOpEx_YTD20()); + medSupExp.setRevNotes(root.getOpEx_YTD20()); + medSupExp.setExpName("Medical Supplies"); + medSupExp.setExpType("Supplies"); + medSupExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp rawFoodCostExp = new LtcYtdExp(); + rawFoodCostExp.setRevYtd(root.getOpEx_YTD21()); + rawFoodCostExp.setRevNotes(root.getOpEx_YTD21()); + rawFoodCostExp.setExpName("Raw Food Cost (inc. dietary supplement costs)"); + rawFoodCostExp.setExpType("Supplies"); + rawFoodCostExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp drgsPharmaExp = new LtcYtdExp(); + drgsPharmaExp.setRevYtd(root.getOpEx_YTD22()); + drgsPharmaExp.setRevNotes(root.getOpEx_YTD22()); + drgsPharmaExp.setExpName("Drugs & Pharmaceutical"); + drgsPharmaExp.setExpType("Supplies"); + drgsPharmaExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp dietSupExp = new LtcYtdExp(); + dietSupExp.setRevYtd(root.getOpEx_YTD23()); + dietSupExp.setRevNotes(root.getOpEx_YTD23()); + dietSupExp.setExpName("Dietary supplies"); + dietSupExp.setExpType("Supplies"); + dietSupExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp ldrySupExp = new LtcYtdExp(); + ldrySupExp.setRevYtd(root.getOpEx_YTD24()); + ldrySupExp.setRevNotes(root.getOpEx_YTD24()); + ldrySupExp.setExpName("Laundry supplies"); + ldrySupExp.setExpType("Supplies"); + ldrySupExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp houseSupExp = new LtcYtdExp(); + houseSupExp.setRevYtd(root.getOpEx_YTD25()); + houseSupExp.setRevNotes(root.getOpEx_YTD25()); + houseSupExp.setExpName("Housekeeping supplies"); + houseSupExp.setExpType("Supplies"); + houseSupExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp othSupExp = new LtcYtdExp(); + othSupExp.setRevYtd(root.getOpEx_YTD26()); + othSupExp.setRevNotes(root.getOpEx_YTD26()); + othSupExp.setExpName("Others - Specify"); + othSupExp.setExpType("Supplies"); + othSupExp.setConfirmationId(root.getForm().getConfirmationId()); + + Collections.addAll(ltcYtdExp, dirCareCostExp, foodCostExp, ldryServExp, housekeepingCostExp, + adminServCostExp, plantMainOpStaffExp, salWagRecvExp, salWagAccExp, othLabCostExp, bnftCostExp, + sickSevrnceAccExp, buildingRentExp, intrstMortgageLngTrmExp, propertyTaxesExp, mntnceExp, + suppliesExp, utilitiesExp, wasteMgmntExp, resTranServExp, othExp, medSupExp, rawFoodCostExp, + drgsPharmaExp, dietSupExp, ldrySupExp, houseSupExp, othSupExp); + + // + /* Subtotals */ + LtcYtdExpSubTotals staffCost1ASubtotal = new LtcYtdExpSubTotals(); + staffCost1ASubtotal.setConfirmationId(root.getForm().getConfirmationId()); + staffCost1ASubtotal.setExpType("Staffing Type (1A)"); + staffCost1ASubtotal.setSubTotalRevYtd(root.getOpEx_sum11()); + + LtcYtdExpSubTotals staffCost1BSubtotal = new LtcYtdExpSubTotals(); + staffCost1BSubtotal.setConfirmationId(root.getForm().getConfirmationId()); + staffCost1BSubtotal.setExpType("Staffing Type (1B)"); + staffCost1BSubtotal.setSubTotalRevYtd(root.getOpEx_sum12()); + + LtcYtdExpSubTotals propertyCostSubtotal = new LtcYtdExpSubTotals(); + propertyCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); + propertyCostSubtotal.setExpType("Property Cost (2)"); + propertyCostSubtotal.setSubTotalRevYtd(root.getOpEx_sum13()); + + LtcYtdExpSubTotals suppliesSubtotal = new LtcYtdExpSubTotals(); + suppliesSubtotal.setConfirmationId(root.getForm().getConfirmationId()); + suppliesSubtotal.setExpType("Supplies"); + suppliesSubtotal.setSubTotalRevYtd(root.getOpEx_sum14()); + + LtcYtdExpSubTotals adminCostSubtotal = new LtcYtdExpSubTotals(); + adminCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); + adminCostSubtotal.setExpType("Administration Cost - non-wages (4)"); + adminCostSubtotal.setSubTotalRevYtd(root.getOpEx_sum15()); + + LtcYtdExpSubTotals operatingCostSubtotal = new LtcYtdExpSubTotals(); + operatingCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); + operatingCostSubtotal.setExpType("Operating Expenses"); + operatingCostSubtotal.setSubTotalRevYtd(root.getOpEx_sum16()); + + /* END */ + + LtcYtdExp offExpAdCost = new LtcYtdExp(); + offExpAdCost.setRevYtd(root.getOpEx_YTD27()); + offExpAdCost.setRevNotes(root.getOpEx_YTD27()); + offExpAdCost.setExpName("Office Expense"); + offExpAdCost.setExpType("Administration Cost - non-wages"); + offExpAdCost.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp mgmntAdCost = new LtcYtdExp(); + mgmntAdCost.setRevYtd(root.getOpEx_YTD28()); + mgmntAdCost.setRevNotes(root.getOpEx_YTD28()); + mgmntAdCost.setExpName("Management Fees"); + mgmntAdCost.setExpType("Administration Cost - non-wages"); + mgmntAdCost.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp hoAllocpAdCost = new LtcYtdExp(); + hoAllocpAdCost.setRevYtd(root.getOpEx_YTD29()); + hoAllocpAdCost.setRevNotes(root.getOpEx_YTD29()); + hoAllocpAdCost.setExpName("Head Office Allocation (non-compensation)"); + hoAllocpAdCost.setExpType("Administration Cost - non-wages"); + hoAllocpAdCost.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp accAdCost = new LtcYtdExp(); + accAdCost.setRevYtd(root.getOpEx_YTD30()); + accAdCost.setRevNotes(root.getOpEx_YTD30()); + accAdCost.setExpName("Accreditation Costs"); + accAdCost.setExpType("Administration Cost - non-wages"); + accAdCost.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp apaAdCost = new LtcYtdExp(); + apaAdCost.setRevYtd(root.getOpEx_YTD31()); + apaAdCost.setRevNotes(root.getOpEx_YTD31()); + apaAdCost.setExpName("Association dues, professional fees, audit fees"); + apaAdCost.setExpType("Administration Cost - non-wages"); + apaAdCost.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp insuranceAdCost = new LtcYtdExp(); + insuranceAdCost.setRevYtd(root.getOpEx_YTD32()); + insuranceAdCost.setRevNotes(root.getOpEx_YTD32()); + insuranceAdCost.setExpName("Insurances (for property & liability)"); + insuranceAdCost.setExpType("Administration Cost - non-wages"); + insuranceAdCost.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp othSupAdCost = new LtcYtdExp(); + othSupAdCost.setRevYtd(root.getOpEx_YTD33()); + othSupAdCost.setRevNotes(root.getOpEx_YTD33()); + othSupAdCost.setExpName("Other - Administration and supplies"); + othSupAdCost.setExpType("Administration Cost - non-wages"); + othSupAdCost.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp othAdCost = new LtcYtdExp(); + othAdCost.setRevYtd(root.getOpEx_YTD33()); + othAdCost.setRevNotes(root.getOpEx_YTD33()); + othAdCost.setExpName("Other - Specify"); + othAdCost.setExpType("Administration Cost - non-wages"); + othAdCost.setConfirmationId(root.getForm().getConfirmationId()); + + + Collections.addAll(ltcYtdExp, dirCareCostExp, foodCostExp, ldryServExp, housekeepingCostExp, + adminServCostExp, plantMainOpStaffExp, salWagRecvExp, salWagAccExp, othLabCostExp, bnftCostExp, + sickSevrnceAccExp, buildingRentExp, intrstMortgageLngTrmExp, propertyTaxesExp, mntnceExp, + suppliesExp, utilitiesExp, wasteMgmntExp, resTranServExp, othExp, medSupExp, rawFoodCostExp, + drgsPharmaExp, dietSupExp, ldrySupExp, houseSupExp, othSupExp, offExpAdCost, mgmntAdCost, + hoAllocpAdCost, accAdCost, apaAdCost, insuranceAdCost, othSupAdCost, othAdCost); + + // subtotal + // total operating expenses + + /* Bed Inventory */ + + /* mandatory bed grid */ + for (BedGrid0 maxOcp : root.getBedGrid0()) { + LtcBedYtdMaxOccupancy numOfBeds = new LtcBedYtdMaxOccupancy(); + numOfBeds.setBedFundingType(maxOcp.getBedType()); + numOfBeds.setConfirmationId(root.getForm().getConfirmationId()); + numOfBeds.setStartDate(maxOcp.getStartDate0()); + numOfBeds.setEndDate(maxOcp.getEndDate0()); + numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); + numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + // notes missing + if (maxOcp.getBedType().equals(Constants.IN_SCOPE)) { + numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); + } else if (maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { + numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); + } else { + numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); + } + + ltcBedYtdMaxOccupancies.add(numOfBeds); + + } + + /* Planned Maximum Bed Occupancy */ + LtcBedYtdMaxOccupancyTotals plannedInScopeOccupancy = new LtcBedYtdMaxOccupancyTotals(); + plannedInScopeOccupancy.setConfirmationID(root.getForm().getConfirmationId()); + plannedInScopeOccupancy.setOccupancyType("Planned Maximum Bed Occupancy"); + plannedInScopeOccupancy.setBedFundingType("In-Scope Max. Beds Days"); + plannedInScopeOccupancy.setTotalBedQuarter1(root.getPlannedInScope1()); + plannedInScopeOccupancy.setTotalBedQuarter2(root.getPlannedInScope2()); + plannedInScopeOccupancy.setTotalBedQuarter3(root.getPlannedInScope3()); + plannedInScopeOccupancy.setTotalBedQuarter4(root.getPlannedInScope4()); + plannedInScopeOccupancy.setTotalBedDays(root.getPlannedInScope()); + + LtcBedYtdMaxOccupancyTotals plannedOutOfScopeOccupancy = new LtcBedYtdMaxOccupancyTotals(); + plannedOutOfScopeOccupancy.setConfirmationID(root.getForm().getConfirmationId()); + plannedOutOfScopeOccupancy.setOccupancyType("Planned Maximum Bed Occupancy"); + plannedOutOfScopeOccupancy.setBedFundingType("Out of Scope Max Beds Days"); + plannedOutOfScopeOccupancy.setTotalBedQuarter1(root.getPlannedOutScope1()); + plannedOutOfScopeOccupancy.setTotalBedQuarter2(root.getPlannedOutScope2()); + plannedOutOfScopeOccupancy.setTotalBedQuarter3(root.getPlannedOutScope3()); + plannedOutOfScopeOccupancy.setTotalBedQuarter4(root.getPlannedOutScope4()); + plannedOutOfScopeOccupancy.setTotalBedDays(root.getPlannedOutScope()); + + LtcBedYtdMaxOccupancyTotals plannedPrivateOccupancy = new LtcBedYtdMaxOccupancyTotals(); + plannedPrivateOccupancy.setConfirmationID(root.getForm().getConfirmationId()); + plannedPrivateOccupancy.setOccupancyType("Planned Maximum Bed Occupancy"); + plannedPrivateOccupancy.setBedFundingType("Private Max Beds Days"); + plannedPrivateOccupancy.setTotalBedQuarter1(root.getPlannedPrivate1()); + plannedPrivateOccupancy.setTotalBedQuarter2(root.getPlannedPrivate2()); + plannedPrivateOccupancy.setTotalBedQuarter3(root.getPlannedPrivate3()); + plannedPrivateOccupancy.setTotalBedQuarter4(root.getPlannedPrivate4()); + plannedPrivateOccupancy.setTotalBedDays(root.getPlannedPrivate()); + + LtcBedYtdMaxOccupancyTotals plannedTotalMaxBedOccupancy = new LtcBedYtdMaxOccupancyTotals(); + plannedTotalMaxBedOccupancy.setConfirmationID(root.getForm().getConfirmationId()); + plannedTotalMaxBedOccupancy.setOccupancyType("Planned Maximum Bed Occupancy"); + plannedTotalMaxBedOccupancy.setBedFundingType("Total Max Bed Days"); + plannedTotalMaxBedOccupancy.setTotalBedQuarter1(root.getPlannedTotal1()); + plannedTotalMaxBedOccupancy.setTotalBedQuarter2(root.getPlannedTotal2()); + plannedTotalMaxBedOccupancy.setTotalBedQuarter3(root.getPlannedTotal3()); + plannedTotalMaxBedOccupancy.setTotalBedQuarter4(root.getPlannedTotal4()); + plannedTotalMaxBedOccupancy.setTotalBedDays(root.getPlannedTotal()); + + LtcBedYtdMaxOccupancyTotals ytdInScopeMaxBedOccupancy = new LtcBedYtdMaxOccupancyTotals(); + ytdInScopeMaxBedOccupancy.setConfirmationID(root.getForm().getConfirmationId()); + ytdInScopeMaxBedOccupancy.setOccupancyType("YTD Maximum Bed Occupancy"); + ytdInScopeMaxBedOccupancy.setBedFundingType("In-Scope Max. Beds Days"); + ytdInScopeMaxBedOccupancy.setTotalBedQuarter1(root.getyTDMaxInScopeQ1()); + ytdInScopeMaxBedOccupancy.setTotalBedQuarter2(root.getyTDMaxInScopeQ2()); + ytdInScopeMaxBedOccupancy.setTotalBedQuarter3(root.getyTDMaxInScopeQ3()); + ytdInScopeMaxBedOccupancy.setTotalBedQuarter4(root.getyTDMaxInScopeQ4()); + ytdInScopeMaxBedOccupancy.setTotalBedDays(root.getInScopeBedTotalYTD()); + + LtcBedYtdMaxOccupancyTotals ytdOutOfScopeMaxBedOccupancy = new LtcBedYtdMaxOccupancyTotals(); + ytdOutOfScopeMaxBedOccupancy.setConfirmationID(root.getForm().getConfirmationId()); + ytdOutOfScopeMaxBedOccupancy.setOccupancyType("YTD Maximum Bed Occupancy"); + ytdOutOfScopeMaxBedOccupancy.setBedFundingType("Out of Scope Max Beds Days"); + ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter1(root.getyTDMaxOutScopeQ1()); + ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter2(root.getyTDMaxOutScopeQ2()); + ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter3(root.getyTDMaxOutScopeQ3()); + ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter4(root.getyTDMaxOutScopeQ4()); + ytdOutOfScopeMaxBedOccupancy.setTotalBedDays(root.getOutScopeBedTotalYTD()); + + LtcBedYtdMaxOccupancyTotals ytdPrivateMaxBedOccupancy = new LtcBedYtdMaxOccupancyTotals(); + ytdPrivateMaxBedOccupancy.setConfirmationID(root.getForm().getConfirmationId()); + ytdPrivateMaxBedOccupancy.setOccupancyType("YTD Maximum Bed Occupancy"); + ytdPrivateMaxBedOccupancy.setBedFundingType("In-Scope Max. Beds Days"); + ytdPrivateMaxBedOccupancy.setTotalBedQuarter1(root.getyTDMaxPrivateQ1()); + ytdPrivateMaxBedOccupancy.setTotalBedQuarter2(root.getyTDMaxPrivateQ2()); + ytdPrivateMaxBedOccupancy.setTotalBedQuarter3(root.getyTDMaxPrivateQ3()); + ytdPrivateMaxBedOccupancy.setTotalBedQuarter4(root.getyTDMaxPrivateQ4()); + ytdPrivateMaxBedOccupancy.setTotalBedDays(root.getPrivateBedTotalYTD()); + + LtcBedYtdMaxOccupancyTotals ytdTotalMaxBedOccupancy = new LtcBedYtdMaxOccupancyTotals(); + ytdTotalMaxBedOccupancy.setConfirmationID(root.getForm().getConfirmationId()); + ytdTotalMaxBedOccupancy.setOccupancyType("YTD Maximum Bed Occupancy"); + ytdTotalMaxBedOccupancy.setBedFundingType("In-Scope Max. Beds Days"); + ytdTotalMaxBedOccupancy.setTotalBedQuarter1(root.getyTDMaxTotalQ1()); + ytdTotalMaxBedOccupancy.setTotalBedQuarter2(root.getyTDMaxTotalQ2()); + ytdTotalMaxBedOccupancy.setTotalBedQuarter3(root.getyTDMaxTotalQ3()); + ytdTotalMaxBedOccupancy.setTotalBedQuarter4(root.getyTDMaxTotalQ4()); + ytdTotalMaxBedOccupancy.setTotalBedDays(root.getTotalBedYTD()); + + Collections.addAll(ltcBedYtdMaxOccTtls,plannedInScopeOccupancy,plannedOutOfScopeOccupancy,plannedPrivateOccupancy,plannedTotalMaxBedOccupancy,ytdTotalMaxBedOccupancy,ytdInScopeMaxBedOccupancy,ytdOutOfScopeMaxBedOccupancy,ytdPrivateMaxBedOccupancy); + + + + switch (root.getQuarter()) { + case "q1": + // bed grid + for (BedGrid1 maxOcp : root.getBedGrid1()) { + LtcBedYtdMaxOccupancy numOfBeds = new LtcBedYtdMaxOccupancy(); + numOfBeds.setBedFundingType(maxOcp.getBedType()); + numOfBeds.setConfirmationId(root.getForm().getConfirmationId()); + numOfBeds.setStartDate(maxOcp.getStartDate1()); + numOfBeds.setEndDate(maxOcp.getEndDate1()); + numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); + numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + // notes missing + if (maxOcp.getBedType().equals(Constants.IN_SCOPE)) { + numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); + } else if (maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { + numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); + } else { + numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); + } + ltcBedYtdMaxOccupancies.add(numOfBeds); + } + + // Q1 - April, May, June + LtcBedYtdOccupiedDays aprilYtdOccDays = new LtcBedYtdOccupiedDays(); + aprilYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + aprilYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth4()); + aprilYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth4()); + aprilYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth4()); + aprilYtdOccDays.setOccMonth("April"); + aprilYtdOccDays.setOccQuarter("Q1"); + + LtcBedYtdOccupiedDays mayYtdOccDays = new LtcBedYtdOccupiedDays(); + mayYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + mayYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth5()); + mayYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth5()); + mayYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth5()); + mayYtdOccDays.setOccMonth("May"); + mayYtdOccDays.setOccQuarter("Q1"); + + LtcBedYtdOccupiedDays juneYtdOccDays = new LtcBedYtdOccupiedDays(); + juneYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + juneYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth6()); + juneYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth6()); + juneYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth6()); + juneYtdOccDays.setOccMonth("June"); + juneYtdOccDays.setOccQuarter("Q1"); + + Collections.addAll(ltcBedYtdOccupiedDays, aprilYtdOccDays,mayYtdOccDays,juneYtdOccDays); + + LtcBedYtdOccupiedDaysTotals q1OccDaysSubttls = new LtcBedYtdOccupiedDaysTotals(); + q1OccDaysSubttls.setConfirmationID(root.getForm().getConfirmationId()); + q1OccDaysSubttls.setOccQuarter("Q1"); + q1OccDaysSubttls.setOccDaysYTDInScopePublic(root.getInScopeTotalQ1()); + q1OccDaysSubttls.setOccDaysYTDOutScopePublic(root.getOutScopeTotalQ1()); + q1OccDaysSubttls.setOccDaysYTDPrivate(root.getPrivateTotalQ1()); + q1OccDaysSubttls.setOccDaysYTDTotalDays(root.getTotalQ1()); + Collections.addAll(ltcBedYtdOccDaysTtls,q1OccDaysSubttls); + +// Q1 + LtcBedYtdOccupancyRate occInRateQ1 = new LtcBedYtdOccupancyRate(); + occInRateQ1.setConfirmationID(root.getForm().getConfirmationId()); + occInRateQ1.setOccRateBedTypes("In-Scope 3.36 HPRD Publicly Funded Beds"); + occInRateQ1.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); + occInRateQ1.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); + occInRateQ1.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); + occInRateQ1.setPercentOcc(root.getNoteInScopeQ1()); + + LtcBedYtdOccupancyRate occOutRateQ1 = new LtcBedYtdOccupancyRate(); + occOutRateQ1.setConfirmationID(root.getForm().getConfirmationId()); + occOutRateQ1.setOccRateBedTypes("Out of Scope Publicly Funded Beds"); + occOutRateQ1.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); + occOutRateQ1.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); + occOutRateQ1.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); + occOutRateQ1.setPercentOcc(root.getNoteInScopeQ1()); + + LtcBedYtdOccupancyRate occRateQ1 = new LtcBedYtdOccupancyRate(); + occRateQ1.setConfirmationID(root.getForm().getConfirmationId()); + occRateQ1.setOccRateBedTypes("Private Beds"); + occRateQ1.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); + occRateQ1.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); + occRateQ1.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); + occRateQ1.setPercentOcc(root.getNoteInScopeQ1()); + + LtcBedYtdOccupancyRateTotals q1RateTotals = new LtcBedYtdOccupancyRateTotals(); + q1RateTotals.setConfirmationID(root.getForm().getConfirmationId()); + q1RateTotals.setOccRateQuarter("Q1"); + q1RateTotals.setTotalPlanMaxOccDays(root.getyTDPlannedTotalQ1()); + q1RateTotals.setTotalYTDMaxOccDays(root.getyTDMaxTotalQ1()); + q1RateTotals.setTotalYTDOccDays(root.getyTDOccupiedTotalQ1()); + q1RateTotals.setTotalPercentOcc(root.getOccupiedPercentageTotalQ1()); + + Collections.addAll(ltcBedYtdOccRateTtls,q1RateTotals); + Collections.addAll(ltcBedYtdOccupancyRates, occInRateQ1,occOutRateQ1,occRateQ1); + + break; + case "q2": + for (BedGrid2 maxOcp : root.getBedGrid2()) { + LtcBedYtdMaxOccupancy numOfBeds = new LtcBedYtdMaxOccupancy(); + numOfBeds.setBedFundingType(maxOcp.getBedType()); + numOfBeds.setConfirmationId(root.getForm().getConfirmationId()); + numOfBeds.setStartDate(maxOcp.getStartDate2()); + numOfBeds.setEndDate(maxOcp.getEndDate2()); + numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); + numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + // notes missing + if (maxOcp.getBedType().equals(Constants.IN_SCOPE)) { + numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); + } else if (maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { + numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); + } else { + numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); + } + ltcBedYtdMaxOccupancies.add(numOfBeds); + } + // Q2 July, August, September + LtcBedYtdOccupiedDays julyYtdOccDays = new LtcBedYtdOccupiedDays(); + julyYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + julyYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth7()); + julyYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth7()); + julyYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth7()); + julyYtdOccDays.setOccMonth("July"); + julyYtdOccDays.setOccQuarter("Q2"); + + LtcBedYtdOccupiedDays augYtdOccDays = new LtcBedYtdOccupiedDays(); + augYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + augYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth8()); + augYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth8()); + augYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth8()); + augYtdOccDays.setOccMonth("May"); + augYtdOccDays.setOccQuarter("Q2"); + + LtcBedYtdOccupiedDays sepYtdOccDays = new LtcBedYtdOccupiedDays(); + sepYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + sepYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth9()); + sepYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth9()); + sepYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth9()); + sepYtdOccDays.setOccMonth("September"); + sepYtdOccDays.setOccQuarter("Q2"); + + Collections.addAll(ltcBedYtdOccupiedDays, julyYtdOccDays,augYtdOccDays,sepYtdOccDays); + + LtcBedYtdOccupiedDaysTotals q2OccDaysSubttls = new LtcBedYtdOccupiedDaysTotals(); + q2OccDaysSubttls.setConfirmationID(root.getForm().getConfirmationId()); + q2OccDaysSubttls.setOccQuarter("Q2"); + q2OccDaysSubttls.setOccDaysYTDInScopePublic(root.getInScopeTotalQ2()); + q2OccDaysSubttls.setOccDaysYTDOutScopePublic(root.getOutScopeTotalQ2()); + q2OccDaysSubttls.setOccDaysYTDPrivate(root.getPrivateTotalQ2()); + q2OccDaysSubttls.setOccDaysYTDTotalDays(root.getTotalQ2()); + Collections.addAll(ltcBedYtdOccDaysTtls,q2OccDaysSubttls); + + + // Q2 + LtcBedYtdOccupancyRate occInRateQ2 = new LtcBedYtdOccupancyRate(); + occInRateQ2.setConfirmationID(root.getForm().getConfirmationId()); + occInRateQ2.setOccRateBedTypes("In-Scope 3.36 HPRD Publicly Funded Beds"); + occInRateQ2.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); + occInRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); + occInRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); + occInRateQ2.setPercentOcc(root.getNoteInScopeQ1()); + + LtcBedYtdOccupancyRate occOutRateQ2 = new LtcBedYtdOccupancyRate(); + occOutRateQ2.setConfirmationID(root.getForm().getConfirmationId()); + occOutRateQ2.setOccRateBedTypes("Out of Scope Publicly Funded Beds"); + occOutRateQ2.setPlanMaxOccDays(root.getyTDPlannedInScopeQ2()); + occOutRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ2()); + occOutRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ2()); + occOutRateQ2.setPercentOcc(root.getNoteInScopeQ2()); + + LtcBedYtdOccupancyRate occRateQ2 = new LtcBedYtdOccupancyRate(); + occRateQ2.setConfirmationID(root.getForm().getConfirmationId()); + occRateQ2.setOccRateBedTypes("Private Beds"); + occRateQ2.setPlanMaxOccDays(root.getyTDPlannedInScopeQ2()); + occRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ2()); + occRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ2()); + occRateQ2.setPercentOcc(root.getNoteInScopeQ2()); + + LtcBedYtdOccupancyRateTotals q2RateTotals = new LtcBedYtdOccupancyRateTotals(); + q2RateTotals.setConfirmationID(root.getForm().getConfirmationId()); + q2RateTotals.setOccRateQuarter("Q2"); + q2RateTotals.setTotalPlanMaxOccDays(root.getyTDPlannedTotalQ2()); + q2RateTotals.setTotalYTDMaxOccDays(root.getyTDMaxTotalQ2()); + q2RateTotals.setTotalYTDOccDays(root.getyTDOccupiedTotalQ2()); + q2RateTotals.setTotalPercentOcc(root.getOccupiedPercentageTotalQ2()); + + Collections.addAll(ltcBedYtdOccRateTtls,q2RateTotals); + Collections.addAll(ltcBedYtdOccupancyRates, occInRateQ2,occOutRateQ2,occRateQ2); + + break; + case "q3": + for (BedGrid3 maxOcp : root.getBedGrid3()) { + LtcBedYtdMaxOccupancy numOfBeds = new LtcBedYtdMaxOccupancy(); + numOfBeds.setBedFundingType(maxOcp.getBedType()); + numOfBeds.setConfirmationId(root.getForm().getConfirmationId()); + numOfBeds.setStartDate(maxOcp.getStartDate3()); + numOfBeds.setEndDate(maxOcp.getEndDate3()); + numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); + numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + // notes missing + if (maxOcp.getBedType().equals(Constants.IN_SCOPE)) { + numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); + } else if (maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { + numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); + } else { + numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); + } + ltcBedYtdMaxOccupancies.add(numOfBeds); + } + + LtcBedYtdOccupiedDaysTotals q3OccDaysSubttls = new LtcBedYtdOccupiedDaysTotals(); + q3OccDaysSubttls.setConfirmationID(root.getForm().getConfirmationId()); + q3OccDaysSubttls.setOccQuarter("Q3"); + q3OccDaysSubttls.setOccDaysYTDInScopePublic(root.getInScopeTotalQ3()); + q3OccDaysSubttls.setOccDaysYTDOutScopePublic(root.getOutScopeTotalQ3()); + q3OccDaysSubttls.setOccDaysYTDPrivate(root.getPrivateTotalQ3()); + q3OccDaysSubttls.setOccDaysYTDTotalDays(root.getTotalQ3()); + Collections.addAll(ltcBedYtdOccDaysTtls,q3OccDaysSubttls); + + // Q3 October, November, December + LtcBedYtdOccupiedDays octYtdOccDays = new LtcBedYtdOccupiedDays(); + octYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + octYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth10()); + octYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth10()); + octYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth10()); + octYtdOccDays.setOccMonth("October"); + octYtdOccDays.setOccQuarter("Q3"); + + LtcBedYtdOccupiedDays novYtdOccDays = new LtcBedYtdOccupiedDays(); + novYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + novYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth11()); + novYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth11()); + novYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth11()); + novYtdOccDays.setOccMonth("November"); + novYtdOccDays.setOccQuarter("Q3"); + + LtcBedYtdOccupiedDays decYtdOccDays = new LtcBedYtdOccupiedDays(); + decYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + decYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth12()); + decYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth12()); + decYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth12()); + decYtdOccDays.setOccMonth("December"); + decYtdOccDays.setOccQuarter("Q3"); + Collections.addAll(ltcBedYtdOccupiedDays, octYtdOccDays,novYtdOccDays,decYtdOccDays); + + // Q3 + LtcBedYtdOccupancyRate occInRateQ3 = new LtcBedYtdOccupancyRate(); + occInRateQ3.setConfirmationID(root.getForm().getConfirmationId()); + occInRateQ3.setOccRateBedTypes("In-Scope 3.36 HPRD Publicly Funded Beds"); + occInRateQ3.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); + occInRateQ3.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); + occInRateQ3.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); + occInRateQ3.setPercentOcc(root.getNoteInScopeQ1()); + + LtcBedYtdOccupancyRate occOutRateQ3 = new LtcBedYtdOccupancyRate(); + occOutRateQ3.setConfirmationID(root.getForm().getConfirmationId()); + occOutRateQ3.setOccRateBedTypes("Out of Scope Publicly Funded Beds"); + occOutRateQ3.setPlanMaxOccDays(root.getyTDPlannedInScopeQ3()); + occOutRateQ3.setYtdMaxOccDays(root.getyTDMaxInScopeQ3()); + occOutRateQ3.setYtdOccDays(root.getyTDOccupiedInScopeQ3()); + occOutRateQ3.setPercentOcc(root.getNoteInScopeQ3()); + + LtcBedYtdOccupancyRate occRateQ3 = new LtcBedYtdOccupancyRate(); + occRateQ3.setConfirmationID(root.getForm().getConfirmationId()); + occRateQ3.setOccRateBedTypes("Private Beds"); + occRateQ3.setPlanMaxOccDays(root.getyTDPlannedInScopeQ3()); + occRateQ3.setYtdMaxOccDays(root.getyTDMaxInScopeQ3()); + occRateQ3.setYtdOccDays(root.getyTDOccupiedInScopeQ3()); + occRateQ3.setPercentOcc(root.getNoteInScopeQ3()); + + LtcBedYtdOccupancyRateTotals q3RateTotals = new LtcBedYtdOccupancyRateTotals(); + q3RateTotals.setConfirmationID(root.getForm().getConfirmationId()); + q3RateTotals.setOccRateQuarter("Q3"); + q3RateTotals.setTotalPlanMaxOccDays(root.getyTDPlannedTotalQ3()); + q3RateTotals.setTotalYTDMaxOccDays(root.getyTDMaxTotalQ3()); + q3RateTotals.setTotalYTDOccDays(root.getyTDOccupiedTotalQ3()); + q3RateTotals.setTotalPercentOcc(root.getOccupiedPercentageTotalQ3()); + + Collections.addAll(ltcBedYtdOccRateTtls,q3RateTotals); + Collections.addAll(ltcBedYtdOccupancyRates, occInRateQ3,occOutRateQ3,occRateQ3); + break; + case "q4": + for (BedGrid4 maxOcp : root.getBedGrid4()) { + LtcBedYtdMaxOccupancy numOfBeds = new LtcBedYtdMaxOccupancy(); + numOfBeds.setBedFundingType(maxOcp.getBedType()); + numOfBeds.setConfirmationId(root.getForm().getConfirmationId()); + numOfBeds.setStartDate(maxOcp.getStartDate4()); + numOfBeds.setEndDate(maxOcp.getEndDate4()); + numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); + numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + // notes missing + if (maxOcp.getBedType().equals(Constants.IN_SCOPE)) { + numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); + } else if (maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { + numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); + } else { + numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); + } + ltcBedYtdMaxOccupancies.add(numOfBeds); + } + LtcBedYtdOccupiedDaysTotals q4OccDaysSubttls = new LtcBedYtdOccupiedDaysTotals(); + q4OccDaysSubttls.setConfirmationID(root.getForm().getConfirmationId()); + q4OccDaysSubttls.setOccQuarter("Q4"); + q4OccDaysSubttls.setOccDaysYTDInScopePublic(root.getInScopeTotalQ4()); + q4OccDaysSubttls.setOccDaysYTDOutScopePublic(root.getOutScopeTotalQ4()); + q4OccDaysSubttls.setOccDaysYTDPrivate(root.getPrivateTotalQ4()); + q4OccDaysSubttls.setOccDaysYTDTotalDays(root.getTotalQ4()); + Collections.addAll(ltcBedYtdOccDaysTtls,q4OccDaysSubttls); + + // Q4 Jan Feb March + LtcBedYtdOccupiedDays janYtdOccDays = new LtcBedYtdOccupiedDays(); + janYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + janYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth1()); + janYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth1()); + janYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth12()); + janYtdOccDays.setOccMonth("January"); + janYtdOccDays.setOccQuarter("Q4"); + janYtdOccDays.setOccDaysYtdTotalDays(root.getTotalMonth1()); + + LtcBedYtdOccupiedDays febYtdOccDays = new LtcBedYtdOccupiedDays(); + febYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + febYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth2()); + febYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth2()); + febYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth12()); + febYtdOccDays.setOccMonth("February"); + febYtdOccDays.setOccQuarter("Q4"); + febYtdOccDays.setOccDaysYtdTotalDays(root.getTotalMonth2()); + + LtcBedYtdOccupiedDays marYtdOccDays = new LtcBedYtdOccupiedDays(); + marYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); + marYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth3()); + marYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth3()); + marYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth12()); + marYtdOccDays.setOccMonth("March"); + marYtdOccDays.setOccQuarter("Q4"); + marYtdOccDays.setOccDaysYtdTotalDays(root.getTotalMonth3()); + + Collections.addAll(ltcBedYtdOccupiedDays, janYtdOccDays,febYtdOccDays,marYtdOccDays); + + // Q4 + LtcBedYtdOccupancyRate occInRateQ4 = new LtcBedYtdOccupancyRate(); + occInRateQ4.setConfirmationID(root.getForm().getConfirmationId()); + occInRateQ4.setOccRateBedTypes("In-Scope 3.36 HPRD Publicly Funded Beds"); + occInRateQ4.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); + occInRateQ4.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); + occInRateQ4.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); + occInRateQ4.setPercentOcc(root.getNoteInScopeQ1()); + + LtcBedYtdOccupancyRate occOutRateQ4 = new LtcBedYtdOccupancyRate(); + occOutRateQ4.setConfirmationID(root.getForm().getConfirmationId()); + occOutRateQ4.setOccRateBedTypes("Out of Scope Publicly Funded Beds"); + occOutRateQ4.setPlanMaxOccDays(root.getyTDPlannedInScopeQ4()); + occOutRateQ4.setYtdMaxOccDays(root.getyTDMaxInScopeQ4()); + occOutRateQ4.setYtdOccDays(root.getyTDOccupiedInScopeQ4()); + occOutRateQ4.setPercentOcc(root.getNoteInScopeQ4()); + + LtcBedYtdOccupancyRate occRateQ4 = new LtcBedYtdOccupancyRate(); + occRateQ4.setConfirmationID(root.getForm().getConfirmationId()); + occRateQ4.setOccRateBedTypes("Private Beds"); + occRateQ4.setPlanMaxOccDays(root.getyTDPlannedInScopeQ4()); + occRateQ4.setYtdMaxOccDays(root.getyTDMaxInScopeQ4()); + occRateQ4.setYtdOccDays(root.getyTDOccupiedInScopeQ4()); + occRateQ4.setPercentOcc(root.getNoteInScopeQ4()); + + LtcBedYtdOccupancyRateTotals q4RateTotals = new LtcBedYtdOccupancyRateTotals(); + q4RateTotals.setConfirmationID(root.getForm().getConfirmationId()); + q4RateTotals.setOccRateQuarter("Q4"); + q4RateTotals.setTotalPlanMaxOccDays(root.getyTDPlannedTotalQ4()); + q4RateTotals.setTotalYTDMaxOccDays(root.getyTDMaxTotalQ4()); + q4RateTotals.setTotalYTDOccDays(root.getyTDOccupiedTotalQ4()); + q4RateTotals.setTotalPercentOcc(root.getOccupiedPercentageTotalQ4()); + + Collections.addAll(ltcBedYtdOccRateTtls,q4RateTotals); + Collections.addAll(ltcBedYtdOccupancyRates, occInRateQ4,occOutRateQ4,occRateQ4); + + break; + default: + break; + } + + ltcYtdSubmission.setLtcBedYtdMaxOccupancy(ltcBedYtdMaxOccupancies); + ltcYtdSubmission.setLtcBedYtdOccupancyRate(ltcBedYtdOccupancyRates); + ltcYtdSubmission.setLtcBedYtdOccupiedDays(ltcBedYtdOccupiedDays); + ltcYtdSubmission.setLtcYtdCompAddPos(ltcYtdCompAddPos); + ltcYtdSubmission.setLtcYtdCompBenefits(ltcYtdCompBenefits); + ltcYtdSubmission.setLtcYtdCompHrs(ltcYtdCompHrs); + ltcYtdSubmission.setLtcYtdCompSal(ltcYtdCompSal); + ltcYtdSubmission.setLtcYtdDirectCareCost(ltcYtdDcCost); + ltcYtdSubmission.setLtcYtdDirectCareHrs(ltcYtdDcHrs); + ltcYtdSubmission.setLtcYtdExp(ltcYtdExp); + ltcYtdSubmission.setLtcYtdRev(ltcYtdRev); + + ltcYtdSubmissions.add(ltcYtdSubmission); + + } + + return ltcYtdSubmissions; + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdFileProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdFileProcessor.java new file mode 100644 index 00000000..17d2df63 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdFileProcessor.java @@ -0,0 +1,19 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor; + +import org.apache.camel.Exchange; + +import org.apache.camel.Processor; + +//import ca.bc.gov.chefs.etl.parser.FileModel; + +public class LtcQuaterlyYtdFileProcessor implements Processor{ + + @Override + public void process(Exchange exchange) throws Exception { + // FileModel fileModel = (FileModel) exchange.getIn().getBody(); + + + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdProcessor.java new file mode 100644 index 00000000..5f11c6ea --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdProcessor.java @@ -0,0 +1,17 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class LtcQuaterlyYtdProcessor implements Processor { + private static final Logger logger = LoggerFactory.getLogger(LtcQuaterlyYtdApiProcessor.class); + @Override + public void process(Exchange exchange) throws Exception { + logger.info("Hello! Processing Now: current timestamp is: {}",System.currentTimeMillis()); + logger.info("Body Received: {}", exchange.getIn().getBody()); + + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java new file mode 100644 index 00000000..701bc9f0 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java @@ -0,0 +1,43 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.route; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ca.bc.gov.chefs.etl.core.routes.BaseRoute; +import ca.bc.gov.chefs.etl.forms.aims.route.AIMSFormRoute; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor.LtcQuaterlyYtdApiProcessor; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor.LtcQuaterlyYtdApiResponseProcessor; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor.LtcQuaterlyYtdProcessor; + +public class LtcQuaterlyYtdRoute extends BaseRoute { + + private static final Logger logger = LoggerFactory.getLogger(AIMSFormRoute.class); + @Override + public void configure() throws Exception { + logger.info("Loaded LTC QYTD Form Route"); + + /** + * receive JSON payload, parse and set to make an API call + * + * + */ + // trigger + from("jetty:http://{{hostname}}:{{port}}/ltc-quaterly-ytd").routeId("ltc-quaterly-ytd-form") + .log("CHEFS-ETL received a request for LTCQ Form extraction")//.bean(AIMSFormPayloadExtractor.class) + .process(new LtcQuaterlyYtdProcessor()).to("direct:ltc-quaterly-ytd").end(); + + from("direct:ltc-quaterly-ytd").process(new LtcQuaterlyYtdApiProcessor()) + // to the http uri + .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/256760e7-6e8b-44c4-8b63-51fb72c8c2cf/export?bridgeEndpoint=true&format=json&type=submissions") + .log("This is the status code from the response: ${header.CamelHttpResponseCode}") + .log("Trying to convert the received body OK").convertBodyTo(String.class) + .process(new LtcQuaterlyYtdApiResponseProcessor()).end(); + + // file conversion + /* + * from("direct:ltc-quarterly-csv-processing").routeId("") + * .log("CHEFS ETL received a request to encrypt files") .process() + */ + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPerf.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPerf.java new file mode 100644 index 00000000..89120aad --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPerf.java @@ -0,0 +1,52 @@ +package ca.bc.gov.chefs.etl.forms.ltc.staffing; + +import java.util.List; + +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LTCStaffPlanPerf implements IModel{ + + private String confirmationId; + private String staffingPlanNum; + private String perf; + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getStaffingPlanNum() { + return staffingPlanNum; + } + public void setStaffingPlanNum(String staffingPlanNum) { + this.staffingPlanNum = staffingPlanNum; + } + public String getPerf() { + return perf; + } + public void setPerf(String perf) { + this.perf = perf; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + // TODO Auto-generated method stub + return null; + } + @Override + public List getCsvElements() { + // TODO Auto-generated method stub + return null; + } + @Override + public List getObjects() { + // TODO Auto-generated method stub + return null; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPosType.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPosType.java new file mode 100644 index 00000000..537f69cf --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPosType.java @@ -0,0 +1,254 @@ +package ca.bc.gov.chefs.etl.forms.ltc.staffing; + +import java.util.List; + +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LTCStaffPlanPosType implements IModel { + + private String confirmationId; + private String staffingPlanNum; + private String staffHrsPosType; + private String sumStaffHrsMon; + private String sumStaffHrsTue; + private String sumStaffHrsWed; + private String sumStaffHrsThurs; + private String sumStaffHrsFri; + private String sumStaffHrsSat; + private String sumStaffHrsSun; + private String sumStaffHrsWkTotal; + private String sumStaffHrsAnnual; + + /* Summary of Annual Hours Paid one and only*/ + private String sumNursAnnual; + private String sumNursInhouse; + private String sumNursContracted; + private String sumNursTotal; + private String sumAlliedNpAnnual; + private String sumAlliedNpInhouse; + private String sumAlliedNpContracted; + private String sumAlliedNpTotal; + private String sumAlliedProfAnnual; + private String sumAlliedProfInhouse; + private String sumAlliedProfContracted; + private String sumAlliedProfTotal; + + + + public String getConfirmationId() { + return confirmationId; + } + + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + + public String getStaffingPlanNum() { + return staffingPlanNum; + } + + public void setStaffingPlanNum(String staffingPlanNum) { + this.staffingPlanNum = staffingPlanNum; + } + + public String getStaffHrsPosType() { + return staffHrsPosType; + } + + public void setStaffHrsPosType(String staffHrsPosType) { + this.staffHrsPosType = staffHrsPosType; + } + + public String getSumStaffHrsMon() { + return sumStaffHrsMon; + } + + public void setSumStaffHrsMon(String sumStaffHrsMon) { + this.sumStaffHrsMon = sumStaffHrsMon; + } + + public String getSumStaffHrsTue() { + return sumStaffHrsTue; + } + + public void setSumStaffHrsTue(String sumStaffHrsTue) { + this.sumStaffHrsTue = sumStaffHrsTue; + } + + public String getSumStaffHrsWed() { + return sumStaffHrsWed; + } + + public void setSumStaffHrsWed(String sumStaffHrsWed) { + this.sumStaffHrsWed = sumStaffHrsWed; + } + + public String getSumStaffHrsThurs() { + return sumStaffHrsThurs; + } + + public void setSumStaffHrsThurs(String sumStaffHrsThurs) { + this.sumStaffHrsThurs = sumStaffHrsThurs; + } + + public String getSumStaffHrsFri() { + return sumStaffHrsFri; + } + + public void setSumStaffHrsFri(String sumStaffHrsFri) { + this.sumStaffHrsFri = sumStaffHrsFri; + } + + public String getSumStaffHrsSat() { + return sumStaffHrsSat; + } + + public void setSumStaffHrsSat(String sumStaffHrsSat) { + this.sumStaffHrsSat = sumStaffHrsSat; + } + + public String getSumStaffHrsSun() { + return sumStaffHrsSun; + } + + public void setSumStaffHrsSun(String sumStaffHrsSun) { + this.sumStaffHrsSun = sumStaffHrsSun; + } + + public String getSumStaffHrsWkTotal() { + return sumStaffHrsWkTotal; + } + + public void setSumStaffHrsWkTotal(String sumStaffHrsWkTotal) { + this.sumStaffHrsWkTotal = sumStaffHrsWkTotal; + } + + public String getSumStaffHrsAnnual() { + return sumStaffHrsAnnual; + } + + public void setSumStaffHrsAnnual(String sumStaffHrsAnnual) { + this.sumStaffHrsAnnual = sumStaffHrsAnnual; + } + + public String getSumNursAnnual() { + return sumNursAnnual; + } + + public void setSumNursAnnual(String sumNursAnnual) { + this.sumNursAnnual = sumNursAnnual; + } + + public String getSumNursInhouse() { + return sumNursInhouse; + } + + public void setSumNursInhouse(String sumNursInhouse) { + this.sumNursInhouse = sumNursInhouse; + } + + public String getSumNursContracted() { + return sumNursContracted; + } + + public void setSumNursContracted(String sumNursContracted) { + this.sumNursContracted = sumNursContracted; + } + + public String getSumNursTotal() { + return sumNursTotal; + } + + public void setSumNursTotal(String sumNursTotal) { + this.sumNursTotal = sumNursTotal; + } + + public String getSumAlliedNpAnnual() { + return sumAlliedNpAnnual; + } + + public void setSumAlliedNpAnnual(String sumAlliedNpAnnual) { + this.sumAlliedNpAnnual = sumAlliedNpAnnual; + } + + public String getSumAlliedNpInhouse() { + return sumAlliedNpInhouse; + } + + public void setSumAlliedNpInhouse(String sumAlliedNpInhouse) { + this.sumAlliedNpInhouse = sumAlliedNpInhouse; + } + + public String getSumAlliedNpContracted() { + return sumAlliedNpContracted; + } + + public void setSumAlliedNpContracted(String sumAlliedNpContracted) { + this.sumAlliedNpContracted = sumAlliedNpContracted; + } + + public String getSumAlliedNpTotal() { + return sumAlliedNpTotal; + } + + public void setSumAlliedNpTotal(String sumAlliedNpTotal) { + this.sumAlliedNpTotal = sumAlliedNpTotal; + } + + public String getSumAlliedProfAnnual() { + return sumAlliedProfAnnual; + } + + public void setSumAlliedProfAnnual(String sumAlliedProfAnnual) { + this.sumAlliedProfAnnual = sumAlliedProfAnnual; + } + + public String getSumAlliedProfInhouse() { + return sumAlliedProfInhouse; + } + + public void setSumAlliedProfInhouse(String sumAlliedProfInhouse) { + this.sumAlliedProfInhouse = sumAlliedProfInhouse; + } + + public String getSumAlliedProfContracted() { + return sumAlliedProfContracted; + } + + public void setSumAlliedProfContracted(String sumAlliedProfContracted) { + this.sumAlliedProfContracted = sumAlliedProfContracted; + } + + public String getSumAlliedProfTotal() { + return sumAlliedProfTotal; + } + + public void setSumAlliedProfTotal(String sumAlliedProfTotal) { + this.sumAlliedProfTotal = sumAlliedProfTotal; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getCsvElements() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getObjects() { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingAddPos.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingAddPos.java new file mode 100644 index 00000000..fff099a2 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingAddPos.java @@ -0,0 +1,91 @@ +package ca.bc.gov.chefs.etl.forms.ltc.staffing; + +import java.util.List; + +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LTCStaffingAddPos implements IModel { + + /* Contracted Services Provider*/ + private String confirmationId; + private String staffingPlanNum; + private String staffingHrsPosType; + private String staffHrsServiceContractOut; + private String staffHrsLegalNameContractService; + private String staffHoursPercentServiceContractOut; + + + + public String getConfirmationId() { + return confirmationId; + } + + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + + public String getStaffingPlanNum() { + return staffingPlanNum; + } + + public void setStaffingPlanNum(String staffingPlanNum) { + this.staffingPlanNum = staffingPlanNum; + } + + public String getStaffingHrsPosType() { + return staffingHrsPosType; + } + + public void setStaffingHrsPosType(String staffingHrsPosType) { + this.staffingHrsPosType = staffingHrsPosType; + } + + public String getStaffHrsServiceContractOut() { + return staffHrsServiceContractOut; + } + + public void setStaffHrsServiceContractOut(String staffHrsServiceContractOut) { + this.staffHrsServiceContractOut = staffHrsServiceContractOut; + } + + public String getStaffHrsLegalNameContractService() { + return staffHrsLegalNameContractService; + } + + public void setStaffHrsLegalNameContractService(String staffHrsLegalNameContractService) { + this.staffHrsLegalNameContractService = staffHrsLegalNameContractService; + } + + public String getStaffHoursPercentServiceContractOut() { + return staffHoursPercentServiceContractOut; + } + + public void setStaffHoursPercentServiceContractOut(String staffHoursPercentServiceContractOut) { + this.staffHoursPercentServiceContractOut = staffHoursPercentServiceContractOut; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getCsvElements() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getObjects() { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingHrs.java new file mode 100644 index 00000000..18d5db4a --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingHrs.java @@ -0,0 +1,176 @@ +package ca.bc.gov.chefs.etl.forms.ltc.staffing; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LTCStaffingHrs implements IModel{ + + private String confirmationId; + private String staffingPlanNum; + private String staffHrsPosType; + private String staffHrsPosShiftType; + private String staffHrsMon; + private String staffHrsTue; + private String staffHrsWed; + private String staffHrsThurs; + private String staffHrsFri; + private String staffHrsSat; + private String staffHrsSun; + private String staffHrsWkTotal; + private String staffHrsAnnual; + + public static List alliedProfessionals = new ArrayList<>(Arrays.asList( + "occupationalTherapist", + "physiotherapist", + "dietitian", + "Social Worker", + "Speech Path", + "Resp. Therapist", + "Medical Lab. Tech." + )); + + /* repeated field 4.1*/ + private String rn247; + + + + public String getConfirmationId() { + return confirmationId; + } + + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + + public String getStaffingPlanNum() { + return staffingPlanNum; + } + + public void setStaffingPlanNum(String staffingPlanNum) { + this.staffingPlanNum = staffingPlanNum; + } + + public String getStaffHrsPosType() { + return staffHrsPosType; + } + + public void setStaffHrsPosType(String staffHrsPosType) { + this.staffHrsPosType = staffHrsPosType; + } + + public String getStaffHrsPosShiftType() { + return staffHrsPosShiftType; + } + + public void setStaffHrsPosShiftType(String staffHrsPosShiftType) { + this.staffHrsPosShiftType = staffHrsPosShiftType; + } + + public String getStaffHrsMon() { + return staffHrsMon; + } + + public void setStaffHrsMon(String staffHrsMon) { + this.staffHrsMon = staffHrsMon; + } + + public String getStaffHrsTue() { + return staffHrsTue; + } + + public void setStaffHrsTue(String staffHrsTue) { + this.staffHrsTue = staffHrsTue; + } + + public String getStaffHrsWed() { + return staffHrsWed; + } + + public void setStaffHrsWed(String staffHrsWed) { + this.staffHrsWed = staffHrsWed; + } + + public String getStaffHrsThurs() { + return staffHrsThurs; + } + + public void setStaffHrsThurs(String staffHrsThurs) { + this.staffHrsThurs = staffHrsThurs; + } + + public String getStaffHrsFri() { + return staffHrsFri; + } + + public void setStaffHrsFri(String staffHrsFri) { + this.staffHrsFri = staffHrsFri; + } + + public String getStaffHrsSat() { + return staffHrsSat; + } + + public void setStaffHrsSat(String staffHrsSat) { + this.staffHrsSat = staffHrsSat; + } + + public String getStaffHrsSun() { + return staffHrsSun; + } + + public void setStaffHrsSun(String staffHrsSun) { + this.staffHrsSun = staffHrsSun; + } + + public String getStaffHrsWkTotal() { + return staffHrsWkTotal; + } + + public void setStaffHrsWkTotal(String staffHrsWkTotal) { + this.staffHrsWkTotal = staffHrsWkTotal; + } + + public String getStaffHrsAnnual() { + return staffHrsAnnual; + } + + public void setStaffHrsAnnual(String staffHrsAnnual) { + this.staffHrsAnnual = staffHrsAnnual; + } + + public String getRn247() { + return rn247; + } + + public void setRn247(String rn247) { + this.rn247 = rn247; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getCsvElements() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getObjects() { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingPlan.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingPlan.java new file mode 100644 index 00000000..fd1e9c08 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingPlan.java @@ -0,0 +1,516 @@ +//package ca.bc.gov.chefs.etl.forms.ltc.staffing; +// +//import java.util.ArrayList; +// +//import java.util.List; +//import java.util.Map; +// +//import com.fasterxml.jackson.annotation.JsonProperty; +// +//import ca.bc.gov.chefs.etl.parser.IModel; +// +//public class LTCStaffingPlan implements IModel{ +// +// /* data which occurs only one*/ +// private String confirmationId; +// private String staffingPlanNum; // sequential not captured by json +// private String staffPlanFor; +// private String periodStart; +// private String periodEnd; +// private String revisionDate; +// private String reasonForRev; +// private String nbTotalBeds; +// /* ends */ +// +// /* 4.1, 4.2 */ +// private String perfIndicator; +// private String perfOtherSpecify; +// private String staffPlanForOther; +// /* 4.3 */ +// +// /* Total Scheduled Hours (Prof and Non Prof) */ +// private String totalHrsNursMon; +// private String totalHrsNursTue; +// private String totalHrsNursWed; +// private String totalHrsNursThurs; +// private String totalHrsNursFri; +// private String totalHrsNursSat; +// private String totalHrsNursSun; +// private String totalHrsNursWkTotal; +// private String totalHrsNursAnnual; +// +// /* main page nursing, allied and total, occurs once.*/ +// private String hprdTotalNursMon; +// private String hprdTotalNursTues; +// private String hprdTotalNursWed; +// private String hprdTotalNursThurs; +// private String hprdTotalNursFri; +// private String hprdTotalNursSat; +// private String hprdTotalNursSun; +// private String hprdTotalNursWkTotal; +// private String hprdTotalAlliedMon; +// private String hprdTotalAlliedTues; +// private String hprdTotalAlliedWed; +// private String hprdTotalAlliedThurs; +// private String hprdTotalAlliedFri; +// private String hprdTotalAlliedSat; +// private String hprdTotalAlliedSun; +// private String hprdTotalAlliedWkTotal; +// +// /* Scheduled Worked Hours By Position type */ +// private List ltcStaffingHours = new ArrayList<>(); +// +// /* Additional Position Type Information */ +// private List ltcStaffingAddPos; +// +// +// @JsonProperty("dataGrid") +// private void unpackDataGrid(Map[] maps) { +// for(Map map : maps) { +// /* Considering NP */ +// Map np = (Map) map.get("np"); +// /* days evenings and nights */ +// LTCStaffingHrs ltcRnDay = new LTCStaffingHrs(); +// ltcRnDay.setConfirmationId(this.confirmationId); +// ltcRnDay.setStaffHrsPosType("rn"); +// ltcRnDay.setStaffHrsPosShiftType("day"); +// ltcRnDay.setStaffHrsMon((String) np.get("rn_day_mon")); +// ltcRnDay.setStaffHrsTue((String) np.get("rn_day_tue")); +// ltcRnDay.setStaffHrsWed((String) np.get("rn_day_wed")); +// ltcRnDay.setStaffHrsThurs((String) np.get("rn_day_thurs")); +// ltcRnDay.setStaffHrsFri((String) np.get("rn_day_fri")); +// ltcRnDay.setStaffHrsSat((String) np.get("rn_day_sat")); +// ltcRnDay.setStaffHrsSun((String) np.get("rn_day_sun")); +// ltcRnDay.setStaffHrsWkTotal((String) np.get("rn_day_total_week")); +// ltcRnDay.setStaffHrsAnnual((String) np.get("rn_day_total_annual")); +// +// LTCStaffingHrs ltcRnEvening = new LTCStaffingHrs(); +// ltcRnEvening.setStaffHrsPosType("rn"); +// ltcRnEvening.setStaffHrsPosShiftType("eve"); +// ltcRnEvening.setStaffHrsMon((String) np.get("rn_eve_mon")); +// ltcRnEvening.setConfirmationId(this.confirmationId); +// ltcRnEvening.setStaffHrsMon((String) np.get("rn_eve_mon")); +// ltcRnEvening.setStaffHrsTue((String) np.get("rn_eve_tue")); +// ltcRnEvening.setStaffHrsWed((String) np.get("rn_eve_wed")); +// ltcRnEvening.setStaffHrsThurs((String) np.get("rn_eve_thurs")); +// ltcRnEvening.setStaffHrsFri((String) np.get("rn_eve_fri")); +// ltcRnEvening.setStaffHrsSat((String) np.get("rn_eve_sat")); +// ltcRnEvening.setStaffHrsSun((String) np.get("rn_eve_sun")); +// ltcRnEvening.setStaffHrsWkTotal((String) np.get("rn_eve_total_week")); +// ltcRnEvening.setStaffHrsAnnual((String) np.get("rn_eve_total_annual")); +// +// LTCStaffingHrs ltcRnNight = new LTCStaffingHrs(); +// ltcRnNight.setConfirmationId(this.confirmationId); +// ltcRnNight.setStaffHrsPosType("rn"); +// ltcRnNight.setStaffHrsPosShiftType("night"); +// ltcRnNight.setStaffHrsMon((String) np.get("rn_night_mon")); +// ltcRnNight.setStaffHrsTue((String) np.get("rn_night_tue")); +// ltcRnNight.setStaffHrsWed((String) np.get("rn_night_wed")); +// ltcRnNight.setStaffHrsThurs((String) np.get("rn_night_thurs")); +// ltcRnNight.setStaffHrsFri((String) np.get("rn_night_fri")); +// ltcRnNight.setStaffHrsSat((String) np.get("rn_night_sat")); +// ltcRnNight.setStaffHrsSun((String) np.get("rn_night_sun")); +// ltcRnNight.setStaffHrsWkTotal((String) np.get("rn_night_total_week")); +// ltcRnNight.setStaffHrsAnnual((String) np.get("rn_night_total_annual")); +// +// +// /* Allied Professional */ +// LTCStaffingHrs allOcTherapist = new LTCStaffingHrs(); +// allOcTherapist.setConfirmationId(this.confirmationId); +// allOcTherapist.setStaffHrsPosType("ot"); +// //allOcTherapist.setStaffHrsPosShiftType("night"); +// allOcTherapist.setStaffHrsMon((String) np.get("ald_ot_mon")); +// allOcTherapist.setStaffHrsTue((String) np.get("ald_ot_tue")); +// allOcTherapist.setStaffHrsWed((String) np.get("ald_ot_wed")); +// allOcTherapist.setStaffHrsThurs((String) np.get("ald_ot_thurs")); +// allOcTherapist.setStaffHrsFri((String) np.get("ald_ot_fri")); +// allOcTherapist.setStaffHrsSat((String) np.get("ald_ot_sat")); +// allOcTherapist.setStaffHrsSun((String) np.get("ald_ot_sun")); +// allOcTherapist.setStaffHrsWkTotal((String) np.get("ald_ot_total_week")); +// allOcTherapist.setStaffHrsAnnual((String) np.get("ald_ot_total_annual")); +// +// LTCStaffingHrs allPhysiotherapist = new LTCStaffingHrs(); +// allPhysiotherapist.setConfirmationId(this.confirmationId); +// allPhysiotherapist.setStaffHrsPosType("dt"); +// //allOcTherapist.setStaffHrsPosShiftType("night"); +// allPhysiotherapist.setStaffHrsMon((String) np.get("ald_dt_mon")); +// allPhysiotherapist.setStaffHrsTue((String) np.get("ald_dt_tue")); +// allPhysiotherapist.setStaffHrsWed((String) np.get("ald_dt_wed")); +// allPhysiotherapist.setStaffHrsThurs((String) np.get("ald_dt_thurs")); +// allPhysiotherapist.setStaffHrsFri((String) np.get("ald_dt_fri")); +// allPhysiotherapist.setStaffHrsSat((String) np.get("ald_dt_sat")); +// allPhysiotherapist.setStaffHrsSun((String) np.get("ald_dt_sun")); +// allPhysiotherapist.setStaffHrsWkTotal((String) np.get("ald_dt_total_week")); +// allPhysiotherapist.setStaffHrsAnnual((String) np.get("ald_dt_total_annual")); +// +// LTCStaffingHrs allDietician = new LTCStaffingHrs(); +// allDietician.setConfirmationId(this.confirmationId); +// allDietician.setStaffHrsPosType("dt"); +// //allOcTherapist.setStaffHrsPosShiftType("night"); +// allDietician.setStaffHrsMon((String) np.get("ald_dt_mon")); +// allDietician.setStaffHrsTue((String) np.get("ald_dt_tue")); +// allDietician.setStaffHrsWed((String) np.get("ald_dt_wed")); +// allDietician.setStaffHrsThurs((String) np.get("ald_dt_thurs")); +// allDietician.setStaffHrsFri((String) np.get("ald_dt_fri")); +// allDietician.setStaffHrsSat((String) np.get("ald_dt_sat")); +// allDietician.setStaffHrsSun((String) np.get("ald_dt_sun")); +// allDietician.setStaffHrsWkTotal((String) np.get("ald_dt_total_week")); +// allDietician.setStaffHrsAnnual((String) np.get("ald_dt_total_annual")); +// +// LTCStaffingHrs allSocialWorker = new LTCStaffingHrs(); +// allSocialWorker.setConfirmationId(this.confirmationId); +// allSocialWorker.setStaffHrsPosType("sw"); +// //allOcTherapist.setStaffHrsPosShiftType("night"); +// allSocialWorker.setStaffHrsMon((String) np.get("ald_sw_mon")); +// allSocialWorker.setStaffHrsTue((String) np.get("ald_sw_tue")); +// allSocialWorker.setStaffHrsWed((String) np.get("ald_sw_wed")); +// allSocialWorker.setStaffHrsThurs((String) np.get("ald_sw_thurs")); +// allSocialWorker.setStaffHrsFri((String) np.get("ald_sw_fri")); +// allSocialWorker.setStaffHrsSat((String) np.get("ald_sw_sat")); +// allSocialWorker.setStaffHrsSun((String) np.get("ald_sw_sun")); +// allSocialWorker.setStaffHrsWkTotal((String) np.get("ald_sw_total_week")); +// allSocialWorker.setStaffHrsAnnual((String) np.get("ald_sw_total_annual")); +// +// +// LTCStaffingHrs allSpeechPath = new LTCStaffingHrs(); +// allSpeechPath.setConfirmationId(this.confirmationId); +// allSpeechPath.setStaffHrsPosType("sw"); +// //allOcTherapist.setStaffHrsPosShiftType("night"); +// allSpeechPath.setStaffHrsMon((String) np.get("ald_sw_mon")); +// allSpeechPath.setStaffHrsTue((String) np.get("ald_sw_tue")); +// allSpeechPath.setStaffHrsWed((String) np.get("ald_sw_wed")); +// allSpeechPath.setStaffHrsThurs((String) np.get("ald_sw_thurs")); +// allSpeechPath.setStaffHrsFri((String) np.get("ald_sw_fri")); +// allSpeechPath.setStaffHrsSat((String) np.get("ald_sw_sat")); +// allSpeechPath.setStaffHrsSun((String) np.get("ald_sw_sun")); +// allSpeechPath.setStaffHrsWkTotal((String) np.get("ald_sw_total_week")); +// allSpeechPath.setStaffHrsAnnual((String) np.get("ald_sw_total_annual")); +// +// +// +// +// +// } +// } +// +// public List getLtcStaffingAddPos() { +// return ltcStaffingAddPos; +// } +// +// public void setLtcStaffingAddPos(List ltcStaffingAddPos) { +// this.ltcStaffingAddPos = ltcStaffingAddPos; +// } +// +// public String getConfirmationId() { +// return confirmationId; +// } +// +// public void setConfirmationId(String confirmationId) { +// this.confirmationId = confirmationId; +// } +// +// public String getStaffingPlanNum() { +// return staffingPlanNum; +// } +// +// public void setStaffingPlanNum(String staffingPlanNum) { +// this.staffingPlanNum = staffingPlanNum; +// } +// +// public String getStaffPlanFor() { +// return staffPlanFor; +// } +// +// public void setStaffPlanFor(String staffPlanFor) { +// this.staffPlanFor = staffPlanFor; +// } +// +// public String getPeriodStart() { +// return periodStart; +// } +// +// public void setPeriodStart(String periodStart) { +// this.periodStart = periodStart; +// } +// +// public String getPeriodEnd() { +// return periodEnd; +// } +// +// public void setPeriodEnd(String periodEnd) { +// this.periodEnd = periodEnd; +// } +// +// public String getRevisionDate() { +// return revisionDate; +// } +// +// public void setRevisionDate(String revisionDate) { +// this.revisionDate = revisionDate; +// } +// +// public String getReasonForRev() { +// return reasonForRev; +// } +// +// public void setReasonForRev(String reasonForRev) { +// this.reasonForRev = reasonForRev; +// } +// +// public String getNbTotalBeds() { +// return nbTotalBeds; +// } +// +// public void setNbTotalBeds(String nbTotalBeds) { +// this.nbTotalBeds = nbTotalBeds; +// } +// +// public String getPerfIndicator() { +// return perfIndicator; +// } +// +// public void setPerfIndicator(String perfIndicator) { +// this.perfIndicator = perfIndicator; +// } +// +// public String getPerfOtherSpecify() { +// return perfOtherSpecify; +// } +// +// public void setPerfOtherSpecify(String perfOtherSpecify) { +// this.perfOtherSpecify = perfOtherSpecify; +// } +// +// public String getStaffPlanForOther() { +// return staffPlanForOther; +// } +// +// public void setStaffPlanForOther(String staffPlanForOther) { +// this.staffPlanForOther = staffPlanForOther; +// } +// +// public String getTotalHrsNursMon() { +// return totalHrsNursMon; +// } +// +// public void setTotalHrsNursMon(String totalHrsNursMon) { +// this.totalHrsNursMon = totalHrsNursMon; +// } +// +// public String getTotalHrsNursTue() { +// return totalHrsNursTue; +// } +// +// public void setTotalHrsNursTue(String totalHrsNursTue) { +// this.totalHrsNursTue = totalHrsNursTue; +// } +// +// public String getTotalHrsNursWed() { +// return totalHrsNursWed; +// } +// +// public void setTotalHrsNursWed(String totalHrsNursWed) { +// this.totalHrsNursWed = totalHrsNursWed; +// } +// +// public String getTotalHrsNursThurs() { +// return totalHrsNursThurs; +// } +// +// public void setTotalHrsNursThurs(String totalHrsNursThurs) { +// this.totalHrsNursThurs = totalHrsNursThurs; +// } +// +// public String getTotalHrsNursFri() { +// return totalHrsNursFri; +// } +// +// public void setTotalHrsNursFri(String totalHrsNursFri) { +// this.totalHrsNursFri = totalHrsNursFri; +// } +// +// public String getTotalHrsNursSat() { +// return totalHrsNursSat; +// } +// +// public void setTotalHrsNursSat(String totalHrsNursSat) { +// this.totalHrsNursSat = totalHrsNursSat; +// } +// +// public String getTotalHrsNursSun() { +// return totalHrsNursSun; +// } +// +// public void setTotalHrsNursSun(String totalHrsNursSun) { +// this.totalHrsNursSun = totalHrsNursSun; +// } +// +// public String getTotalHrsNursWkTotal() { +// return totalHrsNursWkTotal; +// } +// +// public void setTotalHrsNursWkTotal(String totalHrsNursWkTotal) { +// this.totalHrsNursWkTotal = totalHrsNursWkTotal; +// } +// +// public String getTotalHrsNursAnnual() { +// return totalHrsNursAnnual; +// } +// +// public void setTotalHrsNursAnnual(String totalHrsNursAnnual) { +// this.totalHrsNursAnnual = totalHrsNursAnnual; +// } +// +// public String getHprdTotalNursMon() { +// return hprdTotalNursMon; +// } +// +// public void setHprdTotalNursMon(String hprdTotalNursMon) { +// this.hprdTotalNursMon = hprdTotalNursMon; +// } +// +// public String getHprdTotalNursTues() { +// return hprdTotalNursTues; +// } +// +// public void setHprdTotalNursTues(String hprdTotalNursTues) { +// this.hprdTotalNursTues = hprdTotalNursTues; +// } +// +// public String getHprdTotalNursWed() { +// return hprdTotalNursWed; +// } +// +// public void setHprdTotalNursWed(String hprdTotalNursWed) { +// this.hprdTotalNursWed = hprdTotalNursWed; +// } +// +// public String getHprdTotalNursThurs() { +// return hprdTotalNursThurs; +// } +// +// public void setHprdTotalNursThurs(String hprdTotalNursThurs) { +// this.hprdTotalNursThurs = hprdTotalNursThurs; +// } +// +// public String getHprdTotalNursFri() { +// return hprdTotalNursFri; +// } +// +// public void setHprdTotalNursFri(String hprdTotalNursFri) { +// this.hprdTotalNursFri = hprdTotalNursFri; +// } +// +// public String getHprdTotalNursSat() { +// return hprdTotalNursSat; +// } +// +// public void setHprdTotalNursSat(String hprdTotalNursSat) { +// this.hprdTotalNursSat = hprdTotalNursSat; +// } +// +// public String getHprdTotalNursSun() { +// return hprdTotalNursSun; +// } +// +// public void setHprdTotalNursSun(String hprdTotalNursSun) { +// this.hprdTotalNursSun = hprdTotalNursSun; +// } +// +// public String getHprdTotalNursWkTotal() { +// return hprdTotalNursWkTotal; +// } +// +// public void setHprdTotalNursWkTotal(String hprdTotalNursWkTotal) { +// this.hprdTotalNursWkTotal = hprdTotalNursWkTotal; +// } +// +// public String getHprdTotalAlliedMon() { +// return hprdTotalAlliedMon; +// } +// +// public void setHprdTotalAlliedMon(String hprdTotalAlliedMon) { +// this.hprdTotalAlliedMon = hprdTotalAlliedMon; +// } +// +// public String getHprdTotalAlliedTues() { +// return hprdTotalAlliedTues; +// } +// +// public void setHprdTotalAlliedTues(String hprdTotalAlliedTues) { +// this.hprdTotalAlliedTues = hprdTotalAlliedTues; +// } +// +// public String getHprdTotalAlliedWed() { +// return hprdTotalAlliedWed; +// } +// +// public void setHprdTotalAlliedWed(String hprdTotalAlliedWed) { +// this.hprdTotalAlliedWed = hprdTotalAlliedWed; +// } +// +// public String getHprdTotalAlliedThurs() { +// return hprdTotalAlliedThurs; +// } +// +// public void setHprdTotalAlliedThurs(String hprdTotalAlliedThurs) { +// this.hprdTotalAlliedThurs = hprdTotalAlliedThurs; +// } +// +// public String getHprdTotalAlliedFri() { +// return hprdTotalAlliedFri; +// } +// +// public void setHprdTotalAlliedFri(String hprdTotalAlliedFri) { +// this.hprdTotalAlliedFri = hprdTotalAlliedFri; +// } +// +// public String getHprdTotalAlliedSat() { +// return hprdTotalAlliedSat; +// } +// +// public void setHprdTotalAlliedSat(String hprdTotalAlliedSat) { +// this.hprdTotalAlliedSat = hprdTotalAlliedSat; +// } +// +// public String getHprdTotalAlliedSun() { +// return hprdTotalAlliedSun; +// } +// +// public void setHprdTotalAlliedSun(String hprdTotalAlliedSun) { +// this.hprdTotalAlliedSun = hprdTotalAlliedSun; +// } +// +// public String getHprdTotalAlliedWkTotal() { +// return hprdTotalAlliedWkTotal; +// } +// +// public void setHprdTotalAlliedWkTotal(String hprdTotalAlliedWkTotal) { +// this.hprdTotalAlliedWkTotal = hprdTotalAlliedWkTotal; +// } +// +// @Override +// public String getFileName() { +// // TODO Auto-generated method stub +// return null; +// } +// +// @Override +// public String getFormType() { +// // TODO Auto-generated method stub +// return null; +// } +// +// @Override +// public List getCsvElements() { +// // TODO Auto-generated method stub +// return null; +// } +// +// @Override +// public List getObjects() { +// // TODO Auto-generated method stub +// return null; +// } +// +//} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/LoginCredentials.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/LoginCredentials.java new file mode 100644 index 00000000..4c30f9f0 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/LoginCredentials.java @@ -0,0 +1,74 @@ +package ca.bc.gov.chefs.etl.forms.testform; + +import java.util.ArrayList; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import ca.bc.gov.chefs.etl.parser.IModel; + +public class LoginCredentials implements IModel { + + @Override + public String toString() { + return "LoginCredentials [username=" + username + ", password=" + password + "]"; + } + + @JsonProperty("username1") + private String username; + + @JsonProperty("password") + private String password; + + public String getConfirmationId() { + return confirmationId; + } + + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + + @JsonProperty("confirmationId") + private String confirmationId; + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Override + public String getFileName() { + return "sample-today.csv"; + } + + @Override + public String getFormType() { + return "TestModel#LoginCredentials"; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.username); + elements.add(this.password); + elements.add(this.confirmationId); + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/PersonDetails.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/PersonDetails.java new file mode 100644 index 00000000..2cd0a829 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/PersonDetails.java @@ -0,0 +1,95 @@ +package ca.bc.gov.chefs.etl.forms.testform; + +import java.util.ArrayList; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonProperty; + +import ca.bc.gov.chefs.etl.parser.IModel; + +public class PersonDetails implements IModel { + + @JsonProperty("firstName") + private String firstname; + @JsonProperty("lastName") + private String lastname; + @JsonProperty("birthPlace") + private String birthPlace; + @JsonProperty("education") + private String education; + @JsonProperty("confirmationId") + private String confirmationId; + + public String getConfirmationId() { + return confirmationId; + } + + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + + public String getFirstname() { + return firstname; + } + + @Override + public String toString() { + return "PersonDetails [firstname=" + firstname + ", lastname=" + lastname + ", birthPlace=" + birthPlace + + ", education=" + education + "]"; + } + + public void setFirstname(String firstname) { + this.firstname = firstname; + } + + public String getLastname() { + return lastname; + } + + public void setLastname(String lastname) { + this.lastname = lastname; + } + + public String getBirthPlace() { + return birthPlace; + } + + public void setBirthPlace(String birthPlace) { + this.birthPlace = birthPlace; + } + + public String getEducation() { + return education; + } + + public void setEducation(String education) { + this.education = education; + } + + @Override + public String getFileName() { + return "person-details.csv"; + } + + @Override + public String getFormType() { + return "TestModel#PersonDetails"; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.firstname); + elements.add(this.lastname); + elements.add(this.birthPlace); + elements.add(this.education); + elements.add(this.confirmationId); + return elements; + } + + @Override + public List getObjects() { + return new ArrayList<>(); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiProcessor.java new file mode 100644 index 00000000..d1517997 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiProcessor.java @@ -0,0 +1,25 @@ +package ca.bc.gov.chefs.etl.forms.testform; + +import org.apache.camel.Exchange; + +import org.apache.camel.Processor; +import net.minidev.json.JSONObject; + +public class TestFormApiProcessor implements Processor { + + //private static final Logger logger = LoggerFactory.getLogger(TestFormRoute.class); + + @Override + public void process(Exchange exchange) throws Exception { + + JSONObject body = (JSONObject) exchange.getIn().getBody(); + String usernamePassword = body.getAsString("username") + ":" + body.getAsString("password"); + System.out.println(usernamePassword); + exchange.getIn().setHeader("CamelHttpMethod", "GET"); + exchange.getIn().setHeader("Content-Type", "application/json"); + exchange.getIn().setHeader("accept", "application/json"); + exchange.getIn().setHeader("Authorization", "Basic MDc2MjNkMzMtOWY0OS00MjVhLWI3ZDItZDg0OWIzZTBhZjVjOjYzNTcxNzVlLTE4NzctNDU4Ny05MDVkLWE2MjJkNjMzZGQ0Mg=="); + + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiResponseProcessor.java new file mode 100644 index 00000000..acc37d02 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiResponseProcessor.java @@ -0,0 +1,35 @@ +package ca.bc.gov.chefs.etl.forms.testform; + +import java.util.List; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.util.CSVUtil; + + + +public class TestFormApiResponseProcessor implements Processor { + + /* + * receives a JSON Array of objects, models them and makes them ready + */ + @Override + @SuppressWarnings("unchecked") + public void process(Exchange exchange) throws Exception { + + String payload = exchange.getIn().getBody(String.class); + System.out.println(payload); + ObjectMapper mapper = new ObjectMapper(); + + List testModels = mapper.readValue(payload, new TypeReference>() { + }); + List testIModel = (List)(List) testModels; + CSVUtil.provider(testIModel); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormProcessor.java new file mode 100644 index 00000000..0d8025fc --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormProcessor.java @@ -0,0 +1,37 @@ +package ca.bc.gov.chefs.etl.forms.testform; + +import java.security.Security; + +import org.apache.camel.Exchange; +import org.apache.camel.Processor; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ca.bc.gov.chefs.etl.core.routes.TestFormRoute; +import ca.bc.gov.chefs.etl.parser.FileModel; +import ca.bc.gov.chefs.etl.util.FileUtil; + +public class TestFormProcessor implements Processor { + + private static final Logger logger = LoggerFactory.getLogger(TestFormRoute.class); + + public void process(Exchange exchange) throws Exception { + logger.info("Hello! Processing Now: current timestamp is: {}",System.currentTimeMillis()); + logger.info("Body Received: {}", exchange.getIn().getBody()); + FileModel fm = new FileModel(); + fm.setFrom("files"); + fm.setTo("encfiles"); + fm.setPgpPublicKeyPath("keys/publickey.asc"); + + // if provider is not present, add it + if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) { + // insert at specific position + Security.insertProviderAt(new BouncyCastleProvider(), 1); + } + + FileUtil.encryptFilesInDirectory(fm.getFrom(), fm.getPgpPublicKeyPath(), fm.getTo()); + + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestModel.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestModel.java new file mode 100644 index 00000000..8586a134 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestModel.java @@ -0,0 +1,102 @@ +package ca.bc.gov.chefs.etl.forms.testform; + +import java.util.ArrayList; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonUnwrapped; + +import ca.bc.gov.chefs.etl.parser.IModel; + +public class TestModel implements IModel { + + @JsonProperty("confirmationId") + private String confirmationId; + + @JsonProperty("formName") + private String formName; + + @JsonProperty("version") + private String version; + + @JsonProperty("status") + private String status; + + @JsonProperty("createdAt") + private String createdAt; + + @JsonProperty("fullName") + private String fullName; + + @JsonProperty("username") + private String username; + + @JsonProperty("email") + private String email; + + @JsonProperty("assignee") + private String assignee; + + @JsonProperty("assigneeEmail") + private String assigneeEmail; + + @JsonUnwrapped + private LoginCredentials loginCredentials; + @JsonUnwrapped + private PersonDetails personDetails; + + public LoginCredentials getLoginCredentials() { + return loginCredentials; + } + + public void setLoginCredentials(LoginCredentials loginCredentials) { + this.loginCredentials = loginCredentials; + } + + public PersonDetails getPersonDetails() { + return personDetails; + } + + public void setPersonDetails(PersonDetails personDetails) { + this.personDetails = personDetails; + } + + @Override + public String toString() { + return "TestModel [loginCredentials=" + loginCredentials + ", personDetails=" + personDetails + "]"; + } + + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.confirmationId); + elements.add(this.formName); + elements.add(this.version); + elements.add(this.createdAt); + elements.add(this.fullName); + elements.add(this.username); + elements.add(this.email); + elements.add(this.status); + elements.add(this.assignee); + elements.add(this.assigneeEmail); + return elements; + } + + @Override + public String getFileName() { + return "testModel"; + } + + @Override + public String getFormType() { + return "TestModel#Main"; + } + + @Override + public List getObjects() { + List ls = new ArrayList<>(); + ls.add(loginCredentials); + ls.add(personDetails); + return ls; + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/FileModel.java b/src/main/java/ca/bc/gov/chefs/etl/parser/FileModel.java new file mode 100644 index 00000000..5ef1924a --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/parser/FileModel.java @@ -0,0 +1,30 @@ +package ca.bc.gov.chefs.etl.parser; + +public class FileModel { + + public String from; + public String to; + public String pgpPublicKeyPath; + + + public String getFrom() { + return from; + } + public void setFrom(String from) { + this.from = from; + } + public String getTo() { + return to; + } + public void setTo(String to) { + this.to = to; + } + public String getPgpPublicKeyPath() { + return pgpPublicKeyPath; + } + public void setPgpPublicKeyPath(String pgpPublicKeyPath) { + this.pgpPublicKeyPath = pgpPublicKeyPath; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/IModel.java b/src/main/java/ca/bc/gov/chefs/etl/parser/IModel.java new file mode 100644 index 00000000..b821251c --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/parser/IModel.java @@ -0,0 +1,10 @@ +package ca.bc.gov.chefs.etl.parser; + +import java.util.List; + +public interface IModel { + String getFileName(); + String getFormType(); + List getCsvElements(); + List getObjects(); +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormPayloadExtractor.java b/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormPayloadExtractor.java new file mode 100644 index 00000000..f5dc3dae --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormPayloadExtractor.java @@ -0,0 +1,41 @@ +package ca.bc.gov.chefs.etl.parser; + +import java.util.Properties; + +import org.apache.camel.Exchange; +import org.apache.camel.Handler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import ca.bc.gov.chefs.etl.util.PropertiesUtil; +import net.minidev.json.JSONObject; +import net.minidev.json.parser.JSONParser; +import net.minidev.json.parser.ParseException; + +public class TestFormPayloadExtractor { + private static final Logger logger = LoggerFactory.getLogger(TestFormPayloadExtractor.class); + + static Properties properties; + + private TestFormPayloadExtractor() { + } + + + @Handler + public static void extractTestFormPayload(Exchange exchange, String testFormPayload) + throws ParseException { + + + try { + properties = PropertiesUtil.loadProperties(); + } catch(Exception e) { + + } + logger.info("Received payload data.. extracting now"); + logger.info("Received properties.. {}",properties.get("chefs.http.uri")); + JSONParser jsonParser = new JSONParser(JSONParser.DEFAULT_PERMISSIVE_MODE); + JSONObject testFormExtracted = (JSONObject) jsonParser.parse(testFormPayload); + exchange.getIn().setBody(testFormExtracted); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormResponsePayloadExtractor.java b/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormResponsePayloadExtractor.java new file mode 100644 index 00000000..f7cf0cc4 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormResponsePayloadExtractor.java @@ -0,0 +1,29 @@ +package ca.bc.gov.chefs.etl.parser; + +import org.apache.camel.Exchange; +import org.apache.camel.Handler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import net.minidev.json.JSONObject; +import net.minidev.json.parser.JSONParser; +import net.minidev.json.parser.ParseException; + +public class TestFormResponsePayloadExtractor { + private static final Logger logger = LoggerFactory.getLogger(TestFormPayloadExtractor.class); + + private TestFormResponsePayloadExtractor() { + } + + + @Handler + public static void extractTestFormResponsePayload(Exchange exchange, String testFormPayload) + throws ParseException { + logger.info(""); + JSONParser jsonParser = new JSONParser(JSONParser.DEFAULT_PERMISSIVE_MODE); + JSONObject testFormExtracted = (JSONObject) jsonParser.parse(testFormPayload); + exchange.getIn().setBody(testFormExtracted); + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/AuthUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/AuthUtil.java new file mode 100644 index 00000000..5dc72a18 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/util/AuthUtil.java @@ -0,0 +1,13 @@ +package ca.bc.gov.chefs.etl.util; + +import java.util.Base64; +import java.util.Base64.Encoder; + +public class AuthUtil { + + static Encoder encoder = Base64.getEncoder(); + + public static String getBasicAuth(String username,String password) { + return "Basic "+ encoder.encodeToString((username+":"+password).getBytes()); + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java new file mode 100644 index 00000000..5d21d181 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java @@ -0,0 +1,107 @@ +package ca.bc.gov.chefs.etl.util; + +import java.time.LocalDate; +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Queue; + +import ca.bc.gov.chefs.etl.forms.testform.LoginCredentials; +import ca.bc.gov.chefs.etl.forms.testform.PersonDetails; +import ca.bc.gov.chefs.etl.forms.testform.TestModel; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class CSVUtil { + + public static void main(String[] args) { + List ll = new ArrayList<>(); + TestModel testModel = new TestModel(); + LoginCredentials loginCredentials = new LoginCredentials(); + PersonDetails personDetails = new PersonDetails(); + + loginCredentials.setUsername("prit27"); + loginCredentials.setPassword("prit9867"); + + personDetails.setFirstname("Prit"); + personDetails.setLastname("Thakkar"); + personDetails.setEducation("Dalhousie University"); + personDetails.setBirthPlace("Ahmedabad India"); + + testModel.setLoginCredentials(loginCredentials); + testModel.setPersonDetails(personDetails); + + TestModel testModel2 = new TestModel(); + LoginCredentials loginCredentials2 = new LoginCredentials(); + PersonDetails personDetails2 = new PersonDetails(); + + loginCredentials2.setUsername("john98"); + loginCredentials2.setPassword("hiiamjohn"); + + personDetails2.setFirstname("John"); + personDetails2.setLastname("Wohnms"); + personDetails2.setEducation("University of Victoria"); + personDetails2.setBirthPlace("Vancouver BC"); + + testModel2.setLoginCredentials(loginCredentials2); + testModel2.setPersonDetails(personDetails2); + + ll.add(testModel); + ll.add(testModel2); + Map>> map = provider(ll); + System.out.println(map.toString()); + FileUtil.writeToCSVFile(map); + } + + public static Map>> provider(List items) { + Map>> map = new HashMap<>(); + for (IModel item : items) { + Queue children = new LinkedList<>(); + children.addAll(item.getObjects()); + List> parentLs = map.getOrDefault(item.getFormType(), new ArrayList<>()); + parentLs.add(item.getCsvElements()); + map.put(item.getFormType(), parentLs); + while (!children.isEmpty()) { + IModel model = children.poll(); + List> ls = map.getOrDefault(model.getFormType(), new ArrayList<>()); + ls.add(model.getCsvElements()); + map.put(model.getFormType(), ls); + List nestedChildren = model.getObjects(); + if (nestedChildren.size() == 0) { + continue; + } + children.addAll(nestedChildren); + } + } + return map; + } + + public static String generateFileName(String fileType) { + DateTimeFormatter formatter = DateTimeFormatter.BASIC_ISO_DATE; + return fileType.concat(LocalDate.now().format(formatter)).concat(".csv"); + } + + public static String getFormattedDate(String date) { + try { +// String isoDate = date; +// SimpleDateFormat isoFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); +// SimpleDateFormat targetFormat = new SimpleDateFormat("yyyyMMddHHmmss"); +// String targetDate = targetFormat.format(isoFormat.parse(isoDate)); +// System.out.println(targetDate); + + String dateTimeString = date; + OffsetDateTime dateTime = OffsetDateTime.parse(dateTimeString); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); + String formattedDateTime = dateTime.format(formatter); + System.out.println(formattedDateTime); + return formattedDateTime; + } + catch(Exception e) { + e.printStackTrace(); + } + return null; + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java b/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java new file mode 100644 index 00000000..ea6e7642 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java @@ -0,0 +1,87 @@ +package ca.bc.gov.chefs.etl.util; + +import org.bouncycastle.openpgp.PGPException; +import org.bouncycastle.openpgp.PGPLiteralData; +import org.bouncycastle.openpgp.PGPLiteralDataGenerator; +import org.bouncycastle.openpgp.PGPPublicKey; +import org.bouncycastle.openpgp.PGPPublicKeyRing; +import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; +import org.bouncycastle.openpgp.PGPUtil; +import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.sql.Date; +import java.time.LocalDateTime; +import java.time.ZoneOffset; +import java.util.Arrays; +import java.util.Iterator; +import java.util.Optional; + +public class CommonUtils { + + /** + * Copies "length" amount of data from the input stream and writes it pgp + * literal data to the provided output stream + * + * @param outputStream the output stream to which data is to be written + * @param in the input stream from which data is to be read + * @param length the length of data to be read + * @param bufferSize the buffer size, as it uses buffer to speed up copying + * @throws IOException for IO related errors + */ + static void copyAsLiteralData(OutputStream outputStream, InputStream in, long length, int bufferSize) + throws IOException { + PGPLiteralDataGenerator lData = new PGPLiteralDataGenerator(); + OutputStream pOut = lData.open(outputStream, PGPLiteralData.BINARY, PGPLiteralData.CONSOLE, + Date.from(LocalDateTime.now().toInstant(ZoneOffset.UTC)), new byte[bufferSize]); + byte[] buff = new byte[bufferSize]; + try { + int len; + long totalBytesWritten = 0L; + while (totalBytesWritten <= length && (len = in.read(buff)) > 0) { + pOut.write(buff, 0, len); + totalBytesWritten += len; + } + pOut.close(); + } finally { + // Clearing buffer + Arrays.fill(buff, (byte) 0); + // Closing inputstream + in.close(); + } + } + + /** + * Gets the public key from the key input stream + * + * @param keyInputStream the key input stream + * @return a PGPPublic key instance + * @throws IOException for IO related errors + * @throws PGPException PGPException for pgp related errors + */ + static PGPPublicKey getPublicKey(InputStream keyInputStream) throws IOException, PGPException { + PGPPublicKeyRingCollection pgpPublicKeyRings = new PGPPublicKeyRingCollection( + PGPUtil.getDecoderStream(keyInputStream), new JcaKeyFingerprintCalculator()); + Iterator keyRingIterator = pgpPublicKeyRings.getKeyRings(); + while (keyRingIterator.hasNext()) { + PGPPublicKeyRing pgpPublicKeyRing = keyRingIterator.next(); + Optional pgpPublicKey = extractPGPKeyFromRing(pgpPublicKeyRing); + if (pgpPublicKey.isPresent()) { + return pgpPublicKey.get(); + } + } + throw new PGPException("Invalid public key"); + } + + private static Optional extractPGPKeyFromRing(PGPPublicKeyRing pgpPublicKeyRing) { + for (PGPPublicKey publicKey : pgpPublicKeyRing) { + if (publicKey.isEncryptionKey()) { + return Optional.of(publicKey); + } + } + return Optional.empty(); + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/Counter.java b/src/main/java/ca/bc/gov/chefs/etl/util/Counter.java new file mode 100644 index 00000000..1c3c2cc3 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/util/Counter.java @@ -0,0 +1,26 @@ +package ca.bc.gov.chefs.etl.util; + +import java.util.HashMap; +import java.util.Map; + +import ca.bc.gov.chefs.etl.constant.Constants; + +public class Counter { + + static Map counter = new HashMap(); + + static { + counter.put(Constants.AIMS_REFERRAL, 0); + } + + public static int getNext(String formName) { + if(counter.containsKey(formName)) { + counter.put(formName, counter.get(formName)+1); + } + return counter.getOrDefault(formName,0); + } + + public static void resetCounter(String formName) { + counter.put(formName,0); + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java new file mode 100644 index 00000000..49ab4dcb --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -0,0 +1,171 @@ +package ca.bc.gov.chefs.etl.util; + +//import org.apache.commons.io.IOUtils; +import org.bouncycastle.bcpg.ArmoredOutputStream; +import org.bouncycastle.bcpg.CompressionAlgorithmTags; +import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.openpgp.PGPCompressedDataGenerator; +import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; +import org.bouncycastle.openpgp.PGPException; +import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; +import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.supercsv.io.CsvListWriter; +import org.supercsv.io.ICsvListWriter; +import org.supercsv.prefs.CsvPreference; +import org.supercsv.quote.AlwaysQuoteMode; + +import static ca.bc.gov.chefs.etl.constant.Constants.HEADERS; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.security.SecureRandom; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; +import java.util.List; +import java.util.Map; +import java.util.zip.GZIPOutputStream; + +public class FileUtil { + + private int compressionAlgorithm = CompressionAlgorithmTags.ZIP; + private int symmetricKeyAlgorithm = SymmetricKeyAlgorithmTags.AES_128; + private boolean armor = true; + private boolean withIntegrityCheck = true; + private int bufferSize = 1 << 16; + private static final Logger logger = LoggerFactory.getLogger(CSVUtil.class); + private static final CsvPreference ALWAYS_USE_QUOTE = new CsvPreference.Builder(CsvPreference.STANDARD_PREFERENCE) + .useQuoteMode(new AlwaysQuoteMode()).build(); + + public void encrypt(OutputStream encryptOut, InputStream clearIn, long length, InputStream publicKeyIn) + throws IOException, PGPException { + PGPCompressedDataGenerator compressedDataGenerator = new PGPCompressedDataGenerator(compressionAlgorithm); + PGPEncryptedDataGenerator pgpEncryptedDataGenerator = new PGPEncryptedDataGenerator( + // This bit here configures the encrypted data generator + new JcePGPDataEncryptorBuilder(symmetricKeyAlgorithm).setWithIntegrityPacket(withIntegrityCheck) + .setSecureRandom(new SecureRandom()).setProvider(BouncyCastleProvider.PROVIDER_NAME)); + // Adding public key + pgpEncryptedDataGenerator + .addMethod(new JcePublicKeyKeyEncryptionMethodGenerator(CommonUtils.getPublicKey(publicKeyIn))); + if (armor) { + encryptOut = new ArmoredOutputStream(encryptOut); + } + OutputStream cipherOutStream = pgpEncryptedDataGenerator.open(encryptOut, new byte[bufferSize]); + CommonUtils.copyAsLiteralData(compressedDataGenerator.open(cipherOutStream), clearIn, length, bufferSize); + // Closing all output streams in sequence + compressedDataGenerator.close(); + cipherOutStream.close(); + encryptOut.close(); + } + + public static void encryptFilesInDirectory(String directoryPath, String publicKeyFilePath, + String outputDirectoryPath) throws Exception { + FileUtil fU = new FileUtil(); + // Read the public key from the file + InputStream publicKeyInputStream = new BufferedInputStream(new FileInputStream(publicKeyFilePath)); + System.out.println(publicKeyFilePath); + + // Get a list of all the files in the directory + File dir = new File(directoryPath); + File[] files = dir.listFiles(); + + // Compress and encrypt each file + for (File file : files) { + + String inputFilePath = file.getAbsolutePath(); + String outputFilePath = outputDirectoryPath + "/" + file.getName() + ".gz" + ".gpg"; + String gzipFilePath = outputDirectoryPath + "/" + file.getName() + ".gz"; + File outputFile = new File(outputFilePath); + if (!outputFile.exists()) { + outputFile.createNewFile(); + } + if (!new File(gzipFilePath).exists()) { + new File(gzipFilePath).createNewFile(); + } + + fU.compressFileG(inputFilePath, gzipFilePath); + InputStream gzipInputStream = new BufferedInputStream(new FileInputStream(gzipFilePath)); + + OutputStream encryptedOutputStream = new BufferedOutputStream(new FileOutputStream(outputFilePath)); + fU.encrypt(encryptedOutputStream, gzipInputStream, file.length(), publicKeyInputStream); + encryptedOutputStream.close(); + + // Clean up the gzip file + new File(gzipFilePath).delete(); + } + } + + private void compressFileG(String sourceFilePath, String destinationFilePath) { + byte[] buffer = new byte[1024]; + + try { + + FileOutputStream fileOutputStream = new FileOutputStream(destinationFilePath); + + GZIPOutputStream gzipOuputStream = new GZIPOutputStream(fileOutputStream); + + FileInputStream fileInput = new FileInputStream(sourceFilePath); + + int bytes_read; + + while ((bytes_read = fileInput.read(buffer)) > 0) { + gzipOuputStream.write(buffer, 0, bytes_read); + } + + fileInput.close(); + + gzipOuputStream.finish(); + gzipOuputStream.close(); + + System.out.println("The file was compressed successfully!"); + + } catch (IOException ex) { + ex.printStackTrace(); + } + } + + public static void writeToCSVFile(Map>> map) { + ICsvListWriter listWriter = null; + for (Map.Entry>> entry : map.entrySet()) { + String fileName = generateFileName(entry.getKey()); + String[] headers = HEADERS.get(entry.getKey()); + logger.info("--------Generating CSV File---------------{}---------------", fileName); + try { + + listWriter = new CsvListWriter(new FileWriter(fileName), ALWAYS_USE_QUOTE); + listWriter.writeHeader(headers); + + for (List items : entry.getValue()) { + listWriter.write(items); + } + + } catch (IOException ex) { + ex.printStackTrace(); + } finally { + if (listWriter != null) { + try { + listWriter.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + } + + } + + public static String generateFileName(String fileType) { + DateTimeFormatter formatter = DateTimeFormatter.BASIC_ISO_DATE; + return fileType.concat(LocalDate.now().format(formatter)).concat(".txt"); + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/PropertiesUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/PropertiesUtil.java new file mode 100644 index 00000000..e7e02615 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/util/PropertiesUtil.java @@ -0,0 +1,34 @@ +package ca.bc.gov.chefs.etl.util; + +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +public class PropertiesUtil { + + public static Properties loadProperties() { + Properties configuration = new Properties(); + InputStream inputStream = PropertiesUtil.class + .getClassLoader() + .getResourceAsStream("application.properties"); + try { + configuration.load(inputStream); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + try { + inputStream.close(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return configuration; + } + + public static String getValue(String key) { + Properties properties = loadProperties(); + return properties.getProperty(key); + } + +} diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties new file mode 100644 index 00000000..e69de29b diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..664a9602 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,24 @@ +# properties used in route +hostname = localhost +port = 8080 +server-socket=5555 +socket-read-sleep-time=100 +max-socket-read-tries=100 +thread-pool-size=5 +accept-remote-connections=true +valid-ip-list-file=fwlist.txt + + +chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&type=submissions&minDate=%s&maxDate=%s + +aims.username=2f173b2b-2f3a-407a-aecf-6b4bdc9431ae +aims.password=5e056c7b-1b1e-4501-9711-facc44c6e66f + +ltc.facility.username=e1f4761f-efdd-4529-805e-677d3ae21601 +ltc.facility.password=cde8b788-36c7-4258-8f43-2e26fceea9a4 + +ltc.staffing.username=16ce36ca-9b4b-4ec6-bb75-96c2e1f258bb +ltc.staffing.password=ef31830d-e0f5-4eb9-b4e1-7900a3fcd2ae + +ltc.ytd.username=256760e7-6e8b-44c4-8b63-51fb72c8c2cf +ltc.ytd.password=0878a7de-3a63-4749-8101-d152844e186c \ No newline at end of file diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties new file mode 100644 index 00000000..54dbaf24 --- /dev/null +++ b/src/main/resources/log4j2.properties @@ -0,0 +1,6 @@ +appender.out.type = Console +appender.out.name = out +appender.out.layout.type = PatternLayout +appender.out.layout.pattern = [%30.30t] %-30.30c{1} %-5p %m%n +rootLogger.level = INFO +rootLogger.appenderRef.out.ref = out \ No newline at end of file From 60f8585612528e9627cd344e0966b2ac8fde21c8 Mon Sep 17 00:00:00 2001 From: prit-cgi Date: Wed, 1 Mar 2023 11:52:49 -0500 Subject: [PATCH 012/183] changed server port --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 664a9602..921319b3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ # properties used in route hostname = localhost -port = 8080 +port = 8081 server-socket=5555 socket-read-sleep-time=100 max-socket-read-tries=100 From aa9b7dbbac6d8eca0250020ff54f4dc41df39fe4 Mon Sep 17 00:00:00 2001 From: prit-cgi Date: Tue, 7 Mar 2023 15:48:52 -0500 Subject: [PATCH 013/183] updated ltc facility and ltc qytd to reflect latest form changes --- .gitignore | 4 +- .../bc/gov/chefs/etl/constant/Constants.java | 62 +- .../forms/ltc/facility/json/Bcaddress.java | 31 + .../forms/ltc/facility/json/Bcaddress1.java | 30 + .../etl/forms/ltc/facility/json/Crs.java | 22 + .../etl/forms/ltc/facility/json/Fault.java | 38 ++ .../etl/forms/ltc/facility/json/Form.java | 81 +++ .../etl/forms/ltc/facility/json/Geometry.java | 34 ++ .../ltc/facility/json/OperatorAddress.java | 65 ++ .../forms/ltc/facility/json/Properties.java | 131 ++++ .../etl/forms/ltc/facility/json/Root.java | 538 +++++++++++++++++ .../forms/ltc/facility/model/Approver.java | 79 +++ .../ltc/facility/model/FacilityInfo.java | 559 ------------------ .../facility/model/FacilityInformation.java | 324 ++++++++++ .../forms/ltc/facility/model/Preparer.java | 81 +++ .../FacilityInfoFormApiResponseProcessor.java | 226 ++++++- .../ltc/facility/route/FacilityFormRoute.java | 4 +- .../etl/forms/ltc/quaterly/json/BedGrid0.java | 3 + .../etl/forms/ltc/quaterly/json/BedGrid1.java | 3 + .../etl/forms/ltc/quaterly/json/BedGrid2.java | 3 + .../etl/forms/ltc/quaterly/json/BedGrid3.java | 3 + .../etl/forms/ltc/quaterly/json/BedGrid4.java | 3 + .../etl/forms/ltc/quaterly/json/Form.java | 3 + .../quaterly/model/LtcBedYtdMaxOccupancy.java | 4 +- .../quaterly/model/LtcBedYtdOccupiedDays.java | 2 +- .../ltc/quaterly/model/LtcYtdCompHrs.java | 10 +- .../model/LtcYtdCompHrsSubtotals.java | 3 +- .../quaterly/model/LtcYtdCompHrsTotals.java | 15 +- .../forms/ltc/quaterly/model/LtcYtdExp.java | 25 +- .../ltc/quaterly/model/LtcYtdSubmission.java | 114 ++++ .../LtcQuaterlyYtdApiResponseProcessor.java | 264 +++++---- .../quaterly/route/LtcQuaterlyYtdRoute.java | 2 +- .../ca/bc/gov/chefs/etl/util/CSVUtil.java | 1 - .../ca/bc/gov/chefs/etl/util/FileUtil.java | 2 +- src/main/resources/application.properties | 6 +- 35 files changed, 2029 insertions(+), 746 deletions(-) create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress1.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Crs.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Fault.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Form.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Geometry.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Properties.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInfo.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java diff --git a/.gitignore b/.gitignore index cd35bb69..f33f955b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,5 +11,5 @@ logs/* .settings/* .factorypath keys/* -.mvnw -.mvnw.cmd \ No newline at end of file +mvnw +mvnw.cmd diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 848c724c..b78fdec1 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -31,6 +31,9 @@ public class Constants { public final static String PRIVATE_BED = "privateBed"; // form names + public static final String LTC_FACILITY_APPROVER = "LTC_FACILITY_APPROVER"; + public static final String LTC_FACILITY_PREPARER = "LTC_FACILITY_PREPARER"; + public final static String LTC_BED_YTD_OCCUPIED_DAYS = "LTC_BED_YTD_OCCUPIED_DAYS"; public final static String LTC_BED_YTD_OCCUPANCY_RATE = "LTC_BED_YTD_OCCUPANCY_RATE"; public final static String LTC_BED_YTD_MAX_OCCUPANCY = "LTC_BED_YTD_MAX_OCCUPANCY"; @@ -48,6 +51,8 @@ public class Constants { public final static String LTC_FACILITY = "LTC_FACILITY"; public static final String LTC_YTD_COMP_SAL_SUBTOTALS = "LTC_YTD_COMP_SAL_SUBTOTALS"; public static final String LTC_BED_YTD_MAX_OCCUPANCY_TOTALS = "LTC_BED_YTD_MAX_OCCUPANCY_TOTALS"; + public static final String LTC_YTD_COMP_HRS_SUBTOTALS = "LTC_YTD_COMP_HRS_SUBTOTALS"; + public static final String LTC_YTD_COMP_HRS_TOTALS = "LTC_YTD_COMP_HRS_TOTALS"; public static final String LTC_YTD_COMP_SAL_TOTALS = "LTC_YTD_COMP_SAL_TOTALS"; @@ -96,11 +101,25 @@ public class Constants { "Accreditation_Expiry_Date", "Health_Authority", "Owner_Name", "Owner_Address", "Owner_City", "Owner_postal_code", "Owner_contact_name","Owner_contact_phone","Owner_contact_position", "Owner_contact_email", "Operator_Name", "Operator_Address", "Operator_City", "Operator_postal_code", "Operator_contact_Name", - "Operator_contact_phone", "Operator_contact_position", "Operator_contact_email", - "Preparer_contact_Name", "Preparer_contact_phone", "Preparer_contact_position", - "Preparer_contact_email", "Approver_Contact_Name", "Approver_Contact_phone", - "Approver_Contact_position", "Approver_contact_email", }); + "Operator_contact_phone", "Operator_contact_position", "Operator_contact_email", }); + HEADERS.put(LTC_FACILITY_APPROVER, new String[] { + "CONFIRMATION_ID", + "APPROVER_NUM", + "APPROVER_CONTACT_NAME", + "APPROVER_CONTACT_POSITION", + "APPROVER_CONTACT_PHONE", + "APPROVER_CONTACT_EMAIL", + }); + HEADERS.put(LTC_FACILITY_PREPARER, new String[] { + "CONFIRMATION_ID", + "PREPARER_NUM", + "PREPARER_CONTACT_NAME", + "PREPARER_CONTACT_POSITION", + "PREPARER_CONTACT_PHONE", + "PREPARER_CONTACT_EMAIL", + }); + // LTC Quaterly YTD HEADERS.put(LTC_BED_YTD_MAX_OCCUPANCY, new String[] { "CONFIRMATION_ID", "QUARTER_INVENTORY", "BED_FUNDING_TYPE", "BED_SUBTYPE", "START_DATE", @@ -111,7 +130,7 @@ public class Constants { "PERIOD", "SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD" }); HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS, new String[] { "CONFIRMATION_ID", "OCC_QUARTER", "OCC_MONTH", - "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", "OCC_DAYS_YTD_TOTAL_DAYS", "OCC_DAYS_YTD_PRIVATE", }); + "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", "OCC_DAYS_YTD_PRIVATE","OCC_DAYS_YTD_TOTAL_DAYS" }); HEADERS.put(LTC_BED_YTD_OCCUPANCY_RATE, new String[] { "CONFIRMATION_ID", "OCC_RATE_QUARTER", "OCC_RATE_BED_TYPES", "PLAN_MAX_OCC_DAYS", @@ -126,8 +145,8 @@ public class Constants { }); HEADERS.put(LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "SUB_TOTAL_DIR_CARE_PROD_HRS_REGULAR_YTD", - "SUB_TOTAL_DIR_CARE_PROD_HRS_OT_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_SUBTOTAL_YTD", - "SUB_TOTAL_DIR_CARE_PROD_HRS_CONT_SERV_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_TOTAL_YTD", + "SUB_TOTAL_DIR_CARE_PROD_HRS_OT_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_SUBTOTAL_YTD","SUB_TOTAL_DIR_CARE_PROD_HRS_CONT_SERV_YTD" + ,"SUB_TOTAL_DIR_CARE_PROD_HRS_TOTAL_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_VAC_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_SICK_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_OTHER_SERV_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_TOTAL_YTD", "SUB_TOTAL_DIR_CARE_TOTAL_HRS_PAID_YTD", @@ -136,14 +155,26 @@ public class Constants { // HEADERS.put(LTC_YTD_DIRECT_CARE_HRS, new String[] { "CONFIRMATION_ID", "QUARTER_INVENTORY", "BED_FUNDING_TYPE", // "BED_SUBTYPE", "START_DATE", "END_DATE", "NUMBER_OF_BEDS", "MAXIMUM_BED_DAYS", "NOTES" }); HEADERS.put(LTC_YTD_COMP_HRS, - new String[] { "CONFIRMATION_ID", "COMP_HRS_TYPE", "COMP_HRS_NAME", "COMP_HRS_PER_PAYROLL_YTD", + new String[] { "CONFIRMATION_ID", "COMP_HRS_TYPE", "COMP_HRS_NAME", "COMP_HRS_STAFF_YTD", "COMP_HRS_CONTRACT_SERVICES_YTD", "COMP_HRS_OFFICE_ALLOC_YTD", "COMP_TOTAL_WORKED_HRS_YTD" }); + HEADERS.put(LTC_YTD_COMP_HRS_SUBTOTALS, + new String[] { "Confirmation_ID", "Comp_Hrs_Type", "Sub_Total_Comp_Hrs_Staff_YTD", + "Sub_Total_Comp_Hrs_Contract_Services_YTD", "Sub_Total_Comp_Hrs_Office_Alloc_YTD", + "Sub_Total_Comp_Hrs_Total_Cost_YTD", }); + + HEADERS.put(LTC_YTD_COMP_HRS_TOTALS, + new String[] { "Confirmation_ID", "Comp_Hrs_Total_Type", "Total_Comp_Hrs_Staff_YTD", + "Total_Comp_Hrs_Contract_Services_YTD", "Total_Comp_Hrs_Office_Alloc_YTD", + "Total_Comp_Hrs_Total_Cost_YTD", }); + + HEADERS.put(LTC_YTD_COMP_SAL, new String[] { "CONFIRMATION_ID", "COMP_SAL_TYPE", "COMP_SAL_NAME", "COMP_SAL_STAFF_YTD", "COMP_SAL_CONTRACT_SERVICES_YTD", "COMP_SAL_OFFICE_ALLOC_YTD", "Comp_Sal_Total_Cost_YTD" }); + HEADERS.put(LTC_YTD_COMP_SAL_SUBTOTALS, new String[] { "Confirmation_ID", "Comp_Sal_Type", "Sub_Total_Comp_Sal_Staff_YTD", "Sub_Total_Comp_Sal_Contract_Services_YTD", "Sub_Total_Comp_Sal_Office_Alloc_YTD", @@ -185,12 +216,12 @@ public class Constants { HEADERS.put(LTC_BED_YTD_MAX_OCCUPANCY_TOTALS, new String[] { "CONFIRMATION_ID", - "BED_FUNDING_TYPE", + "BED_OCCUPANCY_TYPE", "TOTAL_BED_QUARTER_1", "TOTAL_BED_QUARTER_2", "TOTAL_BED_QUARTER_3", "TOTAL_BED_QUARTER_4", - "TOTAL_PLANNED_BED_DAYS", + "TOTAL_PLANNED_BED_DAYS" }); HEADERS.put(LTC_BED_YTD_OCCUPANCY_RATE_TOTALS, new String[] { @@ -207,14 +238,17 @@ public class Constants { "OCC_QUARTER", "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", - "OCC_DAYS_YTD_TOTAL_DAYS", "OCC_DAYS_YTD_PRIVATE", + "OCC_DAYS_YTD_TOTAL_DAYS", }); HEADERS.put(LTC_YTD_REV, new String[] { "CONFIRMATION_ID", "REV_TYPE", "REV_NAME", "REV_YTD", "REV_NOTES", }); - - HEADERS.put(LTC_YTD_EXP, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "EXP_NAME", "REV_YTD", "REV_NOTES", }); - HEADERS.put(LTC_YTD_COMP_BENEFITS, new String[] { "CONFIRMATION_ID", "BENEFITS_TYPE", "BENEFITS_AMOUNT_YTD" }); + HEADERS.put(LTC_YTD_REV_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "REV_TYPE", "SUB_TOTAL_REV_YTD" }); + + HEADERS.put(LTC_YTD_EXP, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "EXP_NAME", "EXP_YTD", "EXP_NOTES", }); + HEADERS.put(LTC_YTD_EXP_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "SUB_TOTAL_EXP_YTD", }); + HEADERS.put(LTC_YTD_COMP_BENEFITS, new String[] { "CONFIRMATION_ID", "BENEFITS_TYPE", "BENEFITS_AMOUNT_YTD","BENEFITS_PERCENTAGE_ALLOCATION" }); + } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress.java new file mode 100644 index 00000000..c2e1eb1e --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress.java @@ -0,0 +1,31 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.json; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown=true) +public class Bcaddress{ + public String type; + public Geometry geometry; + public Properties properties; + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public Geometry getGeometry() { + return geometry; + } + public void setGeometry(Geometry geometry) { + this.geometry = geometry; + } + public Properties getProperties() { + return properties; + } + public void setProperties(Properties properties) { + this.properties = properties; + } + + +} + diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress1.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress1.java new file mode 100644 index 00000000..505c2e4e --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress1.java @@ -0,0 +1,30 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.json; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown=true) +public class Bcaddress1{ + public String type; + public Geometry geometry; + public Properties properties; + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public Geometry getGeometry() { + return geometry; + } + public void setGeometry(Geometry geometry) { + this.geometry = geometry; + } + public Properties getProperties() { + return properties; + } + public void setProperties(Properties properties) { + this.properties = properties; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Crs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Crs.java new file mode 100644 index 00000000..b9d69a4f --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Crs.java @@ -0,0 +1,22 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.json; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown=true) +public class Crs{ + public String type; + public Properties properties; + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public Properties getProperties() { + return properties; + } + public void setProperties(Properties properties) { + this.properties = properties; + } + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Fault.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Fault.java new file mode 100644 index 00000000..8f8bf0f1 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Fault.java @@ -0,0 +1,38 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.json; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown=true) +public class Fault{ + public String fault; + public String value; + public String element; + public String penalty; + public String getFault() { + return fault; + } + public void setFault(String fault) { + this.fault = fault; + } + public String getValue() { + return value; + } + public void setValue(String value) { + this.value = value; + } + public String getElement() { + return element; + } + public void setElement(String element) { + this.element = element; + } + public String getPenalty() { + return penalty; + } + public void setPenalty(String penalty) { + this.penalty = penalty; + } + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Form.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Form.java new file mode 100644 index 00000000..20f0a22f --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Form.java @@ -0,0 +1,81 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.json; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown=true) +public class Form{ + public String confirmationId; + public String formName; + public int version; + public String createdAt; + public String fullName; + public String username; + public String email; + public String status; + public String assignee; + public String assigneeEmail; + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getFormName() { + return formName; + } + public void setFormName(String formName) { + this.formName = formName; + } + public int getVersion() { + return version; + } + public void setVersion(int version) { + this.version = version; + } + public String getCreatedAt() { + return createdAt; + } + public void setCreatedAt(String createdAt) { + this.createdAt = createdAt; + } + public String getFullName() { + return fullName; + } + public void setFullName(String fullName) { + this.fullName = fullName; + } + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } + public String getEmail() { + return email; + } + public void setEmail(String email) { + this.email = email; + } + public String getStatus() { + return status; + } + public void setStatus(String status) { + this.status = status; + } + public String getAssignee() { + return assignee; + } + public void setAssignee(String assignee) { + this.assignee = assignee; + } + public String getAssigneeEmail() { + return assigneeEmail; + } + public void setAssigneeEmail(String assigneeEmail) { + this.assigneeEmail = assigneeEmail; + } + + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Geometry.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Geometry.java new file mode 100644 index 00000000..424d8564 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Geometry.java @@ -0,0 +1,34 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.json; + + +import java.util.ArrayList; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown=true) +public class Geometry{ + public Crs crs; + public String type; + public ArrayList coordinates; + + public Crs getCrs() { + return crs; + } + public void setCrs(Crs crs) { + this.crs = crs; + } + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public ArrayList getCoordinates() { + return coordinates; + } + public void setCoordinates(ArrayList coordinates) { + this.coordinates = coordinates; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java new file mode 100644 index 00000000..70ca499b --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java @@ -0,0 +1,65 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.json; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import ca.bc.gov.chefs.etl.parser.IModel; + +@JsonIgnoreProperties(ignoreUnknown=true) +public class OperatorAddress implements IModel{ + + public String type; + public Geometry geometry; + public Properties properties; + + + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public Geometry getGeometry() { + return geometry; + } + + public void setGeometry(Geometry geometry) { + this.geometry = geometry; + } + + public Properties getProperties() { + return properties; + } + + public void setProperties(Properties properties) { + this.properties = properties; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getFormType() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getCsvElements() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List getObjects() { + // TODO Auto-generated method stub + return null; + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Properties.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Properties.java new file mode 100644 index 00000000..1fd3bc26 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Properties.java @@ -0,0 +1,131 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.json; + +import java.util.ArrayList; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import ca.bc.gov.chefs.etl.parser.IModel; + +@JsonIgnoreProperties(ignoreUnknown=true) +public class Properties implements IModel{ + public int code; + public int score; + public ArrayList faults; + public String siteID; + public String blockID; + public String siteStatus; + public String accessNotes; + public String fullAddress; + public String localityType; + public String electoralArea; + public String matchPrecision; + public int precisionPoints; + public String locationDescriptor; + public String locationPositionalAccuracy; + + public int getCode() { + return code; + } + public void setCode(int code) { + this.code = code; + } + public int getScore() { + return score; + } + public void setScore(int score) { + this.score = score; + } + public ArrayList getFaults() { + return faults; + } + public void setFaults(ArrayList faults) { + this.faults = faults; + } + public String getSiteID() { + return siteID; + } + public void setSiteID(String siteID) { + this.siteID = siteID; + } + public String getBlockID() { + return blockID; + } + public void setBlockID(String blockID) { + this.blockID = blockID; + } + public String getSiteStatus() { + return siteStatus; + } + public void setSiteStatus(String siteStatus) { + this.siteStatus = siteStatus; + } + public String getAccessNotes() { + return accessNotes; + } + public void setAccessNotes(String accessNotes) { + this.accessNotes = accessNotes; + } + public String getFullAddress() { + return fullAddress; + } + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + public String getLocalityType() { + return localityType; + } + public void setLocalityType(String localityType) { + this.localityType = localityType; + } + public String getElectoralArea() { + return electoralArea; + } + public void setElectoralArea(String electoralArea) { + this.electoralArea = electoralArea; + } + public String getMatchPrecision() { + return matchPrecision; + } + public void setMatchPrecision(String matchPrecision) { + this.matchPrecision = matchPrecision; + } + public int getPrecisionPoints() { + return precisionPoints; + } + public void setPrecisionPoints(int precisionPoints) { + this.precisionPoints = precisionPoints; + } + public String getLocationDescriptor() { + return locationDescriptor; + } + public void setLocationDescriptor(String locationDescriptor) { + this.locationDescriptor = locationDescriptor; + } + public String getLocationPositionalAccuracy() { + return locationPositionalAccuracy; + } + public void setLocationPositionalAccuracy(String locationPositionalAccuracy) { + this.locationPositionalAccuracy = locationPositionalAccuracy; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + // TODO Auto-generated method stub + return null; + } + @Override + public List getCsvElements() { + // TODO Auto-generated method stub + return null; + } + @Override + public List getObjects() { + // TODO Auto-generated method stub + return null; + } +} \ No newline at end of file diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java new file mode 100644 index 00000000..b0e56a66 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java @@ -0,0 +1,538 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.json; +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import ca.bc.gov.chefs.etl.parser.IModel; + +@JsonIgnoreProperties(ignoreUnknown=true) +public class Root implements IModel{ + + public Form form; + public String city1; + public String city3; + public String city5; + public String name2; + public String name3; + public String name4; + public String name5; + public String name6; + public String name7; + public String name8; + public String name9; + public String email2; + public String name10; + public String name11; + public String opName; + public Bcaddress bcaddress; + public String ownerName; + public String position3; + public String position4; + public String position6; + public String position7; + public String position8; + public String position9; + public String textField; + public Bcaddress1 bcaddress1; + public String position10; + public String position11; + public String position12; + public String position13; + public String contactName; + public String phoneNumber; + public String postalCode1; + public String postalCode3; + public String selectList1; + public String contactEmail; + public String contactName3; + public String phoneNumber3; + public String phoneNumber4; + public String phoneNumber5; + public String phoneNumber6; + public String phoneNumber7; + public String phoneNumber8; + public String phoneNumber9; + public String programType1; + public String simpleemail2; + public String simpleemail4; + public String simpleemail5; + public String simpleemail6; + public String simpleemail7; + public String simpleemail8; + public String simpleemail9; + public String contactEmail2; + public String facilityName2; + public String phoneNumber10; + public String phoneNumber11; + public String phoneNumber12; + public String simpleemail10; + public String simpleemail11; + public String ownershipType1; + public String contactPosition; + public String facilityWebsite; + public OperatorAddress operatorAddress; + public String contactPosition2; + public String healthAuthority1; + public String simpletextfield1; + public String accreditationBody; + public String accreditationDate1; + public String simplephonenumber3; + public String contactPhoneNumber2; + public String accreditationExpiryDate1; + public boolean isTheOwnerTheSameAsTheOperator1; + public Form getForm() { + return form; + } + public void setForm(Form form) { + this.form = form; + } + public String getCity1() { + return city1; + } + public void setCity1(String city1) { + this.city1 = city1; + } + public String getCity3() { + return city3; + } + public void setCity3(String city3) { + this.city3 = city3; + } + public String getCity5() { + return city5; + } + public void setCity5(String city5) { + this.city5 = city5; + } + public String getName2() { + return name2; + } + public void setName2(String name2) { + this.name2 = name2; + } + public String getName3() { + return name3; + } + public void setName3(String name3) { + this.name3 = name3; + } + public String getName4() { + return name4; + } + public void setName4(String name4) { + this.name4 = name4; + } + public String getName5() { + return name5; + } + public void setName5(String name5) { + this.name5 = name5; + } + public String getName6() { + return name6; + } + public void setName6(String name6) { + this.name6 = name6; + } + public String getName7() { + return name7; + } + public void setName7(String name7) { + this.name7 = name7; + } + public String getName8() { + return name8; + } + public void setName8(String name8) { + this.name8 = name8; + } + public String getName9() { + return name9; + } + public void setName9(String name9) { + this.name9 = name9; + } + public String getEmail2() { + return email2; + } + public void setEmail2(String email2) { + this.email2 = email2; + } + public String getName10() { + return name10; + } + public void setName10(String name10) { + this.name10 = name10; + } + public String getName11() { + return name11; + } + public void setName11(String name11) { + this.name11 = name11; + } + public String getOpName() { + return opName; + } + public void setOpName(String opName) { + this.opName = opName; + } + public Bcaddress getBcaddress() { + return bcaddress; + } + public void setBcaddress(Bcaddress bcaddress) { + this.bcaddress = bcaddress; + } + public String getOwnerName() { + return ownerName; + } + public void setOwnerName(String ownerName) { + this.ownerName = ownerName; + } + public String getPosition3() { + return position3; + } + public void setPosition3(String position3) { + this.position3 = position3; + } + public String getPosition4() { + return position4; + } + public void setPosition4(String position4) { + this.position4 = position4; + } + public String getPosition6() { + return position6; + } + public void setPosition6(String position6) { + this.position6 = position6; + } + public String getPosition7() { + return position7; + } + public void setPosition7(String position7) { + this.position7 = position7; + } + public String getPosition8() { + return position8; + } + public void setPosition8(String position8) { + this.position8 = position8; + } + public String getPosition9() { + return position9; + } + public void setPosition9(String position9) { + this.position9 = position9; + } + public String getTextField() { + return textField; + } + public void setTextField(String textField) { + this.textField = textField; + } + public Bcaddress1 getBcaddress1() { + return bcaddress1; + } + public void setBcaddress1(Bcaddress1 bcaddress1) { + this.bcaddress1 = bcaddress1; + } + public String getPosition10() { + return position10; + } + public void setPosition10(String position10) { + this.position10 = position10; + } + public String getPosition11() { + return position11; + } + public void setPosition11(String position11) { + this.position11 = position11; + } + public String getPosition12() { + return position12; + } + public void setPosition12(String position12) { + this.position12 = position12; + } + public String getPosition13() { + return position13; + } + public void setPosition13(String position13) { + this.position13 = position13; + } + public String getContactName() { + return contactName; + } + public void setContactName(String contactName) { + this.contactName = contactName; + } + public String getPhoneNumber() { + return phoneNumber; + } + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; + } + public String getPostalCode1() { + return postalCode1; + } + public void setPostalCode1(String postalCode1) { + this.postalCode1 = postalCode1; + } + public String getPostalCode3() { + return postalCode3; + } + public void setPostalCode3(String postalCode3) { + this.postalCode3 = postalCode3; + } + public String getSelectList1() { + return selectList1; + } + public void setSelectList1(String selectList1) { + this.selectList1 = selectList1; + } + public String getContactEmail() { + return contactEmail; + } + public void setContactEmail(String contactEmail) { + this.contactEmail = contactEmail; + } + public String getContactName3() { + return contactName3; + } + public void setContactName3(String contactName3) { + this.contactName3 = contactName3; + } + public String getPhoneNumber3() { + return phoneNumber3; + } + public void setPhoneNumber3(String phoneNumber3) { + this.phoneNumber3 = phoneNumber3; + } + public String getPhoneNumber4() { + return phoneNumber4; + } + public void setPhoneNumber4(String phoneNumber4) { + this.phoneNumber4 = phoneNumber4; + } + public String getPhoneNumber5() { + return phoneNumber5; + } + public void setPhoneNumber5(String phoneNumber5) { + this.phoneNumber5 = phoneNumber5; + } + public String getPhoneNumber6() { + return phoneNumber6; + } + public void setPhoneNumber6(String phoneNumber6) { + this.phoneNumber6 = phoneNumber6; + } + public String getPhoneNumber7() { + return phoneNumber7; + } + public void setPhoneNumber7(String phoneNumber7) { + this.phoneNumber7 = phoneNumber7; + } + public String getPhoneNumber8() { + return phoneNumber8; + } + public void setPhoneNumber8(String phoneNumber8) { + this.phoneNumber8 = phoneNumber8; + } + public String getPhoneNumber9() { + return phoneNumber9; + } + public void setPhoneNumber9(String phoneNumber9) { + this.phoneNumber9 = phoneNumber9; + } + public String getProgramType1() { + return programType1; + } + public void setProgramType1(String programType1) { + this.programType1 = programType1; + } + public String getSimpleemail2() { + return simpleemail2; + } + public void setSimpleemail2(String simpleemail2) { + this.simpleemail2 = simpleemail2; + } + public String getSimpleemail4() { + return simpleemail4; + } + public void setSimpleemail4(String simpleemail4) { + this.simpleemail4 = simpleemail4; + } + public String getSimpleemail5() { + return simpleemail5; + } + public void setSimpleemail5(String simpleemail5) { + this.simpleemail5 = simpleemail5; + } + public String getSimpleemail6() { + return simpleemail6; + } + public void setSimpleemail6(String simpleemail6) { + this.simpleemail6 = simpleemail6; + } + public String getSimpleemail7() { + return simpleemail7; + } + public void setSimpleemail7(String simpleemail7) { + this.simpleemail7 = simpleemail7; + } + public String getSimpleemail8() { + return simpleemail8; + } + public void setSimpleemail8(String simpleemail8) { + this.simpleemail8 = simpleemail8; + } + public String getSimpleemail9() { + return simpleemail9; + } + public void setSimpleemail9(String simpleemail9) { + this.simpleemail9 = simpleemail9; + } + public String getContactEmail2() { + return contactEmail2; + } + public void setContactEmail2(String contactEmail2) { + this.contactEmail2 = contactEmail2; + } + public String getFacilityName2() { + return facilityName2; + } + public void setFacilityName2(String facilityName2) { + this.facilityName2 = facilityName2; + } + public String getPhoneNumber10() { + return phoneNumber10; + } + public void setPhoneNumber10(String phoneNumber10) { + this.phoneNumber10 = phoneNumber10; + } + public String getPhoneNumber11() { + return phoneNumber11; + } + public void setPhoneNumber11(String phoneNumber11) { + this.phoneNumber11 = phoneNumber11; + } + public String getPhoneNumber12() { + return phoneNumber12; + } + public void setPhoneNumber12(String phoneNumber12) { + this.phoneNumber12 = phoneNumber12; + } + public String getSimpleemail10() { + return simpleemail10; + } + public void setSimpleemail10(String simpleemail10) { + this.simpleemail10 = simpleemail10; + } + public String getSimpleemail11() { + return simpleemail11; + } + public void setSimpleemail11(String simpleemail11) { + this.simpleemail11 = simpleemail11; + } + public String getOwnershipType1() { + return ownershipType1; + } + public void setOwnershipType1(String ownershipType1) { + this.ownershipType1 = ownershipType1; + } + public String getContactPosition() { + return contactPosition; + } + public void setContactPosition(String contactPosition) { + this.contactPosition = contactPosition; + } + public String getFacilityWebsite() { + return facilityWebsite; + } + public void setFacilityWebsite(String facilityWebsite) { + this.facilityWebsite = facilityWebsite; + } + public OperatorAddress getOperatorAddress() { + return operatorAddress; + } + public void setOperatorAddress(OperatorAddress operatorAddress) { + this.operatorAddress = operatorAddress; + } + public String getContactPosition2() { + return contactPosition2; + } + public void setContactPosition2(String contactPosition2) { + this.contactPosition2 = contactPosition2; + } + public String getHealthAuthority1() { + return healthAuthority1; + } + public void setHealthAuthority1(String healthAuthority1) { + this.healthAuthority1 = healthAuthority1; + } + public String getSimpletextfield1() { + return simpletextfield1; + } + public void setSimpletextfield1(String simpletextfield1) { + this.simpletextfield1 = simpletextfield1; + } + public String getAccreditationBody() { + return accreditationBody; + } + public void setAccreditationBody(String accreditationBody) { + this.accreditationBody = accreditationBody; + } + public String getAccreditationDate1() { + return accreditationDate1; + } + public void setAccreditationDate1(String accreditationDate1) { + this.accreditationDate1 = accreditationDate1; + } + public String getSimplephonenumber3() { + return simplephonenumber3; + } + public void setSimplephonenumber3(String simplephonenumber3) { + this.simplephonenumber3 = simplephonenumber3; + } + public String getContactPhoneNumber2() { + return contactPhoneNumber2; + } + public void setContactPhoneNumber2(String contactPhoneNumber2) { + this.contactPhoneNumber2 = contactPhoneNumber2; + } + public String getAccreditationExpiryDate1() { + return accreditationExpiryDate1; + } + public void setAccreditationExpiryDate1(String accreditationExpiryDate1) { + this.accreditationExpiryDate1 = accreditationExpiryDate1; + } + public boolean isTheOwnerTheSameAsTheOperator1() { + return isTheOwnerTheSameAsTheOperator1; + } + public void setTheOwnerTheSameAsTheOperator1(boolean isTheOwnerTheSameAsTheOperator1) { + this.isTheOwnerTheSameAsTheOperator1 = isTheOwnerTheSameAsTheOperator1; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + // TODO Auto-generated method stub + return null; + } + @Override + public List getCsvElements() { + // TODO Auto-generated method stub + return null; + } + @Override + public List getObjects() { + // TODO Auto-generated method stub + return null; + } + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java new file mode 100644 index 00000000..ea7c9f26 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java @@ -0,0 +1,79 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class Approver implements IModel{ + private String confirmationID; + private String approverNum; + private String approverContactName; + private String approverContactPosition; + private String approverContactPhone; + private String approverContactEmail; + public String getConfirmationID() { + return confirmationID; + } + public void setConfirmationID(String confirmationID) { + this.confirmationID = confirmationID; + } + public String getApproverNum() { + return approverNum; + } + public void setApproverNum(String approverNum) { + this.approverNum = approverNum; + } + public String getApproverContactName() { + return approverContactName; + } + public void setApproverContactName(String approverContactName) { + this.approverContactName = approverContactName; + } + public String getApproverContactPosition() { + return approverContactPosition; + } + public void setApproverContactPosition(String approverContactPosition) { + this.approverContactPosition = approverContactPosition; + } + public String getApproverContactPhone() { + return approverContactPhone; + } + public void setApproverContactPhone(String approverContactPhone) { + this.approverContactPhone = approverContactPhone; + } + public String getApproverContactEmail() { + return approverContactEmail; + } + public void setApproverContactEmail(String approverContactEmail) { + this.approverContactEmail = approverContactEmail; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_FACILITY_APPROVER; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationID()); + elements.add(this.getApproverNum()); + elements.add(this.getApproverContactName()); + elements.add(this.getApproverContactPosition()); + elements.add(this.getApproverContactPhone()); + elements.add(this.getApproverContactEmail()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInfo.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInfo.java deleted file mode 100644 index 40d7555c..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInfo.java +++ /dev/null @@ -1,559 +0,0 @@ -package ca.bc.gov.chefs.etl.forms.ltc.facility.model; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; - -import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; -import ca.bc.gov.chefs.etl.util.CSVUtil; - -@SuppressWarnings("unchecked") -@JsonIgnoreProperties(ignoreUnknown = true) -public class FacilityInfo implements IModel { - - @JsonIgnore - private String confirmationId; - @JsonIgnore - private String submissionDate; - @JsonIgnore - private String submittedBy; - @JsonProperty("facilityName2") - private String facilityName; - @JsonIgnore - private String facilityAddress; - @JsonProperty("city1") - private String facilityCity; - @JsonProperty("textField") - private String facilityPostalCode; - @JsonProperty("phoneNumber") - private String facilityTelephone; - @JsonProperty("facilityWebsite") - private String facilityWebsite; - @JsonProperty("simpletextfield1") - private String ccmsId; - @JsonProperty("programType1") - private String programType; - @JsonProperty("ownershipType1") - private String ownershipType; - @JsonProperty("selectList1") - private String legislationtType; - @JsonProperty("accreditationBody") - private String accreditationBody; - @JsonProperty("accreditationDate1") - private String accreditationDate; - @JsonProperty("accreditationExpiryDate1") - private String accreditationExpiryDate; - @JsonProperty("healthAuthority1") - private String healthAuthority; - @JsonProperty("ownerName") - private String ownerName; - @JsonIgnore - private String ownerAddress; - @JsonProperty("city3") - private String ownerCity; - @JsonProperty("postalCode1") - private String ownerPostalCode; - @JsonProperty("contactName") - private String ownerContactName; - @JsonProperty("phoneNumber3") - private String ownerContactPhone; - @JsonProperty("contactPosition") - private String ownerContactPosition; - @JsonProperty("contactEmail") - private String ownerContactEmail; - @JsonProperty("opName") - private String operatorName; - @JsonIgnore - private String operatorAddress; - @JsonProperty("city5") - private String operatorCity; - @JsonProperty("postalCode3") - private String operatorPostalCode; - @JsonProperty("contactName3") - private String operatorContactName; - @JsonProperty("contactPhoneNumber2") - private String operatorContactPhone; - @JsonProperty("contactPosition2") - private String operatorContactPosition; - @JsonProperty("contactEmail2") - private String operatorContactEmail; - @JsonProperty("name2") - private String preparerContactName; - @JsonProperty("phoneNumber4") - private String preparerContactPhone; - @JsonProperty("position3") - private String preparerContactPosition; - @JsonProperty("simpleemail2") - private String preparerContactEmail; - @JsonProperty("name3") - private String approverContactName; - @JsonProperty("simplephonenumber3") - private String ApproverContactPhone; - @JsonProperty("position4") - private String approverContactPosition; - @JsonProperty("email2") - private String approverContactEmail; - - @JsonProperty("isTheOwnerTheSameAsTheOperator1") - private boolean ownerSameAsOperator; - - @JsonProperty("form") - private void unPackForm(Map form) { - this.confirmationId = form.get("confirmationId"); - this.submissionDate = CSVUtil.getFormattedDate(form.get("createdAt")); - this.submittedBy = form.get("email"); - } - - @JsonProperty("bcaddress") - private void unPackBcAddress(Map bcaddress) { - if(bcaddress.containsKey("properties")) { - Map properties = (Map) bcaddress.get("properties"); - this.facilityAddress = properties.get("fullAddress"); - } - } - - @JsonProperty("bcaddress1") - private void unPackBcAddress1(Map bcaddress1) { - if(bcaddress1.containsKey("properties")) { - Map properties = (Map) bcaddress1.get("properties"); - this.ownerAddress = properties.get("fullAddress"); - } - } - - @JsonProperty("operatorAddress") - private void unPackOperatorAddress(Map operatorAddress) { - if(operatorAddress.containsKey("properties")) { - Map properties = (Map) operatorAddress.get("properties"); - this.operatorAddress = properties.get("fullAddress"); - } - } - - - - - - /* Overriden methods from IModel for CSV Parsing. */ - @Override - public String getFileName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getFormType() { - return Constants.LTC_FACILITY; - } - - @Override - public List getCsvElements() { - List elements = new ArrayList(); - elements.add(this.getConfirmationId()); - elements.add("false"); - elements.add(this.getSubmissionDate()); - elements.add(this.getSubmittedBy()); - elements.add(this.getFacilityName()); - elements.add(this.getFacilityAddress()); - elements.add(this.getFacilityCity()); - elements.add(this.getFacilityPostalCode()); - elements.add(this.getFacilityTelephone()); - elements.add(this.getFacilityWebsite()); - elements.add(this.getCcmsId()); - elements.add(this.getProgramType()); - elements.add(this.getOwnershipType()); - elements.add(this.getLegislationtType()); - elements.add(this.getAccreditationBody()); - elements.add(this.getAccreditationDate()); - elements.add(this.getAccreditationExpiryDate()); - elements.add(this.getHealthAuthority()); - elements.add(this.getOwnerName()); - elements.add(this.getOwnerAddress()); - elements.add(this.getOwnerCity()); - elements.add(this.getOwnerPostalCode()); - elements.add(this.getOwnerContactName()); - elements.add(this.getOwnerContactPhone()); - elements.add(this.getOwnerContactPosition()); - elements.add(this.getOwnerContactEmail()); - elements.add(this.getOperatorName()); - elements.add(this.getOperatorAddress()); - elements.add(this.getOperatorCity()); - elements.add(this.getOperatorPostalCode()); - elements.add(this.getOperatorContactName()); - elements.add(this.getOperatorContactPhone()); - elements.add(this.getOperatorContactPosition()); - elements.add(this.getOperatorContactEmail()); - elements.add(this.getPreparerContactName()); - elements.add(this.getPreparerContactPhone()); - elements.add(this.getPreparerContactPosition()); - elements.add(this.getPreparerContactEmail()); - elements.add(this.getApproverContactName()); - elements.add(this.getApproverContactPhone()); - elements.add(this.getApproverContactPosition()); - elements.add(this.getApproverContactEmail()); - return elements; - } - - @Override - public List getObjects() { - return new ArrayList<>(); - } - - /* getter and setters */ - public String getConfirmationId() { - return confirmationId; - } - - public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; - } - - public String getSubmissionDate() { - return submissionDate; - } - - public void setSubmissionDate(String submissionDate) { - this.submissionDate = submissionDate; - } - - public String getSubmittedBy() { - return submittedBy; - } - - public void setSubmittedBy(String submittedBy) { - this.submittedBy = submittedBy; - } - - public String getFacilityName() { - return facilityName; - } - - public void setFacilityName(String facilityName) { - this.facilityName = facilityName; - } - - public String getFacilityAddress() { - return facilityAddress; - } - - public void setFacilityAddress(String facilityAddress) { - this.facilityAddress = facilityAddress; - } - - public String getFacilityCity() { - return facilityCity; - } - - public void setFacilityCity(String facilityCity) { - this.facilityCity = facilityCity; - } - - public String getFacilityPostalCode() { - return facilityPostalCode; - } - - public void setFacilityPostalCode(String facilityPostalCode) { - this.facilityPostalCode = facilityPostalCode; - } - - public String getFacilityTelephone() { - return facilityTelephone; - } - - public void setFacilityTelephone(String facilityTelephone) { - this.facilityTelephone = facilityTelephone; - } - - public String getFacilityWebsite() { - return facilityWebsite; - } - - public void setFacilityWebsite(String facilityWebsite) { - this.facilityWebsite = facilityWebsite; - } - - public String getCcmsId() { - return ccmsId; - } - - public void setCcmsId(String ccmsId) { - this.ccmsId = ccmsId; - } - - public String getProgramType() { - return programType; - } - - public void setProgramType(String programType) { - this.programType = programType; - } - - public String getOwnershipType() { - return ownershipType; - } - - public void setOwnershipType(String ownershipType) { - this.ownershipType = ownershipType; - } - - public String getLegislationtType() { - return legislationtType; - } - - public String getAccreditationBody() { - return accreditationBody; - } - - public void setAccreditationBody(String accreditationBody) { - this.accreditationBody = accreditationBody; - } - - public void setLegislationtType(String legislationtType) { - this.legislationtType = legislationtType; - } - - public String getAccreditationDate() { - return CSVUtil.getFormattedDate(accreditationDate); - } - - public void setAccreditationDate(String accreditationDate) { - this.accreditationDate = accreditationDate; - } - - public String getAccreditationExpiryDate() { - return CSVUtil.getFormattedDate(accreditationExpiryDate); - } - - public void setAccreditationExpiryDate(String accreditationExpiryDate) { - this.accreditationExpiryDate = accreditationExpiryDate; - } - - public String getHealthAuthority() { - return healthAuthority; - } - - public void setHealthAuthority(String healthAuthority) { - this.healthAuthority = healthAuthority; - } - - public String getOwnerName() { - return ownerName; - } - - public void setOwnerName(String ownerName) { - this.ownerName = ownerName; - } - - public String getOwnerAddress() { - return ownerAddress; - } - - public void setOwnerAddress(String ownerAddress) { - this.ownerAddress = ownerAddress; - } - - public String getOwnerCity() { - return ownerCity; - } - - public void setOwnerCity(String ownerCity) { - this.ownerCity = ownerCity; - } - - public String getOwnerPostalCode() { - return ownerPostalCode; - } - - public void setOwnerPostalCode(String ownerPostalCode) { - this.ownerPostalCode = ownerPostalCode; - } - - public String getOwnerContactName() { - return ownerContactName; - } - - public void setOwnerContactName(String ownerContactName) { - this.ownerContactName = ownerContactName; - } - - public String getOwnerContactPhone() { - return ownerContactPhone; - } - - public void setOwnerContactPhone(String ownerContactPhone) { - this.ownerContactPhone = ownerContactPhone; - } - - public String getOwnerContactPosition() { - return ownerContactPosition; - } - - public void setOwnerContactPosition(String ownerContactPosition) { - this.ownerContactPosition = ownerContactPosition; - } - - - public String getOwnerContactEmail() { - return ownerContactEmail; - } - - public void setOwnerContactEmail(String ownerContactEmail) { - this.ownerContactEmail = ownerContactEmail; - } - - public String getOperatorName() { - if(ownerSameAsOperator) { - return this.getOwnerName(); - } - return operatorName; - } - - public void setOperatorName(String operatorName) { - this.operatorName = operatorName; - } - - public String getOperatorAddress() { - if(ownerSameAsOperator) { - return this.getOwnerAddress(); - } - return operatorAddress; - } - - public void setOperatorAddress(String operatorAddress) { - this.operatorAddress = operatorAddress; - } - - public String getOperatorCity() { - if(ownerSameAsOperator) { - return this.getOwnerCity(); - } - return operatorCity; - } - - public void setOperatorCity(String operatorCity) { - this.operatorCity = operatorCity; - } - - public String getOperatorPostalCode() { - if(ownerSameAsOperator) { - return this.getOwnerPostalCode(); - } - return operatorPostalCode; - } - - public void setOperatorPostalCode(String operatorPostalCode) { - this.operatorPostalCode = operatorPostalCode; - } - - public String getOperatorContactName() { - if(ownerSameAsOperator) { - return this.getOwnerContactName(); - } - return operatorContactName; - } - - public void setOperatorContactName(String operatorContactName) { - this.operatorContactName = operatorContactName; - } - - public String getOperatorContactPhone() { - if(ownerSameAsOperator) { - return this.getOwnerContactPhone(); - } - return operatorContactPhone; - } - - public void setOperatorContactPhone(String operatorContactPhone) { - this.operatorContactPhone = operatorContactPhone; - } - - public String getOperatorContactPosition() { - if(ownerSameAsOperator) { - return this.getOwnerContactPosition(); - } - return operatorContactPosition; - } - - public void setOperatorContactPosition(String operatorContactPosition) { - this.operatorContactPosition = operatorContactPosition; - } - - public String getOperatorContactEmail() { - if(ownerSameAsOperator) { - return this.getOwnerContactEmail(); - } - return operatorContactEmail; - } - - public void setOperatorContactEmail(String operatorContactEmail) { - this.operatorContactEmail = operatorContactEmail; - } - - public String getPreparerContactName() { - return preparerContactName; - } - - public void setPreparerContactName(String preparerContactName) { - this.preparerContactName = preparerContactName; - } - - public String getPreparerContactPhone() { - return preparerContactPhone; - } - - public void setPreparerContactPhone(String preparerContactPhone) { - this.preparerContactPhone = preparerContactPhone; - } - - public String getPreparerContactPosition() { - return preparerContactPosition; - } - - public void setPreparerContactPosition(String preparerContactPosition) { - this.preparerContactPosition = preparerContactPosition; - } - - public String getPreparerContactEmail() { - return preparerContactEmail; - } - - public void setPreparerContactEmail(String preparerContactEmail) { - this.preparerContactEmail = preparerContactEmail; - } - - public String getApproverContactName() { - return approverContactName; - } - - public void setApproverContactName(String approverContactName) { - this.approverContactName = approverContactName; - } - - public String getApproverContactPhone() { - return ApproverContactPhone; - } - - public void setApproverContactPhone(String approverContactPhone) { - ApproverContactPhone = approverContactPhone; - } - - public String getApproverContactEmail() { - return approverContactEmail; - } - - public String getApproverContactPosition() { - return approverContactPosition; - } - - public void setApproverContactPosition(String approverContactPosition) { - this.approverContactPosition = approverContactPosition; - } - - public void setApproverContactEmail(String approverContactEmail) { - this.approverContactEmail = approverContactEmail; - } - -} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java new file mode 100644 index 00000000..74a1d212 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java @@ -0,0 +1,324 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.util.CSVUtil; + +public class FacilityInformation implements IModel { + + private String ConfirmationID; + private String IsDeleted; + private String SubmissionDate; + private String Submittedby; + private String FacilityName; + private String FacilityAddress; + private String FacilityCity; + private String FacilityPostalCode; + private String FacilityTelephone; + private String FacilityWebsite; + private String CCIMSID; + private String Programtype; + private String Ownershiptype; + private String Legislationtype; + private String AccreditationBody; + private String AccreditationDate; + private String AccreditationExpiryDate; + private String HealthAuthority; + private String OwnerName; + private String OwnerAddress; + private String OwnerCity; + private String Ownerpostalcode; + private String OwnercontactName; + private String Ownercontactphone; + private String Ownercontactposition; + private String Ownercontactemail; + private String OperatorName; + private String OperatorAddress; + private String OperatorCity; + private String Operatorpostalcode; + private String OperatorcontactName; + private String Operatorcontactphone; + private String Operatorcontactposition; + private String Operatorcontactemail; + + private List approvers; + private List preparer; + + public String getConfirmationID() { + return ConfirmationID; + } + public void setConfirmationID(String confirmationID) { + ConfirmationID = confirmationID; + } + public String getIsDeleted() { + return IsDeleted; + } + public void setIsDeleted(String isDeleted) { + IsDeleted = isDeleted; + } + public String getSubmissionDate() { + return CSVUtil.getFormattedDate(SubmissionDate); + } + public void setSubmissionDate(String submissionDate) { + SubmissionDate = submissionDate; + } + public String getSubmittedby() { + return Submittedby; + } + public void setSubmittedby(String submittedby) { + Submittedby = submittedby; + } + public String getFacilityName() { + return FacilityName; + } + public void setFacilityName(String facilityName) { + FacilityName = facilityName; + } + public String getFacilityAddress() { + return FacilityAddress; + } + public void setFacilityAddress(String facilityAddress) { + FacilityAddress = facilityAddress; + } + public String getFacilityCity() { + return FacilityCity; + } + public void setFacilityCity(String facilityCity) { + FacilityCity = facilityCity; + } + public String getFacilityPostalCode() { + return FacilityPostalCode; + } + public void setFacilityPostalCode(String facilityPostalCode) { + FacilityPostalCode = facilityPostalCode; + } + public String getFacilityTelephone() { + return FacilityTelephone; + } + public void setFacilityTelephone(String facilityTelephone) { + FacilityTelephone = facilityTelephone; + } + public String getFacilityWebsite() { + return FacilityWebsite; + } + public void setFacilityWebsite(String facilityWebsite) { + FacilityWebsite = facilityWebsite; + } + public String getCCIMSID() { + return CCIMSID; + } + public void setCCIMSID(String cCIMSID) { + CCIMSID = cCIMSID; + } + public String getProgramtype() { + return Programtype; + } + public void setProgramtype(String programtype) { + Programtype = programtype; + } + public String getOwnershiptype() { + return Ownershiptype; + } + public void setOwnershiptype(String ownershiptype) { + Ownershiptype = ownershiptype; + } + public String getLegislationtype() { + return Legislationtype; + } + public void setLegislationtype(String legislationtype) { + Legislationtype = legislationtype; + } + public String getAccreditationBody() { + return AccreditationBody; + } + public void setAccreditationBody(String accreditationBody) { + AccreditationBody = accreditationBody; + } + public String getAccreditationDate() { + return CSVUtil.getFormattedDate(AccreditationDate); + } + public void setAccreditationDate(String accreditationDate) { + AccreditationDate = accreditationDate; + } + public String getAccreditationExpiryDate() { + return CSVUtil.getFormattedDate(AccreditationExpiryDate); + } + public void setAccreditationExpiryDate(String accreditationExpiryDate) { + AccreditationExpiryDate = accreditationExpiryDate; + } + public String getHealthAuthority() { + return HealthAuthority; + } + public void setHealthAuthority(String healthAuthority) { + HealthAuthority = healthAuthority; + } + public String getOwnerName() { + return OwnerName; + } + public void setOwnerName(String ownerName) { + OwnerName = ownerName; + } + public String getOwnerAddress() { + return OwnerAddress; + } + public void setOwnerAddress(String ownerAddress) { + OwnerAddress = ownerAddress; + } + public String getOwnerCity() { + return OwnerCity; + } + public void setOwnerCity(String ownerCity) { + OwnerCity = ownerCity; + } + public String getOwnerpostalcode() { + return Ownerpostalcode; + } + public void setOwnerpostalcode(String ownerpostalcode) { + Ownerpostalcode = ownerpostalcode; + } + public String getOwnercontactName() { + return OwnercontactName; + } + public void setOwnercontactName(String ownercontactName) { + OwnercontactName = ownercontactName; + } + public String getOwnercontactphone() { + return Ownercontactphone; + } + public void setOwnercontactphone(String ownercontactphone) { + Ownercontactphone = ownercontactphone; + } + public String getOwnercontactposition() { + return Ownercontactposition; + } + public void setOwnercontactposition(String ownercontactposition) { + Ownercontactposition = ownercontactposition; + } + public String getOwnercontactemail() { + return Ownercontactemail; + } + public void setOwnercontactemail(String ownercontactemail) { + Ownercontactemail = ownercontactemail; + } + public String getOperatorName() { + return OperatorName; + } + public void setOperatorName(String operatorName) { + OperatorName = operatorName; + } + public String getOperatorAddress() { + return OperatorAddress; + } + public void setOperatorAddress(String operatorAddress) { + OperatorAddress = operatorAddress; + } + public String getOperatorCity() { + return OperatorCity; + } + public void setOperatorCity(String operatorCity) { + OperatorCity = operatorCity; + } + public String getOperatorpostalcode() { + return Operatorpostalcode; + } + public void setOperatorpostalcode(String operatorpostalcode) { + Operatorpostalcode = operatorpostalcode; + } + public String getOperatorcontactName() { + return OperatorcontactName; + } + public void setOperatorcontactName(String operatorcontactName) { + OperatorcontactName = operatorcontactName; + } + public String getOperatorcontactphone() { + return Operatorcontactphone; + } + public void setOperatorcontactphone(String operatorcontactphone) { + Operatorcontactphone = operatorcontactphone; + } + public String getOperatorcontactposition() { + return Operatorcontactposition; + } + public void setOperatorcontactposition(String operatorcontactposition) { + Operatorcontactposition = operatorcontactposition; + } + public String getOperatorcontactemail() { + return Operatorcontactemail; + } + public void setOperatorcontactemail(String operatorcontactemail) { + Operatorcontactemail = operatorcontactemail; + } + + public List getApprovers() { + return approvers; + } + public void setApprovers(List approvers) { + this.approvers = approvers; + } + public List getPreparers() { + return preparer; + } + public void setPreparers(List preparer) { + this.preparer = preparer; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_FACILITY; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationID()); + elements.add("false"); + elements.add(this.getSubmissionDate()); + elements.add(this.getSubmittedby()); + elements.add(this.getFacilityName()); + elements.add(this.getFacilityAddress()); + elements.add(this.getFacilityCity()); + elements.add(this.getFacilityPostalCode()); + elements.add(this.getFacilityTelephone()); + elements.add(this.getFacilityWebsite()); + elements.add(this.getCCIMSID()); + elements.add(this.getProgramtype()); + elements.add(this.getOwnershiptype()); + elements.add(this.getLegislationtype()); + elements.add(this.getAccreditationBody()); + elements.add(this.getAccreditationDate()); + elements.add(this.getAccreditationExpiryDate()); + elements.add(this.getHealthAuthority()); + elements.add(this.getOwnerName()); + elements.add(this.getOwnerAddress()); + elements.add(this.getOwnerCity()); + elements.add(this.getOwnerpostalcode()); + elements.add(this.getOwnercontactName()); + elements.add(this.getOwnercontactphone()); + elements.add(this.getOwnercontactposition()); + elements.add(this.getOwnercontactemail()); + elements.add(this.getOperatorName()); + elements.add(this.getOperatorAddress()); + elements.add(this.getOperatorCity()); + elements.add(this.getOperatorpostalcode()); + elements.add(this.getOperatorcontactName()); + elements.add(this.getOperatorcontactphone()); + elements.add(this.getOperatorcontactposition()); + elements.add(this.getOperatorcontactemail()); + return elements; + } + @Override + public List getObjects() { + List objects = new ArrayList<>(); + objects.addAll(this.getPreparers()); + objects.addAll(this.getApprovers()); + return objects; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java new file mode 100644 index 00000000..278f23ce --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java @@ -0,0 +1,81 @@ +package ca.bc.gov.chefs.etl.forms.ltc.facility.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.IModel; + +public class Preparer implements IModel{ + private String confirmationID; + private String preparerNum; + private String preparerContactName; + private String preparerContactPosition; + private String preparerContactPhone; + private String preparerContactEmail; + + public String getConfirmationID() { + return confirmationID; + } + public void setConfirmationID(String confirmationID) { + this.confirmationID = confirmationID; + } + public String getPreparerNum() { + return preparerNum; + } + public void setPreparerNum(String preparerNum) { + this.preparerNum = preparerNum; + } + public String getPreparerContactName() { + return preparerContactName; + } + public void setPreparerContactName(String preparerContactName) { + this.preparerContactName = preparerContactName; + } + public String getPreparerContactPosition() { + return preparerContactPosition; + } + public void setPreparerContactPosition(String preparerContactPosition) { + this.preparerContactPosition = preparerContactPosition; + } + public String getPreparerContactPhone() { + return preparerContactPhone; + } + public void setPreparerContactPhone(String preparerContactPhone) { + this.preparerContactPhone = preparerContactPhone; + } + public String getPreparerContactEmail() { + return preparerContactEmail; + } + public void setPreparerContactEmail(String preparerContactEmail) { + this.preparerContactEmail = preparerContactEmail; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_FACILITY_PREPARER; + } + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.getConfirmationID()); + elements.add(this.getPreparerNum()); + elements.add(this.getPreparerContactName()); + elements.add(this.getPreparerContactPosition()); + elements.add(this.getPreparerContactPhone()); + elements.add(this.getPreparerContactEmail()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java index 3a5feb5d..704d54bf 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java @@ -1,5 +1,6 @@ package ca.bc.gov.chefs.etl.forms.ltc.facility.processor; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -10,7 +11,10 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import ca.bc.gov.chefs.etl.forms.ltc.facility.model.FacilityInfo; +import ca.bc.gov.chefs.etl.forms.ltc.facility.json.Root; +import ca.bc.gov.chefs.etl.forms.ltc.facility.model.Approver; +import ca.bc.gov.chefs.etl.forms.ltc.facility.model.FacilityInformation; +import ca.bc.gov.chefs.etl.forms.ltc.facility.model.Preparer; import ca.bc.gov.chefs.etl.parser.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; import ca.bc.gov.chefs.etl.util.FileUtil; @@ -24,13 +28,223 @@ public void process(Exchange exchange) throws Exception { System.out.println(payload); ObjectMapper mapper = new ObjectMapper(); - List facilityInformationModels = mapper.readValue(payload, - new TypeReference>() { + List facilityInformationModels = mapper.readValue(payload, + new TypeReference>() { }); - - List iModels = (List) (List) facilityInformationModels; - + List parsedFacilityInfo = parseFacilityInfo(facilityInformationModels); + List iModels = (List) (List) parsedFacilityInfo; Map>> map = CSVUtil.provider(iModels); FileUtil.writeToCSVFile(map); } + + private List parseFacilityInfo(List facilities) { + /* Mandatory fields */ + List facilityInfoParsed = new ArrayList<>(); + for(Root facility : facilities) { + FacilityInformation facilityInfo = new FacilityInformation(); + facilityInfo.setAccreditationBody(facility.getAccreditationBody()); + facilityInfo.setAccreditationDate(facility.getAccreditationDate1()); + facilityInfo.setAccreditationExpiryDate(facility.getAccreditationExpiryDate1()); + facilityInfo.setCCIMSID(facility.getSimpletextfield1()); + facilityInfo.setConfirmationID(facility.getForm().getConfirmationId()); + facilityInfo.setFacilityAddress(facility.getBcaddress().getProperties().getFullAddress()); + facilityInfo.setFacilityCity(facility.getCity1()); + facilityInfo.setFacilityName(facility.getFacilityName2()); + facilityInfo.setFacilityPostalCode(facility.getTextField()); + facilityInfo.setFacilityTelephone(facility.getPhoneNumber()); + facilityInfo.setFacilityWebsite(facility.getFacilityWebsite()); + facilityInfo.setHealthAuthority(facility.getHealthAuthority1()); + facilityInfo.setIsDeleted("false"); // FIXME + facilityInfo.setLegislationtype(facility.getSelectList1()); + facilityInfo.setOwnerAddress(facility.getBcaddress1().getProperties().getFullAddress()); + facilityInfo.setOwnerCity(facility.getCity3()); + facilityInfo.setOwnercontactemail(facility.getContactEmail()); + facilityInfo.setOwnercontactName(facility.getContactName()); + facilityInfo.setOwnercontactposition(facility.getContactPosition()); + facilityInfo.setOwnerName(facility.getOwnerName()); + facilityInfo.setOwnercontactphone(facility.getPhoneNumber3()); + facilityInfo.setOwnerpostalcode(facility.getPostalCode1()); + facilityInfo.setOwnershiptype(facility.getOwnershipType1()); + facilityInfo.setProgramtype(facility.getProgramType1()); + facilityInfo.setSubmissionDate(facility.getForm().getCreatedAt()); + facilityInfo.setSubmittedby(facility.getForm().getEmail()); + + + if(!facility.isTheOwnerTheSameAsTheOperator1()) { + facilityInfo.setOperatorAddress(facility.getOperatorAddress().getProperties().getFullAddress()); + facilityInfo.setOperatorCity(facility.getCity5()); + facilityInfo.setOperatorcontactemail(facility.getContactEmail2()); + facilityInfo.setOperatorcontactName(facility.getContactName3()); + facilityInfo.setOperatorcontactphone(facility.getContactPhoneNumber2()); + facilityInfo.setOperatorcontactposition(facility.getContactPosition2()); + facilityInfo.setOperatorName(facility.getOpName()); + facilityInfo.setOperatorpostalcode(facility.getPostalCode3()); + }else { + facilityInfo.setOperatorAddress(facilityInfo.getOwnerAddress()); + facilityInfo.setOperatorCity(facilityInfo.getOwnerCity()); + facilityInfo.setOperatorcontactemail(facilityInfo.getOwnercontactemail()); + facilityInfo.setOperatorcontactName(facilityInfo.getOwnercontactName()); + facilityInfo.setOperatorcontactphone(facilityInfo.getOwnercontactphone()); + facilityInfo.setOperatorcontactposition(facilityInfo.getOwnercontactposition()); + facilityInfo.setOperatorName(facilityInfo.getOwnerName()); + facilityInfo.setOperatorpostalcode(facilityInfo.getOwnerpostalcode()); + } + + + /* Creating Preparer Pojos */ + List preparers = new ArrayList(); + Preparer preparer1 = new Preparer(); + preparer1.setConfirmationID(facility.getForm().getConfirmationId()); + preparer1.setPreparerContactEmail(facility.getSimpleemail2()); + preparer1.setPreparerContactName(facility.getName2()); + preparer1.setPreparerContactPhone(facility.getPhoneNumber4()); + preparer1.setPreparerContactPosition(facility.getPosition3()); + preparer1.setPreparerNum("1"); + + if(preparer1.getPreparerContactEmail().isBlank() || preparer1.getPreparerContactName().isBlank() || preparer1.getPreparerContactPhone().isBlank() || preparer1.getPreparerContactPosition().isBlank() || preparer1.getPreparerContactName().isBlank()) { + + }else { + preparers.add(preparer1); + } + + Preparer preparer2 = new Preparer(); + preparer2.setConfirmationID(facility.getForm().getConfirmationId()); + preparer2.setPreparerContactEmail(facility.getSimpleemail4()); + preparer2.setPreparerContactName(facility.getName4()); + preparer2.setPreparerContactPhone(facility.getPhoneNumber5()); + preparer2.setPreparerContactPosition(facility.getPosition6()); + preparer2.setPreparerNum("2"); + + if(preparer2.getPreparerContactEmail().isBlank() || preparer2.getPreparerContactName().isBlank() || preparer2.getPreparerContactPhone().isBlank() || preparer2.getPreparerContactPosition().isBlank() || preparer2.getPreparerContactName().isBlank()) { + + }else { + preparers.add(preparer2); + } + + + Preparer preparer3 = new Preparer(); + preparer3.setConfirmationID(facility.getForm().getConfirmationId()); + preparer3.setPreparerContactEmail(facility.getSimpleemail5()); + preparer3.setPreparerContactName(facility.getName5()); + preparer3.setPreparerContactPhone(facility.getPhoneNumber6()); + preparer3.setPreparerContactPosition(facility.getPosition7()); + preparer3.setPreparerNum("3"); + + if(preparer3.getPreparerContactEmail().isBlank() || preparer3.getPreparerContactName().isBlank() || preparer3.getPreparerContactPhone().isBlank() || preparer3.getPreparerContactPosition().isBlank() || preparer3.getPreparerContactName().isBlank()) { + + }else { + preparers.add(preparer3); + } + + + Preparer preparer4 = new Preparer(); + preparer4.setConfirmationID(facility.getForm().getConfirmationId()); + preparer4.setPreparerContactEmail(facility.getSimpleemail8()); + preparer4.setPreparerContactName(facility.getName8()); + preparer4.setPreparerContactPhone(facility.getPhoneNumber9()); + preparer4.setPreparerContactPosition(facility.getPosition10()); + preparer4.setPreparerNum("4"); + + if(preparer4.getPreparerContactEmail().isBlank() || preparer4.getPreparerContactName().isBlank() || preparer4.getPreparerContactPhone().isBlank() || preparer4.getPreparerContactPosition().isBlank() || preparer4.getPreparerContactName().isBlank()) { + + }else { + preparers.add(preparer4); + } + + + Preparer preparer5 = new Preparer(); + preparer5.setConfirmationID(facility.getForm().getConfirmationId()); + preparer5.setPreparerContactEmail(facility.getSimpleemail9()); + preparer5.setPreparerContactName(facility.getName9()); + preparer5.setPreparerContactPhone(facility.getPhoneNumber10()); + preparer5.setPreparerContactPosition(facility.getPosition11()); + preparer5.setPreparerNum("5"); + + if(preparer5.getPreparerContactEmail().isBlank() || preparer5.getPreparerContactName().isBlank() || preparer5.getPreparerContactPhone().isBlank() || preparer5.getPreparerContactPosition().isBlank() || preparer5.getPreparerContactName().isBlank()) { + + }else { + preparers.add(preparer5); + } + + List approvers = new ArrayList(); + Approver approver1 = new Approver(); + approver1.setApproverContactEmail(facility.getEmail2()); + approver1.setApproverContactName(facility.getName3()); + approver1.setApproverContactPhone(facility.getSimplephonenumber3()); + approver1.setApproverContactPosition(facility.getPosition4()); + approver1.setApproverNum("1"); + approver1.setConfirmationID(facility.getForm().getConfirmationId()); + + if(approver1.getApproverContactEmail().isBlank() || approver1.getApproverContactName().isBlank() || approver1.getApproverContactPhone().isBlank() || approver1.getApproverContactPosition().isBlank() || approver1.getApproverNum().isBlank()) { + + }else { + approvers.add(approver1); + } + + Approver approver2 = new Approver(); + approver2.setApproverContactEmail(facility.getEmail2()); + approver2.setApproverContactName(facility.getName6()); + approver2.setApproverContactPhone(facility.getPhoneNumber7()); + approver2.setApproverContactPosition(facility.getPosition8()); + approver2.setApproverNum("2"); + approver2.setConfirmationID(facility.getForm().getConfirmationId()); + + if(approver2.getApproverContactEmail().isBlank() || approver2.getApproverContactName().isBlank() || approver2.getApproverContactPhone().isBlank() || approver2.getApproverContactPosition().isBlank() || approver2.getApproverNum().isBlank()) { + + }else { + approvers.add(approver2); + } + + + Approver approver3 = new Approver(); + approver3.setApproverContactEmail(facility.getSimpleemail6()); + approver3.setApproverContactName(facility.getName3()); + approver3.setApproverContactPhone(facility.getSimplephonenumber3()); + approver3.setApproverContactPosition(facility.getPosition4()); + approver3.setApproverNum("3"); + approver3.setConfirmationID(facility.getForm().getConfirmationId()); + + if(approver3.getApproverContactEmail().isBlank() || approver3.getApproverContactName().isBlank() || approver3.getApproverContactPhone().isBlank() || approver3.getApproverContactPosition().isBlank() || approver3.getApproverNum().isBlank()) { + + }else { + approvers.add(approver3); + } + + + Approver approver4 = new Approver(); + approver4.setApproverContactEmail(facility.getSimpleemail10()); + approver4.setApproverContactName(facility.getName10()); + approver4.setApproverContactPhone(facility.getPhoneNumber11()); + approver4.setApproverContactPosition(facility.getPosition12()); + approver4.setApproverNum("4"); + approver4.setConfirmationID(facility.getForm().getConfirmationId()); + + if(approver4.getApproverContactEmail().isBlank() || approver4.getApproverContactName().isBlank() || approver4.getApproverContactPhone().isBlank() || approver4.getApproverContactPosition().isBlank() || approver4.getApproverNum().isBlank()) { + + }else { + approvers.add(approver4); + } + + + Approver approver5 = new Approver(); + approver5.setApproverContactEmail(facility.getSimpleemail7()); + approver5.setApproverContactName(facility.getName7()); + approver5.setApproverContactPhone(facility.getPhoneNumber8()); + approver5.setApproverContactPosition(facility.getPosition9()); + approver5.setApproverNum("5"); + approver5.setConfirmationID(facility.getForm().getConfirmationId()); + + if(approver5.getApproverContactEmail().isBlank() || approver5.getApproverContactName().isBlank() || approver5.getApproverContactPhone().isBlank() || approver5.getApproverContactPosition().isBlank() || approver5.getApproverNum().isBlank()) { + + }else { + approvers.add(approver5); + } + + facilityInfo.setPreparers(preparers); + facilityInfo.setApprovers(approvers); + facilityInfoParsed.add(facilityInfo); + } + return facilityInfoParsed; + } + } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java index 258baa47..fce46850 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java @@ -29,11 +29,13 @@ public void configure() throws Exception { from("direct:ltc-facility-information").process(new FacilityInfoFormApiProcessor()) // to the http uri - .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/e1f4761f-efdd-4529-805e-677d3ae21601/export?bridgeEndpoint=true&format=json&version=2&type=submissions") + .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/e1f4761f-efdd-4529-805e-677d3ae21601/export?bridgeEndpoint=true&format=json&type=submissions&version=2") .log("This is the status code from the response: ${header.CamelHttpResponseCode}") .log("Trying to convert the received body OK").convertBodyTo(String.class) .process(new FacilityInfoFormApiResponseProcessor()).end(); // database phase + + // file conversion diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid0.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid0.java index 8ae474fd..295d4225 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid0.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid0.java @@ -1,5 +1,8 @@ package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class BedGrid0{ public String bedType; public String endDate; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid1.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid1.java index 1c19e0e8..b22eb460 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid1.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid1.java @@ -1,5 +1,8 @@ package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class BedGrid1{ public String bedType; public String bedType1; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid2.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid2.java index 340b1f6c..3cd6e30f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid2.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid2.java @@ -1,5 +1,8 @@ package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class BedGrid2{ public String bedType; public String bedType2; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid3.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid3.java index a9a84e1d..e2873b17 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid3.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid3.java @@ -1,5 +1,8 @@ package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class BedGrid3{ public String bedType; public String bedType3; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid4.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid4.java index c1ccafd3..0fa0026c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid4.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid4.java @@ -1,5 +1,8 @@ package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class BedGrid4{ public String bedType; public String bedType4; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Form.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Form.java index 7650af02..e880031b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Form.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Form.java @@ -1,5 +1,8 @@ package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) public class Form{ public String assignee; public String assigneeEmail; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java index 447f1e86..15c1b351 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; +import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; public class LtcBedYtdMaxOccupancy implements IModel { @@ -79,8 +80,7 @@ public String getFileName() { } @Override public String getFormType() { - // TODO Auto-generated method stub - return null; + return Constants.LTC_BED_YTD_MAX_OCCUPANCY; } @Override public List getCsvElements() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java index 1f785d84..2f0cb49f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java @@ -76,8 +76,8 @@ public List getCsvElements() { elements.add(this.getOccMonth()); elements.add(this.getOccDaysYTDInScopePublic()); elements.add(this.getOccDaysYTOutScopePublic()); - elements.add(this.getOccDaysYtdTotalDays()); elements.add(this.getOccDaysYTDPrivate()); + elements.add(this.getOccDaysYtdTotalDays()); return elements; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java index 305e6678..8509ada7 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java @@ -11,7 +11,7 @@ public class LtcYtdCompHrs implements IModel { private String confirmationId; private String compHrsType; private String compHrsName; - private String compHrsPerPayrollYtd; + //private String compHrsPerPayrollYtd; private String compHrsStaffYtd; private String compHrsContractServicesYtd; private String compHrsOfficeAllocYtd; @@ -35,12 +35,7 @@ public String getCompHrsName() { public void setCompHrsName(String compHrsName) { this.compHrsName = compHrsName; } - public String getCompHrsPerPayrollYtd() { - return compHrsPerPayrollYtd; - } - public void setCompHrsPerPayrollYtd(String compHrsPerPayrollYtd) { - this.compHrsPerPayrollYtd = compHrsPerPayrollYtd; - } + public String getCompHrsStaffYtd() { return compHrsStaffYtd; } @@ -81,7 +76,6 @@ public List getCsvElements() { elements.add(this.getConfirmationId()); elements.add(this.getCompHrsType()); elements.add(this.getCompHrsName()); - elements.add(this.getCompHrsPerPayrollYtd()); elements.add(this.getCompHrsStaffYtd()); elements.add(this.getCompHrsContractServicesYtd()); elements.add(this.getCompHrsOfficeAllocYtd()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java index 57354d50..b8554006 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; +import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; public class LtcYtdCompHrsSubtotals implements IModel { @@ -58,7 +59,7 @@ public String getFileName() { } @Override public String getFormType() { - return "LTC_YTD_COMP_HRS_SUB_TOTALS"; + return Constants.LTC_YTD_COMP_HRS_SUBTOTALS; } @Override public List getCsvElements() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java index 972614ec..0db6082b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java @@ -3,13 +3,13 @@ import java.util.ArrayList; import java.util.List; +import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; public class LtcYtdCompHrsTotals implements IModel{ private String confirmationID; private String compHrsTotalType; - private String totalCompHrsPerPayrollYTD; private String totalCompHrsStaffYTD; private String totalCompHrsContractServicesYTD; private String totalCompHrsOfficeAllocYTD; @@ -33,14 +33,6 @@ public void setCompHrsTotalType(String compHrsTotalType) { this.compHrsTotalType = compHrsTotalType; } - public String getTotalCompHrsPerPayrollYTD() { - return totalCompHrsPerPayrollYTD; - } - - public void setTotalCompHrsPerPayrollYTD(String totalCompHrsPerPayrollYTD) { - this.totalCompHrsPerPayrollYTD = totalCompHrsPerPayrollYTD; - } - public String getTotalCompHrsStaffYTD() { return totalCompHrsStaffYTD; } @@ -81,8 +73,7 @@ public String getFileName() { @Override public String getFormType() { - // TODO Auto-generated method stub - return null; + return Constants.LTC_YTD_COMP_HRS_TOTALS; } @Override @@ -90,7 +81,7 @@ public List getCsvElements() { List elements = new ArrayList<>(); elements.add(this.getConfirmationID()); elements.add(this.getCompHrsTotalType()); - elements.add(this.getTotalCompHrsPerPayrollYTD()); + // elements.add(this.getTotalCompHrsPerPayrollYTD()); elements.add(this.getTotalCompHrsStaffYTD()); elements.add(this.getTotalCompHrsContractServicesYTD()); elements.add(this.getTotalCompHrsOfficeAllocYTD()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java index 637e7651..7b54519e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java @@ -11,8 +11,8 @@ public class LtcYtdExp implements IModel { private String confirmationId; private String expType; private String expName; - private String revYtd; - private String revNotes; + private String expYtd; + private String expNotes; public String getConfirmationId() { return confirmationId; @@ -32,17 +32,17 @@ public String getExpName() { public void setExpName(String expName) { this.expName = expName; } - public String getRevYtd() { - return revYtd; + public String getExpYtd() { + return expYtd; } - public void setRevYtd(String revYtd) { - this.revYtd = revYtd; + public void setExpYtd(String expYtd) { + this.expYtd = expYtd; } - public String getRevNotes() { - return revNotes; + public String getExpNotes() { + return expNotes; } - public void setRevNotes(String revNotes) { - this.revNotes = revNotes; + public void setExpNotes(String expNotes) { + this.expNotes = expNotes; } @Override public String getFileName() { @@ -59,9 +59,8 @@ public List getCsvElements() { elements.add(this.getConfirmationId()); elements.add(this.getExpType()); elements.add(this.getExpName()); - elements.add(this.getRevYtd()); - elements.add(this.getRevNotes()); - + elements.add(this.getExpYtd()); + elements.add(this.getExpNotes()); return elements; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java index 0719c28b..81ee1fab 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java @@ -34,6 +34,18 @@ public class LtcYtdSubmission implements IModel { private List ltcYtdDirectCareHrs; private List ltcYtdExp; private List ltcYtdRev; + private List ltcYtdExpSubttls; + private List ltcYtdRevSubttls; + private List ltcYtdCompSalSubttls; + private List ltcYtdCompSalTtls; + private List ltcYtdCompHrsSubttls; + private List ltcYtdCompHrsTtls; + private List ltcYtdDirectCareHrsSubttls; + private List ltcYtdDirectCareCostSubttls; + private List ltcBedYtdMaxOccTtls; + private List ltcBedYtdOccDaysTtls; + private List ltcBedYtdOccRateTtls; + @Override public String getFileName() { @@ -45,6 +57,8 @@ public String getFileName() { public String getFormType() { return Constants.LTC_YTD_SUBMISSION; } + + @Override public List getCsvElements() { @@ -76,6 +90,17 @@ public List getObjects() { ltcQtdInstances.addAll(this.getLtcYtdDirectCareHrs()); ltcQtdInstances.addAll(this.getLtcYtdExp()); ltcQtdInstances.addAll(this.getLtcYtdRev()); + ltcQtdInstances.addAll(this.getLtcYtdExpSubttls()); + ltcQtdInstances.addAll(this.getLtcYtdRevSubttls()); + ltcQtdInstances.addAll(this.getLtcYtdCompSalSubttls()); + ltcQtdInstances.addAll(this.getLtcYtdCompSalTtls()); + ltcQtdInstances.addAll(this.getLtcYtdCompHrsSubttls()); + ltcQtdInstances.addAll(this.getLtcYtdCompHrsTtls()); + ltcQtdInstances.addAll(this.getLtcYtdDirectCareHrsSubttls()); + ltcQtdInstances.addAll(this.getLtcYtdDirectCareCostSubttls()); + ltcQtdInstances.addAll(this.getLtcBedYtdMaxOccTtls()); + ltcQtdInstances.addAll(this.getLtcBedYtdOccDaysTtls()); + ltcQtdInstances.addAll(this.getLtcBedYtdOccRateTtls()); return ltcQtdInstances; } @@ -248,4 +273,93 @@ public void setLtcYtdRev(List ltcYtdRev) { this.ltcYtdRev = ltcYtdRev; } + public List getLtcYtdExpSubttls() { + return ltcYtdExpSubttls; + } + + public void setLtcYtdExpSubttls(List ltcYtdExpSubttls) { + this.ltcYtdExpSubttls = ltcYtdExpSubttls; + } + + public List getLtcYtdRevSubttls() { + return ltcYtdRevSubttls; + } + + public void setLtcYtdRevSubttls(List ltcYtdRevSubttls) { + this.ltcYtdRevSubttls = ltcYtdRevSubttls; + } + + public List getLtcYtdCompSalSubttls() { + return ltcYtdCompSalSubttls; + } + + public void setLtcYtdCompSalSubttls(List ltcYtdCompSalSubttls) { + this.ltcYtdCompSalSubttls = ltcYtdCompSalSubttls; + } + + public List getLtcYtdCompSalTtls() { + return ltcYtdCompSalTtls; + } + + public void setLtcYtdCompSalTtls(List ltcYtdCompSalTtls) { + this.ltcYtdCompSalTtls = ltcYtdCompSalTtls; + } + + public List getLtcYtdCompHrsSubttls() { + return ltcYtdCompHrsSubttls; + } + + public void setLtcYtdCompHrsSubttls(List ltcYtdCompHrsSubttls) { + this.ltcYtdCompHrsSubttls = ltcYtdCompHrsSubttls; + } + + public List getLtcYtdCompHrsTtls() { + return ltcYtdCompHrsTtls; + } + + public void setLtcYtdCompHrsTtls(List ltcYtdCompHrsTtls) { + this.ltcYtdCompHrsTtls = ltcYtdCompHrsTtls; + } + + public List getLtcYtdDirectCareHrsSubttls() { + return ltcYtdDirectCareHrsSubttls; + } + + public void setLtcYtdDirectCareHrsSubttls(List ltcYtdDirectCareHrsSubttls) { + this.ltcYtdDirectCareHrsSubttls = ltcYtdDirectCareHrsSubttls; + } + + public List getLtcYtdDirectCareCostSubttls() { + return ltcYtdDirectCareCostSubttls; + } + + public void setLtcYtdDirectCareCostSubttls(List ltcYtdDirectCareCostSubttls) { + this.ltcYtdDirectCareCostSubttls = ltcYtdDirectCareCostSubttls; + } + + public List getLtcBedYtdMaxOccTtls() { + return ltcBedYtdMaxOccTtls; + } + + public void setLtcBedYtdMaxOccTtls(List ltcBedYtdMaxOccTtls) { + this.ltcBedYtdMaxOccTtls = ltcBedYtdMaxOccTtls; + } + + public List getLtcBedYtdOccDaysTtls() { + return ltcBedYtdOccDaysTtls; + } + + public void setLtcBedYtdOccDaysTtls(List ltcBedYtdOccDaysTtls) { + this.ltcBedYtdOccDaysTtls = ltcBedYtdOccDaysTtls; + } + + public List getLtcBedYtdOccRateTtls() { + return ltcBedYtdOccRateTtls; + } + + public void setLtcBedYtdOccRateTtls(List ltcBedYtdOccRateTtls) { + this.ltcBedYtdOccRateTtls = ltcBedYtdOccRateTtls; + } + + } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 5b6a365c..9d18cfc1 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -82,7 +82,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT List ltcYtdCompBenefits = new ArrayList<>(); List ltcYtdRev = new ArrayList<>(); List ltcYtdRevSubTtls = new ArrayList(); - //List ltcYtdExpSubttls = new ArrayList(); + List ltcYtdExpSubttls = new ArrayList(); List ltcYtdExp = new ArrayList<>(); List ltcBedYtdOccupancyRates = new ArrayList<>(); List ltcBedYtdMaxOccupancies = new ArrayList<>(); @@ -380,6 +380,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsSickYTD(root.getNursingNProdH_sum21()); nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsOtherServYTD(root.getNursingNProdH_sum31()); nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsTotalYTD(root.getNursingNProdH_calcsum1()); + nursingDirCareHrsSubTotal.setConfirmationID(root.getForm().getConfirmationId()); + LtcYtdDirectCareHrsSubTotals alliedDirCareHrsSubTotal = new LtcYtdDirectCareHrsSubTotals(); alliedDirCareHrsSubTotal.setDirCareType("Allied Professional"); @@ -393,6 +395,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsSickYTD(root.getAlliedNProdH_sum21()); alliedDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsOtherServYTD(root.getAlliedProfNProdH_sum31()); alliedDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsTotalYTD(root.getAlliedProfNProdH_calcsum1()); + alliedDirCareHrsSubTotal.setConfirmationID(root.getForm().getConfirmationId()); LtcYtdDirectCareHrsSubTotals alliedNPDirCareHrsSubTotal = new LtcYtdDirectCareHrsSubTotals(); alliedNPDirCareHrsSubTotal.setDirCareType("Allied Non-professional"); @@ -406,6 +409,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsSickYTD(root.getAlliedNPNProdH_sum21()); alliedNPDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsOtherServYTD(root.getAlliedNPNProdH_sum31()); alliedNPDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsTotalYTD(root.getAlliedNPNProdH_calcsum1()); + alliedNPDirCareHrsSubTotal.setConfirmationID(root.getForm().getConfirmationId()); Collections.addAll(ltcYtdDcHrsSubttls, nursingDirCareHrsSubTotal,alliedDirCareHrsSubTotal,alliedNPDirCareHrsSubTotal); /* END */ @@ -981,13 +985,13 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPRASal.setCompSalTotalCostYtd(root.getCompB_calc23()); LtcYtdCompSal alliedNPAWSal = new LtcYtdCompSal(); - alliedProfOTHSal.setCompSalStaffYtd(root.getCompB_item124()); - alliedProfOTHSal.setCompSalContractServicesYtd(root.getCompB_item224()); - alliedProfOTHSal.setCompSalOfficeAllocYtd(root.getCompB_item324()); - alliedProfOTHSal.setCompSalName("Activity Worker"); - alliedProfOTHSal.setCompSalType("Allied Non-professional"); - alliedProfOTHSal.setConfirmationId(root.getForm().getConfirmationId()); - alliedProfOTHSal.setCompSalTotalCostYtd(root.getCompB_calc24()); + alliedNPAWSal.setCompSalStaffYtd(root.getCompB_item124()); + alliedNPAWSal.setCompSalContractServicesYtd(root.getCompB_item224()); + alliedNPAWSal.setCompSalOfficeAllocYtd(root.getCompB_item324()); + alliedNPAWSal.setCompSalName("Activity Worker"); + alliedNPAWSal.setCompSalType("Allied Non-professional"); + alliedNPAWSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPAWSal.setCompSalTotalCostYtd(root.getCompB_calc24()); LtcYtdCompSal alliedNPMTSal = new LtcYtdCompSal(); alliedNPMTSal.setCompSalStaffYtd(root.getCompB_item125()); @@ -1102,7 +1106,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT /* Hours for Staff and Contracted Services */ LtcYtdCompHrs supportFoodServicesHrs = new LtcYtdCompHrs(); - supportFoodServicesHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP1()); + //supportFoodServicesHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP1()); supportFoodServicesHrs.setCompHrsStaffYtd(root.getCompH_item11()); supportFoodServicesHrs.setCompHrsContractServicesYtd(root.getCompH_item21()); supportFoodServicesHrs.setCompHrsOfficeAllocYtd(root.getCompH_item31()); @@ -1112,7 +1116,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT supportFoodServicesHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc1()); LtcYtdCompHrs supportLaundryServicesHrs = new LtcYtdCompHrs(); - supportLaundryServicesHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP2()); + //supportLaundryServicesHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP2()); supportLaundryServicesHrs.setCompHrsStaffYtd(root.getCompH_item12()); supportLaundryServicesHrs.setCompHrsContractServicesYtd(root.getCompH_item22()); supportLaundryServicesHrs.setCompHrsOfficeAllocYtd(root.getCompH_item32()); @@ -1122,7 +1126,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT supportLaundryServicesHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc2()); LtcYtdCompHrs supportHousekeepingHrs = new LtcYtdCompHrs(); - supportHousekeepingHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP3()); + //supportHousekeepingHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP3()); supportHousekeepingHrs.setCompHrsStaffYtd(root.getCompH_item13()); supportHousekeepingHrs.setCompHrsContractServicesYtd(root.getCompH_item23()); supportHousekeepingHrs.setCompHrsOfficeAllocYtd(root.getCompH_item33()); @@ -1132,7 +1136,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT supportHousekeepingHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc3()); LtcYtdCompHrs supportPlantMntnceHrs = new LtcYtdCompHrs(); - supportPlantMntnceHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP4()); + // supportPlantMntnceHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP4()); supportPlantMntnceHrs.setCompHrsStaffYtd(root.getCompH_item14()); supportPlantMntnceHrs.setCompHrsContractServicesYtd(root.getCompH_item24()); supportPlantMntnceHrs.setCompHrsOfficeAllocYtd(root.getCompH_item34()); @@ -1143,7 +1147,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT // sum remaining LtcYtdCompHrs adminAdministratorHrs = new LtcYtdCompHrs(); - adminAdministratorHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP5()); + // adminAdministratorHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP5()); adminAdministratorHrs.setCompHrsStaffYtd(root.getCompH_item15()); adminAdministratorHrs.setCompHrsContractServicesYtd(root.getCompH_item25()); adminAdministratorHrs.setCompHrsOfficeAllocYtd(root.getCompH_item35()); @@ -1154,7 +1158,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcYtdCompHrs adminDirOfCareHrs = new LtcYtdCompHrs(); - adminDirOfCareHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP6()); + //adminDirOfCareHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP6()); adminDirOfCareHrs.setCompHrsStaffYtd(root.getCompH_item16()); adminDirOfCareHrs.setCompHrsContractServicesYtd(root.getCompH_item26()); adminDirOfCareHrs.setCompHrsOfficeAllocYtd(root.getCompH_item36()); @@ -1164,7 +1168,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT adminDirOfCareHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc6()); LtcYtdCompHrs adminDeptManagersHrs = new LtcYtdCompHrs(); - adminDeptManagersHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP7()); + // adminDeptManagersHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP7()); adminDeptManagersHrs.setCompHrsStaffYtd(root.getCompH_item17()); adminDeptManagersHrs.setCompHrsContractServicesYtd(root.getCompH_item27()); adminDeptManagersHrs.setCompHrsOfficeAllocYtd(root.getCompH_item37()); @@ -1174,7 +1178,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT adminDeptManagersHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc7()); LtcYtdCompHrs adminSupportHrs = new LtcYtdCompHrs(); - adminSupportHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP8()); + //adminSupportHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP8()); adminSupportHrs.setCompHrsStaffYtd(root.getCompH_item18()); adminSupportHrs.setCompHrsContractServicesYtd(root.getCompH_item28()); adminSupportHrs.setCompHrsOfficeAllocYtd(root.getCompH_item38()); @@ -1184,7 +1188,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT adminSupportHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc8()); LtcYtdCompHrs adminPastoCareWrkrHrs = new LtcYtdCompHrs(); - adminPastoCareWrkrHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP9()); + // adminPastoCareWrkrHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP9()); adminPastoCareWrkrHrs.setCompHrsStaffYtd(root.getCompH_item19()); adminPastoCareWrkrHrs.setCompHrsContractServicesYtd(root.getCompH_item29()); adminPastoCareWrkrHrs.setCompHrsOfficeAllocYtd(root.getCompH_item39()); @@ -1194,7 +1198,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT adminPastoCareWrkrHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc9()); LtcYtdCompHrs adminClrksHrs = new LtcYtdCompHrs(); - adminClrksHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP10()); + //adminClrksHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP10()); adminClrksHrs.setCompHrsStaffYtd(root.getCompH_item110()); adminClrksHrs.setCompHrsContractServicesYtd(root.getCompH_item210()); adminClrksHrs.setCompHrsOfficeAllocYtd(root.getCompH_item310()); @@ -1204,7 +1208,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT adminClrksHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc10()); LtcYtdCompHrs adminClncCrdinatorHrs = new LtcYtdCompHrs(); - adminClncCrdinatorHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP11()); + // adminClncCrdinatorHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP11()); adminClncCrdinatorHrs.setCompHrsStaffYtd(root.getCompH_item111()); adminClncCrdinatorHrs.setCompHrsContractServicesYtd(root.getCompH_item211()); adminClncCrdinatorHrs.setCompHrsOfficeAllocYtd(root.getCompH_item311()); @@ -1214,7 +1218,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT adminClncCrdinatorHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc11()); LtcYtdCompHrs adminOtherHrs = new LtcYtdCompHrs(); - adminOtherHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP12()); + // adminOtherHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP12()); adminOtherHrs.setCompHrsStaffYtd(root.getCompH_item112()); adminOtherHrs.setCompHrsContractServicesYtd(root.getCompH_item212()); adminOtherHrs.setCompHrsOfficeAllocYtd(root.getCompH_item312()); @@ -1225,7 +1229,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT /* Nursing, Allied, Non Allied Hours */ LtcYtdCompHrs nursingRNHrs = new LtcYtdCompHrs(); - nursingRNHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP13()); + //nursingRNHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP13()); nursingRNHrs.setCompHrsStaffYtd(root.getCompH_item113()); nursingRNHrs.setCompHrsContractServicesYtd(root.getCompH_item213()); nursingRNHrs.setCompHrsOfficeAllocYtd(root.getCompH_item313()); @@ -1235,7 +1239,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingRNHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc13()); LtcYtdCompHrs nursingLPNHrs = new LtcYtdCompHrs(); - nursingLPNHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP14()); + //nursingLPNHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP14()); nursingLPNHrs.setCompHrsStaffYtd(root.getCompH_item114()); nursingLPNHrs.setCompHrsContractServicesYtd(root.getCompH_item214()); nursingLPNHrs.setCompHrsOfficeAllocYtd(root.getCompH_item314()); @@ -1245,7 +1249,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingLPNHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc14()); LtcYtdCompHrs nursingHCAHrs = new LtcYtdCompHrs(); - nursingHCAHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP15()); + //nursingHCAHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP15()); nursingHCAHrs.setCompHrsStaffYtd(root.getCompH_item115()); nursingHCAHrs.setCompHrsContractServicesYtd(root.getCompH_item215()); nursingHCAHrs.setCompHrsOfficeAllocYtd(root.getCompH_item315()); @@ -1255,7 +1259,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingHCAHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc15()); LtcYtdCompHrs nursingOthHrs = new LtcYtdCompHrs(); - nursingOthHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP16()); + //nursingOthHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP16()); nursingOthHrs.setCompHrsStaffYtd(root.getCompH_item116()); nursingOthHrs.setCompHrsContractServicesYtd(root.getCompH_item216()); nursingOthHrs.setCompHrsOfficeAllocYtd(root.getCompH_item316()); @@ -1265,7 +1269,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingOthHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc16()); LtcYtdCompHrs alliedProfOTHrs = new LtcYtdCompHrs(); - alliedProfOTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP17()); + //alliedProfOTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP17()); alliedProfOTHrs.setCompHrsStaffYtd(root.getCompH_item117()); alliedProfOTHrs.setCompHrsContractServicesYtd(root.getCompH_item217()); alliedProfOTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item317()); @@ -1275,7 +1279,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedProfOTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc17()); LtcYtdCompHrs alliedProfPTHrs = new LtcYtdCompHrs(); - alliedProfPTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP18()); + //alliedProfPTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP18()); alliedProfPTHrs.setCompHrsStaffYtd(root.getCompH_item118()); alliedProfPTHrs.setCompHrsContractServicesYtd(root.getCompH_item218()); alliedProfPTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item318()); @@ -1285,7 +1289,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedProfPTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc18()); LtcYtdCompHrs alliedProfDTHrs = new LtcYtdCompHrs(); - alliedProfDTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP19()); + //alliedProfDTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP19()); alliedProfDTHrs.setCompHrsStaffYtd(root.getCompH_item119()); alliedProfDTHrs.setCompHrsContractServicesYtd(root.getCompH_item219()); alliedProfDTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item319()); @@ -1295,7 +1299,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedProfDTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc19()); LtcYtdCompHrs alliedProfSWHrs = new LtcYtdCompHrs(); - alliedProfSWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP20()); + //alliedProfSWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP20()); alliedProfSWHrs.setCompHrsStaffYtd(root.getCompH_item120()); alliedProfSWHrs.setCompHrsContractServicesYtd(root.getCompH_item220()); alliedProfSWHrs.setCompHrsOfficeAllocYtd(root.getCompH_item320()); @@ -1305,7 +1309,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedProfSWHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc20()); LtcYtdCompHrs alliedProfOTHHrs = new LtcYtdCompHrs(); - alliedProfOTHHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP21()); + //alliedProfOTHHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP21()); alliedProfOTHHrs.setCompHrsStaffYtd(root.getCompH_item121()); alliedProfOTHHrs.setCompHrsContractServicesYtd(root.getCompH_item221()); alliedProfOTHHrs.setCompHrsOfficeAllocYtd(root.getCompH_item321()); @@ -1315,7 +1319,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedProfOTHHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc21()); LtcYtdCompHrs alliedNPRTHrs = new LtcYtdCompHrs(); - alliedNPRTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP22()); + //alliedNPRTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP22()); alliedNPRTHrs.setCompHrsStaffYtd(root.getCompH_item122()); alliedNPRTHrs.setCompHrsContractServicesYtd(root.getCompH_item222()); alliedNPRTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item322()); @@ -1325,7 +1329,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPRTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc22()); LtcYtdCompHrs alliedNPRAHrs = new LtcYtdCompHrs(); - alliedNPRAHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP23()); + //alliedNPRAHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP23()); alliedNPRAHrs.setCompHrsStaffYtd(root.getCompH_item123()); alliedNPRAHrs.setCompHrsContractServicesYtd(root.getCompH_item223()); alliedNPRAHrs.setCompHrsOfficeAllocYtd(root.getCompH_item323()); @@ -1335,7 +1339,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPRAHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc23()); LtcYtdCompHrs alliedNPAWHrs = new LtcYtdCompHrs(); - alliedNPAWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP24()); + //alliedNPAWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP24()); alliedNPAWHrs.setCompHrsStaffYtd(root.getCompH_item124()); alliedNPAWHrs.setCompHrsContractServicesYtd(root.getCompH_item224()); alliedNPAWHrs.setCompHrsOfficeAllocYtd(root.getCompH_item324()); @@ -1345,7 +1349,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPAWHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc24()); LtcYtdCompHrs alliedNPMTHrs = new LtcYtdCompHrs(); - alliedNPMTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP25()); + //alliedNPMTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP25()); alliedNPMTHrs.setCompHrsStaffYtd(root.getCompH_item125()); alliedNPMTHrs.setCompHrsContractServicesYtd(root.getCompH_item225()); alliedNPMTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item325()); @@ -1355,7 +1359,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPMTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc25()); LtcYtdCompHrs alliedNPATHrs = new LtcYtdCompHrs(); - alliedNPATHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP26()); + //alliedNPATHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP26()); alliedNPATHrs.setCompHrsStaffYtd(root.getCompH_item126()); alliedNPATHrs.setCompHrsContractServicesYtd(root.getCompH_item226()); alliedNPATHrs.setCompHrsOfficeAllocYtd(root.getCompH_item326()); @@ -1365,7 +1369,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPATHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc26()); LtcYtdCompHrs alliedNPOTHHrs = new LtcYtdCompHrs(); - alliedNPOTHHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP27()); + //alliedNPOTHHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP27()); alliedNPOTHHrs.setCompHrsStaffYtd(root.getCompH_item127()); alliedNPOTHHrs.setCompHrsContractServicesYtd(root.getCompH_item227()); alliedNPOTHHrs.setCompHrsOfficeAllocYtd(root.getCompH_item327()); @@ -1431,6 +1435,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT totalPerPayrollHrsTotals.setTotalCompHrsContractServicesYTD(root.getCompH_total2()); totalPerPayrollHrsTotals.setTotalCompHrsOfficeAllocYTD(root.getCompH_total3()); totalPerPayrollHrsTotals.setTotalCompTotalWorkedHrsYTD(root.getCompH_total()); + totalPerPayrollHrsTotals.setConfirmationID(root.getForm().getConfirmationId()); LtcYtdCompHrsTotals accuredHrsTotals = new LtcYtdCompHrsTotals(); accuredHrsTotals.setCompHrsTotalType("Accured Hours"); @@ -1438,6 +1443,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT accuredHrsTotals.setTotalCompHrsContractServicesYTD(root.getCompH_accrued3()); accuredHrsTotals.setTotalCompHrsOfficeAllocYTD(root.getCompH_accrued3()); accuredHrsTotals.setTotalCompTotalWorkedHrsYTD(root.getCompH_accrued()); + accuredHrsTotals.setConfirmationID(root.getForm().getConfirmationId()); Collections.addAll(ltcYtdCompHrsTtls,totalPerPayrollHrsTotals,accuredHrsTotals); @@ -1801,65 +1807,65 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT Collections.addAll(ltcYtdRevSubTtls, revFromHA1Subttl,revFromHA2Subttl,revFromHA4Subttl,clntRevSubttl,othRevSubttl,opRevSubttl); LtcYtdExp dirCareCostExp = new LtcYtdExp(); - dirCareCostExp.setRevYtd(root.getOpEx_YTD1()); - dirCareCostExp.setRevNotes(root.getOpEx_note1()); + dirCareCostExp.setExpYtd(root.getOpEx_YTD1()); + dirCareCostExp.setExpNotes(root.getOpEx_note1()); dirCareCostExp.setExpName("Direct Care"); dirCareCostExp.setExpType("Staffing Cost (1A)"); dirCareCostExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp foodCostExp = new LtcYtdExp(); - foodCostExp.setRevYtd(root.getOpEx_YTD2()); - foodCostExp.setRevNotes(root.getOpEx_note2()); + foodCostExp.setExpYtd(root.getOpEx_YTD2()); + foodCostExp.setExpNotes(root.getOpEx_note2()); foodCostExp.setExpName("Food Services"); foodCostExp.setExpType("Staffing Cost (1A)"); foodCostExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp ldryServExp = new LtcYtdExp(); - ldryServExp.setRevYtd(root.getOpEx_YTD3()); - ldryServExp.setRevNotes(root.getOpEx_note3()); + ldryServExp.setExpYtd(root.getOpEx_YTD3()); + ldryServExp.setExpNotes(root.getOpEx_note3()); ldryServExp.setExpName("Laundry Services"); ldryServExp.setExpType("Staffing Cost (1A)"); ldryServExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp housekeepingCostExp = new LtcYtdExp(); - housekeepingCostExp.setRevYtd(root.getOpEx_YTD4()); - housekeepingCostExp.setRevNotes(root.getOpEx_note4()); + housekeepingCostExp.setExpYtd(root.getOpEx_YTD4()); + housekeepingCostExp.setExpNotes(root.getOpEx_note4()); housekeepingCostExp.setExpName("Housekeeping Services"); housekeepingCostExp.setExpType("Staffing Cost (1A)"); housekeepingCostExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp adminServCostExp = new LtcYtdExp(); - adminServCostExp.setRevYtd(root.getOpEx_YTD5()); - adminServCostExp.setRevNotes(root.getOpEx_note5()); + adminServCostExp.setExpYtd(root.getOpEx_YTD5()); + adminServCostExp.setExpNotes(root.getOpEx_note5()); adminServCostExp.setExpName("Administration Services"); adminServCostExp.setExpType("Staffing Cost (1A)"); adminServCostExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp plantMainOpStaffExp = new LtcYtdExp(); - plantMainOpStaffExp.setRevYtd(root.getOpEx_YTD6()); - plantMainOpStaffExp.setRevNotes(root.getOpEx_YTD6()); + plantMainOpStaffExp.setExpYtd(root.getOpEx_YTD6()); + plantMainOpStaffExp.setExpNotes(root.getOpEx_note6()); plantMainOpStaffExp.setExpName("Plant Maintenance & Op. Staffing"); plantMainOpStaffExp.setExpType("Staffing Cost (1A)"); plantMainOpStaffExp.setConfirmationId(root.getForm().getConfirmationId()); // subtotal before salary and wages - omitted LtcYtdExp salWagRecvExp = new LtcYtdExp(); - salWagRecvExp.setRevYtd(root.getOpEx_YTD7()); - salWagRecvExp.setRevNotes(root.getOpEx_YTD7()); + salWagRecvExp.setExpYtd(root.getOpEx_YTD7()); + salWagRecvExp.setExpNotes(root.getOpEx_note7()); salWagRecvExp.setExpName("Salary & wages recovered"); salWagRecvExp.setExpType("Staffing Cost (1A)"); salWagRecvExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp salWagAccExp = new LtcYtdExp(); - salWagAccExp.setRevYtd(root.getOpEx_YTD8()); - salWagAccExp.setRevNotes(root.getOpEx_YTD8()); + salWagAccExp.setExpYtd(root.getOpEx_YTD8()); + salWagAccExp.setExpNotes(root.getOpEx_note8()); salWagAccExp.setExpName("Salaries and wages accrual"); salWagAccExp.setExpType("Staffing Cost (1A)"); salWagAccExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp othLabCostExp = new LtcYtdExp(); - othLabCostExp.setRevYtd(root.getOpEx_YTD8()); - othLabCostExp.setRevNotes(root.getOpEx_YTD8()); + othLabCostExp.setExpYtd(root.getOpEx_YTD9()); + othLabCostExp.setExpNotes(root.getOpEx_note9()); othLabCostExp.setExpName("Salary & wages recovered"); othLabCostExp.setExpType("Staffing Cost (1A)"); othLabCostExp.setConfirmationId(root.getForm().getConfirmationId()); @@ -1867,79 +1873,79 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT // subtotal LtcYtdExp bnftCostExp = new LtcYtdExp(); - bnftCostExp.setRevYtd(root.getOpEx_YTD9()); - bnftCostExp.setRevNotes(root.getOpEx_YTD9()); + bnftCostExp.setExpYtd(root.getOpEx_YTD10()); + bnftCostExp.setExpNotes(root.getOpEx_YTD10()); bnftCostExp.setExpName("Benefits"); bnftCostExp.setExpType("Staffing Cost (1B)"); bnftCostExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp sickSevrnceAccExp = new LtcYtdExp(); - sickSevrnceAccExp.setRevYtd(root.getOpEx_YTD10()); - sickSevrnceAccExp.setRevNotes(root.getOpEx_YTD10()); + sickSevrnceAccExp.setExpYtd(root.getOpEx_YTD11()); + sickSevrnceAccExp.setExpNotes(root.getOpEx_YTD11()); sickSevrnceAccExp.setExpName("Sick, severance and other accrual"); sickSevrnceAccExp.setExpType("Staffing Cost (1B)"); sickSevrnceAccExp.setConfirmationId(root.getForm().getConfirmationId()); // subtotal LtcYtdExp buildingRentExp = new LtcYtdExp(); - buildingRentExp.setRevYtd(root.getOpEx_YTD11()); - buildingRentExp.setRevNotes(root.getOpEx_YTD11()); + buildingRentExp.setExpYtd(root.getOpEx_YTD12()); + buildingRentExp.setExpNotes(root.getOpEx_YTD12()); buildingRentExp.setExpName("Building rent/lease cost"); buildingRentExp.setExpType("Property Cost"); buildingRentExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp intrstMortgageLngTrmExp = new LtcYtdExp(); - intrstMortgageLngTrmExp.setRevYtd(root.getOpEx_YTD12()); - intrstMortgageLngTrmExp.setRevNotes(root.getOpEx_YTD12()); + intrstMortgageLngTrmExp.setExpYtd(root.getOpEx_YTD13()); + intrstMortgageLngTrmExp.setExpNotes(root.getOpEx_YTD13()); intrstMortgageLngTrmExp.setExpName("Interest on mortgage or long-term debt"); intrstMortgageLngTrmExp.setExpType("Property Cost"); intrstMortgageLngTrmExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp propertyTaxesExp = new LtcYtdExp(); - propertyTaxesExp.setRevYtd(root.getOpEx_YTD13()); - propertyTaxesExp.setRevNotes(root.getOpEx_YTD13()); + propertyTaxesExp.setExpYtd(root.getOpEx_YTD14()); + propertyTaxesExp.setExpNotes(root.getOpEx_YTD14()); propertyTaxesExp.setExpName("Property taxes"); propertyTaxesExp.setExpType("Property Cost"); propertyTaxesExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp mntnceExp = new LtcYtdExp(); - mntnceExp.setRevYtd(root.getOpEx_YTD14()); - mntnceExp.setRevNotes(root.getOpEx_YTD14()); + mntnceExp.setExpYtd(root.getOpEx_YTD15()); + mntnceExp.setExpNotes(root.getOpEx_YTD15()); mntnceExp.setExpName("Maintenance & Repairs - building, ground & equip."); mntnceExp.setExpType("Property Cost"); mntnceExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp suppliesExp = new LtcYtdExp(); - suppliesExp.setRevYtd(root.getOpEx_YTD15()); - suppliesExp.setRevNotes(root.getOpEx_YTD15()); + suppliesExp.setExpYtd(root.getOpEx_YTD16()); + suppliesExp.setExpNotes(root.getOpEx_YTD16()); suppliesExp.setExpName("Supplies ~ for building, ground & equipment"); suppliesExp.setExpType("Property Cost"); suppliesExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp utilitiesExp = new LtcYtdExp(); - utilitiesExp.setRevYtd(root.getOpEx_YTD16()); - utilitiesExp.setRevNotes(root.getOpEx_YTD16()); + utilitiesExp.setExpYtd(root.getOpEx_YTD17()); + utilitiesExp.setExpNotes(root.getOpEx_YTD17()); utilitiesExp.setExpName("Utilities"); utilitiesExp.setExpType("Property Cost"); utilitiesExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp wasteMgmntExp = new LtcYtdExp(); - wasteMgmntExp.setRevYtd(root.getOpEx_YTD17()); - wasteMgmntExp.setRevNotes(root.getOpEx_YTD17()); + wasteMgmntExp.setExpYtd(root.getOpEx_YTD18()); + wasteMgmntExp.setExpNotes(root.getOpEx_YTD18()); wasteMgmntExp.setExpName("Waste management"); wasteMgmntExp.setExpType("Property Cost"); wasteMgmntExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp resTranServExp = new LtcYtdExp(); - resTranServExp.setRevYtd(root.getOpEx_YTD18()); - resTranServExp.setRevNotes(root.getOpEx_YTD18()); + resTranServExp.setExpYtd(root.getOpEx_YTD19()); + resTranServExp.setExpNotes(root.getOpEx_YTD19()); resTranServExp.setExpName("Resident Transportation Services"); resTranServExp.setExpType("Property Cost"); resTranServExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp othExp = new LtcYtdExp(); - othExp.setRevYtd(root.getOpEx_YTD19()); - othExp.setRevNotes(root.getOpEx_YTD19()); + othExp.setExpYtd(root.getOpEx_YTD20()); + othExp.setExpNotes(root.getOpEx_YTD20()); othExp.setExpName("Others - Operating"); othExp.setExpType("Property Cost"); othExp.setConfirmationId(root.getForm().getConfirmationId()); @@ -1947,50 +1953,52 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT // skipping subtotal for now LtcYtdExp medSupExp = new LtcYtdExp(); - medSupExp.setRevYtd(root.getOpEx_YTD20()); - medSupExp.setRevNotes(root.getOpEx_YTD20()); + medSupExp.setExpYtd(root.getOpEx_YTD21()); + medSupExp.setExpNotes(root.getOpEx_YTD21()); medSupExp.setExpName("Medical Supplies"); medSupExp.setExpType("Supplies"); medSupExp.setConfirmationId(root.getForm().getConfirmationId()); + LtcYtdExp drgsPharmaExp = new LtcYtdExp(); + drgsPharmaExp.setExpYtd(root.getOpEx_YTD22()); + drgsPharmaExp.setExpNotes(root.getOpEx_YTD22()); + drgsPharmaExp.setExpName("Drugs & Pharmaceutical"); + drgsPharmaExp.setExpType("Supplies"); + drgsPharmaExp.setConfirmationId(root.getForm().getConfirmationId()); + LtcYtdExp rawFoodCostExp = new LtcYtdExp(); - rawFoodCostExp.setRevYtd(root.getOpEx_YTD21()); - rawFoodCostExp.setRevNotes(root.getOpEx_YTD21()); + rawFoodCostExp.setExpYtd(root.getOpEx_YTD23()); + rawFoodCostExp.setExpNotes(root.getOpEx_YTD23()); rawFoodCostExp.setExpName("Raw Food Cost (inc. dietary supplement costs)"); rawFoodCostExp.setExpType("Supplies"); rawFoodCostExp.setConfirmationId(root.getForm().getConfirmationId()); - LtcYtdExp drgsPharmaExp = new LtcYtdExp(); - drgsPharmaExp.setRevYtd(root.getOpEx_YTD22()); - drgsPharmaExp.setRevNotes(root.getOpEx_YTD22()); - drgsPharmaExp.setExpName("Drugs & Pharmaceutical"); - drgsPharmaExp.setExpType("Supplies"); - drgsPharmaExp.setConfirmationId(root.getForm().getConfirmationId()); + LtcYtdExp dietSupExp = new LtcYtdExp(); - dietSupExp.setRevYtd(root.getOpEx_YTD23()); - dietSupExp.setRevNotes(root.getOpEx_YTD23()); + dietSupExp.setExpYtd(root.getOpEx_YTD24()); + dietSupExp.setExpNotes(root.getOpEx_YTD24()); dietSupExp.setExpName("Dietary supplies"); dietSupExp.setExpType("Supplies"); dietSupExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp ldrySupExp = new LtcYtdExp(); - ldrySupExp.setRevYtd(root.getOpEx_YTD24()); - ldrySupExp.setRevNotes(root.getOpEx_YTD24()); + ldrySupExp.setExpYtd(root.getOpEx_YTD25()); + ldrySupExp.setExpNotes(root.getOpEx_YTD25()); ldrySupExp.setExpName("Laundry supplies"); ldrySupExp.setExpType("Supplies"); ldrySupExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp houseSupExp = new LtcYtdExp(); - houseSupExp.setRevYtd(root.getOpEx_YTD25()); - houseSupExp.setRevNotes(root.getOpEx_YTD25()); + houseSupExp.setExpYtd(root.getOpEx_YTD26()); + houseSupExp.setExpNotes(root.getOpEx_YTD26()); houseSupExp.setExpName("Housekeeping supplies"); houseSupExp.setExpType("Supplies"); houseSupExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp othSupExp = new LtcYtdExp(); - othSupExp.setRevYtd(root.getOpEx_YTD26()); - othSupExp.setRevNotes(root.getOpEx_YTD26()); + othSupExp.setExpYtd(root.getOpEx_YTD27()); + othSupExp.setExpNotes(root.getOpEx_YTD27()); othSupExp.setExpName("Others - Specify"); othSupExp.setExpType("Supplies"); othSupExp.setConfirmationId(root.getForm().getConfirmationId()); @@ -2033,60 +2041,62 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT operatingCostSubtotal.setExpType("Operating Expenses"); operatingCostSubtotal.setSubTotalRevYtd(root.getOpEx_sum16()); + Collections.addAll(ltcYtdExpSubttls,staffCost1ASubtotal,staffCost1BSubtotal,propertyCostSubtotal,suppliesSubtotal,adminCostSubtotal,operatingCostSubtotal); + /* END */ LtcYtdExp offExpAdCost = new LtcYtdExp(); - offExpAdCost.setRevYtd(root.getOpEx_YTD27()); - offExpAdCost.setRevNotes(root.getOpEx_YTD27()); + offExpAdCost.setExpYtd(root.getOpEx_YTD28()); + offExpAdCost.setExpNotes(root.getOpEx_YTD28()); offExpAdCost.setExpName("Office Expense"); offExpAdCost.setExpType("Administration Cost - non-wages"); offExpAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp mgmntAdCost = new LtcYtdExp(); - mgmntAdCost.setRevYtd(root.getOpEx_YTD28()); - mgmntAdCost.setRevNotes(root.getOpEx_YTD28()); + mgmntAdCost.setExpYtd(root.getOpEx_YTD29()); + mgmntAdCost.setExpNotes(root.getOpEx_YTD29()); mgmntAdCost.setExpName("Management Fees"); mgmntAdCost.setExpType("Administration Cost - non-wages"); mgmntAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp hoAllocpAdCost = new LtcYtdExp(); - hoAllocpAdCost.setRevYtd(root.getOpEx_YTD29()); - hoAllocpAdCost.setRevNotes(root.getOpEx_YTD29()); + hoAllocpAdCost.setExpYtd(root.getOpEx_YTD30()); + hoAllocpAdCost.setExpNotes(root.getOpEx_YTD30()); hoAllocpAdCost.setExpName("Head Office Allocation (non-compensation)"); hoAllocpAdCost.setExpType("Administration Cost - non-wages"); hoAllocpAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp accAdCost = new LtcYtdExp(); - accAdCost.setRevYtd(root.getOpEx_YTD30()); - accAdCost.setRevNotes(root.getOpEx_YTD30()); + accAdCost.setExpYtd(root.getOpEx_YTD31()); + accAdCost.setExpNotes(root.getOpEx_YTD31()); accAdCost.setExpName("Accreditation Costs"); accAdCost.setExpType("Administration Cost - non-wages"); accAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp apaAdCost = new LtcYtdExp(); - apaAdCost.setRevYtd(root.getOpEx_YTD31()); - apaAdCost.setRevNotes(root.getOpEx_YTD31()); + apaAdCost.setExpYtd(root.getOpEx_YTD32()); + apaAdCost.setExpNotes(root.getOpEx_YTD32()); apaAdCost.setExpName("Association dues, professional fees, audit fees"); apaAdCost.setExpType("Administration Cost - non-wages"); apaAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp insuranceAdCost = new LtcYtdExp(); - insuranceAdCost.setRevYtd(root.getOpEx_YTD32()); - insuranceAdCost.setRevNotes(root.getOpEx_YTD32()); + insuranceAdCost.setExpYtd(root.getOpEx_YTD33()); + insuranceAdCost.setExpNotes(root.getOpEx_YTD33()); insuranceAdCost.setExpName("Insurances (for property & liability)"); insuranceAdCost.setExpType("Administration Cost - non-wages"); insuranceAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp othSupAdCost = new LtcYtdExp(); - othSupAdCost.setRevYtd(root.getOpEx_YTD33()); - othSupAdCost.setRevNotes(root.getOpEx_YTD33()); + othSupAdCost.setExpYtd(root.getOpEx_YTD34()); + othSupAdCost.setExpNotes(root.getOpEx_YTD34()); othSupAdCost.setExpName("Other - Administration and supplies"); othSupAdCost.setExpType("Administration Cost - non-wages"); othSupAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp othAdCost = new LtcYtdExp(); - othAdCost.setRevYtd(root.getOpEx_YTD33()); - othAdCost.setRevNotes(root.getOpEx_YTD33()); + othAdCost.setExpYtd(root.getOpEx_YTD35()); + othAdCost.setExpNotes(root.getOpEx_YTD35()); othAdCost.setExpName("Other - Specify"); othAdCost.setExpType("Administration Cost - non-wages"); othAdCost.setConfirmationId(root.getForm().getConfirmationId()); @@ -2114,9 +2124,9 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); // notes missing - if (maxOcp.getBedType().equals(Constants.IN_SCOPE)) { - numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); - } else if (maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { + if (maxOcp.getBedType()!=null && maxOcp.getBedType().equals(Constants.IN_SCOPE)) { + numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); + } else if (maxOcp.getBedType()!=null && maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); } else { numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); @@ -2223,12 +2233,12 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); // notes missing - if (maxOcp.getBedType().equals(Constants.IN_SCOPE)) { + if (maxOcp.getBedType1()!=null && maxOcp.getBedType1().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); - } else if (maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { + } else if (maxOcp.getBedType1()!=null && maxOcp.getBedType1().equals(Constants.OUT_OF_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); } else { - numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); + numOfBeds.setBedSubype(maxOcp.getSubTypePrivate() == null ? "" : maxOcp.getSubTypePrivate()); } ltcBedYtdMaxOccupancies.add(numOfBeds); } @@ -2316,9 +2326,9 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); // notes missing - if (maxOcp.getBedType().equals(Constants.IN_SCOPE)) { + if (maxOcp.getBedType2()!=null && maxOcp.getBedType2().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); - } else if (maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { + } else if (maxOcp.getBedType2()!=null && maxOcp.getBedType2().equals(Constants.OUT_OF_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); } else { numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); @@ -2409,9 +2419,9 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); // notes missing - if (maxOcp.getBedType().equals(Constants.IN_SCOPE)) { + if (maxOcp.getBedType3()!=null && maxOcp.getBedType3().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); - } else if (maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { + } else if (maxOcp.getBedType3()!=null && maxOcp.getBedType3().equals(Constants.OUT_OF_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); } else { numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); @@ -2500,9 +2510,9 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); // notes missing - if (maxOcp.getBedType().equals(Constants.IN_SCOPE)) { + if (maxOcp.getBedType4()!=null && maxOcp.getBedType4().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); - } else if (maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { + } else if (maxOcp.getBedType4()!=null && maxOcp.getBedType4().equals(Constants.OUT_OF_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); } else { numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); @@ -2600,6 +2610,18 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT ltcYtdSubmission.setLtcYtdDirectCareHrs(ltcYtdDcHrs); ltcYtdSubmission.setLtcYtdExp(ltcYtdExp); ltcYtdSubmission.setLtcYtdRev(ltcYtdRev); + ltcYtdSubmission.setLtcYtdExpSubttls(ltcYtdExpSubttls); + ltcYtdSubmission.setLtcYtdRevSubttls(ltcYtdRevSubTtls); + ltcYtdSubmission.setLtcYtdCompSalSubttls(ltcYtdCompSalSubttls); + ltcYtdSubmission.setLtcYtdCompSalTtls(ltcYtdCompsalTtls); + ltcYtdSubmission.setLtcYtdCompHrsSubttls(ltcYtdCompHrsSubttls); + ltcYtdSubmission.setLtcYtdCompHrsTtls(ltcYtdCompHrsTtls); + ltcYtdSubmission.setLtcYtdDirectCareHrsSubttls(ltcYtdDcHrsSubttls); + ltcYtdSubmission.setLtcYtdDirectCareCostSubttls(ltcYtdDcCostSubttls); + ltcYtdSubmission.setLtcBedYtdMaxOccTtls(ltcBedYtdMaxOccTtls); + ltcYtdSubmission.setLtcBedYtdOccDaysTtls(ltcBedYtdOccDaysTtls); + ltcYtdSubmission.setLtcBedYtdOccRateTtls(ltcBedYtdOccRateTtls); + ltcYtdSubmissions.add(ltcYtdSubmission); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java index 701bc9f0..86ea0b7f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java @@ -28,7 +28,7 @@ public void configure() throws Exception { from("direct:ltc-quaterly-ytd").process(new LtcQuaterlyYtdApiProcessor()) // to the http uri - .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/256760e7-6e8b-44c4-8b63-51fb72c8c2cf/export?bridgeEndpoint=true&format=json&type=submissions") + .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/7eb3c107-5adb-435a-adbf-b8683a56ecc0/export?bridgeEndpoint=true&format=json&type=submissions&version=3") .log("This is the status code from the response: ${header.CamelHttpResponseCode}") .log("Trying to convert the received body OK").convertBodyTo(String.class) .process(new LtcQuaterlyYtdApiResponseProcessor()).end(); diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java index 5d21d181..ecc56120 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java @@ -96,7 +96,6 @@ public static String getFormattedDate(String date) { OffsetDateTime dateTime = OffsetDateTime.parse(dateTimeString); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); String formattedDateTime = dateTime.format(formatter); - System.out.println(formattedDateTime); return formattedDateTime; } catch(Exception e) { diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index 49ab4dcb..cf6700f6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -166,6 +166,6 @@ public static void writeToCSVFile(Map>> map) { public static String generateFileName(String fileType) { DateTimeFormatter formatter = DateTimeFormatter.BASIC_ISO_DATE; - return fileType.concat(LocalDate.now().format(formatter)).concat(".txt"); + return fileType+"_".concat(LocalDate.now().format(formatter)).concat(".txt"); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 921319b3..8150046c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ # properties used in route hostname = localhost -port = 8081 +port = 8080 server-socket=5555 socket-read-sleep-time=100 max-socket-read-tries=100 @@ -20,5 +20,5 @@ ltc.facility.password=cde8b788-36c7-4258-8f43-2e26fceea9a4 ltc.staffing.username=16ce36ca-9b4b-4ec6-bb75-96c2e1f258bb ltc.staffing.password=ef31830d-e0f5-4eb9-b4e1-7900a3fcd2ae -ltc.ytd.username=256760e7-6e8b-44c4-8b63-51fb72c8c2cf -ltc.ytd.password=0878a7de-3a63-4749-8101-d152844e186c \ No newline at end of file +ltc.ytd.username=7eb3c107-5adb-435a-adbf-b8683a56ecc0 +ltc.ytd.password=65fdc5e3-4232-42bc-bfe3-7a0a51eeacfa \ No newline at end of file From 60c208b01815a2cc9645d3754398a4b22401a829 Mon Sep 17 00:00:00 2001 From: prit-cgi Date: Thu, 9 Mar 2023 16:57:18 -0500 Subject: [PATCH 014/183] added version support, dynamic chefs uri --- .../bc/gov/chefs/etl/constant/Constants.java | 9 ++++-- .../gov/chefs/etl/core/routes/BaseRoute.java | 3 ++ .../aims/processor/AIMSFormApiProcessor.java | 13 ++++++++ .../etl/forms/aims/route/AIMSFormRoute.java | 14 ++++---- .../facility/model/FacilityInformation.java | 2 +- .../FacilityInfoFormApiProcessor.java | 16 ++++++++++ .../ltc/facility/route/FacilityFormRoute.java | 10 +++--- .../quaterly/model/LtcBedYtdMaxOccupancy.java | 5 +-- .../model/LtcBedYtdMaxOccupancyTotals.java | 1 + .../ltc/quaterly/model/LtcYtdCompAddPos.java | 11 ++----- .../quaterly/model/LtcYtdCompBenefits.java | 4 +-- .../ltc/quaterly/model/LtcYtdCompHrs.java | 8 ++--- .../model/LtcYtdCompHrsSubtotals.java | 8 ++--- .../quaterly/model/LtcYtdCompHrsTotals.java | 8 ++--- .../ltc/quaterly/model/LtcYtdCompSal.java | 6 ++-- .../model/LtcYtdCompSalSubtotals.java | 8 ++--- .../quaterly/model/LtcYtdCompSalTotals.java | 8 ++--- .../quaterly/model/LtcYtdDirectCareCost.java | 6 ++-- .../quaterly/model/LtcYtdDirectCareHrs.java | 2 +- .../forms/ltc/quaterly/model/LtcYtdExp.java | 2 +- .../forms/ltc/quaterly/model/LtcYtdRev.java | 2 +- .../ltc/quaterly/model/LtcYtdSubmission.java | 17 +++------- .../processor/LtcQuaterlyYtdApiProcessor.java | 12 +++++++ .../LtcQuaterlyYtdApiResponseProcessor.java | 26 ++++++++++++++- .../quaterly/route/LtcQuaterlyYtdRoute.java | 6 ++-- .../chefs/etl/parser/ChefsRequestPayload.java | 32 +++++++++++++++++++ .../ca/bc/gov/chefs/etl/util/FileUtil.java | 6 ++-- .../ca/bc/gov/chefs/etl/util/JsonUtil.java | 11 +++++++ src/main/resources/application.properties | 2 +- 29 files changed, 184 insertions(+), 74 deletions(-) create mode 100644 src/main/java/ca/bc/gov/chefs/etl/parser/ChefsRequestPayload.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/util/JsonUtil.java diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index b78fdec1..d7f38075 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -10,6 +10,9 @@ public class Constants { * Constants representing keys in application.properties. * */ + /* CHEFS API */ + public final static String CHEFS_API_URL = "chefs.http.uri"; + /* AIMS */ public final static String AIMS_USERNAME = "aims.username"; public final static String AIMS_PASSWORD = "aims.password"; @@ -38,7 +41,7 @@ public class Constants { public final static String LTC_BED_YTD_OCCUPANCY_RATE = "LTC_BED_YTD_OCCUPANCY_RATE"; public final static String LTC_BED_YTD_MAX_OCCUPANCY = "LTC_BED_YTD_MAX_OCCUPANCY"; public final static String LTC_YTD_DIRECT_CARE_HRS = "LTC_YTD_DIRECT_CARE_HRS"; - public final static String LTC_YTD_COMP_HRS = "TC_YTD_COMP_HRS"; + public final static String LTC_YTD_COMP_HRS = "LTC_YTD_COMP_HRS"; public final static String LTC_YTD_COMP_SAL = "LTC_YTD_COMP_SAL"; public final static String LTC_YTD_COMP_ADD_POS = "LTC_YTD_COMP_ADD_POS"; public final static String LTC_YTD_DIRECT_CARE_COST = "LTC_YTD_DIRECT_CARE_COST"; @@ -127,7 +130,7 @@ public class Constants { HEADERS.put(LTC_YTD_SUBMISSION, new String[] { "CONFIRMATION_ID", "IS_DELETED", "SUBMISSION_DATE", "SUBMITTED_BY", "FACILITY_SUB_ID", - "PERIOD", "SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD" }); + "PERIOD", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD" }); HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS, new String[] { "CONFIRMATION_ID", "OCC_QUARTER", "OCC_MONTH", "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", "OCC_DAYS_YTD_PRIVATE","OCC_DAYS_YTD_TOTAL_DAYS" }); @@ -186,7 +189,7 @@ public class Constants { "Total_Comp_Sal_Total_Cost_YTD", }); HEADERS.put(LTC_YTD_COMP_ADD_POS, new String[] { "CONFIRMATION_ID", "ADD_POS_TYPE", "ADD_POS_NAME", - "ADD_POS_CONTRACTED_OUT_YTD", "ADD_POS_LGL_NM_CON_SRV_YTD", "ADD_POS_PCT_SRV_CON_OUT_YTD", }); + "ADD_POS_LGL_NM_CON_SRV_YTD", "ADD_POS_PCT_SRV_CON_OUT_YTD", }); HEADERS.put(LTC_YTD_DIRECT_CARE_COST, new String[] { "CONFIRMATION_ID", "DIR_CARE_COST_TYPE", "DIR_CARE_COST_NAME", "DIR_CARE_COST_PROD_HRS_REG_YTD", "DIR_CARE_COST_PROD_HRS_OT_YTD", diff --git a/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java b/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java index 511c815d..be35f74c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java @@ -1,5 +1,7 @@ package ca.bc.gov.chefs.etl.core.routes; +import java.util.HashMap; +import java.util.Map; import java.util.Properties; import org.apache.camel.builder.RouteBuilder; @@ -8,5 +10,6 @@ public abstract class BaseRoute extends RouteBuilder { static Properties properties = PropertiesUtil.loadProperties(); + protected Map sharedData = new HashMap(); } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java index 64738a48..37a153ce 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java @@ -1,16 +1,29 @@ package ca.bc.gov.chefs.etl.forms.aims.processor; +import java.util.Map; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.ChefsRequestPayload; import ca.bc.gov.chefs.etl.util.AuthUtil; +import ca.bc.gov.chefs.etl.util.JsonUtil; import ca.bc.gov.chefs.etl.util.PropertiesUtil; public class AIMSFormApiProcessor implements Processor { + private Map sharedData; + + public AIMSFormApiProcessor(Map sharedData2) { + this.sharedData = sharedData2; + } +/// https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&bridgeEndpoint=true&version=%s&type=submissions&minDate=%s&maxDate=%s @Override public void process(Exchange exchange) throws Exception { + ChefsRequestPayload payload = JsonUtil.parseJsonString((String)sharedData.get("body"), ChefsRequestPayload.class) ; + String uri = PropertiesUtil.getValue(Constants.CHEFS_API_URL).formatted(PropertiesUtil.getValue(Constants.AIMS_USERNAME), payload.getVersion(),payload.getStartDate(),payload.getEndDate()); + exchange.getIn().setHeader("RequestUri", uri); exchange.getIn().setHeader("CamelHttpMethod", "GET"); exchange.getIn().setHeader("Content-Type", "application/json"); exchange.getIn().setHeader("accept", "application/json"); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java index 3d11e5a2..5273bdd8 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java @@ -1,12 +1,10 @@ package ca.bc.gov.chefs.etl.forms.aims.route; import org.slf4j.Logger; - import org.slf4j.LoggerFactory; import ca.bc.gov.chefs.etl.core.routes.BaseRoute; import ca.bc.gov.chefs.etl.forms.aims.processor.AIMSFormApiProcessor; import ca.bc.gov.chefs.etl.forms.aims.processor.AIMSFormApiResponseProcessor; -import ca.bc.gov.chefs.etl.forms.aims.processor.AIMSFormProcessor; public class AIMSFormRoute extends BaseRoute { private static final Logger logger = LoggerFactory.getLogger(AIMSFormRoute.class); @@ -19,14 +17,18 @@ public void configure() throws Exception { * * */ + // trigger + + from("jetty:http://{{hostname}}:{{port}}/aims").routeId("aims-form") .log("CHEFS-ETL received a request for AIMS Form extraction")//.bean(AIMSFormPayloadExtractor.class) - .process(new AIMSFormProcessor()).to("direct:aims").end(); + .process(exchange -> sharedData.put("body", exchange.getIn().getBody(String.class))) + .to("direct:aims").end(); - from("direct:aims").process(new AIMSFormApiProcessor()) - // to the http uri - .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/2f173b2b-2f3a-407a-aecf-6b4bdc9431ae/export?bridgeEndpoint=true&format=json&type=submissions") + from("direct:aims")// to the http uri + .process(new AIMSFormApiProcessor(sharedData)) + .toD("${header.RequestUri}") .log("This is the status code from the response: ${header.CamelHttpResponseCode}") .log("Trying to convert the received body OK").convertBodyTo(String.class) .process(new AIMSFormApiResponseProcessor()).end(); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java index 74a1d212..97ff7c1c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java @@ -277,7 +277,7 @@ public String getFormType() { public List getCsvElements() { List elements = new ArrayList(); elements.add(this.getConfirmationID()); - elements.add("false"); + elements.add("false"); // FIXME elements.add(this.getSubmissionDate()); elements.add(this.getSubmittedby()); elements.add(this.getFacilityName()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java index b15c2247..73dbdda2 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java @@ -1,16 +1,32 @@ package ca.bc.gov.chefs.etl.forms.ltc.facility.processor; +import java.util.HashMap; +import java.util.Map; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.ChefsRequestPayload; import ca.bc.gov.chefs.etl.util.AuthUtil; +import ca.bc.gov.chefs.etl.util.JsonUtil; import ca.bc.gov.chefs.etl.util.PropertiesUtil; public class FacilityInfoFormApiProcessor implements Processor { + private Map sharedData = new HashMap(); + + + public FacilityInfoFormApiProcessor(Map sharedData) { + this.sharedData=sharedData; + } + @Override public void process(Exchange exchange) throws Exception { + ChefsRequestPayload payload = JsonUtil.parseJsonString((String)sharedData.get("body"), ChefsRequestPayload.class) ; + String uri = PropertiesUtil.getValue(Constants.CHEFS_API_URL).formatted(PropertiesUtil.getValue(Constants.LTC_FACILITY_USERNAME), payload.getVersion(),payload.getStartDate(),payload.getEndDate()); + + exchange.getIn().setHeader("RequestUri", uri); exchange.getIn().setHeader("CamelHttpMethod", "GET"); exchange.getIn().setHeader("Content-Type", "application/json"); exchange.getIn().setHeader("accept", "application/json"); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java index fce46850..77936bf7 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java @@ -2,12 +2,12 @@ import org.slf4j.Logger; + import org.slf4j.LoggerFactory; import ca.bc.gov.chefs.etl.core.routes.BaseRoute; import ca.bc.gov.chefs.etl.forms.ltc.facility.processor.FacilityInfoFormApiProcessor; import ca.bc.gov.chefs.etl.forms.ltc.facility.processor.FacilityInfoFormApiResponseProcessor; -import ca.bc.gov.chefs.etl.forms.ltc.facility.processor.FacilityInfoFormProcessor; public class FacilityFormRoute extends BaseRoute { @@ -25,11 +25,13 @@ public void configure() throws Exception { // trigger from("jetty:http://{{hostname}}:{{port}}/ltc/facility-information").routeId("ltc-facility-information-form") .log("CHEFS-ETL received a request for LTC Facility Information Form extraction")// .bean(AIMSFormPayloadExtractor.class) - .process(new FacilityInfoFormProcessor()).to("direct:ltc-facility-information").end(); + .process(exchange -> sharedData.put("body", exchange.getIn().getBody(String.class))) + .to("direct:ltc-facility-information").end(); - from("direct:ltc-facility-information").process(new FacilityInfoFormApiProcessor()) + from("direct:ltc-facility-information") // to the http uri - .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/e1f4761f-efdd-4529-805e-677d3ae21601/export?bridgeEndpoint=true&format=json&type=submissions&version=2") + .process(new FacilityInfoFormApiProcessor(sharedData)) + .toD("${header.RequestUri}") .log("This is the status code from the response: ${header.CamelHttpResponseCode}") .log("Trying to convert the received body OK").convertBodyTo(String.class) .process(new FacilityInfoFormApiResponseProcessor()).end(); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java index 15c1b351..a7e39168 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java @@ -5,6 +5,7 @@ import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.util.CSVUtil; public class LtcBedYtdMaxOccupancy implements IModel { @@ -43,13 +44,13 @@ public void setBedSubype(String bedSubype) { this.bedSubype = bedSubype; } public String getStartDate() { - return startDate; + return CSVUtil.getFormattedDate(startDate); } public void setStartDate(String startDate) { this.startDate = startDate; } public String getEndDate() { - return endDate; + return CSVUtil.getFormattedDate(endDate); } public void setEndDate(String endDate) { this.endDate = endDate; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java index c7470f50..ceb1aaf5 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java @@ -96,6 +96,7 @@ public String getFormType() { public List getCsvElements() { List elements = new ArrayList(); elements.add(this.getConfirmationID()); + elements.add(this.getOccupancyType()); elements.add(this.getBedFundingType()); elements.add(this.getTotalBedQuarter1()); elements.add(this.getTotalBedQuarter2()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java index 722af361..81809b46 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java @@ -11,7 +11,7 @@ public class LtcYtdCompAddPos implements IModel{ private String confirmationId; private String addPosType; private String addPosName; - private String addPosContractedOutYtd; + //private String addPosContractedOutYtd; private String addPosLegalNameContractServiceYtd; private String addPosPercentServiceContractOutYtd; @@ -33,12 +33,7 @@ public String getAddPosName() { public void setAddPosName(String addPosName) { this.addPosName = addPosName; } - public String getAddPosContractedOutYtd() { - return addPosContractedOutYtd; - } - public void setAddPosContractedOutYtd(String addPosContractedOutYtd) { - this.addPosContractedOutYtd = addPosContractedOutYtd; - } + public String getAddPosLegalNameContractServiceYtd() { return addPosLegalNameContractServiceYtd; } @@ -67,7 +62,7 @@ public List getCsvElements() { elements.add(this.getConfirmationId()); elements.add(this.getAddPosType()); elements.add(this.getAddPosName()); - elements.add(this.getAddPosContractedOutYtd()); + //elements.add(this.getAddPosContractedOutYtd()); elements.add(this.getAddPosLegalNameContractServiceYtd()); elements.add(this.getAddPosPercentServiceContractOutYtd()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java index 63f2559d..009fed6b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java @@ -26,7 +26,7 @@ public void setBenefitsType(String benefitsType) { this.benefitsType = benefitsType; } public String getBenefitsAmountYtd() { - return benefitsAmountYtd; + return benefitsAmountYtd.isBlank() ? "0" : benefitsAmountYtd; } public void setBenefitsAmountYtd(String benefitsAmountYtd) { this.benefitsAmountYtd = benefitsAmountYtd; @@ -35,7 +35,7 @@ public void setBenefitsAmountYtd(String benefitsAmountYtd) { public String getBenefitsPercentageAlloc() { - return benefitsPercentageAlloc; + return benefitsPercentageAlloc.isBlank() ? "0" : benefitsPercentageAlloc; } public void setBenefitsPercentageAlloc(String benefitsPercentageAlloc) { this.benefitsPercentageAlloc = benefitsPercentageAlloc; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java index 8509ada7..36f59fc9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java @@ -37,26 +37,26 @@ public void setCompHrsName(String compHrsName) { } public String getCompHrsStaffYtd() { - return compHrsStaffYtd; + return compHrsStaffYtd.isBlank() ? "0" : compHrsStaffYtd; } public void setCompHrsStaffYtd(String compHrsStaffYtd) { this.compHrsStaffYtd = compHrsStaffYtd; } public String getCompHrsContractServicesYtd() { - return compHrsContractServicesYtd; + return compHrsContractServicesYtd.isBlank() ? "0" : compHrsContractServicesYtd; } public void setCompHrsContractServicesYtd(String compHrsContractServicesYtd) { this.compHrsContractServicesYtd = compHrsContractServicesYtd; } public String getCompHrsOfficeAllocYtd() { - return compHrsOfficeAllocYtd; + return compHrsOfficeAllocYtd.isBlank() ? "0" : compHrsOfficeAllocYtd; } public void setCompHrsOfficeAllocYtd(String compHrsOfficeAllocYtd) { this.compHrsOfficeAllocYtd = compHrsOfficeAllocYtd; } public String getCompTotalWorkedHrsYtd() { - return compTotalWorkedHrsYtd; + return compTotalWorkedHrsYtd.isBlank() ? "0" : compTotalWorkedHrsYtd; } public void setCompTotalWorkedHrsYtd(String compTotalWorkedHrsYtd) { this.compTotalWorkedHrsYtd = compTotalWorkedHrsYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java index b8554006..3d1dfe35 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java @@ -28,25 +28,25 @@ public void setCompHrsType(String compHrsType) { this.compHrsType = compHrsType; } public String getSubTotalCompHrsStaffYTD() { - return subTotalCompHrsStaffYTD; + return subTotalCompHrsStaffYTD.isBlank() ? "0" : subTotalCompHrsStaffYTD; } public void setSubTotalCompHrsStaffYTD(String subTotalCompHrsStaffYTD) { this.subTotalCompHrsStaffYTD = subTotalCompHrsStaffYTD; } public String getSubTotalCompHrsContractServicesYTD() { - return subTotalCompHrsContractServicesYTD; + return subTotalCompHrsContractServicesYTD.isBlank() ? "0" : subTotalCompHrsContractServicesYTD; } public void setSubTotalCompHrsContractServicesYTD(String subTotalCompHrsContractServicesYTD) { this.subTotalCompHrsContractServicesYTD = subTotalCompHrsContractServicesYTD; } public String getSubTotalCompHrsOfficeAllocYTD() { - return subTotalCompHrsOfficeAllocYTD; + return subTotalCompHrsOfficeAllocYTD.isBlank() ? "0" : subTotalCompHrsOfficeAllocYTD; } public void setSubTotalCompHrsOfficeAllocYTD(String subTotalCompHrsOfficeAllocYTD) { this.subTotalCompHrsOfficeAllocYTD = subTotalCompHrsOfficeAllocYTD; } public String getSubTotalCompTotalWorkedHrsYTD() { - return subTotalCompTotalWorkedHrsYTD; + return subTotalCompTotalWorkedHrsYTD.isBlank() ? "0" : subTotalCompTotalWorkedHrsYTD; } public void setSubTotalCompTotalWorkedHrsYTD(String subTotalCompTotalWorkedHrsYTD) { this.subTotalCompTotalWorkedHrsYTD = subTotalCompTotalWorkedHrsYTD; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java index 0db6082b..903ef47f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java @@ -34,7 +34,7 @@ public void setCompHrsTotalType(String compHrsTotalType) { } public String getTotalCompHrsStaffYTD() { - return totalCompHrsStaffYTD; + return totalCompHrsStaffYTD.isBlank() ? "0" : totalCompHrsStaffYTD; } public void setTotalCompHrsStaffYTD(String totalCompHrsStaffYTD) { @@ -42,7 +42,7 @@ public void setTotalCompHrsStaffYTD(String totalCompHrsStaffYTD) { } public String getTotalCompHrsContractServicesYTD() { - return totalCompHrsContractServicesYTD; + return totalCompHrsContractServicesYTD.isBlank() ? "0" : totalCompHrsContractServicesYTD; } public void setTotalCompHrsContractServicesYTD(String totalCompHrsContractServicesYTD) { @@ -50,7 +50,7 @@ public void setTotalCompHrsContractServicesYTD(String totalCompHrsContractServic } public String getTotalCompHrsOfficeAllocYTD() { - return totalCompHrsOfficeAllocYTD; + return totalCompHrsOfficeAllocYTD.isBlank() ? "0" : totalCompHrsOfficeAllocYTD; } public void setTotalCompHrsOfficeAllocYTD(String totalCompHrsOfficeAllocYTD) { @@ -58,7 +58,7 @@ public void setTotalCompHrsOfficeAllocYTD(String totalCompHrsOfficeAllocYTD) { } public String getTotalCompTotalWorkedHrsYTD() { - return totalCompTotalWorkedHrsYTD; + return totalCompTotalWorkedHrsYTD.isBlank() ? "0" : totalCompTotalWorkedHrsYTD; } public void setTotalCompTotalWorkedHrsYTD(String totalCompTotalWorkedHrsYTD) { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java index dac2cb84..7fef42a7 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java @@ -40,19 +40,19 @@ public void setCompSalName(String compSalName) { this.compSalName = compSalName; } public String getCompSalStaffYtd() { - return compSalStaffYtd; + return compSalStaffYtd.isBlank() ? "0" : compSalStaffYtd; } public void setCompSalStaffYtd(String compSalStaffYtd) { this.compSalStaffYtd = compSalStaffYtd; } public String getCompSalContractServicesYtd() { - return compSalContractServicesYtd; + return compSalContractServicesYtd.isBlank() ? "0" : compSalContractServicesYtd; } public void setCompSalContractServicesYtd(String compSalContractServicesYtd) { this.compSalContractServicesYtd = compSalContractServicesYtd; } public String getCompSalOfficeAllocYtd() { - return compSalOfficeAllocYtd; + return compSalOfficeAllocYtd.isBlank() ? "0" : compSalOfficeAllocYtd; } public void setCompSalOfficeAllocYtd(String compSalOfficeAllocYtd) { this.compSalOfficeAllocYtd = compSalOfficeAllocYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java index 90af7dc4..5151658e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java @@ -32,7 +32,7 @@ public void setCompSalType(String compSalType) { } public String getSubTotalCompSalStaffYTD() { - return subTotalCompSalStaffYTD; + return subTotalCompSalStaffYTD.isBlank() ? "0" : subTotalCompSalStaffYTD; } public void setSubTotalCompSalStaffYTD(String subTotalCompSalStaffYTD) { @@ -40,7 +40,7 @@ public void setSubTotalCompSalStaffYTD(String subTotalCompSalStaffYTD) { } public String getSubTotalCompSalContractServicesYTD() { - return subTotalCompSalContractServicesYTD; + return subTotalCompSalContractServicesYTD.isBlank() ? "0" : subTotalCompSalContractServicesYTD; } public void setSubTotalCompSalContractServicesYTD(String subTotalCompSalContractServicesYTD) { @@ -48,7 +48,7 @@ public void setSubTotalCompSalContractServicesYTD(String subTotalCompSalContract } public String getSubTotalCompSalOfficeAllocYTD() { - return subTotalCompSalOfficeAllocYTD; + return subTotalCompSalOfficeAllocYTD.isBlank() ? "0" : subTotalCompSalOfficeAllocYTD; } public void setSubTotalCompSalOfficeAllocYTD(String subTotalCompSalOfficeAllocYTD) { @@ -56,7 +56,7 @@ public void setSubTotalCompSalOfficeAllocYTD(String subTotalCompSalOfficeAllocYT } public String getSubTotalCompSalTotalCostYTD() { - return subTotalCompSalTotalCostYTD; + return subTotalCompSalTotalCostYTD.isBlank() ? "0" : subTotalCompSalTotalCostYTD; } public void setSubTotalCompSalTotalCostYTD(String subTotalCompSalTotalCostYTD) { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java index 20e17884..a4767796 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java @@ -32,7 +32,7 @@ public void setCompSalType(String compSalType) { } public String getTotalCompSalStaffYTD() { - return totalCompSalStaffYTD; + return totalCompSalStaffYTD.isBlank() ? "0" : totalCompSalStaffYTD; } public void setTotalCompSalStaffYTD(String totalCompSalStaffYTD) { @@ -40,7 +40,7 @@ public void setTotalCompSalStaffYTD(String totalCompSalStaffYTD) { } public String getTotalCompSalContractServicesYTD() { - return totalCompSalContractServicesYTD; + return totalCompSalContractServicesYTD.isBlank() ? "0" : totalCompSalContractServicesYTD; } public void setTotalCompSalContractServicesYTD(String totalCompSalContractServicesYTD) { @@ -48,7 +48,7 @@ public void setTotalCompSalContractServicesYTD(String totalCompSalContractServic } public String getTotalCompSalOfficeAllocYTD() { - return totalCompSalOfficeAllocYTD; + return totalCompSalOfficeAllocYTD.isBlank() ? "0" : totalCompSalOfficeAllocYTD; } public void setTotalCompSalOfficeAllocYTD(String totalCompSalOfficeAllocYTD) { @@ -56,7 +56,7 @@ public void setTotalCompSalOfficeAllocYTD(String totalCompSalOfficeAllocYTD) { } public String getTotalCompSalTotalCostYTD() { - return totalCompSalTotalCostYTD; + return totalCompSalTotalCostYTD.isBlank() ? "0" : totalCompSalTotalCostYTD; } public void setTotalCompSalTotalCostYTD(String totalCompSalTotalCostYTD) { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java index 32bb04bf..479ba8be 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java @@ -44,19 +44,19 @@ public void setDirCareCostName(String dirCareCostName) { this.dirCareCostName = dirCareCostName; } public String getDirCareCostProdHrsRegYtd() { - return dirCareCostProdHrsRegYtd; + return dirCareCostProdHrsRegYtd.isBlank() ? "0" : dirCareCostProdHrsRegYtd; } public void setDirCareCostProdHrsRegYtd(String dirCareCostProdHrsRegYtd) { this.dirCareCostProdHrsRegYtd = dirCareCostProdHrsRegYtd; } public String getDirCareCostProdHrsOtYtd() { - return dirCareCostProdHrsOtYtd; + return dirCareCostProdHrsOtYtd.isBlank() ? "0" : dirCareCostProdHrsOtYtd; } public void setDirCareCostProdHrsOtYtd(String dirCareCostProdHrsOtYtd) { this.dirCareCostProdHrsOtYtd = dirCareCostProdHrsOtYtd; } public String getDirCareCostProdHrsContractedYtd() { - return dirCareCostProdHrsContractedYtd; + return dirCareCostProdHrsContractedYtd.isBlank() ? "0" : dirCareCostProdHrsContractedYtd; } public void setDirCareCostProdHrsContractedYtd(String dirCareCostProdHrsContractedYtd) { this.dirCareCostProdHrsContractedYtd = dirCareCostProdHrsContractedYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java index ea287c15..76b9e99a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java @@ -42,7 +42,7 @@ public void setDirCareName(String dirCareName) { this.dirCareName = dirCareName; } public String getDirCareProdHrsRegYtd() { - return dirCareProdHrsRegYtd; + return dirCareProdHrsRegYtd.isBlank() ? "0" : dirCareProdHrsRegYtd; } public void setDirCareProdHrsRegYtd(String dirCareProdHrsRegYtd) { this.dirCareProdHrsRegYtd = dirCareProdHrsRegYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java index 7b54519e..4c3bafbc 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java @@ -33,7 +33,7 @@ public void setExpName(String expName) { this.expName = expName; } public String getExpYtd() { - return expYtd; + return expYtd.isBlank() ? "0" : expYtd; } public void setExpYtd(String expYtd) { this.expYtd = expYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java index e11ec65d..6fb8f461 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java @@ -33,7 +33,7 @@ public void setRevName(String revName) { this.revName = revName; } public String getRevYTD() { - return revYTD; + return revYTD.isBlank() ? "0" : revYTD; } public void setRevYTD(String revYTD) { this.revYTD = revYTD; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java index 81ee1fab..99c8772f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java @@ -5,6 +5,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.util.CSVUtil; public class LtcYtdSubmission implements IModel { @@ -17,7 +18,7 @@ public class LtcYtdSubmission implements IModel { private String submittedBy; private String facilitySubId; private String period; - private String submissionFy; + //private String submissionFy; private String nbTotalBeds; private String nbFundedBeds; private String occRateThreshold; @@ -64,12 +65,12 @@ public String getFormType() { public List getCsvElements() { List elements = new ArrayList(); elements.add(this.getConfirmationId()); - elements.add(this.getIsDeleted()); + elements.add("false"); // FIXME Replace with elements.add(this.getIsDeleted()) when isDeleted is available in the CHEFS API. elements.add(this.getSubmissionDate()); elements.add(this.getSubmittedBy()); elements.add(this.getFacilitySubId()); elements.add(this.getPeriod()); - elements.add(this.getSubmissionFy()); + //elements.add(this.getSubmissionFy()); elements.add(this.getNbTotalBeds()); elements.add(this.getNbFundedBeds()); elements.add(this.getOccRateThreshold()); @@ -114,7 +115,7 @@ public void setConfirmationId(String confirmationId) { } public String getSubmissionDate() { - return submissionDate; + return CSVUtil.getFormattedDate(submissionDate); } public void setSubmissionDate(String submissionDate) { @@ -145,14 +146,6 @@ public void setPeriod(String period) { this.period = period; } - public String getSubmissionFy() { - return submissionFy; - } - - public void setSubmissionFy(String submissionFy) { - this.submissionFy = submissionFy; - } - public String getNbTotalBeds() { return nbTotalBeds; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java index 2ea26ab6..b5b9e332 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java @@ -1,16 +1,28 @@ package ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor; +import java.util.Map; + import org.apache.camel.Exchange; import org.apache.camel.Processor; import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.parser.ChefsRequestPayload; import ca.bc.gov.chefs.etl.util.AuthUtil; +import ca.bc.gov.chefs.etl.util.JsonUtil; import ca.bc.gov.chefs.etl.util.PropertiesUtil; public class LtcQuaterlyYtdApiProcessor implements Processor{ + private Map sharedData; + public LtcQuaterlyYtdApiProcessor(Map sharedData) { + this.sharedData = sharedData; + } + @Override public void process(Exchange exchange) throws Exception { + ChefsRequestPayload payload = JsonUtil.parseJsonString((String)sharedData.get("body"), ChefsRequestPayload.class) ; + String uri = PropertiesUtil.getValue(Constants.CHEFS_API_URL).formatted(PropertiesUtil.getValue(Constants.LTC_YTD_USERNAME), payload.getVersion(),payload.getStartDate(),payload.getEndDate()); + exchange.getIn().setHeader("RequestUri", uri); exchange.getIn().setHeader("CamelHttpMethod", "GET"); exchange.getIn().setHeader("Content-Type", "application/json"); exchange.getIn().setHeader("accept", "application/json"); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 9d18cfc1..1d42e5bc 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -101,7 +101,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT ltcYtdSubmission.setOccRateThreshold(root.getThreshold()); ltcYtdSubmission.setPeriod(root.getQuarter()); ltcYtdSubmission.setSubmissionDate(root.getForm().getCreatedAt()); - ltcYtdSubmission.setSubmissionFy(""); // not sure + //ltcYtdSubmission.setSubmissionFy(""); // not sure ltcYtdSubmission.setSubmittedBy(root.getForm().getFullName()); @@ -385,6 +385,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcYtdDirectCareHrsSubTotals alliedDirCareHrsSubTotal = new LtcYtdDirectCareHrsSubTotals(); alliedDirCareHrsSubTotal.setDirCareType("Allied Professional"); + alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsRegularYTD(root.getAlliedProfProdH_sum11()); alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsOTYTD(root.getAlliedProfProdH_sum21()); alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsSubtotalYTD(root.getAlliedProfProdH_calcsum1()); @@ -2118,6 +2119,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT for (BedGrid0 maxOcp : root.getBedGrid0()) { LtcBedYtdMaxOccupancy numOfBeds = new LtcBedYtdMaxOccupancy(); numOfBeds.setBedFundingType(maxOcp.getBedType()); + numOfBeds.setQuarterInventory(maxOcp.getQuarter()); numOfBeds.setConfirmationId(root.getForm().getConfirmationId()); numOfBeds.setStartDate(maxOcp.getStartDate0()); numOfBeds.setEndDate(maxOcp.getEndDate0()); @@ -2232,6 +2234,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setEndDate(maxOcp.getEndDate1()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + numOfBeds.setQuarterInventory(maxOcp.getQuarter()); // notes missing if (maxOcp.getBedType1()!=null && maxOcp.getBedType1().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); @@ -2249,6 +2252,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT aprilYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth4()); aprilYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth4()); aprilYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth4()); + aprilYtdOccDays.setOccDaysYtdTotalDays(root.getTotalMonth4()); aprilYtdOccDays.setOccMonth("April"); aprilYtdOccDays.setOccQuarter("Q1"); @@ -2259,6 +2263,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT mayYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth5()); mayYtdOccDays.setOccMonth("May"); mayYtdOccDays.setOccQuarter("Q1"); + mayYtdOccDays.setOccDaysYtdTotalDays(root.getTotalMonth5()); LtcBedYtdOccupiedDays juneYtdOccDays = new LtcBedYtdOccupiedDays(); juneYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); @@ -2267,6 +2272,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT juneYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth6()); juneYtdOccDays.setOccMonth("June"); juneYtdOccDays.setOccQuarter("Q1"); + juneYtdOccDays.setOccDaysYtdTotalDays(root.getTotalMonth6()); Collections.addAll(ltcBedYtdOccupiedDays, aprilYtdOccDays,mayYtdOccDays,juneYtdOccDays); @@ -2287,6 +2293,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occInRateQ1.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); occInRateQ1.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); occInRateQ1.setPercentOcc(root.getNoteInScopeQ1()); + occInRateQ1.setOccRateNotes(root.getNoteInScopeQ1()); + occInRateQ1.setOccRateQuarter("Q1"); LtcBedYtdOccupancyRate occOutRateQ1 = new LtcBedYtdOccupancyRate(); occOutRateQ1.setConfirmationID(root.getForm().getConfirmationId()); @@ -2295,6 +2303,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occOutRateQ1.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); occOutRateQ1.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); occOutRateQ1.setPercentOcc(root.getNoteInScopeQ1()); + occOutRateQ1.setOccRateQuarter("Q1"); + occInRateQ1.setOccRateNotes(root.getOpEx_note13()); LtcBedYtdOccupancyRate occRateQ1 = new LtcBedYtdOccupancyRate(); occRateQ1.setConfirmationID(root.getForm().getConfirmationId()); @@ -2303,6 +2313,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occRateQ1.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); occRateQ1.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); occRateQ1.setPercentOcc(root.getNoteInScopeQ1()); + occRateQ1.setOccRateQuarter("Q1"); + occInRateQ1.setOccRateNotes(root.getNoteInScopeQ1()); LtcBedYtdOccupancyRateTotals q1RateTotals = new LtcBedYtdOccupancyRateTotals(); q1RateTotals.setConfirmationID(root.getForm().getConfirmationId()); @@ -2325,6 +2337,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setEndDate(maxOcp.getEndDate2()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + numOfBeds.setQuarterInventory("Q2"); // notes missing if (maxOcp.getBedType2()!=null && maxOcp.getBedType2().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); @@ -2343,6 +2356,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT julyYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth7()); julyYtdOccDays.setOccMonth("July"); julyYtdOccDays.setOccQuarter("Q2"); + julyYtdOccDays.setOccDaysYtdTotalDays(root.getTotalMonth7()); LtcBedYtdOccupiedDays augYtdOccDays = new LtcBedYtdOccupiedDays(); augYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); @@ -2351,6 +2365,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT augYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth8()); augYtdOccDays.setOccMonth("May"); augYtdOccDays.setOccQuarter("Q2"); + augYtdOccDays.setOccDaysYtdTotalDays(root.getTotalMonth8()); LtcBedYtdOccupiedDays sepYtdOccDays = new LtcBedYtdOccupiedDays(); sepYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); @@ -2359,6 +2374,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT sepYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth9()); sepYtdOccDays.setOccMonth("September"); sepYtdOccDays.setOccQuarter("Q2"); + sepYtdOccDays.setOccDaysYtdTotalDays(root.getTotalMonth9()); Collections.addAll(ltcBedYtdOccupiedDays, julyYtdOccDays,augYtdOccDays,sepYtdOccDays); @@ -2380,6 +2396,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occInRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); occInRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); occInRateQ2.setPercentOcc(root.getNoteInScopeQ1()); + occInRateQ2.setOccRateQuarter("Q2"); LtcBedYtdOccupancyRate occOutRateQ2 = new LtcBedYtdOccupancyRate(); occOutRateQ2.setConfirmationID(root.getForm().getConfirmationId()); @@ -2388,6 +2405,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occOutRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ2()); occOutRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ2()); occOutRateQ2.setPercentOcc(root.getNoteInScopeQ2()); + occOutRateQ2.setOccRateQuarter("Q2"); LtcBedYtdOccupancyRate occRateQ2 = new LtcBedYtdOccupancyRate(); occRateQ2.setConfirmationID(root.getForm().getConfirmationId()); @@ -2396,6 +2414,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ2()); occRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ2()); occRateQ2.setPercentOcc(root.getNoteInScopeQ2()); + occRateQ2.setOccRateQuarter("Q2"); LtcBedYtdOccupancyRateTotals q2RateTotals = new LtcBedYtdOccupancyRateTotals(); q2RateTotals.setConfirmationID(root.getForm().getConfirmationId()); @@ -2404,6 +2423,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT q2RateTotals.setTotalYTDMaxOccDays(root.getyTDMaxTotalQ2()); q2RateTotals.setTotalYTDOccDays(root.getyTDOccupiedTotalQ2()); q2RateTotals.setTotalPercentOcc(root.getOccupiedPercentageTotalQ2()); + Collections.addAll(ltcBedYtdOccRateTtls,q2RateTotals); Collections.addAll(ltcBedYtdOccupancyRates, occInRateQ2,occOutRateQ2,occRateQ2); @@ -2418,6 +2438,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setEndDate(maxOcp.getEndDate3()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + numOfBeds.setQuarterInventory(maxOcp.getQuarter()); // notes missing if (maxOcp.getBedType3()!=null && maxOcp.getBedType3().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); @@ -2472,6 +2493,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occInRateQ3.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); occInRateQ3.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); occInRateQ3.setPercentOcc(root.getNoteInScopeQ1()); + LtcBedYtdOccupancyRate occOutRateQ3 = new LtcBedYtdOccupancyRate(); occOutRateQ3.setConfirmationID(root.getForm().getConfirmationId()); @@ -2509,6 +2531,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setEndDate(maxOcp.getEndDate4()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + numOfBeds.setQuarterInventory(maxOcp.getQuarter()); // notes missing if (maxOcp.getBedType4()!=null && maxOcp.getBedType4().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); @@ -2537,6 +2560,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT janYtdOccDays.setOccMonth("January"); janYtdOccDays.setOccQuarter("Q4"); janYtdOccDays.setOccDaysYtdTotalDays(root.getTotalMonth1()); + LtcBedYtdOccupiedDays febYtdOccDays = new LtcBedYtdOccupiedDays(); febYtdOccDays.setConfirmationId(root.getForm().getConfirmationId()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java index 86ea0b7f..0e6cf774 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java @@ -24,11 +24,13 @@ public void configure() throws Exception { // trigger from("jetty:http://{{hostname}}:{{port}}/ltc-quaterly-ytd").routeId("ltc-quaterly-ytd-form") .log("CHEFS-ETL received a request for LTCQ Form extraction")//.bean(AIMSFormPayloadExtractor.class) + .process(exchange -> sharedData.put("body", exchange.getIn().getBody(String.class))) .process(new LtcQuaterlyYtdProcessor()).to("direct:ltc-quaterly-ytd").end(); - from("direct:ltc-quaterly-ytd").process(new LtcQuaterlyYtdApiProcessor()) + from("direct:ltc-quaterly-ytd") // to the http uri - .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/7eb3c107-5adb-435a-adbf-b8683a56ecc0/export?bridgeEndpoint=true&format=json&type=submissions&version=3") + .process(new LtcQuaterlyYtdApiProcessor(sharedData)) + .toD("${header.RequestUri}") .log("This is the status code from the response: ${header.CamelHttpResponseCode}") .log("Trying to convert the received body OK").convertBodyTo(String.class) .process(new LtcQuaterlyYtdApiResponseProcessor()).end(); diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/ChefsRequestPayload.java b/src/main/java/ca/bc/gov/chefs/etl/parser/ChefsRequestPayload.java new file mode 100644 index 00000000..2cac0733 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/parser/ChefsRequestPayload.java @@ -0,0 +1,32 @@ +package ca.bc.gov.chefs.etl.parser; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class ChefsRequestPayload { + + private String version; + private String startDate; + private String endDate; + + public String getVersion() { + return version; + } + public void setVersion(String version) { + this.version = version; + } + public String getStartDate() { + return startDate; + } + public void setStartDate(String startDate) { + this.startDate = startDate; + } + public String getEndDate() { + return endDate; + } + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index cf6700f6..1d4c7b6e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -29,7 +29,7 @@ import java.io.InputStream; import java.io.OutputStream; import java.security.SecureRandom; -import java.time.LocalDate; +import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Map; @@ -165,7 +165,7 @@ public static void writeToCSVFile(Map>> map) { } public static String generateFileName(String fileType) { - DateTimeFormatter formatter = DateTimeFormatter.BASIC_ISO_DATE; - return fileType+"_".concat(LocalDate.now().format(formatter)).concat(".txt"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMMddHHmmss"); + return fileType.toLowerCase()+"_".concat(LocalDateTime.now().format(formatter)).concat(".txt"); } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/JsonUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/JsonUtil.java new file mode 100644 index 00000000..0bf2e821 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/util/JsonUtil.java @@ -0,0 +1,11 @@ +package ca.bc.gov.chefs.etl.util; + +import com.fasterxml.jackson.databind.ObjectMapper; + +public class JsonUtil { + private static final ObjectMapper mapper = new ObjectMapper(); + + public static T parseJsonString(String json, Class clazz) throws Exception { + return mapper.readValue(json, clazz); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8150046c..b531d3b3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -9,7 +9,7 @@ accept-remote-connections=true valid-ip-list-file=fwlist.txt -chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&type=submissions&minDate=%s&maxDate=%s +chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&bridgeEndpoint=true&version=%s&type=submissions&minDate=%s&maxDate=%s aims.username=2f173b2b-2f3a-407a-aecf-6b4bdc9431ae aims.password=5e056c7b-1b1e-4501-9711-facc44c6e66f From b4166885954ba2df62d0fdde6203d1841da59066 Mon Sep 17 00:00:00 2001 From: prit-cgi Date: Fri, 10 Mar 2023 16:55:39 -0500 Subject: [PATCH 015/183] Added directory structure for encrypted and unencrypted files --- pom.xml | 87 ++++++++++--------- .../bc/gov/chefs/etl/ChefsETLMainMethod.java | 28 ++++++ .../bc/gov/chefs/etl/constant/Constants.java | 27 ++++-- .../AIMSFormApiResponseProcessor.java | 7 +- .../FacilityInfoFormApiResponseProcessor.java | 8 +- .../quaterly/model/LtcYtdCompBenefits.java | 6 +- .../ltc/quaterly/model/LtcYtdCompHrs.java | 6 +- .../model/LtcYtdCompHrsSubtotals.java | 10 ++- .../quaterly/model/LtcYtdCompHrsTotals.java | 10 ++- .../ltc/quaterly/model/LtcYtdCompSal.java | 8 +- .../model/LtcYtdCompSalSubtotals.java | 10 ++- .../quaterly/model/LtcYtdCompSalTotals.java | 10 ++- .../quaterly/model/LtcYtdDirectCareCost.java | 8 +- .../quaterly/model/LtcYtdDirectCareHrs.java | 11 ++- .../forms/ltc/quaterly/model/LtcYtdExp.java | 4 +- .../forms/ltc/quaterly/model/LtcYtdRev.java | 4 +- .../LtcQuaterlyYtdApiResponseProcessor.java | 62 +++++++------ .../gov/chefs/etl/parser/FileProperties.java | 29 +++++++ .../ca/bc/gov/chefs/etl/util/CSVUtil.java | 47 +--------- .../ca/bc/gov/chefs/etl/util/FileUtil.java | 22 ++++- 20 files changed, 246 insertions(+), 158 deletions(-) create mode 100644 src/main/java/ca/bc/gov/chefs/etl/parser/FileProperties.java diff --git a/pom.xml b/pom.xml index 97165c9a..5db815e3 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,7 @@ 5.7.1 2.4.7 2.4.0 + 3.12.0 @@ -148,6 +149,14 @@ compile + + + org.apache.commons + commons-lang3 + ${apache-commons-version} + + + @@ -175,45 +184,45 @@ org.apache.maven.plugins maven-shade-plugin ${maven-shade-plugin-version} - - - - package - - shade - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - true - executable-jar - medis-etl - - - ca.bc.gov.chefs.etl.ChefsETLMainMethod - - ca/bc/gov/chefs/etl/ - - - - META-INF/services/org/apache/camel/TypeConverterLoader - - - - - - - - - + + + + package + + shade + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + true + executable-jar + medis-etl + + + ca.bc.gov.chefs.etl.ChefsETLMainMethod + + ca/bc/gov/chefs/etl/ + + + + META-INF/services/org/apache/camel/TypeConverterLoader + + + + + + + + + diff --git a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java index 1b597013..24aee4ac 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java +++ b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java @@ -1,5 +1,10 @@ package ca.bc.gov.chefs.etl; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; + import org.apache.camel.main.Main; import ca.bc.gov.chefs.etl.core.routes.HelloRoute; @@ -11,6 +16,29 @@ * Camel Class runner. * */ public class ChefsETLMainMethod { + + static { + /* Creating Necessary Directories for ETL */ + + /* Encrypted and Non-Encrypted Directories */ + try { + Files.createDirectories(Paths.get("."+File.separator+"encrypted")); + Files.createDirectories(Paths.get("."+File.separator+"unencrypted")); + + /* LTC_FACILITY */ + Files.createDirectories(Paths.get("."+File.separator+ "encrypted","ltc_facility")); + Files.createDirectories(Paths.get("."+File.separator+ "unencrypted","ltc_facility")); + /* LTC _QUARTERLY YTD */ + Files.createDirectories(Paths.get("."+File.separator +"encrypted","ltc_quarterly_ytd")); + Files.createDirectories(Paths.get("."+File.separator+"unencrypted","ltc_quarterly_ytd")); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + + + } public static void main(String... args) throws Exception { Main main = new Main(); diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index d7f38075..3e04717d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -1,5 +1,6 @@ package ca.bc.gov.chefs.etl.constant; +import java.io.File; import java.util.HashMap; import java.util.Map; @@ -18,6 +19,9 @@ public class Constants { public final static String AIMS_PASSWORD = "aims.password"; public final static Map HEADERS = new HashMap(); + public final static Map UNENC_FILE_PATH = new HashMap(); + public final static Map ENC_FILE_PATH = new HashMap(); + public final static String AIMS_FORM = "AIMS_FORM"; public final static String AIMS_MISUSE = "AIMS_MISUSE"; public final static String AIMS_REFERRAL = "AIMS_REFERRAL"; @@ -65,14 +69,29 @@ public class Constants { public static final String LTC_BED_YTD_OCCUPIED_DAYS_TOTALS = "LTC_BED_YTD_OCCUPIED_DAYS_TOTALS"; /* File Constants */ - public final static String ETL_DIRECTORY = "etl"; - public final static String UNENCRYPTED_DIRECTORY = "unencrypted"; - public final static String ENCRYPTED_DIRECTORY = "encrypted"; + public static final String LTC_FACILITY_UNENCRYPTED_FP = "."+File.separator+"unencrypted"+File.separator+"ltc_facility"; + public static final String LTC_FACILITY_ENCRYPTED_FP = "."+File.separator+"encrypted"+File.separator+"ltc_facility"; + + public static final String AIMS_UNENCRYPTED_FP = "."+File.separator+"unencrypted"+File.separator+"aims"; + public static final String AIMS_ENCRYPTED_FP = "."+File.separator+"encrypted"+File.separator+"aims"; + + public static final String LTC_QUARTERLY_YTD_UNENCRYPTED_FP = "."+File.separator+"unencrypted"+File.separator+"ltc_quarterly"; + public static final String LTC_QUARTERLY_YTD_ENCRYPTED_FP = "."+File.separator+"encrypted"+File.separator+"ltc_quarterly"; + static { + + UNENC_FILE_PATH.put(LTC_FACILITY, LTC_FACILITY_UNENCRYPTED_FP); + UNENC_FILE_PATH.put(LTC_YTD_SUBMISSION, LTC_QUARTERLY_YTD_UNENCRYPTED_FP); + UNENC_FILE_PATH.put(AIMS_FORM,AIMS_UNENCRYPTED_FP); + + ENC_FILE_PATH.put(AIMS_FORM, AIMS_ENCRYPTED_FP); + ENC_FILE_PATH.put(LTC_FACILITY, LTC_FACILITY_ENCRYPTED_FP); + ENC_FILE_PATH.put(LTC_YTD_SUBMISSION, LTC_QUARTERLY_YTD_ENCRYPTED_FP); + HEADERS.put("TestModel#Main", new String[] { "confirmationId", "formName", "version", "createdAt", "fullName", "username", "email", "status", "assignee", "assigneeEmail", }); @@ -155,8 +174,6 @@ public class Constants { "SUB_TOTAL_DIR_CARE_TOTAL_HRS_PAID_YTD", }); -// HEADERS.put(LTC_YTD_DIRECT_CARE_HRS, new String[] { "CONFIRMATION_ID", "QUARTER_INVENTORY", "BED_FUNDING_TYPE", -// "BED_SUBTYPE", "START_DATE", "END_DATE", "NUMBER_OF_BEDS", "MAXIMUM_BED_DAYS", "NOTES" }); HEADERS.put(LTC_YTD_COMP_HRS, new String[] { "CONFIRMATION_ID", "COMP_HRS_TYPE", "COMP_HRS_NAME", "COMP_HRS_STAFF_YTD", "COMP_HRS_CONTRACT_SERVICES_YTD", "COMP_HRS_OFFICE_ALLOC_YTD", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java index 267d75f7..f9c026a2 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java @@ -11,6 +11,7 @@ import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.forms.aims.model.MainEntity; +import ca.bc.gov.chefs.etl.parser.FileProperties; import ca.bc.gov.chefs.etl.parser.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; import ca.bc.gov.chefs.etl.util.Counter; @@ -32,7 +33,11 @@ public void process(Exchange exchange) throws Exception { List iModels = (List)(List) aimsModels; Map>> map = CSVUtil.provider(iModels); - FileUtil.writeToCSVFile(map); + + FileProperties fileProperties = new FileProperties(); + fileProperties.setUnEncDirForThisExchange(Constants.UNENC_FILE_PATH.get(Constants.AIMS_FORM)); + fileProperties.setEncDirForThisExchange(Constants.ENC_FILE_PATH.get(Constants.AIMS_FORM)); + FileUtil.writeToCSVFile(map,fileProperties); } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java index 704d54bf..cd2fc27f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java @@ -11,10 +11,12 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; +import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.forms.ltc.facility.json.Root; import ca.bc.gov.chefs.etl.forms.ltc.facility.model.Approver; import ca.bc.gov.chefs.etl.forms.ltc.facility.model.FacilityInformation; import ca.bc.gov.chefs.etl.forms.ltc.facility.model.Preparer; +import ca.bc.gov.chefs.etl.parser.FileProperties; import ca.bc.gov.chefs.etl.parser.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; import ca.bc.gov.chefs.etl.util.FileUtil; @@ -34,7 +36,11 @@ public void process(Exchange exchange) throws Exception { List parsedFacilityInfo = parseFacilityInfo(facilityInformationModels); List iModels = (List) (List) parsedFacilityInfo; Map>> map = CSVUtil.provider(iModels); - FileUtil.writeToCSVFile(map); + FileProperties fileProperties = new FileProperties(); + fileProperties.setUnEncDirForThisExchange(Constants.UNENC_FILE_PATH.get(Constants.LTC_FACILITY)); + fileProperties.setEncDirForThisExchange(Constants.ENC_FILE_PATH.get(Constants.LTC_FACILITY)); + + FileUtil.writeToCSVFile(map,fileProperties); } private List parseFacilityInfo(List facilities) { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java index 009fed6b..78972088 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; @@ -26,7 +28,7 @@ public void setBenefitsType(String benefitsType) { this.benefitsType = benefitsType; } public String getBenefitsAmountYtd() { - return benefitsAmountYtd.isBlank() ? "0" : benefitsAmountYtd; + return StringUtils.isEmpty(benefitsAmountYtd) ? "0" : benefitsAmountYtd; } public void setBenefitsAmountYtd(String benefitsAmountYtd) { this.benefitsAmountYtd = benefitsAmountYtd; @@ -35,7 +37,7 @@ public void setBenefitsAmountYtd(String benefitsAmountYtd) { public String getBenefitsPercentageAlloc() { - return benefitsPercentageAlloc.isBlank() ? "0" : benefitsPercentageAlloc; + return StringUtils.isEmpty(benefitsPercentageAlloc) ? "0" : benefitsPercentageAlloc; } public void setBenefitsPercentageAlloc(String benefitsPercentageAlloc) { this.benefitsPercentageAlloc = benefitsPercentageAlloc; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java index 36f59fc9..e0f2194d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; @@ -37,7 +39,7 @@ public void setCompHrsName(String compHrsName) { } public String getCompHrsStaffYtd() { - return compHrsStaffYtd.isBlank() ? "0" : compHrsStaffYtd; + return StringUtils.isEmpty(compHrsStaffYtd) ? "0" : compHrsStaffYtd; } public void setCompHrsStaffYtd(String compHrsStaffYtd) { this.compHrsStaffYtd = compHrsStaffYtd; @@ -49,7 +51,7 @@ public void setCompHrsContractServicesYtd(String compHrsContractServicesYtd) { this.compHrsContractServicesYtd = compHrsContractServicesYtd; } public String getCompHrsOfficeAllocYtd() { - return compHrsOfficeAllocYtd.isBlank() ? "0" : compHrsOfficeAllocYtd; + return StringUtils.isEmpty(compHrsOfficeAllocYtd) ? "0" : compHrsOfficeAllocYtd; } public void setCompHrsOfficeAllocYtd(String compHrsOfficeAllocYtd) { this.compHrsOfficeAllocYtd = compHrsOfficeAllocYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java index 3d1dfe35..1eeadd97 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; @@ -28,25 +30,25 @@ public void setCompHrsType(String compHrsType) { this.compHrsType = compHrsType; } public String getSubTotalCompHrsStaffYTD() { - return subTotalCompHrsStaffYTD.isBlank() ? "0" : subTotalCompHrsStaffYTD; + return StringUtils.isBlank(subTotalCompHrsStaffYTD) ? "0" : subTotalCompHrsStaffYTD; } public void setSubTotalCompHrsStaffYTD(String subTotalCompHrsStaffYTD) { this.subTotalCompHrsStaffYTD = subTotalCompHrsStaffYTD; } public String getSubTotalCompHrsContractServicesYTD() { - return subTotalCompHrsContractServicesYTD.isBlank() ? "0" : subTotalCompHrsContractServicesYTD; + return StringUtils.isEmpty(subTotalCompHrsContractServicesYTD) ? "0" : subTotalCompHrsContractServicesYTD; } public void setSubTotalCompHrsContractServicesYTD(String subTotalCompHrsContractServicesYTD) { this.subTotalCompHrsContractServicesYTD = subTotalCompHrsContractServicesYTD; } public String getSubTotalCompHrsOfficeAllocYTD() { - return subTotalCompHrsOfficeAllocYTD.isBlank() ? "0" : subTotalCompHrsOfficeAllocYTD; + return StringUtils.isBlank(subTotalCompHrsOfficeAllocYTD) ? "0" : subTotalCompHrsOfficeAllocYTD; } public void setSubTotalCompHrsOfficeAllocYTD(String subTotalCompHrsOfficeAllocYTD) { this.subTotalCompHrsOfficeAllocYTD = subTotalCompHrsOfficeAllocYTD; } public String getSubTotalCompTotalWorkedHrsYTD() { - return subTotalCompTotalWorkedHrsYTD.isBlank() ? "0" : subTotalCompTotalWorkedHrsYTD; + return StringUtils.isBlank(subTotalCompTotalWorkedHrsYTD) ? "0" : subTotalCompTotalWorkedHrsYTD; } public void setSubTotalCompTotalWorkedHrsYTD(String subTotalCompTotalWorkedHrsYTD) { this.subTotalCompTotalWorkedHrsYTD = subTotalCompTotalWorkedHrsYTD; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java index 903ef47f..37c0a5d8 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; @@ -34,7 +36,7 @@ public void setCompHrsTotalType(String compHrsTotalType) { } public String getTotalCompHrsStaffYTD() { - return totalCompHrsStaffYTD.isBlank() ? "0" : totalCompHrsStaffYTD; + return StringUtils.isBlank(totalCompHrsStaffYTD) ? "0" : totalCompHrsStaffYTD; } public void setTotalCompHrsStaffYTD(String totalCompHrsStaffYTD) { @@ -42,7 +44,7 @@ public void setTotalCompHrsStaffYTD(String totalCompHrsStaffYTD) { } public String getTotalCompHrsContractServicesYTD() { - return totalCompHrsContractServicesYTD.isBlank() ? "0" : totalCompHrsContractServicesYTD; + return StringUtils.isBlank(totalCompHrsContractServicesYTD) ? "0" : totalCompHrsContractServicesYTD; } public void setTotalCompHrsContractServicesYTD(String totalCompHrsContractServicesYTD) { @@ -50,7 +52,7 @@ public void setTotalCompHrsContractServicesYTD(String totalCompHrsContractServic } public String getTotalCompHrsOfficeAllocYTD() { - return totalCompHrsOfficeAllocYTD.isBlank() ? "0" : totalCompHrsOfficeAllocYTD; + return StringUtils.isBlank(totalCompHrsOfficeAllocYTD) ? "0" : totalCompHrsOfficeAllocYTD; } public void setTotalCompHrsOfficeAllocYTD(String totalCompHrsOfficeAllocYTD) { @@ -58,7 +60,7 @@ public void setTotalCompHrsOfficeAllocYTD(String totalCompHrsOfficeAllocYTD) { } public String getTotalCompTotalWorkedHrsYTD() { - return totalCompTotalWorkedHrsYTD.isBlank() ? "0" : totalCompTotalWorkedHrsYTD; + return StringUtils.isBlank(totalCompTotalWorkedHrsYTD) ? "0" : totalCompTotalWorkedHrsYTD; } public void setTotalCompTotalWorkedHrsYTD(String totalCompTotalWorkedHrsYTD) { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java index 7fef42a7..3d1cd079 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; @@ -40,19 +42,19 @@ public void setCompSalName(String compSalName) { this.compSalName = compSalName; } public String getCompSalStaffYtd() { - return compSalStaffYtd.isBlank() ? "0" : compSalStaffYtd; + return StringUtils.isBlank(compSalStaffYtd) ? "0" : compSalStaffYtd; } public void setCompSalStaffYtd(String compSalStaffYtd) { this.compSalStaffYtd = compSalStaffYtd; } public String getCompSalContractServicesYtd() { - return compSalContractServicesYtd.isBlank() ? "0" : compSalContractServicesYtd; + return StringUtils.isBlank(compSalContractServicesYtd) ? "0" : compSalContractServicesYtd; } public void setCompSalContractServicesYtd(String compSalContractServicesYtd) { this.compSalContractServicesYtd = compSalContractServicesYtd; } public String getCompSalOfficeAllocYtd() { - return compSalOfficeAllocYtd.isBlank() ? "0" : compSalOfficeAllocYtd; + return StringUtils.isBlank(compSalOfficeAllocYtd) ? "0" : compSalOfficeAllocYtd; } public void setCompSalOfficeAllocYtd(String compSalOfficeAllocYtd) { this.compSalOfficeAllocYtd = compSalOfficeAllocYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java index 5151658e..0fc03f2b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; @@ -32,7 +34,7 @@ public void setCompSalType(String compSalType) { } public String getSubTotalCompSalStaffYTD() { - return subTotalCompSalStaffYTD.isBlank() ? "0" : subTotalCompSalStaffYTD; + return StringUtils.isBlank(subTotalCompSalStaffYTD) ? "0" : subTotalCompSalStaffYTD; } public void setSubTotalCompSalStaffYTD(String subTotalCompSalStaffYTD) { @@ -40,7 +42,7 @@ public void setSubTotalCompSalStaffYTD(String subTotalCompSalStaffYTD) { } public String getSubTotalCompSalContractServicesYTD() { - return subTotalCompSalContractServicesYTD.isBlank() ? "0" : subTotalCompSalContractServicesYTD; + return StringUtils.isBlank(subTotalCompSalContractServicesYTD) ? "0" : subTotalCompSalContractServicesYTD; } public void setSubTotalCompSalContractServicesYTD(String subTotalCompSalContractServicesYTD) { @@ -48,7 +50,7 @@ public void setSubTotalCompSalContractServicesYTD(String subTotalCompSalContract } public String getSubTotalCompSalOfficeAllocYTD() { - return subTotalCompSalOfficeAllocYTD.isBlank() ? "0" : subTotalCompSalOfficeAllocYTD; + return StringUtils.isBlank(subTotalCompSalOfficeAllocYTD) ? "0" : subTotalCompSalOfficeAllocYTD; } public void setSubTotalCompSalOfficeAllocYTD(String subTotalCompSalOfficeAllocYTD) { @@ -56,7 +58,7 @@ public void setSubTotalCompSalOfficeAllocYTD(String subTotalCompSalOfficeAllocYT } public String getSubTotalCompSalTotalCostYTD() { - return subTotalCompSalTotalCostYTD.isBlank() ? "0" : subTotalCompSalTotalCostYTD; + return StringUtils.isBlank(subTotalCompSalTotalCostYTD) ? "0" : subTotalCompSalTotalCostYTD; } public void setSubTotalCompSalTotalCostYTD(String subTotalCompSalTotalCostYTD) { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java index a4767796..31908be8 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; @@ -32,7 +34,7 @@ public void setCompSalType(String compSalType) { } public String getTotalCompSalStaffYTD() { - return totalCompSalStaffYTD.isBlank() ? "0" : totalCompSalStaffYTD; + return StringUtils.isBlank(totalCompSalStaffYTD) ? "0" : totalCompSalStaffYTD; } public void setTotalCompSalStaffYTD(String totalCompSalStaffYTD) { @@ -40,7 +42,7 @@ public void setTotalCompSalStaffYTD(String totalCompSalStaffYTD) { } public String getTotalCompSalContractServicesYTD() { - return totalCompSalContractServicesYTD.isBlank() ? "0" : totalCompSalContractServicesYTD; + return StringUtils.isBlank(totalCompSalContractServicesYTD) ? "0" : totalCompSalContractServicesYTD; } public void setTotalCompSalContractServicesYTD(String totalCompSalContractServicesYTD) { @@ -48,7 +50,7 @@ public void setTotalCompSalContractServicesYTD(String totalCompSalContractServic } public String getTotalCompSalOfficeAllocYTD() { - return totalCompSalOfficeAllocYTD.isBlank() ? "0" : totalCompSalOfficeAllocYTD; + return StringUtils.isBlank(totalCompSalOfficeAllocYTD) ? "0" : totalCompSalOfficeAllocYTD; } public void setTotalCompSalOfficeAllocYTD(String totalCompSalOfficeAllocYTD) { @@ -56,7 +58,7 @@ public void setTotalCompSalOfficeAllocYTD(String totalCompSalOfficeAllocYTD) { } public String getTotalCompSalTotalCostYTD() { - return totalCompSalTotalCostYTD.isBlank() ? "0" : totalCompSalTotalCostYTD; + return StringUtils.isBlank(totalCompSalTotalCostYTD) ? "0" : totalCompSalTotalCostYTD; } public void setTotalCompSalTotalCostYTD(String totalCompSalTotalCostYTD) { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java index 479ba8be..52da5364 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; @@ -44,19 +46,19 @@ public void setDirCareCostName(String dirCareCostName) { this.dirCareCostName = dirCareCostName; } public String getDirCareCostProdHrsRegYtd() { - return dirCareCostProdHrsRegYtd.isBlank() ? "0" : dirCareCostProdHrsRegYtd; + return StringUtils.isBlank(dirCareCostProdHrsRegYtd) ? "0" : dirCareCostProdHrsRegYtd; } public void setDirCareCostProdHrsRegYtd(String dirCareCostProdHrsRegYtd) { this.dirCareCostProdHrsRegYtd = dirCareCostProdHrsRegYtd; } public String getDirCareCostProdHrsOtYtd() { - return dirCareCostProdHrsOtYtd.isBlank() ? "0" : dirCareCostProdHrsOtYtd; + return StringUtils.isBlank(dirCareCostProdHrsOtYtd) ? "0" : dirCareCostProdHrsOtYtd; } public void setDirCareCostProdHrsOtYtd(String dirCareCostProdHrsOtYtd) { this.dirCareCostProdHrsOtYtd = dirCareCostProdHrsOtYtd; } public String getDirCareCostProdHrsContractedYtd() { - return dirCareCostProdHrsContractedYtd.isBlank() ? "0" : dirCareCostProdHrsContractedYtd; + return StringUtils.isBlank(dirCareCostProdHrsContractedYtd) ? "0" : dirCareCostProdHrsContractedYtd; } public void setDirCareCostProdHrsContractedYtd(String dirCareCostProdHrsContractedYtd) { this.dirCareCostProdHrsContractedYtd = dirCareCostProdHrsContractedYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java index 76b9e99a..72917956 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; @@ -42,19 +44,19 @@ public void setDirCareName(String dirCareName) { this.dirCareName = dirCareName; } public String getDirCareProdHrsRegYtd() { - return dirCareProdHrsRegYtd.isBlank() ? "0" : dirCareProdHrsRegYtd; + return StringUtils.isBlank(dirCareProdHrsRegYtd) ? "0" : dirCareProdHrsRegYtd; } public void setDirCareProdHrsRegYtd(String dirCareProdHrsRegYtd) { this.dirCareProdHrsRegYtd = dirCareProdHrsRegYtd; } public String getDirCareProdHrsOtYtd() { - return dirCareProdHrsOtYtd; + return StringUtils.isBlank(dirCareProdHrsOtYtd) ? "0" : dirCareProdHrsOtYtd; } public void setDirCareProdHrsOtYtd(String dirCareProdHrsOtYtd) { this.dirCareProdHrsOtYtd = dirCareProdHrsOtYtd; } public String getDirCareProdHrsContractedYtd() { - return dirCareProdHrsContractedYtd; + return StringUtils.isBlank(dirCareProdHrsContractedYtd) ? "0" : dirCareProdHrsContractedYtd; } public void setDirCareProdHrsContractedYtd(String dirCareProdHrsContractedYtd) { this.dirCareProdHrsContractedYtd = dirCareProdHrsContractedYtd; @@ -141,7 +143,4 @@ public List getObjects() { return new ArrayList<>(); } - - - } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java index 4c3bafbc..68ac6453 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; @@ -33,7 +35,7 @@ public void setExpName(String expName) { this.expName = expName; } public String getExpYtd() { - return expYtd.isBlank() ? "0" : expYtd; + return StringUtils.isBlank(expYtd) ? "0" : expYtd; } public void setExpYtd(String expYtd) { this.expYtd = expYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java index 6fb8f461..6b00368d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.parser.IModel; @@ -33,7 +35,7 @@ public void setRevName(String revName) { this.revName = revName; } public String getRevYTD() { - return revYTD.isBlank() ? "0" : revYTD; + return StringUtils.isBlank(revYTD) ? "0" : revYTD; } public void setRevYTD(String revYTD) { this.revYTD = revYTD; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 1d42e5bc..c350d79f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -42,6 +42,7 @@ import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdRev; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdRevSubTotals; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdSubmission; +import ca.bc.gov.chefs.etl.parser.FileProperties; import ca.bc.gov.chefs.etl.parser.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; import ca.bc.gov.chefs.etl.util.FileUtil; @@ -60,7 +61,10 @@ public void process(Exchange exchange) throws Exception { List parsedLtycYtdSubmissions = parseYtdQuaterlyRequest(ltcYtdForms); List iModels = (List)(List) parsedLtycYtdSubmissions; Map>> map = CSVUtil.provider(iModels); - FileUtil.writeToCSVFile(map); + FileProperties fileProperties = new FileProperties(); + fileProperties.setUnEncDirForThisExchange(Constants.UNENC_FILE_PATH.get(Constants.LTC_YTD_SUBMISSION)); + fileProperties.setEncDirForThisExchange(Constants.ENC_FILE_PATH.get(Constants.LTC_YTD_SUBMISSION)); + FileUtil.writeToCSVFile(map,fileProperties); } @@ -2234,7 +2238,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setEndDate(maxOcp.getEndDate1()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); - numOfBeds.setQuarterInventory(maxOcp.getQuarter()); + numOfBeds.setQuarterInventory(root.getQuarter()); // notes missing if (maxOcp.getBedType1()!=null && maxOcp.getBedType1().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); @@ -2292,7 +2296,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occInRateQ1.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); occInRateQ1.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); occInRateQ1.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); - occInRateQ1.setPercentOcc(root.getNoteInScopeQ1()); + occInRateQ1.setPercentOcc(root.getOccupiedPercentageInScopeQ1()); occInRateQ1.setOccRateNotes(root.getNoteInScopeQ1()); occInRateQ1.setOccRateQuarter("Q1"); @@ -2302,9 +2306,9 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occOutRateQ1.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); occOutRateQ1.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); occOutRateQ1.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); - occOutRateQ1.setPercentOcc(root.getNoteInScopeQ1()); + occOutRateQ1.setPercentOcc(root.getOccupiedPercentageOutScopeQ1()); occOutRateQ1.setOccRateQuarter("Q1"); - occInRateQ1.setOccRateNotes(root.getOpEx_note13()); + //occInRateQ1.setOccRateNotes(root.getOpEx_note13()); LtcBedYtdOccupancyRate occRateQ1 = new LtcBedYtdOccupancyRate(); occRateQ1.setConfirmationID(root.getForm().getConfirmationId()); @@ -2312,9 +2316,9 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occRateQ1.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); occRateQ1.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); occRateQ1.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); - occRateQ1.setPercentOcc(root.getNoteInScopeQ1()); + occRateQ1.setPercentOcc(root.getOccupiedPercentagePrivateQ1()); occRateQ1.setOccRateQuarter("Q1"); - occInRateQ1.setOccRateNotes(root.getNoteInScopeQ1()); + // occInRateQ1.setOccRateNotes(root.getNoteInScopeQ1()); LtcBedYtdOccupancyRateTotals q1RateTotals = new LtcBedYtdOccupancyRateTotals(); q1RateTotals.setConfirmationID(root.getForm().getConfirmationId()); @@ -2392,10 +2396,11 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcBedYtdOccupancyRate occInRateQ2 = new LtcBedYtdOccupancyRate(); occInRateQ2.setConfirmationID(root.getForm().getConfirmationId()); occInRateQ2.setOccRateBedTypes("In-Scope 3.36 HPRD Publicly Funded Beds"); - occInRateQ2.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); - occInRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); - occInRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); - occInRateQ2.setPercentOcc(root.getNoteInScopeQ1()); + occInRateQ2.setPlanMaxOccDays(root.getyTDPlannedInScopeQ2()); + occInRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ2()); + occInRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ2()); + occInRateQ2.setPercentOcc(root.getOccupiedPercentageInScopeQ2()); + occInRateQ2.setOccRateNotes(root.getNoteInScopeQ2()); occInRateQ2.setOccRateQuarter("Q2"); LtcBedYtdOccupancyRate occOutRateQ2 = new LtcBedYtdOccupancyRate(); @@ -2404,7 +2409,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occOutRateQ2.setPlanMaxOccDays(root.getyTDPlannedInScopeQ2()); occOutRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ2()); occOutRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ2()); - occOutRateQ2.setPercentOcc(root.getNoteInScopeQ2()); + occOutRateQ2.setPercentOcc(root.getOccupiedPercentageOutScopeQ2()); occOutRateQ2.setOccRateQuarter("Q2"); LtcBedYtdOccupancyRate occRateQ2 = new LtcBedYtdOccupancyRate(); @@ -2413,7 +2418,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occRateQ2.setPlanMaxOccDays(root.getyTDPlannedInScopeQ2()); occRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ2()); occRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ2()); - occRateQ2.setPercentOcc(root.getNoteInScopeQ2()); + occRateQ2.setPercentOcc(root.getOccupiedPercentagePrivateQ2()); occRateQ2.setOccRateQuarter("Q2"); LtcBedYtdOccupancyRateTotals q2RateTotals = new LtcBedYtdOccupancyRateTotals(); @@ -2438,7 +2443,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setEndDate(maxOcp.getEndDate3()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); - numOfBeds.setQuarterInventory(maxOcp.getQuarter()); + numOfBeds.setQuarterInventory(root.getQuarter()); // notes missing if (maxOcp.getBedType3()!=null && maxOcp.getBedType3().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); @@ -2489,11 +2494,11 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcBedYtdOccupancyRate occInRateQ3 = new LtcBedYtdOccupancyRate(); occInRateQ3.setConfirmationID(root.getForm().getConfirmationId()); occInRateQ3.setOccRateBedTypes("In-Scope 3.36 HPRD Publicly Funded Beds"); - occInRateQ3.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); - occInRateQ3.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); - occInRateQ3.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); - occInRateQ3.setPercentOcc(root.getNoteInScopeQ1()); - + occInRateQ3.setPlanMaxOccDays(root.getyTDPlannedInScopeQ3()); + occInRateQ3.setYtdMaxOccDays(root.getyTDMaxInScopeQ3()); + occInRateQ3.setYtdOccDays(root.getyTDOccupiedInScopeQ3()); + occInRateQ3.setOccRateNotes(root.getNoteInScopeQ3()); + occInRateQ3.setPercentOcc(root.getOccupiedPercentageInScopeQ3()); LtcBedYtdOccupancyRate occOutRateQ3 = new LtcBedYtdOccupancyRate(); occOutRateQ3.setConfirmationID(root.getForm().getConfirmationId()); @@ -2501,7 +2506,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occOutRateQ3.setPlanMaxOccDays(root.getyTDPlannedInScopeQ3()); occOutRateQ3.setYtdMaxOccDays(root.getyTDMaxInScopeQ3()); occOutRateQ3.setYtdOccDays(root.getyTDOccupiedInScopeQ3()); - occOutRateQ3.setPercentOcc(root.getNoteInScopeQ3()); + occOutRateQ3.setPercentOcc(root.getOccupiedPercentageOutScopeQ3()); LtcBedYtdOccupancyRate occRateQ3 = new LtcBedYtdOccupancyRate(); occRateQ3.setConfirmationID(root.getForm().getConfirmationId()); @@ -2509,7 +2514,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occRateQ3.setPlanMaxOccDays(root.getyTDPlannedInScopeQ3()); occRateQ3.setYtdMaxOccDays(root.getyTDMaxInScopeQ3()); occRateQ3.setYtdOccDays(root.getyTDOccupiedInScopeQ3()); - occRateQ3.setPercentOcc(root.getNoteInScopeQ3()); + occRateQ3.setPercentOcc(root.getOccupiedPercentagePrivateQ3()); LtcBedYtdOccupancyRateTotals q3RateTotals = new LtcBedYtdOccupancyRateTotals(); q3RateTotals.setConfirmationID(root.getForm().getConfirmationId()); @@ -2531,7 +2536,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT numOfBeds.setEndDate(maxOcp.getEndDate4()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); - numOfBeds.setQuarterInventory(maxOcp.getQuarter()); + numOfBeds.setQuarterInventory(root.getQuarter()); // notes missing if (maxOcp.getBedType4()!=null && maxOcp.getBedType4().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); @@ -2586,10 +2591,11 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcBedYtdOccupancyRate occInRateQ4 = new LtcBedYtdOccupancyRate(); occInRateQ4.setConfirmationID(root.getForm().getConfirmationId()); occInRateQ4.setOccRateBedTypes("In-Scope 3.36 HPRD Publicly Funded Beds"); - occInRateQ4.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); - occInRateQ4.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); - occInRateQ4.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); - occInRateQ4.setPercentOcc(root.getNoteInScopeQ1()); + occInRateQ4.setPlanMaxOccDays(root.getyTDPlannedInScopeQ4()); + occInRateQ4.setYtdMaxOccDays(root.getyTDMaxInScopeQ4()); + occInRateQ4.setYtdOccDays(root.getyTDOccupiedInScopeQ4()); + occInRateQ4.setOccRateNotes(root.getNoteInScopeQ4()); + occInRateQ4.setPercentOcc(root.getOccupiedPercentageInScopeQ4()); LtcBedYtdOccupancyRate occOutRateQ4 = new LtcBedYtdOccupancyRate(); occOutRateQ4.setConfirmationID(root.getForm().getConfirmationId()); @@ -2597,7 +2603,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occOutRateQ4.setPlanMaxOccDays(root.getyTDPlannedInScopeQ4()); occOutRateQ4.setYtdMaxOccDays(root.getyTDMaxInScopeQ4()); occOutRateQ4.setYtdOccDays(root.getyTDOccupiedInScopeQ4()); - occOutRateQ4.setPercentOcc(root.getNoteInScopeQ4()); + occOutRateQ4.setPercentOcc(root.getOccupiedPercentageOutScopeQ4()); LtcBedYtdOccupancyRate occRateQ4 = new LtcBedYtdOccupancyRate(); occRateQ4.setConfirmationID(root.getForm().getConfirmationId()); @@ -2605,7 +2611,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT occRateQ4.setPlanMaxOccDays(root.getyTDPlannedInScopeQ4()); occRateQ4.setYtdMaxOccDays(root.getyTDMaxInScopeQ4()); occRateQ4.setYtdOccDays(root.getyTDOccupiedInScopeQ4()); - occRateQ4.setPercentOcc(root.getNoteInScopeQ4()); + occRateQ4.setPercentOcc(root.getOccupiedPercentagePrivateQ4()); LtcBedYtdOccupancyRateTotals q4RateTotals = new LtcBedYtdOccupancyRateTotals(); q4RateTotals.setConfirmationID(root.getForm().getConfirmationId()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/FileProperties.java b/src/main/java/ca/bc/gov/chefs/etl/parser/FileProperties.java new file mode 100644 index 00000000..5168eff9 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/parser/FileProperties.java @@ -0,0 +1,29 @@ +package ca.bc.gov.chefs.etl.parser; + + +public class FileProperties { + + private String unEncDirForThisExchange; + private String encDirForThisExchange; + + + public String getUnEncDirForThisExchange() { + return unEncDirForThisExchange; + } + + public void setUnEncDirForThisExchange(String unEncDirForThisExchange) { + this.unEncDirForThisExchange = unEncDirForThisExchange; + } + + public String getEncDirForThisExchange() { + return encDirForThisExchange; + } + + public void setEncDirForThisExchange(String encDirForThisExchange) { + this.encDirForThisExchange = encDirForThisExchange; + } + + + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java index ecc56120..9e15596a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java @@ -1,6 +1,5 @@ package ca.bc.gov.chefs.etl.util; -import java.time.LocalDate; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; @@ -10,51 +9,12 @@ import java.util.Map; import java.util.Queue; -import ca.bc.gov.chefs.etl.forms.testform.LoginCredentials; -import ca.bc.gov.chefs.etl.forms.testform.PersonDetails; -import ca.bc.gov.chefs.etl.forms.testform.TestModel; import ca.bc.gov.chefs.etl.parser.IModel; public class CSVUtil { public static void main(String[] args) { - List ll = new ArrayList<>(); - TestModel testModel = new TestModel(); - LoginCredentials loginCredentials = new LoginCredentials(); - PersonDetails personDetails = new PersonDetails(); - - loginCredentials.setUsername("prit27"); - loginCredentials.setPassword("prit9867"); - - personDetails.setFirstname("Prit"); - personDetails.setLastname("Thakkar"); - personDetails.setEducation("Dalhousie University"); - personDetails.setBirthPlace("Ahmedabad India"); - - testModel.setLoginCredentials(loginCredentials); - testModel.setPersonDetails(personDetails); - - TestModel testModel2 = new TestModel(); - LoginCredentials loginCredentials2 = new LoginCredentials(); - PersonDetails personDetails2 = new PersonDetails(); - - loginCredentials2.setUsername("john98"); - loginCredentials2.setPassword("hiiamjohn"); - - personDetails2.setFirstname("John"); - personDetails2.setLastname("Wohnms"); - personDetails2.setEducation("University of Victoria"); - personDetails2.setBirthPlace("Vancouver BC"); - - testModel2.setLoginCredentials(loginCredentials2); - testModel2.setPersonDetails(personDetails2); - - ll.add(testModel); - ll.add(testModel2); - Map>> map = provider(ll); - System.out.println(map.toString()); - FileUtil.writeToCSVFile(map); - } + } public static Map>> provider(List items) { Map>> map = new HashMap<>(); @@ -78,11 +38,6 @@ public static Map>> provider(List items) { } return map; } - - public static String generateFileName(String fileType) { - DateTimeFormatter formatter = DateTimeFormatter.BASIC_ISO_DATE; - return fileType.concat(LocalDate.now().format(formatter)).concat(".csv"); - } public static String getFormattedDate(String date) { try { diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index 1d4c7b6e..68282ed9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -2,6 +2,7 @@ //import org.apache.commons.io.IOUtils; import org.bouncycastle.bcpg.ArmoredOutputStream; + import org.bouncycastle.bcpg.CompressionAlgorithmTags; import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; import org.bouncycastle.jce.provider.BouncyCastleProvider; @@ -17,6 +18,8 @@ import org.supercsv.prefs.CsvPreference; import org.supercsv.quote.AlwaysQuoteMode; +import ca.bc.gov.chefs.etl.parser.FileProperties; + import static ca.bc.gov.chefs.etl.constant.Constants.HEADERS; import java.io.BufferedInputStream; @@ -28,6 +31,8 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Paths; import java.security.SecureRandom; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -133,10 +138,10 @@ private void compressFileG(String sourceFilePath, String destinationFilePath) { } } - public static void writeToCSVFile(Map>> map) { + public static void writeToCSVFile(Map>> map, FileProperties fileProperties) { ICsvListWriter listWriter = null; for (Map.Entry>> entry : map.entrySet()) { - String fileName = generateFileName(entry.getKey()); + String fileName = generateFileName(entry.getKey(),fileProperties); String[] headers = HEADERS.get(entry.getKey()); logger.info("--------Generating CSV File---------------{}---------------", fileName); try { @@ -164,8 +169,17 @@ public static void writeToCSVFile(Map>> map) { } - public static String generateFileName(String fileType) { + public static String generateFileName(String fileType,FileProperties fileProperties) { + String directoryForThisExchange = fileProperties.getUnEncDirForThisExchange(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMMddHHmmss"); - return fileType.toLowerCase()+"_".concat(LocalDateTime.now().format(formatter)).concat(".txt"); + String dateTime = LocalDateTime.now().format(formatter); + String directoryPath = directoryForThisExchange.concat(File.separator).concat(dateTime).concat(File.separator); + try { + Files.createDirectories(Paths.get(directoryPath)); + } catch (IOException e) { + logger.error("File Write Exception: "+e.getMessage()); + e.printStackTrace(); + } + return directoryPath+fileType.toLowerCase()+"_".concat(LocalDateTime.now().format(formatter)).concat(".txt"); } } From c2cecc9829912fa9d49c14a0c84ebfd9c3d3d9ba Mon Sep 17 00:00:00 2001 From: prit-cgi <118858594+prit-cgi@users.noreply.github.com> Date: Mon, 13 Mar 2023 11:39:31 -0400 Subject: [PATCH 016/183] Update application.properties --- src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b531d3b3..94387da7 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ # properties used in route hostname = localhost -port = 8080 +port = 8081 server-socket=5555 socket-read-sleep-time=100 max-socket-read-tries=100 @@ -21,4 +21,4 @@ ltc.staffing.username=16ce36ca-9b4b-4ec6-bb75-96c2e1f258bb ltc.staffing.password=ef31830d-e0f5-4eb9-b4e1-7900a3fcd2ae ltc.ytd.username=7eb3c107-5adb-435a-adbf-b8683a56ecc0 -ltc.ytd.password=65fdc5e3-4232-42bc-bfe3-7a0a51eeacfa \ No newline at end of file +ltc.ytd.password=65fdc5e3-4232-42bc-bfe3-7a0a51eeacfa From 42adfbaa8c09d363b9d5d066e612bab928e1dae4 Mon Sep 17 00:00:00 2001 From: prit-cgi Date: Tue, 14 Mar 2023 10:57:38 -0400 Subject: [PATCH 017/183] added flag file generation, error and success responses. --- .gitignore | 2 + .../gov/chefs/etl/core/routes/BaseRoute.java | 33 +++++++++++++++ .../gov/chefs/etl/core/routes/HelloRoute.java | 6 +++ .../etl/forms/aims/route/AIMSFormRoute.java | 1 + .../FacilityInfoFormApiResponseProcessor.java | 6 ++- .../ltc/facility/route/FacilityFormRoute.java | 5 ++- .../quaterly/route/LtcQuaterlyYtdRoute.java | 1 + .../gov/chefs/etl/parser/ErrorResponse.java | 28 +++++++++++++ .../gov/chefs/etl/parser/FileProperties.java | 10 ++++- .../gov/chefs/etl/parser/SuccessResponse.java | 42 +++++++++++++++++++ .../ca/bc/gov/chefs/etl/util/FileUtil.java | 35 ++++++++++++---- src/main/resources/application.properties | 2 +- 12 files changed, 158 insertions(+), 13 deletions(-) create mode 100644 src/main/java/ca/bc/gov/chefs/etl/parser/ErrorResponse.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/parser/SuccessResponse.java diff --git a/.gitignore b/.gitignore index f33f955b..673f0917 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ logs/* keys/* mvnw mvnw.cmd +unencrypted/** +encrypted/** \ No newline at end of file diff --git a/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java b/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java index be35f74c..0297088f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java @@ -1,15 +1,48 @@ package ca.bc.gov.chefs.etl.core.routes; import java.util.HashMap; + import java.util.Map; import java.util.Properties; +import org.apache.camel.Exchange; +import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; +import org.apache.http.HttpStatus; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.fasterxml.jackson.databind.ObjectMapper; +import ca.bc.gov.chefs.etl.parser.ErrorResponse; import ca.bc.gov.chefs.etl.util.PropertiesUtil; public abstract class BaseRoute extends RouteBuilder { static Properties properties = PropertiesUtil.loadProperties(); protected Map sharedData = new HashMap(); + private static final Logger logger = LoggerFactory.getLogger(BaseRoute.class); + @Override + public void configure() throws Exception { + onException(Exception.class) + .handled(true) + .process(new Processor() { + + @Override + public void process(Exchange exchange) throws Exception { + logger.error("Error in the process"); + ObjectMapper mapper = new ObjectMapper(); + Exception exception = (Exception) exchange.getProperty(Exchange.EXCEPTION_CAUGHT); + ErrorResponse errorResponse = new ErrorResponse(); + errorResponse.setMessage(exception.getLocalizedMessage()); + errorResponse.setStatusCode(HttpStatus.SC_INTERNAL_SERVER_ERROR); + errorResponse.setType("Error"); + + exchange.getIn().setBody(mapper.writeValueAsString(errorResponse)); + } + + }) + .setHeader("Content-Type",constant("application/json")) + .end(); + } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/core/routes/HelloRoute.java b/src/main/java/ca/bc/gov/chefs/etl/core/routes/HelloRoute.java index d615050c..58b146e7 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/core/routes/HelloRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/core/routes/HelloRoute.java @@ -6,12 +6,18 @@ public class HelloRoute extends BaseRoute{ @Override public void configure() throws Exception { + super.configure(); // TODO Auto-generated method stub from("jetty:http://{{hostname}}:{{port}}/hello").routeId("hello") .log("CHEFS-ETL received a request for health check") .setHeader(Exchange.HTTP_RESPONSE_CODE,constant(200)) .setBody(constant("HTTP 200 OK")) .end(); + + from("jetty:http://{{hostname}}:{{port}}/error").routeId("error") + .log("CHEFS-ETL received a request for Error check") + .throwException(new Exception("Exception Raised")) + .end(); } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java index 5273bdd8..6c605d08 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/route/AIMSFormRoute.java @@ -10,6 +10,7 @@ public class AIMSFormRoute extends BaseRoute { private static final Logger logger = LoggerFactory.getLogger(AIMSFormRoute.class); @Override public void configure() throws Exception { + super.configure(); logger.info("Loaded AIMS Form Route"); /** diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java index cd2fc27f..8829df64 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java @@ -18,6 +18,7 @@ import ca.bc.gov.chefs.etl.forms.ltc.facility.model.Preparer; import ca.bc.gov.chefs.etl.parser.FileProperties; import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.parser.SuccessResponse; import ca.bc.gov.chefs.etl.util.CSVUtil; import ca.bc.gov.chefs.etl.util.FileUtil; @@ -40,7 +41,10 @@ public void process(Exchange exchange) throws Exception { fileProperties.setUnEncDirForThisExchange(Constants.UNENC_FILE_PATH.get(Constants.LTC_FACILITY)); fileProperties.setEncDirForThisExchange(Constants.ENC_FILE_PATH.get(Constants.LTC_FACILITY)); - FileUtil.writeToCSVFile(map,fileProperties); + List filesGenerated = FileUtil.writeToCSVFile(map,fileProperties); + SuccessResponse successResponse = new SuccessResponse(); + successResponse.setFiles(filesGenerated); + exchange.getIn().setBody(mapper.writeValueAsString(successResponse)); } private List parseFacilityInfo(List facilities) { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java index 77936bf7..1bdfcbbf 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/route/FacilityFormRoute.java @@ -16,6 +16,7 @@ public class FacilityFormRoute extends BaseRoute { @Override public void configure() throws Exception { logger.info("Loaded Facility Info Form Route"); + super.configure(); /** * receive JSON payload, parse and set to make an API call @@ -34,7 +35,9 @@ public void configure() throws Exception { .toD("${header.RequestUri}") .log("This is the status code from the response: ${header.CamelHttpResponseCode}") .log("Trying to convert the received body OK").convertBodyTo(String.class) - .process(new FacilityInfoFormApiResponseProcessor()).end(); + .process(new FacilityInfoFormApiResponseProcessor()) + .setHeader("Content-Type",constant("application/json")) + .end(); // database phase diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java index 0e6cf774..da301b7f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java @@ -14,6 +14,7 @@ public class LtcQuaterlyYtdRoute extends BaseRoute { private static final Logger logger = LoggerFactory.getLogger(AIMSFormRoute.class); @Override public void configure() throws Exception { + super.configure(); logger.info("Loaded LTC QYTD Form Route"); /** diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/ErrorResponse.java b/src/main/java/ca/bc/gov/chefs/etl/parser/ErrorResponse.java new file mode 100644 index 00000000..60ade7fb --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/parser/ErrorResponse.java @@ -0,0 +1,28 @@ +package ca.bc.gov.chefs.etl.parser; + +public class ErrorResponse { + + private String type; + private Integer statusCode; + private String message; + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public Integer getStatusCode() { + return statusCode; + } + public void setStatusCode(Integer statusCode) { + this.statusCode = statusCode; + } + public String getMessage() { + return message; + } + public void setMessage(String message) { + this.message = message; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/FileProperties.java b/src/main/java/ca/bc/gov/chefs/etl/parser/FileProperties.java index 5168eff9..08c87e26 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/parser/FileProperties.java +++ b/src/main/java/ca/bc/gov/chefs/etl/parser/FileProperties.java @@ -5,7 +5,7 @@ public class FileProperties { private String unEncDirForThisExchange; private String encDirForThisExchange; - + private String extension = ".txt"; public String getUnEncDirForThisExchange() { return unEncDirForThisExchange; @@ -22,6 +22,14 @@ public String getEncDirForThisExchange() { public void setEncDirForThisExchange(String encDirForThisExchange) { this.encDirForThisExchange = encDirForThisExchange; } + + public String getExtension() { + return extension; + } + + public void setExtension(String extension) { + this.extension = extension; + } diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/SuccessResponse.java b/src/main/java/ca/bc/gov/chefs/etl/parser/SuccessResponse.java new file mode 100644 index 00000000..2f0e6959 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/parser/SuccessResponse.java @@ -0,0 +1,42 @@ +package ca.bc.gov.chefs.etl.parser; + +import java.util.List; + +import org.apache.http.HttpStatus; + +public class SuccessResponse { + + private String type = "success"; + private Integer statusCode = HttpStatus.SC_OK; + private List files; + + + public String getType() { + return type; + } + public void setType(String type) { + this.type = type; + } + public Integer getStatusCode() { + return statusCode; + } + public void setStatusCode(Integer statusCode) { + this.statusCode = statusCode; + } + public String getMessage() { + if(files.isEmpty()) { + return "Empty response from CHEFS, Hence not generating any files"; + } + return "Files Generated"; + } + public void setMessage(String message) { + } + public List getFiles() { + return files; + } + public void setFiles(List files) { + this.files = files; + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index 68282ed9..37e59052 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -36,6 +36,7 @@ import java.security.SecureRandom; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.zip.GZIPOutputStream; @@ -138,21 +139,25 @@ private void compressFileG(String sourceFilePath, String destinationFilePath) { } } - public static void writeToCSVFile(Map>> map, FileProperties fileProperties) { + public static List writeToCSVFile(Map>> map, FileProperties fileProperties) throws IOException { ICsvListWriter listWriter = null; + List filesGenerated = new ArrayList(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMMddHHmmss"); + String dateTime = LocalDateTime.now().format(formatter); + for (Map.Entry>> entry : map.entrySet()) { - String fileName = generateFileName(entry.getKey(),fileProperties); + String fileName = generateFileName(entry.getKey(),dateTime,fileProperties); String[] headers = HEADERS.get(entry.getKey()); logger.info("--------Generating CSV File---------------{}---------------", fileName); try { listWriter = new CsvListWriter(new FileWriter(fileName), ALWAYS_USE_QUOTE); listWriter.writeHeader(headers); - + for (List items : entry.getValue()) { listWriter.write(items); } - + filesGenerated.add(fileName.substring(fileName.lastIndexOf(File.separator)+1)); } catch (IOException ex) { ex.printStackTrace(); } finally { @@ -166,13 +171,22 @@ public static void writeToCSVFile(Map>> map, File } } - + fileProperties.setExtension(".flag"); + String flagFileName = generateFileName("medis-etl", dateTime, fileProperties); + File file = new File(flagFileName); + FileWriter fileWriter = new FileWriter(file); + logger.info("--------Generating Flag File---------------{}---------------", flagFileName); + for(String fileName : filesGenerated) { + fileWriter.append(fileName); + fileWriter.append("\n"); + } + filesGenerated.add(flagFileName.substring(flagFileName.lastIndexOf(File.separator)+1)); + fileWriter.close(); + return filesGenerated; } - public static String generateFileName(String fileType,FileProperties fileProperties) { + public static String generateFileName(String fileType,String dateTime,FileProperties fileProperties) { String directoryForThisExchange = fileProperties.getUnEncDirForThisExchange(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMMddHHmmss"); - String dateTime = LocalDateTime.now().format(formatter); String directoryPath = directoryForThisExchange.concat(File.separator).concat(dateTime).concat(File.separator); try { Files.createDirectories(Paths.get(directoryPath)); @@ -180,6 +194,9 @@ public static String generateFileName(String fileType,FileProperties filePropert logger.error("File Write Exception: "+e.getMessage()); e.printStackTrace(); } - return directoryPath+fileType.toLowerCase()+"_".concat(LocalDateTime.now().format(formatter)).concat(".txt"); + if(fileProperties.getExtension().equals(".flag")) { + return directoryPath+fileType.toLowerCase().concat(fileProperties.getExtension()); + } + return directoryPath+fileType.toLowerCase()+"_".concat(dateTime).concat(fileProperties.getExtension()); } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b531d3b3..253c4709 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ # properties used in route hostname = localhost -port = 8080 +port = 8081 server-socket=5555 socket-read-sleep-time=100 max-socket-read-tries=100 From 8dee7335b8fa91a44de3f64458f75134429d8797 Mon Sep 17 00:00:00 2001 From: prit-cgi Date: Tue, 14 Mar 2023 21:22:19 -0400 Subject: [PATCH 018/183] refactored code --- .../bc/gov/chefs/etl/ChefsETLMainMethod.java | 6 +- .../bc/gov/chefs/etl/constant/Constants.java | 2 +- .../model}/ChefsRequestPayload.java | 2 +- .../{parser => core/model}/ErrorResponse.java | 2 +- .../etl/{parser => core/model}/FileModel.java | 2 +- .../model}/FileProperties.java | 2 +- .../etl/{parser => core/model}/IModel.java | 2 +- .../model}/SuccessResponse.java | 2 +- .../gov/chefs/etl/core/routes/BaseRoute.java | 2 +- .../chefs/etl/core/routes/TestFormRoute.java | 46 -------- .../etl/forms/aims/model/AimsMisuse.java | 2 +- .../etl/forms/aims/model/AimsReferral.java | 2 +- .../etl/forms/aims/model/MainEntity.java | 2 +- .../aims/parser/AIMSFormPayloadExtractor.java | 38 ------- .../aims/processor/AIMSFormApiProcessor.java | 2 +- .../AIMSFormApiResponseProcessor.java | 4 +- .../ltc/facility/json/OperatorAddress.java | 2 +- .../forms/ltc/facility/json/Properties.java | 2 +- .../etl/forms/ltc/facility/json/Root.java | 2 +- .../forms/ltc/facility/model/Approver.java | 2 +- .../facility/model/FacilityInformation.java | 2 +- .../forms/ltc/facility/model/Preparer.java | 2 +- .../FacilityInfoFormApiProcessor.java | 2 +- .../FacilityInfoFormApiResponseProcessor.java | 6 +- .../quaterly/model/LtcBedYtdMaxOccupancy.java | 2 +- .../model/LtcBedYtdMaxOccupancyTotals.java | 2 +- .../model/LtcBedYtdOccupancyRate.java | 2 +- .../model/LtcBedYtdOccupancyRateTotals.java | 2 +- .../quaterly/model/LtcBedYtdOccupiedDays.java | 2 +- .../model/LtcBedYtdOccupiedDaysTotals.java | 2 +- .../ltc/quaterly/model/LtcYtdCompAddPos.java | 2 +- .../quaterly/model/LtcYtdCompBenefits.java | 2 +- .../ltc/quaterly/model/LtcYtdCompHrs.java | 2 +- .../model/LtcYtdCompHrsSubtotals.java | 2 +- .../quaterly/model/LtcYtdCompHrsTotals.java | 2 +- .../ltc/quaterly/model/LtcYtdCompSal.java | 2 +- .../model/LtcYtdCompSalSubtotals.java | 2 +- .../quaterly/model/LtcYtdCompSalTotals.java | 2 +- .../quaterly/model/LtcYtdDirectCareCost.java | 2 +- .../model/LtcYtdDirectCareCostSubtotals.java | 2 +- .../quaterly/model/LtcYtdDirectCareHrs.java | 2 +- .../model/LtcYtdDirectCareHrsSubTotals.java | 2 +- .../forms/ltc/quaterly/model/LtcYtdExp.java | 2 +- .../quaterly/model/LtcYtdExpSubTotals.java | 2 +- .../forms/ltc/quaterly/model/LtcYtdRev.java | 2 +- .../quaterly/model/LtcYtdRevSubTotals.java | 2 +- .../ltc/quaterly/model/LtcYtdSubmission.java | 16 ++- .../processor/LtcQuaterlyYtdApiProcessor.java | 2 +- .../LtcQuaterlyYtdApiResponseProcessor.java | 24 +++-- .../forms/ltc/staffing/LTCStaffPlanPerf.java | 2 +- .../ltc/staffing/LTCStaffPlanPosType.java | 2 +- .../forms/ltc/staffing/LTCStaffingAddPos.java | 2 +- .../forms/ltc/staffing/LTCStaffingHrs.java | 2 +- .../etl/forms/testform/LoginCredentials.java | 74 ------------- .../etl/forms/testform/PersonDetails.java | 95 ---------------- .../forms/testform/TestFormApiProcessor.java | 25 ----- .../TestFormApiResponseProcessor.java | 35 ------ .../etl/forms/testform/TestFormProcessor.java | 37 ------- .../chefs/etl/forms/testform/TestModel.java | 102 ------------------ .../etl/parser/TestFormPayloadExtractor.java | 41 ------- .../TestFormResponsePayloadExtractor.java | 29 ----- .../ca/bc/gov/chefs/etl/util/CSVUtil.java | 2 +- .../ca/bc/gov/chefs/etl/util/CommonUtils.java | 1 + .../ca/bc/gov/chefs/etl/util/FileUtil.java | 2 +- src/main/resources/application.properties | 2 +- 65 files changed, 83 insertions(+), 594 deletions(-) rename src/main/java/ca/bc/gov/chefs/etl/{parser => core/model}/ChefsRequestPayload.java (93%) rename src/main/java/ca/bc/gov/chefs/etl/{parser => core/model}/ErrorResponse.java (92%) rename src/main/java/ca/bc/gov/chefs/etl/{parser => core/model}/FileModel.java (92%) rename src/main/java/ca/bc/gov/chefs/etl/{parser => core/model}/FileProperties.java (94%) rename src/main/java/ca/bc/gov/chefs/etl/{parser => core/model}/IModel.java (79%) rename src/main/java/ca/bc/gov/chefs/etl/{parser => core/model}/SuccessResponse.java (95%) delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/core/routes/TestFormRoute.java delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/aims/parser/AIMSFormPayloadExtractor.java delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/LoginCredentials.java delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/PersonDetails.java delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiProcessor.java delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiResponseProcessor.java delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormProcessor.java delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestModel.java delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/parser/TestFormPayloadExtractor.java delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/parser/TestFormResponsePayloadExtractor.java diff --git a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java index 24aee4ac..7c828c42 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java +++ b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java @@ -1,6 +1,7 @@ package ca.bc.gov.chefs.etl; import java.io.File; + import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; @@ -8,7 +9,6 @@ import org.apache.camel.main.Main; import ca.bc.gov.chefs.etl.core.routes.HelloRoute; -import ca.bc.gov.chefs.etl.core.routes.TestFormRoute; import ca.bc.gov.chefs.etl.forms.ltc.facility.route.FacilityFormRoute; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.route.LtcQuaterlyYtdRoute; import ca.bc.gov.chefs.etl.forms.aims.route.AIMSFormRoute; @@ -32,17 +32,13 @@ public class ChefsETLMainMethod { Files.createDirectories(Paths.get("."+File.separator +"encrypted","ltc_quarterly_ytd")); Files.createDirectories(Paths.get("."+File.separator+"unencrypted","ltc_quarterly_ytd")); } catch (IOException e) { - // TODO Auto-generated catch block e.printStackTrace(); } - - } public static void main(String... args) throws Exception { Main main = new Main(); - main.configure().addRoutesBuilder(TestFormRoute.class); main.configure().addRoutesBuilder(HelloRoute.class); main.configure().addRoutesBuilder(AIMSFormRoute.class); main.configure().addRoutesBuilder(FacilityFormRoute.class); diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 3e04717d..be53f897 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -149,7 +149,7 @@ public class Constants { HEADERS.put(LTC_YTD_SUBMISSION, new String[] { "CONFIRMATION_ID", "IS_DELETED", "SUBMISSION_DATE", "SUBMITTED_BY", "FACILITY_SUB_ID", - "PERIOD", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD" }); + "PERIOD","SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD" }); HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS, new String[] { "CONFIRMATION_ID", "OCC_QUARTER", "OCC_MONTH", "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", "OCC_DAYS_YTD_PRIVATE","OCC_DAYS_YTD_TOTAL_DAYS" }); diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/ChefsRequestPayload.java b/src/main/java/ca/bc/gov/chefs/etl/core/model/ChefsRequestPayload.java similarity index 93% rename from src/main/java/ca/bc/gov/chefs/etl/parser/ChefsRequestPayload.java rename to src/main/java/ca/bc/gov/chefs/etl/core/model/ChefsRequestPayload.java index 2cac0733..787cc471 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/parser/ChefsRequestPayload.java +++ b/src/main/java/ca/bc/gov/chefs/etl/core/model/ChefsRequestPayload.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.parser; +package ca.bc.gov.chefs.etl.core.model; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/ErrorResponse.java b/src/main/java/ca/bc/gov/chefs/etl/core/model/ErrorResponse.java similarity index 92% rename from src/main/java/ca/bc/gov/chefs/etl/parser/ErrorResponse.java rename to src/main/java/ca/bc/gov/chefs/etl/core/model/ErrorResponse.java index 60ade7fb..8e9183a0 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/parser/ErrorResponse.java +++ b/src/main/java/ca/bc/gov/chefs/etl/core/model/ErrorResponse.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.parser; +package ca.bc.gov.chefs.etl.core.model; public class ErrorResponse { diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/FileModel.java b/src/main/java/ca/bc/gov/chefs/etl/core/model/FileModel.java similarity index 92% rename from src/main/java/ca/bc/gov/chefs/etl/parser/FileModel.java rename to src/main/java/ca/bc/gov/chefs/etl/core/model/FileModel.java index 5ef1924a..be208901 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/parser/FileModel.java +++ b/src/main/java/ca/bc/gov/chefs/etl/core/model/FileModel.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.parser; +package ca.bc.gov.chefs.etl.core.model; public class FileModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/FileProperties.java b/src/main/java/ca/bc/gov/chefs/etl/core/model/FileProperties.java similarity index 94% rename from src/main/java/ca/bc/gov/chefs/etl/parser/FileProperties.java rename to src/main/java/ca/bc/gov/chefs/etl/core/model/FileProperties.java index 08c87e26..bd1cb78d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/parser/FileProperties.java +++ b/src/main/java/ca/bc/gov/chefs/etl/core/model/FileProperties.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.parser; +package ca.bc.gov.chefs.etl.core.model; public class FileProperties { diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/IModel.java b/src/main/java/ca/bc/gov/chefs/etl/core/model/IModel.java similarity index 79% rename from src/main/java/ca/bc/gov/chefs/etl/parser/IModel.java rename to src/main/java/ca/bc/gov/chefs/etl/core/model/IModel.java index b821251c..f45d3bc2 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/parser/IModel.java +++ b/src/main/java/ca/bc/gov/chefs/etl/core/model/IModel.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.parser; +package ca.bc.gov.chefs.etl.core.model; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/SuccessResponse.java b/src/main/java/ca/bc/gov/chefs/etl/core/model/SuccessResponse.java similarity index 95% rename from src/main/java/ca/bc/gov/chefs/etl/parser/SuccessResponse.java rename to src/main/java/ca/bc/gov/chefs/etl/core/model/SuccessResponse.java index 2f0e6959..1ea65c2f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/parser/SuccessResponse.java +++ b/src/main/java/ca/bc/gov/chefs/etl/core/model/SuccessResponse.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.parser; +package ca.bc.gov.chefs.etl.core.model; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java b/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java index 0297088f..aa6d7a99 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/core/routes/BaseRoute.java @@ -14,7 +14,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import ca.bc.gov.chefs.etl.parser.ErrorResponse; +import ca.bc.gov.chefs.etl.core.model.ErrorResponse; import ca.bc.gov.chefs.etl.util.PropertiesUtil; public abstract class BaseRoute extends RouteBuilder { diff --git a/src/main/java/ca/bc/gov/chefs/etl/core/routes/TestFormRoute.java b/src/main/java/ca/bc/gov/chefs/etl/core/routes/TestFormRoute.java deleted file mode 100644 index cfcbca9c..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/core/routes/TestFormRoute.java +++ /dev/null @@ -1,46 +0,0 @@ -package ca.bc.gov.chefs.etl.core.routes; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import ca.bc.gov.chefs.etl.forms.testform.TestFormApiProcessor; -import ca.bc.gov.chefs.etl.forms.testform.TestFormApiResponseProcessor; -import ca.bc.gov.chefs.etl.forms.testform.TestFormProcessor; -import ca.bc.gov.chefs.etl.parser.TestFormPayloadExtractor; - -public class TestFormRoute extends BaseRoute { - - private static final Logger logger = LoggerFactory.getLogger(TestFormRoute.class); - @Override - public void configure() throws Exception { - logger.info("Loaded TestFormRoute"); - - /** - * receive JSON payload, parse and set to make an API call - * - * - */ - // trigger - from("jetty:http://{{hostname}}:{{port}}/test").routeId("test-form") - .log("CHEFS-ETL received a request for TestForm extraction").bean(TestFormPayloadExtractor.class) - .process(new TestFormProcessor()).to("direct:test").end(); - - from("direct:test").process(new TestFormApiProcessor()) - // to the http uri - .to("https://submit.digital.gov.bc.ca/app/api/v1/forms/07623d33-9f49-425a-b7d2-d849b3e0af5c/export?bridgeEndpoint=true&format=json") - .log("This is the status code from the response: ${header.CamelHttpResponseCode}") - .log("Trying to convert the received body OK") - .convertBodyTo(String.class) - .process(new TestFormApiResponseProcessor()) - .end(); - // database phase - from("jetty:http://{{hostname}}:{{port}}/testpgp").routeId("test-formpgp") - .log("CHEFS-ETL received a request for TestForm extraction").bean(TestFormPayloadExtractor.class) - .process(new TestFormProcessor()).to("direct:test").end(); - - - // file conversion - - } - -} \ No newline at end of file diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsMisuse.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsMisuse.java index 2d1312c2..4f9b6a18 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsMisuse.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsMisuse.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.util.Counter; public class AimsMisuse implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java index 940c23d6..a1065891 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java @@ -8,7 +8,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.util.Counter; public class AimsReferral implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java index 54c1918b..9b730b7b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java @@ -10,7 +10,7 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; //@JsonIgnoreProperties(ignoreUnknown = true) public class MainEntity implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/parser/AIMSFormPayloadExtractor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/parser/AIMSFormPayloadExtractor.java deleted file mode 100644 index c2d85d14..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/parser/AIMSFormPayloadExtractor.java +++ /dev/null @@ -1,38 +0,0 @@ -package ca.bc.gov.chefs.etl.forms.aims.parser; - -import java.util.Properties; - -import org.apache.camel.Exchange; -import org.apache.camel.Handler; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import ca.bc.gov.chefs.etl.parser.TestFormPayloadExtractor; -import ca.bc.gov.chefs.etl.util.PropertiesUtil; -import net.minidev.json.JSONObject; -import net.minidev.json.parser.JSONParser; -import net.minidev.json.parser.ParseException; - -public class AIMSFormPayloadExtractor { - private static final Logger logger = LoggerFactory.getLogger(TestFormPayloadExtractor.class); - - static Properties properties; - - private AIMSFormPayloadExtractor() { - } - - @Handler - public static void extractTestFormPayload(Exchange exchange, String testFormPayload) throws ParseException { - - try { - properties = PropertiesUtil.loadProperties(); - } catch (Exception e) { - - } - logger.info("Received payload data.. extracting now"); - logger.info("Received properties.. {}", properties.get("chefs.http.uri")); - JSONParser jsonParser = new JSONParser(JSONParser.DEFAULT_PERMISSIVE_MODE); - JSONObject testFormExtracted = (JSONObject) jsonParser.parse(testFormPayload); - exchange.getIn().setBody(testFormExtracted); - } -} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java index 37a153ce..97dc5630 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiProcessor.java @@ -6,7 +6,7 @@ import org.apache.camel.Processor; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.ChefsRequestPayload; +import ca.bc.gov.chefs.etl.core.model.ChefsRequestPayload; import ca.bc.gov.chefs.etl.util.AuthUtil; import ca.bc.gov.chefs.etl.util.JsonUtil; import ca.bc.gov.chefs.etl.util.PropertiesUtil; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java index f9c026a2..dea68e5c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java @@ -10,9 +10,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.core.model.FileProperties; +import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.forms.aims.model.MainEntity; -import ca.bc.gov.chefs.etl.parser.FileProperties; -import ca.bc.gov.chefs.etl.parser.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; import ca.bc.gov.chefs.etl.util.Counter; import ca.bc.gov.chefs.etl.util.FileUtil; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java index 70ca499b..ac6eb30b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; @JsonIgnoreProperties(ignoreUnknown=true) public class OperatorAddress implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Properties.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Properties.java index 1fd3bc26..a5bae4f8 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Properties.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Properties.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; @JsonIgnoreProperties(ignoreUnknown=true) public class Properties implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java index b0e56a66..b4fee288 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; @JsonIgnoreProperties(ignoreUnknown=true) public class Root implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java index ea7c9f26..add5b4cf 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class Approver implements IModel{ private String confirmationID; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java index 97ff7c1c..c1c80b05 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; public class FacilityInformation implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java index 278f23ce..2576d90e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class Preparer implements IModel{ private String confirmationID; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java index 73dbdda2..10c6ce57 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiProcessor.java @@ -7,7 +7,7 @@ import org.apache.camel.Processor; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.ChefsRequestPayload; +import ca.bc.gov.chefs.etl.core.model.ChefsRequestPayload; import ca.bc.gov.chefs.etl.util.AuthUtil; import ca.bc.gov.chefs.etl.util.JsonUtil; import ca.bc.gov.chefs.etl.util.PropertiesUtil; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java index 8829df64..bf648e88 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java @@ -12,13 +12,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.core.model.FileProperties; +import ca.bc.gov.chefs.etl.core.model.IModel; +import ca.bc.gov.chefs.etl.core.model.SuccessResponse; import ca.bc.gov.chefs.etl.forms.ltc.facility.json.Root; import ca.bc.gov.chefs.etl.forms.ltc.facility.model.Approver; import ca.bc.gov.chefs.etl.forms.ltc.facility.model.FacilityInformation; import ca.bc.gov.chefs.etl.forms.ltc.facility.model.Preparer; -import ca.bc.gov.chefs.etl.parser.FileProperties; -import ca.bc.gov.chefs.etl.parser.IModel; -import ca.bc.gov.chefs.etl.parser.SuccessResponse; import ca.bc.gov.chefs.etl.util.CSVUtil; import ca.bc.gov.chefs.etl.util.FileUtil; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java index a7e39168..473e0ffd 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; public class LtcBedYtdMaxOccupancy implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java index ceb1aaf5..836f1ca1 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcBedYtdMaxOccupancyTotals implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRate.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRate.java index e4b451d7..f81b40c1 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRate.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRate.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcBedYtdOccupancyRate implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRateTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRateTotals.java index fcd1f393..ff6733ac 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRateTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRateTotals.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcBedYtdOccupancyRateTotals implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java index 2f0cb49f..867d7db5 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcBedYtdOccupiedDays implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDaysTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDaysTotals.java index f2e030da..f8425327 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDaysTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDaysTotals.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcBedYtdOccupiedDaysTotals implements IModel { private String ConfirmationID; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java index 81809b46..32f9ce9d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdCompAddPos implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java index 78972088..45e207aa 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdCompBenefits implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java index e0f2194d..8c51a6e6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdCompHrs implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java index 1eeadd97..ef392350 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdCompHrsSubtotals implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java index 37c0a5d8..8f512c28 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdCompHrsTotals implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java index 3d1cd079..6365796d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdCompSal implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java index 0fc03f2b..ae8da431 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdCompSalSubtotals implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java index 31908be8..d48ebc3c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdCompSalTotals implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java index 52da5364..f3667822 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdDirectCareCost implements IModel{ private String confirmationId; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCostSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCostSubtotals.java index cce534b1..f9d0a2a9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCostSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCostSubtotals.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdDirectCareCostSubtotals implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java index 72917956..d342f6bc 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdDirectCareHrs implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrsSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrsSubTotals.java index ce24c968..37064f81 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrsSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrsSubTotals.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdDirectCareHrsSubTotals implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java index 68ac6453..f51e37b7 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdExp implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExpSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExpSubTotals.java index 7117b263..2edf82bc 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExpSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExpSubTotals.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdExpSubTotals implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java index 6b00368d..cf704b26 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.StringUtils; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdRev implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRevSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRevSubTotals.java index 0eb31581..c7d7e0c7 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRevSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRevSubTotals.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LtcYtdRevSubTotals implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java index 99c8772f..91725ed5 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java @@ -4,7 +4,7 @@ import java.util.List; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; public class LtcYtdSubmission implements IModel { @@ -18,7 +18,7 @@ public class LtcYtdSubmission implements IModel { private String submittedBy; private String facilitySubId; private String period; - //private String submissionFy; + private String submissionFy; private String nbTotalBeds; private String nbFundedBeds; private String occRateThreshold; @@ -70,7 +70,7 @@ public List getCsvElements() { elements.add(this.getSubmittedBy()); elements.add(this.getFacilitySubId()); elements.add(this.getPeriod()); - //elements.add(this.getSubmissionFy()); + elements.add(this.getSubmissionFy()); elements.add(this.getNbTotalBeds()); elements.add(this.getNbFundedBeds()); elements.add(this.getOccRateThreshold()); @@ -354,5 +354,15 @@ public void setLtcBedYtdOccRateTtls(List ltcBedYtd this.ltcBedYtdOccRateTtls = ltcBedYtdOccRateTtls; } + public String getSubmissionFy() { + return submissionFy; + } + + public void setSubmissionFy(String submissionFy) { + this.submissionFy = submissionFy; + } + + + } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java index b5b9e332..11e4a52f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java @@ -6,7 +6,7 @@ import org.apache.camel.Processor; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.parser.ChefsRequestPayload; +import ca.bc.gov.chefs.etl.core.model.ChefsRequestPayload; import ca.bc.gov.chefs.etl.util.AuthUtil; import ca.bc.gov.chefs.etl.util.JsonUtil; import ca.bc.gov.chefs.etl.util.PropertiesUtil; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index c350d79f..ca9f6d66 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -13,6 +13,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.core.model.FileProperties; +import ca.bc.gov.chefs.etl.core.model.IModel; +import ca.bc.gov.chefs.etl.core.model.SuccessResponse; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid0; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid1; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid2; @@ -42,8 +45,6 @@ import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdRev; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdRevSubTotals; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdSubmission; -import ca.bc.gov.chefs.etl.parser.FileProperties; -import ca.bc.gov.chefs.etl.parser.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; import ca.bc.gov.chefs.etl.util.FileUtil; @@ -64,7 +65,11 @@ public void process(Exchange exchange) throws Exception { FileProperties fileProperties = new FileProperties(); fileProperties.setUnEncDirForThisExchange(Constants.UNENC_FILE_PATH.get(Constants.LTC_YTD_SUBMISSION)); fileProperties.setEncDirForThisExchange(Constants.ENC_FILE_PATH.get(Constants.LTC_YTD_SUBMISSION)); - FileUtil.writeToCSVFile(map,fileProperties); + List filesGenerated = FileUtil.writeToCSVFile(map,fileProperties); + SuccessResponse successResponse = new SuccessResponse(); + successResponse.setFiles(filesGenerated); + exchange.getIn().setBody(mapper.writeValueAsString(successResponse)); + } @@ -105,10 +110,9 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT ltcYtdSubmission.setOccRateThreshold(root.getThreshold()); ltcYtdSubmission.setPeriod(root.getQuarter()); ltcYtdSubmission.setSubmissionDate(root.getForm().getCreatedAt()); - //ltcYtdSubmission.setSubmissionFy(""); // not sure + // FIXME ltcYtdSubmission.setSubmissionFy(""); ltcYtdSubmission.setSubmittedBy(root.getForm().getFullName()); - /* START : Direct Care Hours */ /* Productive and NP Nursing */ // why no subtotal and total? LtcYtdDirectCareHrs nursingRNProdH = new LtcYtdDirectCareHrs(); @@ -930,7 +934,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedProfOTSal.setCompSalContractServicesYtd(root.getCompB_item217()); alliedProfOTSal.setCompSalOfficeAllocYtd(root.getCompB_item317()); alliedProfOTSal.setCompSalName("Occupational Therapist"); - alliedProfOTSal.setCompSalType("Allied Non-professional"); + alliedProfOTSal.setCompSalType("Allied professional"); alliedProfOTSal.setConfirmationId(root.getForm().getConfirmationId()); alliedProfOTSal.setCompSalTotalCostYtd(root.getCompB_calc17()); @@ -939,7 +943,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedProfPTSal.setCompSalContractServicesYtd(root.getCompB_item218()); alliedProfPTSal.setCompSalOfficeAllocYtd(root.getCompB_item318()); alliedProfPTSal.setCompSalName("Physiotherapist"); - alliedProfPTSal.setCompSalType("Allied Non-professional"); + alliedProfPTSal.setCompSalType("Allied professional"); alliedProfPTSal.setConfirmationId(root.getForm().getConfirmationId()); alliedProfPTSal.setCompSalTotalCostYtd(root.getCompB_calc18()); @@ -948,7 +952,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedProfDTSal.setCompSalContractServicesYtd(root.getCompB_item219()); alliedProfDTSal.setCompSalOfficeAllocYtd(root.getCompB_item319()); alliedProfDTSal.setCompSalName("Dietitian"); - alliedProfDTSal.setCompSalType("Allied Non-professional"); + alliedProfDTSal.setCompSalType("Allied professional"); alliedProfDTSal.setConfirmationId(root.getForm().getConfirmationId()); alliedProfDTSal.setCompSalTotalCostYtd(root.getCompB_calc19()); @@ -957,7 +961,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedProfSWSal.setCompSalContractServicesYtd(root.getCompB_item220()); alliedProfSWSal.setCompSalOfficeAllocYtd(root.getCompB_item320()); alliedProfSWSal.setCompSalName("Dietitian"); - alliedProfSWSal.setCompSalType("Allied Non-professional"); + alliedProfSWSal.setCompSalType("Allied professional"); alliedProfSWSal.setConfirmationId(root.getForm().getConfirmationId()); alliedProfSWSal.setCompSalTotalCostYtd(root.getCompB_calc20()); @@ -966,7 +970,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedProfOTHSal.setCompSalContractServicesYtd(root.getCompB_item221()); alliedProfOTHSal.setCompSalOfficeAllocYtd(root.getCompB_item321()); alliedProfOTHSal.setCompSalName("Other (specify)"); - alliedProfOTHSal.setCompSalType("Allied Non-professional"); + alliedProfOTHSal.setCompSalType("Allied professional"); alliedProfOTHSal.setConfirmationId(root.getForm().getConfirmationId()); alliedProfOTHSal.setCompSalTotalCostYtd(root.getCompB_calc21()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPerf.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPerf.java index 89120aad..85cc3da7 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPerf.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPerf.java @@ -2,7 +2,7 @@ import java.util.List; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LTCStaffPlanPerf implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPosType.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPosType.java index 537f69cf..f419031e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPosType.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffPlanPosType.java @@ -2,7 +2,7 @@ import java.util.List; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LTCStaffPlanPosType implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingAddPos.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingAddPos.java index fff099a2..3cfee65a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingAddPos.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingAddPos.java @@ -2,7 +2,7 @@ import java.util.List; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LTCStaffingAddPos implements IModel { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingHrs.java index 18d5db4a..19628cdb 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/staffing/LTCStaffingHrs.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.List; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class LTCStaffingHrs implements IModel{ diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/LoginCredentials.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/LoginCredentials.java deleted file mode 100644 index 4c30f9f0..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/LoginCredentials.java +++ /dev/null @@ -1,74 +0,0 @@ -package ca.bc.gov.chefs.etl.forms.testform; - -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import ca.bc.gov.chefs.etl.parser.IModel; - -public class LoginCredentials implements IModel { - - @Override - public String toString() { - return "LoginCredentials [username=" + username + ", password=" + password + "]"; - } - - @JsonProperty("username1") - private String username; - - @JsonProperty("password") - private String password; - - public String getConfirmationId() { - return confirmationId; - } - - public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; - } - - @JsonProperty("confirmationId") - private String confirmationId; - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Override - public String getFileName() { - return "sample-today.csv"; - } - - @Override - public String getFormType() { - return "TestModel#LoginCredentials"; - } - - @Override - public List getCsvElements() { - List elements = new ArrayList<>(); - elements.add(this.username); - elements.add(this.password); - elements.add(this.confirmationId); - return elements; - } - - @Override - public List getObjects() { - return new ArrayList<>(); - } - -} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/PersonDetails.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/PersonDetails.java deleted file mode 100644 index 2cd0a829..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/PersonDetails.java +++ /dev/null @@ -1,95 +0,0 @@ -package ca.bc.gov.chefs.etl.forms.testform; - -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import ca.bc.gov.chefs.etl.parser.IModel; - -public class PersonDetails implements IModel { - - @JsonProperty("firstName") - private String firstname; - @JsonProperty("lastName") - private String lastname; - @JsonProperty("birthPlace") - private String birthPlace; - @JsonProperty("education") - private String education; - @JsonProperty("confirmationId") - private String confirmationId; - - public String getConfirmationId() { - return confirmationId; - } - - public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; - } - - public String getFirstname() { - return firstname; - } - - @Override - public String toString() { - return "PersonDetails [firstname=" + firstname + ", lastname=" + lastname + ", birthPlace=" + birthPlace - + ", education=" + education + "]"; - } - - public void setFirstname(String firstname) { - this.firstname = firstname; - } - - public String getLastname() { - return lastname; - } - - public void setLastname(String lastname) { - this.lastname = lastname; - } - - public String getBirthPlace() { - return birthPlace; - } - - public void setBirthPlace(String birthPlace) { - this.birthPlace = birthPlace; - } - - public String getEducation() { - return education; - } - - public void setEducation(String education) { - this.education = education; - } - - @Override - public String getFileName() { - return "person-details.csv"; - } - - @Override - public String getFormType() { - return "TestModel#PersonDetails"; - } - - @Override - public List getCsvElements() { - List elements = new ArrayList<>(); - elements.add(this.firstname); - elements.add(this.lastname); - elements.add(this.birthPlace); - elements.add(this.education); - elements.add(this.confirmationId); - return elements; - } - - @Override - public List getObjects() { - return new ArrayList<>(); - } - -} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiProcessor.java deleted file mode 100644 index d1517997..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiProcessor.java +++ /dev/null @@ -1,25 +0,0 @@ -package ca.bc.gov.chefs.etl.forms.testform; - -import org.apache.camel.Exchange; - -import org.apache.camel.Processor; -import net.minidev.json.JSONObject; - -public class TestFormApiProcessor implements Processor { - - //private static final Logger logger = LoggerFactory.getLogger(TestFormRoute.class); - - @Override - public void process(Exchange exchange) throws Exception { - - JSONObject body = (JSONObject) exchange.getIn().getBody(); - String usernamePassword = body.getAsString("username") + ":" + body.getAsString("password"); - System.out.println(usernamePassword); - exchange.getIn().setHeader("CamelHttpMethod", "GET"); - exchange.getIn().setHeader("Content-Type", "application/json"); - exchange.getIn().setHeader("accept", "application/json"); - exchange.getIn().setHeader("Authorization", "Basic MDc2MjNkMzMtOWY0OS00MjVhLWI3ZDItZDg0OWIzZTBhZjVjOjYzNTcxNzVlLTE4NzctNDU4Ny05MDVkLWE2MjJkNjMzZGQ0Mg=="); - - } - -} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiResponseProcessor.java deleted file mode 100644 index acc37d02..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormApiResponseProcessor.java +++ /dev/null @@ -1,35 +0,0 @@ -package ca.bc.gov.chefs.etl.forms.testform; - -import java.util.List; - -import org.apache.camel.Exchange; -import org.apache.camel.Processor; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; - -import ca.bc.gov.chefs.etl.parser.IModel; -import ca.bc.gov.chefs.etl.util.CSVUtil; - - - -public class TestFormApiResponseProcessor implements Processor { - - /* - * receives a JSON Array of objects, models them and makes them ready - */ - @Override - @SuppressWarnings("unchecked") - public void process(Exchange exchange) throws Exception { - - String payload = exchange.getIn().getBody(String.class); - System.out.println(payload); - ObjectMapper mapper = new ObjectMapper(); - - List testModels = mapper.readValue(payload, new TypeReference>() { - }); - List testIModel = (List)(List) testModels; - CSVUtil.provider(testIModel); - } - -} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormProcessor.java deleted file mode 100644 index 0d8025fc..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestFormProcessor.java +++ /dev/null @@ -1,37 +0,0 @@ -package ca.bc.gov.chefs.etl.forms.testform; - -import java.security.Security; - -import org.apache.camel.Exchange; -import org.apache.camel.Processor; -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import ca.bc.gov.chefs.etl.core.routes.TestFormRoute; -import ca.bc.gov.chefs.etl.parser.FileModel; -import ca.bc.gov.chefs.etl.util.FileUtil; - -public class TestFormProcessor implements Processor { - - private static final Logger logger = LoggerFactory.getLogger(TestFormRoute.class); - - public void process(Exchange exchange) throws Exception { - logger.info("Hello! Processing Now: current timestamp is: {}",System.currentTimeMillis()); - logger.info("Body Received: {}", exchange.getIn().getBody()); - FileModel fm = new FileModel(); - fm.setFrom("files"); - fm.setTo("encfiles"); - fm.setPgpPublicKeyPath("keys/publickey.asc"); - - // if provider is not present, add it - if (Security.getProvider(BouncyCastleProvider.PROVIDER_NAME) == null) { - // insert at specific position - Security.insertProviderAt(new BouncyCastleProvider(), 1); - } - - FileUtil.encryptFilesInDirectory(fm.getFrom(), fm.getPgpPublicKeyPath(), fm.getTo()); - - } - -} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestModel.java b/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestModel.java deleted file mode 100644 index 8586a134..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/testform/TestModel.java +++ /dev/null @@ -1,102 +0,0 @@ -package ca.bc.gov.chefs.etl.forms.testform; - -import java.util.ArrayList; -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonUnwrapped; - -import ca.bc.gov.chefs.etl.parser.IModel; - -public class TestModel implements IModel { - - @JsonProperty("confirmationId") - private String confirmationId; - - @JsonProperty("formName") - private String formName; - - @JsonProperty("version") - private String version; - - @JsonProperty("status") - private String status; - - @JsonProperty("createdAt") - private String createdAt; - - @JsonProperty("fullName") - private String fullName; - - @JsonProperty("username") - private String username; - - @JsonProperty("email") - private String email; - - @JsonProperty("assignee") - private String assignee; - - @JsonProperty("assigneeEmail") - private String assigneeEmail; - - @JsonUnwrapped - private LoginCredentials loginCredentials; - @JsonUnwrapped - private PersonDetails personDetails; - - public LoginCredentials getLoginCredentials() { - return loginCredentials; - } - - public void setLoginCredentials(LoginCredentials loginCredentials) { - this.loginCredentials = loginCredentials; - } - - public PersonDetails getPersonDetails() { - return personDetails; - } - - public void setPersonDetails(PersonDetails personDetails) { - this.personDetails = personDetails; - } - - @Override - public String toString() { - return "TestModel [loginCredentials=" + loginCredentials + ", personDetails=" + personDetails + "]"; - } - - @Override - public List getCsvElements() { - List elements = new ArrayList<>(); - elements.add(this.confirmationId); - elements.add(this.formName); - elements.add(this.version); - elements.add(this.createdAt); - elements.add(this.fullName); - elements.add(this.username); - elements.add(this.email); - elements.add(this.status); - elements.add(this.assignee); - elements.add(this.assigneeEmail); - return elements; - } - - @Override - public String getFileName() { - return "testModel"; - } - - @Override - public String getFormType() { - return "TestModel#Main"; - } - - @Override - public List getObjects() { - List ls = new ArrayList<>(); - ls.add(loginCredentials); - ls.add(personDetails); - return ls; - } -} diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormPayloadExtractor.java b/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormPayloadExtractor.java deleted file mode 100644 index f5dc3dae..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormPayloadExtractor.java +++ /dev/null @@ -1,41 +0,0 @@ -package ca.bc.gov.chefs.etl.parser; - -import java.util.Properties; - -import org.apache.camel.Exchange; -import org.apache.camel.Handler; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import ca.bc.gov.chefs.etl.util.PropertiesUtil; -import net.minidev.json.JSONObject; -import net.minidev.json.parser.JSONParser; -import net.minidev.json.parser.ParseException; - -public class TestFormPayloadExtractor { - private static final Logger logger = LoggerFactory.getLogger(TestFormPayloadExtractor.class); - - static Properties properties; - - private TestFormPayloadExtractor() { - } - - - @Handler - public static void extractTestFormPayload(Exchange exchange, String testFormPayload) - throws ParseException { - - - try { - properties = PropertiesUtil.loadProperties(); - } catch(Exception e) { - - } - logger.info("Received payload data.. extracting now"); - logger.info("Received properties.. {}",properties.get("chefs.http.uri")); - JSONParser jsonParser = new JSONParser(JSONParser.DEFAULT_PERMISSIVE_MODE); - JSONObject testFormExtracted = (JSONObject) jsonParser.parse(testFormPayload); - exchange.getIn().setBody(testFormExtracted); - } - -} diff --git a/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormResponsePayloadExtractor.java b/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormResponsePayloadExtractor.java deleted file mode 100644 index f7cf0cc4..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/parser/TestFormResponsePayloadExtractor.java +++ /dev/null @@ -1,29 +0,0 @@ -package ca.bc.gov.chefs.etl.parser; - -import org.apache.camel.Exchange; -import org.apache.camel.Handler; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import net.minidev.json.JSONObject; -import net.minidev.json.parser.JSONParser; -import net.minidev.json.parser.ParseException; - -public class TestFormResponsePayloadExtractor { - private static final Logger logger = LoggerFactory.getLogger(TestFormPayloadExtractor.class); - - private TestFormResponsePayloadExtractor() { - } - - - @Handler - public static void extractTestFormResponsePayload(Exchange exchange, String testFormPayload) - throws ParseException { - logger.info(""); - JSONParser jsonParser = new JSONParser(JSONParser.DEFAULT_PERMISSIVE_MODE); - JSONObject testFormExtracted = (JSONObject) jsonParser.parse(testFormPayload); - exchange.getIn().setBody(testFormExtracted); - } - - -} diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java index 9e15596a..414d16b3 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/CSVUtil.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Queue; -import ca.bc.gov.chefs.etl.parser.IModel; +import ca.bc.gov.chefs.etl.core.model.IModel; public class CSVUtil { diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java b/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java index ea6e7642..8a631fab 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java @@ -1,6 +1,7 @@ package ca.bc.gov.chefs.etl.util; import org.bouncycastle.openpgp.PGPException; + import org.bouncycastle.openpgp.PGPLiteralData; import org.bouncycastle.openpgp.PGPLiteralDataGenerator; import org.bouncycastle.openpgp.PGPPublicKey; diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index 37e59052..7334deb2 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -18,7 +18,7 @@ import org.supercsv.prefs.CsvPreference; import org.supercsv.quote.AlwaysQuoteMode; -import ca.bc.gov.chefs.etl.parser.FileProperties; +import ca.bc.gov.chefs.etl.core.model.FileProperties; import static ca.bc.gov.chefs.etl.constant.Constants.HEADERS; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 253c4709..b531d3b3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ # properties used in route hostname = localhost -port = 8081 +port = 8080 server-socket=5555 socket-read-sleep-time=100 max-socket-read-tries=100 From 60d6985ce4f3b49f6a5ab33395a7a908110843c8 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 21 Mar 2023 02:14:34 -0400 Subject: [PATCH 019/183] added new util methods to generate directories path --- src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index 7334deb2..a00596a9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -18,6 +18,7 @@ import org.supercsv.prefs.CsvPreference; import org.supercsv.quote.AlwaysQuoteMode; +import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.FileProperties; import static ca.bc.gov.chefs.etl.constant.Constants.HEADERS; @@ -199,4 +200,15 @@ public static String generateFileName(String fileType,String dateTime,FileProper } return directoryPath+fileType.toLowerCase()+"_".concat(dateTime).concat(fileProperties.getExtension()); } + + public static String buildDestinationPath(String propertyName, boolean isDataEncrypted){ + if (isDataEncrypted){ + return "."+File.separator+PropertiesUtil.getValue(Constants.PROPERTIES_ENC_DATA_DIR)+File.separator+PropertiesUtil.getValue(propertyName); + } + return "."+File.separator+PropertiesUtil.getValue(Constants.PROPERTIES_DATA_DIR)+File.separator+PropertiesUtil.getValue(propertyName); + } + + public static String buildDirectoryPath(String propertyName){ + return "."+File.separator+PropertiesUtil.getValue(propertyName); + } } From 8aa844b85b5d68c0970acf9fab4cf29c700a63c7 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 21 Mar 2023 02:15:09 -0400 Subject: [PATCH 020/183] added dir names to properties file --- src/main/resources/application.properties | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index b531d3b3..a2841b97 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -8,6 +8,13 @@ thread-pool-size=5 accept-remote-connections=true valid-ip-list-file=fwlist.txt +data-dir=unencrypted +enc-data-dir=encrypted +aims-dir=aims +ltc-facility-dir=ltc-facility +ltc-quaterly-dir=ltc-quaterly + + chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&bridgeEndpoint=true&version=%s&type=submissions&minDate=%s&maxDate=%s From 444ff0b2cbd07940c9b3145340664ba77690ef7b Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 21 Mar 2023 02:16:38 -0400 Subject: [PATCH 021/183] building dir paths from the properties file instead of hard coded --- .../bc/gov/chefs/etl/constant/Constants.java | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index be53f897..f2200a16 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -1,10 +1,11 @@ package ca.bc.gov.chefs.etl.constant; -import java.io.File; import java.util.HashMap; import java.util.Map; +import ca.bc.gov.chefs.etl.util.FileUtil; + public class Constants { /* @@ -69,18 +70,23 @@ public class Constants { public static final String LTC_BED_YTD_OCCUPIED_DAYS_TOTALS = "LTC_BED_YTD_OCCUPIED_DAYS_TOTALS"; /* File Constants */ - public static final String LTC_FACILITY_UNENCRYPTED_FP = "."+File.separator+"unencrypted"+File.separator+"ltc_facility"; - public static final String LTC_FACILITY_ENCRYPTED_FP = "."+File.separator+"encrypted"+File.separator+"ltc_facility"; + public final static String PROPERTIES_DATA_DIR = "data-dir"; + public final static String PROPERTIES_ENC_DATA_DIR = "enc-data-dir"; + public static final String DATA_DIRECTORY = FileUtil.buildDirectoryPath(PROPERTIES_DATA_DIR); + public static final String ENCRYPTED_DATA_DIRECTORY = FileUtil.buildDirectoryPath(PROPERTIES_ENC_DATA_DIR); + + public final static String PROPERTIES_LTC_FACILITY_DIR = "ltc-facility-dir"; + public static final String LTC_FACILITY_UNENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_FACILITY_DIR, false); + public static final String LTC_FACILITY_ENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_FACILITY_DIR, true); - public static final String AIMS_UNENCRYPTED_FP = "."+File.separator+"unencrypted"+File.separator+"aims"; - public static final String AIMS_ENCRYPTED_FP = "."+File.separator+"encrypted"+File.separator+"aims"; + public final static String PROPERTIES_AIMS_DIR = "aims-dir"; + public static final String AIMS_UNENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_AIMS_DIR, false); + public static final String AIMS_ENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_AIMS_DIR, true); - public static final String LTC_QUARTERLY_YTD_UNENCRYPTED_FP = "."+File.separator+"unencrypted"+File.separator+"ltc_quarterly"; - public static final String LTC_QUARTERLY_YTD_ENCRYPTED_FP = "."+File.separator+"encrypted"+File.separator+"ltc_quarterly"; + public final static String PROPERTIES_LTC_QUATERLY_DIR = "ltc-quaterly-dir"; + public static final String LTC_QUARTERLY_YTD_UNENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_QUATERLY_DIR, false); + public static final String LTC_QUARTERLY_YTD_ENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_QUATERLY_DIR, true); - - - static { From 918a8d60d20afc3c13e1cbdd649d329b893978a9 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 21 Mar 2023 02:16:58 -0400 Subject: [PATCH 022/183] using dynamicly generated paths --- .../java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java index 7c828c42..cadb9dac 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java +++ b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java @@ -8,6 +8,7 @@ import org.apache.camel.main.Main; +import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.routes.HelloRoute; import ca.bc.gov.chefs.etl.forms.ltc.facility.route.FacilityFormRoute; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.route.LtcQuaterlyYtdRoute; @@ -22,15 +23,8 @@ public class ChefsETLMainMethod { /* Encrypted and Non-Encrypted Directories */ try { - Files.createDirectories(Paths.get("."+File.separator+"encrypted")); - Files.createDirectories(Paths.get("."+File.separator+"unencrypted")); - - /* LTC_FACILITY */ - Files.createDirectories(Paths.get("."+File.separator+ "encrypted","ltc_facility")); - Files.createDirectories(Paths.get("."+File.separator+ "unencrypted","ltc_facility")); - /* LTC _QUARTERLY YTD */ - Files.createDirectories(Paths.get("."+File.separator +"encrypted","ltc_quarterly_ytd")); - Files.createDirectories(Paths.get("."+File.separator+"unencrypted","ltc_quarterly_ytd")); + Files.createDirectories(Paths.get(Constants.DATA_DIRECTORY)); + Files.createDirectories(Paths.get(Constants.ENCRYPTED_DATA_DIRECTORY)); } catch (IOException e) { e.printStackTrace(); } From 59c2aff9814e15f8c6776c8fa39d8f687b00aca2 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 21 Mar 2023 02:23:09 -0400 Subject: [PATCH 023/183] code refactorisation --- .../forms/aims/processor/AIMSFormApiResponseProcessor.java | 5 +---- .../processor/FacilityInfoFormApiResponseProcessor.java | 5 +---- .../processor/LtcQuaterlyYtdApiResponseProcessor.java | 5 +---- src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java | 5 ++++- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java index dea68e5c..e56f8fdb 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java @@ -34,10 +34,7 @@ public void process(Exchange exchange) throws Exception { Map>> map = CSVUtil.provider(iModels); - FileProperties fileProperties = new FileProperties(); - fileProperties.setUnEncDirForThisExchange(Constants.UNENC_FILE_PATH.get(Constants.AIMS_FORM)); - fileProperties.setEncDirForThisExchange(Constants.ENC_FILE_PATH.get(Constants.AIMS_FORM)); - FileUtil.writeToCSVFile(map,fileProperties); + FileUtil.writeToCSVFile(map,Constants.AIMS_FORM); } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java index bf648e88..aa0a3385 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java @@ -37,11 +37,8 @@ public void process(Exchange exchange) throws Exception { List parsedFacilityInfo = parseFacilityInfo(facilityInformationModels); List iModels = (List) (List) parsedFacilityInfo; Map>> map = CSVUtil.provider(iModels); - FileProperties fileProperties = new FileProperties(); - fileProperties.setUnEncDirForThisExchange(Constants.UNENC_FILE_PATH.get(Constants.LTC_FACILITY)); - fileProperties.setEncDirForThisExchange(Constants.ENC_FILE_PATH.get(Constants.LTC_FACILITY)); - List filesGenerated = FileUtil.writeToCSVFile(map,fileProperties); + List filesGenerated = FileUtil.writeToCSVFile(map,Constants.LTC_FACILITY); SuccessResponse successResponse = new SuccessResponse(); successResponse.setFiles(filesGenerated); exchange.getIn().setBody(mapper.writeValueAsString(successResponse)); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index ca9f6d66..1cf1aa81 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -62,10 +62,7 @@ public void process(Exchange exchange) throws Exception { List parsedLtycYtdSubmissions = parseYtdQuaterlyRequest(ltcYtdForms); List iModels = (List)(List) parsedLtycYtdSubmissions; Map>> map = CSVUtil.provider(iModels); - FileProperties fileProperties = new FileProperties(); - fileProperties.setUnEncDirForThisExchange(Constants.UNENC_FILE_PATH.get(Constants.LTC_YTD_SUBMISSION)); - fileProperties.setEncDirForThisExchange(Constants.ENC_FILE_PATH.get(Constants.LTC_YTD_SUBMISSION)); - List filesGenerated = FileUtil.writeToCSVFile(map,fileProperties); + List filesGenerated = FileUtil.writeToCSVFile(map,Constants.LTC_YTD_SUBMISSION); SuccessResponse successResponse = new SuccessResponse(); successResponse.setFiles(filesGenerated); exchange.getIn().setBody(mapper.writeValueAsString(successResponse)); diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index a00596a9..c3d0045c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -140,7 +140,10 @@ private void compressFileG(String sourceFilePath, String destinationFilePath) { } } - public static List writeToCSVFile(Map>> map, FileProperties fileProperties) throws IOException { + public static List writeToCSVFile(Map>> map, String directoryKey) throws IOException { + FileProperties fileProperties = new FileProperties(); + fileProperties.setUnEncDirForThisExchange(Constants.UNENC_FILE_PATH.get(directoryKey)); + fileProperties.setEncDirForThisExchange(Constants.ENC_FILE_PATH.get(directoryKey)); ICsvListWriter listWriter = null; List filesGenerated = new ArrayList(); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMMddHHmmss"); From ffb7f2d0b1932e08f6fbae0f4125b133c1d1b362 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 21 Mar 2023 02:25:45 -0400 Subject: [PATCH 024/183] removed unecessary import --- src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java index cadb9dac..f567ae8f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java +++ b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java @@ -1,7 +1,5 @@ package ca.bc.gov.chefs.etl; -import java.io.File; - import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; From 1928e93d9f5b1adf624f39854fe8599a68343b87 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 21 Mar 2023 09:01:16 -0400 Subject: [PATCH 025/183] style format, removing blank lines --- src/main/resources/application.properties | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a2841b97..e7f884eb 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -14,8 +14,6 @@ aims-dir=aims ltc-facility-dir=ltc-facility ltc-quaterly-dir=ltc-quaterly - - chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&bridgeEndpoint=true&version=%s&type=submissions&minDate=%s&maxDate=%s aims.username=2f173b2b-2f3a-407a-aecf-6b4bdc9431ae From 43c6bcbbb84141b0694158e6fecd2d8b0e63a29b Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 21 Mar 2023 12:24:14 -0400 Subject: [PATCH 026/183] removed unecessary file separators in file path --- src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index c3d0045c..fc66ccea 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -206,12 +206,12 @@ public static String generateFileName(String fileType,String dateTime,FileProper public static String buildDestinationPath(String propertyName, boolean isDataEncrypted){ if (isDataEncrypted){ - return "."+File.separator+PropertiesUtil.getValue(Constants.PROPERTIES_ENC_DATA_DIR)+File.separator+PropertiesUtil.getValue(propertyName); + return PropertiesUtil.getValue(Constants.PROPERTIES_ENC_DATA_DIR)+File.separator+PropertiesUtil.getValue(propertyName); } - return "."+File.separator+PropertiesUtil.getValue(Constants.PROPERTIES_DATA_DIR)+File.separator+PropertiesUtil.getValue(propertyName); + return PropertiesUtil.getValue(Constants.PROPERTIES_DATA_DIR)+File.separator+PropertiesUtil.getValue(propertyName); } public static String buildDirectoryPath(String propertyName){ - return "."+File.separator+PropertiesUtil.getValue(propertyName); + return PropertiesUtil.getValue(propertyName); } } From e0bf06230c32b5f581c91ed0811abd1f6379fa73 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Tue, 21 Mar 2023 10:29:45 -0700 Subject: [PATCH 027/183] Renaming application.properties to application-dev.properties --- src/main/resources/application-dev.properties | 29 +++++++++++++++++++ src/main/resources/application.properties | 29 ------------------- 2 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 src/main/resources/application.properties diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index e69de29b..e7f884eb 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -0,0 +1,29 @@ +# properties used in route +hostname = localhost +port = 8080 +server-socket=5555 +socket-read-sleep-time=100 +max-socket-read-tries=100 +thread-pool-size=5 +accept-remote-connections=true +valid-ip-list-file=fwlist.txt + +data-dir=unencrypted +enc-data-dir=encrypted +aims-dir=aims +ltc-facility-dir=ltc-facility +ltc-quaterly-dir=ltc-quaterly + +chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&bridgeEndpoint=true&version=%s&type=submissions&minDate=%s&maxDate=%s + +aims.username=2f173b2b-2f3a-407a-aecf-6b4bdc9431ae +aims.password=5e056c7b-1b1e-4501-9711-facc44c6e66f + +ltc.facility.username=e1f4761f-efdd-4529-805e-677d3ae21601 +ltc.facility.password=cde8b788-36c7-4258-8f43-2e26fceea9a4 + +ltc.staffing.username=16ce36ca-9b4b-4ec6-bb75-96c2e1f258bb +ltc.staffing.password=ef31830d-e0f5-4eb9-b4e1-7900a3fcd2ae + +ltc.ytd.username=7eb3c107-5adb-435a-adbf-b8683a56ecc0 +ltc.ytd.password=65fdc5e3-4232-42bc-bfe3-7a0a51eeacfa \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index e7f884eb..00000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,29 +0,0 @@ -# properties used in route -hostname = localhost -port = 8080 -server-socket=5555 -socket-read-sleep-time=100 -max-socket-read-tries=100 -thread-pool-size=5 -accept-remote-connections=true -valid-ip-list-file=fwlist.txt - -data-dir=unencrypted -enc-data-dir=encrypted -aims-dir=aims -ltc-facility-dir=ltc-facility -ltc-quaterly-dir=ltc-quaterly - -chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&bridgeEndpoint=true&version=%s&type=submissions&minDate=%s&maxDate=%s - -aims.username=2f173b2b-2f3a-407a-aecf-6b4bdc9431ae -aims.password=5e056c7b-1b1e-4501-9711-facc44c6e66f - -ltc.facility.username=e1f4761f-efdd-4529-805e-677d3ae21601 -ltc.facility.password=cde8b788-36c7-4258-8f43-2e26fceea9a4 - -ltc.staffing.username=16ce36ca-9b4b-4ec6-bb75-96c2e1f258bb -ltc.staffing.password=ef31830d-e0f5-4eb9-b4e1-7900a3fcd2ae - -ltc.ytd.username=7eb3c107-5adb-435a-adbf-b8683a56ecc0 -ltc.ytd.password=65fdc5e3-4232-42bc-bfe3-7a0a51eeacfa \ No newline at end of file From 898221e12245d80d83157a54f5be1c1a03aed264 Mon Sep 17 00:00:00 2001 From: evgeny-pluzhnikov Date: Tue, 21 Mar 2023 10:38:33 -0700 Subject: [PATCH 028/183] deleting the file --- src/main/resources/application.properties | 29 ----------------------- 1 file changed, 29 deletions(-) delete mode 100644 src/main/resources/application.properties diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 7ec60efb..00000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,29 +0,0 @@ -# properties used in route -hostname = localhost -port = 8080 -server-socket=5555 -socket-read-sleep-time=100 -max-socket-read-tries=100 -thread-pool-size=5 -accept-remote-connections=true -valid-ip-list-file=fwlist.txt - -data-dir=unencrypted -enc-data-dir=encrypted -aims-dir=aims -ltc-facility-dir=ltc-facility -ltc-quaterly-dir=ltc-quaterly - -chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&bridgeEndpoint=true&version=%s&type=submissions&minDate=%s&maxDate=%s - -aims.username=2f173b2b-2f3a-407a-aecf-6b4bdc9431ae -aims.password=5e056c7b-1b1e-4501-9711-facc44c6e66f - -ltc.facility.username=e1f4761f-efdd-4529-805e-677d3ae21601 -ltc.facility.password=cde8b788-36c7-4258-8f43-2e26fceea9a4 - -ltc.staffing.username=16ce36ca-9b4b-4ec6-bb75-96c2e1f258bb -ltc.staffing.password=ef31830d-e0f5-4eb9-b4e1-7900a3fcd2ae - -ltc.ytd.username=7eb3c107-5adb-435a-adbf-b8683a56ecc0 -ltc.ytd.password=65fdc5e3-4232-42bc-bfe3-7a0a51eeacfa From ff0ceb2f14cba0dfab98e4551400afebad8c6d0c Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Wed, 22 Mar 2023 09:01:12 -0700 Subject: [PATCH 029/183] Modifying java startup command to include config files directory. It seems that if you use java -jar some.jar it ignores any manipulations with -cp parameter. --- docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 04706e81..2dd38bed 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -29,4 +29,4 @@ FROM openjdk:17-jdk COPY --from=build app/target/medis-etl.jar /app/target/export-run-artifact.jar EXPOSE 8081 -ENTRYPOINT [ "java", "-cp", "/app/config/", "-jar", "/app/target/export-run-artifact.jar" ] +ENTRYPOINT [ "java", "-cp", "/app/target/export-run-artifact.jar:/app/config/", "ca.bc.gov.chefs.etl.ChefsETLMainMethod" ] From c3c421d9b5cecfe6f81e2fb9a0e3803815f9cc7d Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Wed, 22 Mar 2023 09:05:33 -0700 Subject: [PATCH 030/183] Renaming log4j2.properties file so it won't be in effect during runtime. Outstanding step is to remove properties files from resulting jar package. --- src/main/resources/{log4j2.properties => log4j2-dev.properties} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/{log4j2.properties => log4j2-dev.properties} (100%) diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2-dev.properties similarity index 100% rename from src/main/resources/log4j2.properties rename to src/main/resources/log4j2-dev.properties From 8766a48bc0f7e1e6c80d106de77ca6c9a70bd15d Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 24 Mar 2023 13:36:31 -0400 Subject: [PATCH 031/183] added info and TODO on comment --- .../chefs/etl/forms/ltc/facility/model/FacilityInformation.java | 2 +- .../processor/FacilityInfoFormApiResponseProcessor.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java index c1c80b05..45876449 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java @@ -277,7 +277,7 @@ public String getFormType() { public List getCsvElements() { List elements = new ArrayList(); elements.add(this.getConfirmationID()); - elements.add("false"); // FIXME + elements.add("false"); // TODO FIXME : the value should be taken from the isDeleted atttribute once available elements.add(this.getSubmissionDate()); elements.add(this.getSubmittedby()); elements.add(this.getFacilityName()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java index aa0a3385..844c6f22 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java @@ -61,7 +61,7 @@ private List parseFacilityInfo(List facilities) { facilityInfo.setFacilityTelephone(facility.getPhoneNumber()); facilityInfo.setFacilityWebsite(facility.getFacilityWebsite()); facilityInfo.setHealthAuthority(facility.getHealthAuthority1()); - facilityInfo.setIsDeleted("false"); // FIXME + facilityInfo.setIsDeleted("false"); // TODO FIXME facilityInfo.setLegislationtype(facility.getSelectList1()); facilityInfo.setOwnerAddress(facility.getBcaddress1().getProperties().getFullAddress()); facilityInfo.setOwnerCity(facility.getCity3()); From 58c71e15d01f7cff5e860666011bbb7e10befd90 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 24 Mar 2023 13:37:08 -0400 Subject: [PATCH 032/183] removed unecessary impletation of IModel by Root class --- .../etl/forms/ltc/facility/json/Root.java | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java index b4fee288..dee5cb2d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java @@ -6,7 +6,7 @@ import ca.bc.gov.chefs.etl.core.model.IModel; @JsonIgnoreProperties(ignoreUnknown=true) -public class Root implements IModel{ +public class Root { public Form form; public String city1; @@ -512,27 +512,4 @@ public boolean isTheOwnerTheSameAsTheOperator1() { public void setTheOwnerTheSameAsTheOperator1(boolean isTheOwnerTheSameAsTheOperator1) { this.isTheOwnerTheSameAsTheOperator1 = isTheOwnerTheSameAsTheOperator1; } - @Override - public String getFileName() { - // TODO Auto-generated method stub - return null; - } - @Override - public String getFormType() { - // TODO Auto-generated method stub - return null; - } - @Override - public List getCsvElements() { - // TODO Auto-generated method stub - return null; - } - @Override - public List getObjects() { - // TODO Auto-generated method stub - return null; - } - - - } From bf35b479f4d60abfb02ddbe77c7a490e642320b1 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 27 Mar 2023 14:04:36 -0400 Subject: [PATCH 033/183] updated CSV Headers for AIMS form --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index f2200a16..704fffcd 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -108,13 +108,13 @@ public class Constants { // HEADERS.put(AIMS_FORM, - new String[] { "Confirmation_ID", "Submission_Date", "Submitted_by", "Submission_type", "Agency_Code", + new String[] { "Confirmation_ID", "Is_Deleted","Submission_Date", "Submitted_by", "Submission_type", "Agency_Code", "Program_Type", "Office_Code", "Referral_Source", "Office_Date", "Regional_HA", - "Contracting_HA", "Health_Num", "Last_Name", "First_Name", "Middle_Name", "Birthdate", + "Contracting_HA", "Health_Num", "Last_Name", "First_Name", "Middle_Name", "Gender", "Birthdate", "Postal_Code", "Primary_Language", "Education_Level", "Marital_Status", "Employment_Status", "Number_Dependent_Children", "Methadone_Maintenance", "Current_Injection_Drug_Use", "Substance", - "Other_Client_Info", "Substance_Relation", "Primary_Drug_of_Choice", "Adm_Screened_Ref", - "Activity_Date", "Activity_Service_Provider_Code", "Discharge_Type", "Discharge_Date", + "Other_Client_Info", "Substance_Relation", "Primary_Drug_of_Choice", "Is_Screened", "Is_Administered", + "Is_Referred","Activity_Date", "Activity_Service_Provider_Code", "Discharge_Type", "Discharge_Date", "Discharge_Service_Provider_Code", "Discharge_Program_Completion" }); HEADERS.put(AIMS_MISUSE, new String[] { "Confirmation_ID", "Substance_misuses" }); From 7ce78a1081f8abfc75223f4deba90aa53db33bb2 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 27 Mar 2023 14:05:01 -0400 Subject: [PATCH 034/183] updated data model for AIMS form --- .../etl/forms/aims/model/MainEntity.java | 79 ++++++++++++------- 1 file changed, 49 insertions(+), 30 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java index 9b730b7b..4b22f965 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java @@ -18,6 +18,8 @@ public class MainEntity implements IModel { @JsonIgnore protected String confirmationId; @JsonIgnore + protected String isDeleted = "false"; // TODO FIXME, take isDeleted from the json file when ready, rather than set it manually + @JsonIgnore protected String submissionDate; @JsonIgnore protected String submittedBy; @@ -46,6 +48,8 @@ public class MainEntity implements IModel { protected String firstName; @JsonProperty("middleNameS") protected String middleName; + @JsonProperty("gender") + protected String gender; @JsonProperty("birthdate") protected String birthDate; @JsonProperty("postalCode") @@ -72,8 +76,12 @@ public class MainEntity implements IModel { protected String substanceRelation; @JsonProperty("primaryDrugOfChoice1") protected String primaryDrugOfChoice; - @JsonProperty("radioGroup") - protected String admScreenedRef; + @JsonIgnore + protected String isScreened; + @JsonIgnore + protected String isAdministered; + @JsonIgnore + protected String isReferred; @JsonProperty("date1") protected String activityDate; @JsonProperty("serviceProviderCode2") @@ -102,7 +110,7 @@ protected void unPackForm(Map form) { } @JsonProperty("selectBoxes1") - protected void unPackSelectBoxes(Map selectBoxes1) { + protected void unPackSelectBoxes1(Map selectBoxes1) { List aimsMisuses = new ArrayList(); for (Map.Entry entry : selectBoxes1.entrySet()) { @@ -115,8 +123,18 @@ protected void unPackSelectBoxes(Map selectBoxes1) { } this.setAimsMisuses(aimsMisuses); } + + @JsonProperty("radioGroup") + protected void isScreenedSelected(String radioGroup){ + this.isScreened = String.valueOf((radioGroup != null && radioGroup != "")); + } - + @JsonProperty("selectBoxes") + protected void unPackSelectBoxes(Map selectBoxes){ + this.isAdministered = selectBoxes.get("admitted"); + this.isReferred = selectBoxes.get("referred"); + } + @Override public String getFileName() { return "AIMS_FORM"; @@ -129,6 +147,7 @@ public String getFormType() { public List getCsvElements() { List elements = new ArrayList<>(); elements.add(this.confirmationId); + elements.add(this.isDeleted); elements.add(this.submissionDate); elements.add(this.submittedBy); elements.add(this.submissionType); @@ -143,6 +162,7 @@ public List getCsvElements() { elements.add(this.lastName); elements.add(this.firstName); elements.add(this.middleName); + elements.add(this.gender); elements.add(this.birthDate); elements.add(this.postalCode); elements.add(this.primaryLanguage); @@ -156,7 +176,9 @@ public List getCsvElements() { elements.add(this.otherClientInfo); elements.add(this.substanceRelation); elements.add(this.primaryDrugOfChoice); - elements.add(this.admScreenedRef); + elements.add(this.isScreened); + elements.add(this.isAdministered); + elements.add(this.isReferred); elements.add(this.activityDate); elements.add(this.activityServiceProviderCode); elements.add(this.dischargeType); @@ -269,6 +291,12 @@ public String getMiddleName() { public void setMiddleName(String middleName) { this.middleName = middleName; } + public String getGender() { + return gender; + } + public void setGender(String gender) { + this.gender = gender; + } public String getBirthDate() { return birthDate; } @@ -347,11 +375,23 @@ public String getPrimaryDrugOfChoice() { public void setPrimaryDrugOfChoice(String primaryDrugOfChoice) { this.primaryDrugOfChoice = primaryDrugOfChoice; } - public String getAdmScreenedRef() { - return admScreenedRef; + public String getIsScreened() { + return isScreened; + } + public void setIsScreened(String is_Screened) { + this.isScreened = is_Screened; + } + public String getIsAdministered() { + return isAdministered; + } + public void setIsAdministered(String isAdministered) { + this.isAdministered = isAdministered; + } + public String getIsReferred() { + return isReferred; } - public void setAdmScreenedRef(String admScreenedRef) { - this.admScreenedRef = admScreenedRef; + public void setIsReferred(String isReferred) { + this.isReferred = isReferred; } public String getActivityDate() { return activityDate; @@ -401,25 +441,4 @@ public AimsReferral getAimsReferral() { public void setAimsReferral(AimsReferral aimsReferral) { this.aimsReferral = aimsReferral; } - - @Override - public String toString() { - return "MainEntity [confirmationId=" + confirmationId + ", submissionDate=" + submissionDate + ", submittedBy=" - + submittedBy + ", submissionType=" + submissionType + ", agencyCode=" + agencyCode + ", programType=" - + programType + ", officeCode=" + officeCode + ", referralSource=" + referralSource + ", officeDate=" - + officeDate + ", regionalHA=" + regionalHA + ", contractingHA=" + contractingHA + ", healthNum=" - + healthNum + ", lastName=" + lastName + ", firstName=" + firstName + ", middleName=" + middleName - + ", birthDate=" + birthDate + ", postalCode=" + postalCode + ", primaryLanguage=" + primaryLanguage - + ", educationLevel=" + educationLevel + ", maritalStatus=" + maritalStatus + ", employmentStatus=" - + employmentStatus + ", numberDependentChildren=" + numberDependentChildren + ", methadoneMaintainance=" - + methadoneMaintainance + ", currentInjectionDrugUse=" + currentInjectionDrugUse + ", substance=" - + substance + ", otherClientInfo=" + otherClientInfo + ", substanceRelation=" + substanceRelation - + ", primaryDrugOfChoice=" + primaryDrugOfChoice + ", admScreenedRef=" + admScreenedRef - + ", activityDate=" + activityDate + ", activityServiceProviderCode=" + activityServiceProviderCode - + ", dischargeType=" + dischargeType + ", dischargeDate=" + dischargeDate - + ", dischargeServiceProviderCode=" + dischargeServiceProviderCode + ", dischargeProgramCompletion=" - + dischargeProgramCompletion + ", aimsMisuses=" + aimsMisuses + ", aimsReferral=" + aimsReferral + "]"; - } - - } From 1f62d2ba14f52295822699d5292b9bdb6804d136 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 27 Mar 2023 15:37:35 -0400 Subject: [PATCH 035/183] correction to AIMS REFERRAL Csv headers --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 704fffcd..aff909c3 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -118,7 +118,7 @@ public class Constants { "Discharge_Service_Provider_Code", "Discharge_Program_Completion" }); HEADERS.put(AIMS_MISUSE, new String[] { "Confirmation_ID", "Substance_misuses" }); - HEADERS.put(AIMS_REFERRAL, new String[] { "Confirmation_ID", "AIMS_Referral_ID", "Date", + HEADERS.put(AIMS_REFERRAL, new String[] { "Confirmation_ID", "AIMS_REFERRAL_NUM", "Date", "Service_Provider_Code", "Referral_Target", }); // LTC Facility From c0d8fb896fbfde0da4d0ffac6c2217f51cd99e2e Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 27 Mar 2023 16:20:46 -0400 Subject: [PATCH 036/183] fixed ETL for AIMS referral. Now updated with the current data model --- .../etl/forms/aims/model/AimsReferral.java | 21 ++++++++++++------- .../etl/forms/aims/model/MainEntity.java | 20 +++++++++++++----- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java index a1065891..c1ed8604 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java @@ -13,28 +13,33 @@ public class AimsReferral implements IModel { - @JsonIgnore private String confirmationId; - @JsonProperty("serviceProviderCode1") + private String referralDate; private String serviceProviderCode; - @JsonProperty("referralTarget") private String referralTarget; - @JsonProperty("DataGridReferral_date_1") - private String referralDate; public String getAimsReferralNumber() { return confirmationId.concat("-"+String.valueOf(Counter.getNext(getFormType()))); } - public String getServiceProviderCode() { - return serviceProviderCode; - } public void setConfirmationId(String confirmationId) { this.confirmationId = confirmationId; } + public String getReferralDate() { + return referralDate; + } + + public void setReferralDate(String referralDate) { + this.referralDate = referralDate; + } + + public String getServiceProviderCode() { + return serviceProviderCode; + } + public void setServiceProviderCode(String serviceProviderCode) { this.serviceProviderCode = serviceProviderCode; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java index 4b22f965..b6b77e87 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java @@ -6,13 +6,13 @@ import java.util.Map; import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonUnwrapped; import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; -//@JsonIgnoreProperties(ignoreUnknown = true) +@JsonIgnoreProperties(ignoreUnknown = true) public class MainEntity implements IModel { @JsonIgnore @@ -98,7 +98,7 @@ public class MainEntity implements IModel { @JsonIgnore protected List aimsMisuses; - @JsonUnwrapped + @JsonIgnore protected AimsReferral aimsReferral; @@ -108,6 +108,17 @@ protected void unPackForm(Map form) { this.submissionDate = form.get("createdAt"); this.submittedBy = form.get("email"); } + + //TODO make sure that only one referral is permited per form, we are manually accessing the 1st element of the array here + @JsonProperty("dataGrid") + protected void unPackDataGrid(List> dataGrid) { + AimsReferral aimsReferral = new AimsReferral(); + aimsReferral.setConfirmationId(this.confirmationId); + aimsReferral.setReferralDate(dataGrid.get(0).get("DataGridReferral_date_1")); + aimsReferral.setServiceProviderCode(dataGrid.get(0).get("simpletextfield1")); + aimsReferral.setReferralTarget(dataGrid.get(0).get("referralTarget")); + this.setAimsReferral(aimsReferral); + } @JsonProperty("selectBoxes1") protected void unPackSelectBoxes1(Map selectBoxes1) { @@ -190,9 +201,8 @@ public List getCsvElements() { } @Override public List getObjects() { - this.aimsReferral.setConfirmationId(this.confirmationId); List objects = new ArrayList<>(); - if(this.getAimsMisuses()!=null) { + if(this.getAimsMisuses()!=null) { //TODO always seems to be true objects.addAll(this.getAimsMisuses()); } if(this.getAimsReferral()!=null) { From 5bd99d6f7060ba44db69802a1b71e0ce70f40663 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 28 Mar 2023 15:05:05 -0400 Subject: [PATCH 037/183] transformed AIMS referals to recover all referred elements --- .../etl/forms/aims/model/MainEntity.java | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java index b6b77e87..c8cd2e85 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/MainEntity.java @@ -99,8 +99,7 @@ public class MainEntity implements IModel { protected List aimsMisuses; @JsonIgnore - protected AimsReferral aimsReferral; - + protected List aimsReferrals; @JsonProperty("form") protected void unPackForm(Map form) { @@ -109,15 +108,18 @@ protected void unPackForm(Map form) { this.submittedBy = form.get("email"); } - //TODO make sure that only one referral is permited per form, we are manually accessing the 1st element of the array here @JsonProperty("dataGrid") protected void unPackDataGrid(List> dataGrid) { - AimsReferral aimsReferral = new AimsReferral(); - aimsReferral.setConfirmationId(this.confirmationId); - aimsReferral.setReferralDate(dataGrid.get(0).get("DataGridReferral_date_1")); - aimsReferral.setServiceProviderCode(dataGrid.get(0).get("simpletextfield1")); - aimsReferral.setReferralTarget(dataGrid.get(0).get("referralTarget")); - this.setAimsReferral(aimsReferral); + List aimsReferrals = new ArrayList(); + for(Map referal : dataGrid) { + AimsReferral aimsReferral = new AimsReferral(); + aimsReferral.setConfirmationId(this.confirmationId); + aimsReferral.setReferralDate(referal.get("DataGridReferral_date_1")); + aimsReferral.setServiceProviderCode(referal.get("simpletextfield1")); + aimsReferral.setReferralTarget(referal.get("referralTarget")); + aimsReferrals.add(aimsReferral); + } + this.setAimsReferrals(aimsReferrals); } @JsonProperty("selectBoxes1") @@ -205,8 +207,8 @@ public List getObjects() { if(this.getAimsMisuses()!=null) { //TODO always seems to be true objects.addAll(this.getAimsMisuses()); } - if(this.getAimsReferral()!=null) { - objects.add(this.getAimsReferral()); + if(this.getAimsReferrals()!=null) { + objects.addAll(this.getAimsReferrals()); } return objects; } @@ -445,10 +447,11 @@ public List getAimsMisuses() { public void setAimsMisuses(List aimsMisuses) { this.aimsMisuses = aimsMisuses; } - public AimsReferral getAimsReferral() { - return aimsReferral; + public List getAimsReferrals() { + return aimsReferrals; } - public void setAimsReferral(AimsReferral aimsReferral) { - this.aimsReferral = aimsReferral; + + public void setAimsReferrals(List aimsReferrals) { + this.aimsReferrals = aimsReferrals; } } From c003710a1e414a5acf633c4dea669c4075c35b22 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 28 Mar 2023 15:07:07 -0400 Subject: [PATCH 038/183] modified one of AIMS referral csv header, from date to Referral_Date --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index aff909c3..96f15de6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -118,7 +118,7 @@ public class Constants { "Discharge_Service_Provider_Code", "Discharge_Program_Completion" }); HEADERS.put(AIMS_MISUSE, new String[] { "Confirmation_ID", "Substance_misuses" }); - HEADERS.put(AIMS_REFERRAL, new String[] { "Confirmation_ID", "AIMS_REFERRAL_NUM", "Date", + HEADERS.put(AIMS_REFERRAL, new String[] { "Confirmation_ID", "AIMS_REFERRAL_NUM", "Referral_Date", "Service_Provider_Code", "Referral_Target", }); // LTC Facility From 26d0aac8955d6533858d75c2e6b5e224a0c92bae Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 28 Mar 2023 15:35:18 -0400 Subject: [PATCH 039/183] removed dead code --- .../ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java index c1ed8604..ba9e3dbd 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/model/AimsReferral.java @@ -4,9 +4,6 @@ import java.util.List; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; - import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.util.Counter; From 965d26ac4d7930bd4e1a01ad382d5e0522ffb8ec Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 28 Mar 2023 16:57:15 -0400 Subject: [PATCH 040/183] modified header name for AIMS form --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 96f15de6..6d6cd137 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -112,7 +112,7 @@ public class Constants { "Program_Type", "Office_Code", "Referral_Source", "Office_Date", "Regional_HA", "Contracting_HA", "Health_Num", "Last_Name", "First_Name", "Middle_Name", "Gender", "Birthdate", "Postal_Code", "Primary_Language", "Education_Level", "Marital_Status", "Employment_Status", - "Number_Dependent_Children", "Methadone_Maintenance", "Current_Injection_Drug_Use", "Substance", + "Number_Dependent_Children", "Methadone_Maintenance", "Current_Injection_Drug_Use", "Client_Type", "Other_Client_Info", "Substance_Relation", "Primary_Drug_of_Choice", "Is_Screened", "Is_Administered", "Is_Referred","Activity_Date", "Activity_Service_Provider_Code", "Discharge_Type", "Discharge_Date", "Discharge_Service_Provider_Code", "Discharge_Program_Completion" }); From daf4dc7c849ceffdc3e9ea9d355b4b778d81b704 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 29 Mar 2023 11:50:42 -0400 Subject: [PATCH 041/183] organised file --- .../ca/bc/gov/chefs/etl/constant/Constants.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 6d6cd137..25d7be99 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -12,6 +12,10 @@ public class Constants { * Constants representing keys in application.properties. * */ + public final static Map HEADERS = new HashMap(); + public final static Map UNENC_FILE_PATH = new HashMap(); + public final static Map ENC_FILE_PATH = new HashMap(); + /* CHEFS API */ public final static String CHEFS_API_URL = "chefs.http.uri"; @@ -19,9 +23,6 @@ public class Constants { public final static String AIMS_USERNAME = "aims.username"; public final static String AIMS_PASSWORD = "aims.password"; - public final static Map HEADERS = new HashMap(); - public final static Map UNENC_FILE_PATH = new HashMap(); - public final static Map ENC_FILE_PATH = new HashMap(); public final static String AIMS_FORM = "AIMS_FORM"; public final static String AIMS_MISUSE = "AIMS_MISUSE"; @@ -31,17 +32,16 @@ public class Constants { public final static String LTC_FACILITY_USERNAME = "ltc.facility.username"; public final static String LTC_FACILITY_PASSWORD = "ltc.facility.password"; + public static final String LTC_FACILITY_APPROVER = "LTC_FACILITY_APPROVER"; + public static final String LTC_FACILITY_PREPARER = "LTC_FACILITY_PREPARER"; + /* LTC Quaterly YTD */ public final static String LTC_YTD_USERNAME = "ltc.ytd.username"; public final static String LTC_YTD_PASSWORD = "ltc.ytd.password"; public final static String IN_SCOPE = "inScope"; public final static String OUT_OF_SCOPE = "outOfScope"; public final static String PRIVATE_BED = "privateBed"; - // form names - public static final String LTC_FACILITY_APPROVER = "LTC_FACILITY_APPROVER"; - public static final String LTC_FACILITY_PREPARER = "LTC_FACILITY_PREPARER"; - public final static String LTC_BED_YTD_OCCUPIED_DAYS = "LTC_BED_YTD_OCCUPIED_DAYS"; public final static String LTC_BED_YTD_OCCUPANCY_RATE = "LTC_BED_YTD_OCCUPANCY_RATE"; public final static String LTC_BED_YTD_MAX_OCCUPANCY = "LTC_BED_YTD_MAX_OCCUPANCY"; @@ -61,8 +61,6 @@ public class Constants { public static final String LTC_BED_YTD_MAX_OCCUPANCY_TOTALS = "LTC_BED_YTD_MAX_OCCUPANCY_TOTALS"; public static final String LTC_YTD_COMP_HRS_SUBTOTALS = "LTC_YTD_COMP_HRS_SUBTOTALS"; public static final String LTC_YTD_COMP_HRS_TOTALS = "LTC_YTD_COMP_HRS_TOTALS"; - - public static final String LTC_YTD_COMP_SAL_TOTALS = "LTC_YTD_COMP_SAL_TOTALS"; public static final String LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS = "LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS"; public static final String LTC_YTD_DIRECT_CARE_COST_SUBTOTALS = "LTC_YTD_DIRECT_CARE_COST_SUBTOTALS"; From 7b9e5cfb089443f15cb6cfc0454a4f190a1a7c64 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 30 Mar 2023 15:12:00 -0400 Subject: [PATCH 042/183] test new branch --- .../etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java index 473e0ffd..de6b2f7d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java @@ -7,6 +7,7 @@ import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; +// TEST public class LtcBedYtdMaxOccupancy implements IModel { private String confirmationId; From 41ec96004721d21ca8ec824f7e36577707243d18 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 30 Mar 2023 15:16:47 -0400 Subject: [PATCH 043/183] ending test --- .../etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java index de6b2f7d..473e0ffd 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java @@ -7,7 +7,6 @@ import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; -// TEST public class LtcBedYtdMaxOccupancy implements IModel { private String confirmationId; From 92844333fbad9d6166f74d013b3e6c83b8abdaa4 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Fri, 31 Mar 2023 13:09:44 -0700 Subject: [PATCH 044/183] Adding the list of domains. Based on DomainModelDomains_v1.7.txt. --- doc/DomainModelDomains.txt | 878 +++++++++++++++++++++++++++++++++++++ 1 file changed, 878 insertions(+) create mode 100755 doc/DomainModelDomains.txt diff --git a/doc/DomainModelDomains.txt b/doc/DomainModelDomains.txt new file mode 100755 index 00000000..29abed3e --- /dev/null +++ b/doc/DomainModelDomains.txt @@ -0,0 +1,878 @@ +"Domain","Value","Order Sequence" +"BOOLEAN_YES_NO","yes","1" +"BOOLEAN_YES_NO","no","2" +"BOOLEAN_TRUE_FALSE","true","1" +"BOOLEAN_TRUE_FALSE","false","2" +"AIMS_SUBMISSION_TYPE","Intake","1" +"AIMS_SUBMISSION_TYPE","Discharge","2" +"AIMS_PROGRAM_TYPE","DEWW - Day Treatment for Women","1" +"AIMS_PROGRAM_TYPE","DEWM - Day Treatment for Men","2" +"AIMS_PROGRAM_TYPE","DEWC - Co-ed Day Treatment","3" +"AIMS_PROGRAM_TYPE","DEWY - Day Treatment for Youth","4" +"AIMS_PROGRAM_TYPE","RESD - Residential Treatment","5" +"AIMS_PROGRAM_TYPE","WDMT - Withdrawal management","6" +"AIMS_PROGRAM_TYPE","SUPR - Supportive Recovery","7" +"AIMS_PROGRAM_TYPE","PRGA - Problem Gambling","8" +"AIMS_PROGRAM_TYPE","PGTC - Problem Gambling Phone Counselling","9" +"AIMS_PROGRAM_TYPE","OUTP - Outpatient Services","10" +"AIMS_PROGRAM_TYPE","OTRC - Co-ed Outreach Services","11" +"AIMS_PROGRAM_TYPE","BEST - DWI Program","12" +"AIMS_PROGRAM_TYPE","EAPP - Employee Assistance Programs","13" +"AIMS_PROGRAM_TYPE","PHYC - Physician","14" +"AIMS_PROGRAM_TYPE","SBPP - School-based Prevention Program","15" +"AIMS_PROGRAM_TYPE","RESW - Residential Treatment for Women","16" +"AIMS_PROGRAM_TYPE","SUPC - Co-ed Supportive Recovery","17" +"AIMS_PROGRAM_TYPE","SBRC - Sobering Centre","18" +"AIMS_PROGRAM_TYPE","RESM - Residential Treatment for Men","19" +"AIMS_PROGRAM_TYPE","RESY - Residential Treatment for Youth","20" +"AIMS_PROGRAM_TYPE","WDMW - Withdrawal management for Women","21" +"AIMS_PROGRAM_TYPE","WDMM - Withdrawal management for Men","22" +"AIMS_PROGRAM_TYPE","WDMY - Withdrawal management for Youth","23" +"AIMS_PROGRAM_TYPE","SUPW - Supportive Recovery for Women","24" +"AIMS_PROGRAM_TYPE","SUPM - Supportive Recovery for Men","25" +"AIMS_PROGRAM_TYPE","SUPY - Supportive Recovery for Youth","26" +"AIMS_PROGRAM_TYPE","TNSC - Co-ed Transition/Stabilization","27" +"AIMS_PROGRAM_TYPE","TNSM - Transition/Stabilization for Men","28" +"AIMS_PROGRAM_TYPE","TNSW - Transition/Stabilization for Women","29" +"AIMS_PROGRAM_TYPE","OUTY - Outpatient Services for Youth","30" +"AIMS_PROGRAM_TYPE","OTRY - Outreach Services for Youth","31" +"AIMS_PROGRAM_TYPE","DUDX - Dual Diagnosis Program","32" +"AIMS_PROGRAM_TYPE","SAMY - Substance Abuse Management for Youth","33" +"AIMS_PROGRAM_TYPE","YCCP - Youth Custody Centre Addictions Counsellor Program","34" +"AIMS_PROGRAM_TYPE","MCPY - Multi Component Program for Youth","35" +"AIMS_OFFICE_CODE","ABA - Kootenays Region","1" +"AIMS_OFFICE_CODE","DBA - Okanagan Region","2" +"AIMS_OFFICE_CODE","EBA - Thompson/Cariboo Region","3" +"AIMS_OFFICE_CODE","FBA - Upper Fraser Region","4" +"AIMS_OFFICE_CODE","GBA - South Fraser Region","5" +"AIMS_OFFICE_CODE","HBA - Simon Fraser Region","6" +"AIMS_OFFICE_CODE","JBA - Coast/North Shore Region","7" +"AIMS_OFFICE_CODE","KBA - Central/Upper Island Region","8" +"AIMS_OFFICE_CODE","QBA - North Region","9" +"AIMS_OFFICE_CODE","RBA - Vancouver/Richmond Region","10" +"AIMS_OFFICE_CODE","SBA - Vancouver Direct Services","11" +"AIMS_OFFICE_CODE","VBA - Capital Region","12" +"AIMS_REFERRAL_SOURCE","ABOR - Aboriginal Organization","1" +"AIMS_REFERRAL_SOURCE","ABCP - Aboriginal child protection","2" +"AIMS_REFERRAL_SOURCE","BANK - Bankruptcy Trustee","3" +"AIMS_REFERRAL_SOURCE","CHPR - Chid Protection","4" +"AIMS_REFERRAL_SOURCE","CLGY - Clergy","5" +"AIMS_REFERRAL_SOURCE","COMM - Community Service Organization","6" +"AIMS_REFERRAL_SOURCE","CSAM - Substance Abuse Management","7" +"AIMS_REFERRAL_SOURCE","DEBT - Debtors' Assistance Agency","8" +"AIMS_REFERRAL_SOURCE","EAPL - Employee Assistance Plan","9" +"AIMS_REFERRAL_SOURCE","EDUC - Educational Institution","10" +"AIMS_REFERRAL_SOURCE","EMPL - Employer","11" +"AIMS_REFERRAL_SOURCE","FAMI - Family/Friend","12" +"AIMS_REFERRAL_SOURCE","GAMB - Gambling or gaming facility","13" +"AIMS_REFERRAL_SOURCE","HOSP - Hospital","14" +"AIMS_REFERRAL_SOURCE","IRAD - Information and Referral Services - for Alcohol and Drug","15" +"AIMS_REFERRAL_SOURCE","IRPG - Information and Referral Services - for Problem Gambling","16" +"AIMS_REFERRAL_SOURCE","LEGL - Legal System","17" +"AIMS_REFERRAL_SOURCE","MULT - Multicultural Centre/Service","18" +"AIMS_REFERRAL_SOURCE","CYMH - Child and Youth Mental Health","19" +"AIMS_REFERRAL_SOURCE","MHLT -  Mental Health Services  (Adult or Child)","20" +"AIMS_REFERRAL_SOURCE","MHRS - Ministry of Human Resources staff","21" +"AIMS_REFERRAL_SOURCE","NADP - National Native A&D Abuse Programs","22" +"AIMS_REFERRAL_SOURCE","PUBL - Public Health","23" +"AIMS_REFERRAL_SOURCE","PHYS - Physician","24" +"AIMS_REFERRAL_SOURCE","SELF - Self referral","25" +"AIMS_REFERRAL_SOURCE","STEP - Support Group","26" +"AIMS_REFERRAL_SOURCE","OSMV - Superintendent of Motor Vehicles","27" +"AIMS_REFERRAL_SOURCE","OMCF - Other MCF staff","28" +"AIMS_REFERRAL_SOURCE","OTHR - Other","29" +"AIMS_REFERRAL_SOURCE","XXAB - Referral from Alberta","30" +"AIMS_REFERRAL_SOURCE","XXMB - Referral from Manitoba","31" +"AIMS_REFERRAL_SOURCE","XXNB - Referral from New Brunswick","32" +"AIMS_REFERRAL_SOURCE","XXNF - Referral from Newfoundland","33" +"AIMS_REFERRAL_SOURCE","XXPE - Referral from Prince Edward Island","34" +"AIMS_REFERRAL_SOURCE","XXNT - Referral from Northwest Territories","35" +"AIMS_REFERRAL_SOURCE","XXON - Referral from Ontario","36" +"AIMS_REFERRAL_SOURCE","XXQC - Referral from Quebec","37" +"AIMS_REFERRAL_SOURCE","XXYT - Referral from Yukon","38" +"AIMS_REFERRAL_SOURCE","XXNS - Referral from Nova Scotia","39" +"AIMS_REFERRAL_SOURCE","XXSK - Referral from Saskatchewan","40" +"AIMS_REFERRAL_SOURCE","XUSA - Referral from United States","41" +"AIMS_REFERRAL_SOURCE","XANT - Referral from Netherlands Antilles","42" +"AIMS_REFERRAL_SOURCE","XARE - Referral from United Arab Emirates","43" +"AIMS_REFERRAL_SOURCE","PROB - Probation","44" +"AIMS_REFERRAL_SOURCE","EMPP - Employment Centre or program","45" +"AIMS_REFERRAL_SOURCE","PSYC - Psychologist or Psychiatrist","46" +"AIMS_REFERRAL_SOURCE","RNAF - Risk Needs Assessment Form","47" +"HEALTH_AUTHORITY","Fraser","1" +"HEALTH_AUTHORITY","Vancouver Island","2" +"HEALTH_AUTHORITY","Vancouver Coastal","3" +"HEALTH_AUTHORITY","Northern","4" +"HEALTH_AUTHORITY","Interior","5" +"LANGUAGE","ABR - Aboriginal language","1" +"LANGUAGE","ASL - American Sign language","2" +"LANGUAGE","ARA - Arabic","3" +"LANGUAGE","CAN - Cantonese","4" +"LANGUAGE","CZH - Czech","5" +"LANGUAGE","DCH - Dutch","6" +"LANGUAGE","FRS - Farsi","7" +"LANGUAGE","FNN - Finnish","8" +"LANGUAGE","FRE - French","9" +"LANGUAGE","GRM - German","10" +"LANGUAGE","GRK - Greek","11" +"LANGUAGE","HND - Hindi","12" +"LANGUAGE","HNG - Hungarian","13" +"LANGUAGE","IND - Indonesian","14" +"LANGUAGE","ITL - Italian","15" +"LANGUAGE","JPN - Japanese","16" +"LANGUAGE","KRN - Korean","17" +"LANGUAGE","MLY - Malaysian","18" +"LANGUAGE","MAN - Mandarin","19" +"LANGUAGE","NRW - Norwegian","20" +"LANGUAGE","PKS - Pakistani","21" +"LANGUAGE","PLS - Polish","22" +"LANGUAGE","PRG - Portuguese","23" +"LANGUAGE","PNJ - Punjabi","24" +"LANGUAGE","RSS - Russian","25" +"LANGUAGE","SLV - Slovak","26" +"LANGUAGE","SPA - Spanish","27" +"LANGUAGE","SWD - Swedish","28" +"LANGUAGE","TAG - Tagalog (Filipino)","29" +"LANGUAGE","TRK - Turkish","30" +"LANGUAGE","VTN - Vietnamese","31" +"LANGUAGE","OTH - Other language not listed","32" +"LANGUAGE","NVL - Invalid Code","33" +"LANGUAGE","ENG - English","34" +"EDUCATION_LEVEL","ELM - Elementary school or some high school","1" +"EDUCATION_LEVEL","HSG - Graduated high school","2" +"EDUCATION_LEVEL","CVT - Some college, vocational, technical, or trade school completion","3" +"EDUCATION_LEVEL","UND - Undergraduate degree","4" +"EDUCATION_LEVEL","GRD - Graduate degree","5" +"EDUCATION_LEVEL","NVL - Invalid Code","6" +"MARITAL_STATUS","SNG - Single, never been married","7" +"MARITAL_STATUS","CLR - Living common law or in a long term relationship","8" +"MARITAL_STATUS","MAR - Married","9" +"MARITAL_STATUS","DIV - Divorced/Separated","10" +"MARITAL_STATUS","WID - Widow or widower","11" +"MARITAL_STATUS","NVL - Invalid Code","12" +"MARITAL_STATUS","SEP - Separated","13" +"EMPLOYMENT_STATUS","FLT - Full time employment","1" +"EMPLOYMENT_STATUS","FTS - Full time seasonal employment (self-employed)","2" +"EMPLOYMENT_STATUS","HOM - Homemaker","3" +"EMPLOYMENT_STATUS","NLF - Not in the labour force (Ineligible to work)","4" +"EMPLOYMENT_STATUS","PRT - Part time employment","5" +"EMPLOYMENT_STATUS","PTS - Part time seasonal employment","6" +"EMPLOYMENT_STATUS","RET - Retired","7" +"EMPLOYMENT_STATUS","STU - Student, attending any education institution","8" +"EMPLOYMENT_STATUS","UEM - Unemployed","9" +"SUBSTANCE_MIS_AFF","Substance Misuse","1" +"SUBSTANCE_MIS_AFF","Substance Affected","2" +"SUBSTANCE_RELATION","CHL Child of parent with addiction issues","1" +"SUBSTANCE_RELATION","CWK Co-worker of a person with addiction issues","2" +"SUBSTANCE_RELATION","EMP Employer of a person with addiction issues","3" +"SUBSTANCE_RELATION","FRD Friend of a person with addiction issues","4" +"SUBSTANCE_RELATION","OTH Other than any of the above","5" +"SUBSTANCE_RELATION","OTR Other relative of a person with addiction issues","6" +"SUBSTANCE_RELATION","PRT Parent of a child with addiction issues","7" +"SUBSTANCE_RELATION","PTN Partner to a person with addiction issues","8" +"PRIMARY_DRUG_OF_CHOICE","CAN - Cannabis","1" +"PRIMARY_DRUG_OF_CHOICE","COC - Cocaine","2" +"PRIMARY_DRUG_OF_CHOICE","HAL - Hallucinogen","3" +"PRIMARY_DRUG_OF_CHOICE","BAR - Barbiturate","4" +"PRIMARY_DRUG_OF_CHOICE","AMP - Amphetamine","5" +"PRIMARY_DRUG_OF_CHOICE","HER - Heroin","6" +"PRIMARY_DRUG_OF_CHOICE","OPT - Opiate","7" +"PRIMARY_DRUG_OF_CHOICE","INH - Inhalant","8" +"PRIMARY_DRUG_OF_CHOICE","IMT - Illicit Methadone","9" +"PRIMARY_DRUG_OF_CHOICE","BEN - Benzodiazepine","10" +"PRIMARY_DRUG_OF_CHOICE","OTC - Over the counter drugs","11" +"PRIMARY_DRUG_OF_CHOICE","OPD - Other prescription drugs","12" +"PRIMARY_DRUG_OF_CHOICE","OTH - Other drugs not listed","13" +"PRIMARY_DRUG_OF_CHOICE","ALC - Alcohol","14" +"PRIMARY_DRUG_OF_CHOICE","MA - Methamphetamine","15" +"QUARTER","Q1","1" +"QUARTER","Q2","2" +"QUARTER","Q3","3" +"QUARTER","Q4","4" +"ADMIN_SCREEN_REF","Admitted","1" +"ADMIN_SCREEN_REF","Screened","2" +"ADMIN_SCREEN_REF","Referred","3" +"DISCHARGE_TYPE","Discharged","1" +"DISCHARGE_TYPE","Screen only","2" +"DISCHARGE_PRG_COMP_TYPE","Completed","1" +"DISCHARGE_PRG_COMP_TYPE","Incomplete","2" +"DISCHARGE_PRG_COMP_TYPE","Client Deceased","3" +"REFERRAL_TARGET","ABCP  Aboriginal Child Protection","1" +"REFERRAL_TARGET","ABOR -  Aboriginal Organization","2" +"REFERRAL_TARGET","BANK -  Bankruptcy Trustee","3" +"REFERRAL_TARGET","CHPR -  Child Protection","4" +"REFERRAL_TARGET","CLGY -  Clergy","5" +"REFERRAL_TARGET","COMM -  Community Service Organization","6" +"REFERRAL_TARGET","CSAM  Corrections Substance Abuse Management","7" +"REFERRAL_TARGET","CYMH  Child and Youth Mental Health","8" +"REFERRAL_TARGET","DEBT  Debtor's Assistance Agency","9" +"REFERRAL_TARGET","EAPL  Employee Assistance Plan","10" +"REFERRAL_TARGET","EDUC  Educational Institute","11" +"REFERRAL_TARGET","EMPL  Employer","12" +"REFERRAL_TARGET","EMPP  Employment Center or Program","13" +"REFERRAL_TARGET","FAMI  Family/Friend","14" +"REFERRAL_TARGET","GAMB  Gambling or Gaming Facility","15" +"REFERRAL_TARGET","HOSP  Hospital","16" +"REFERRAL_TARGET","IRAD  Referral Services for Alcohol and Drug","17" +"REFERRAL_TARGET","IRPG  Referral Services for Problem Gambling","18" +"REFERRAL_TARGET","LEGL  Legal System","19" +"REFERRAL_TARGET","MHLT  Mental Health Services","20" +"REFERRAL_TARGET","MHRS  Ministry of Human Resources","21" +"REFERRAL_TARGET","MULT  Multicultural Centre/Service","22" +"REFERRAL_TARGET","NADP  National Native A&D Programs","23" +"REFERRAL_TARGET","OMCF  Other MCFD Staff","24" +"REFERRAL_TARGET","OSMV  Superintendent of Motor Vehicles","25" +"REFERRAL_TARGET","OTHR  Other","26" +"REFERRAL_TARGET","PHYS  Physician","27" +"REFERRAL_TARGET","PROB  Probation","28" +"REFERRAL_TARGET","PSYC  Psychologist or Psychiatrist","29" +"REFERRAL_TARGET","PUBL  Public Health","30" +"REFERRAL_TARGET","RNAF  Risk Needs Assessment Form8","31" +"REFERRAL_TARGET","SELF  Self Referral","32" +"REFERRAL_TARGET","STEP  Support Group","33" +"REFERRAL_TARGET","XX**  Outside of BC, another Province","34" +"REFERRAL_TARGET","XXAB  AB-Alberta","35" +"REFERRAL_TARGET","XXMB  MB-Manitoba","36" +"REFERRAL_TARGET","XXNB  NB-New Brunswick","37" +"REFERRAL_TARGET","XXNF  NF-Newfoundland","38" +"REFERRAL_TARGET","XXNS  NS-Nova Scotia","39" +"REFERRAL_TARGET","XXNT  NT-Northwest Territories","40" +"REFERRAL_TARGET","XXON  ON-Ontario","41" +"REFERRAL_TARGET","XXPE  PE-Prince Edward Island","42" +"REFERRAL_TARGET","XXQC  QC-Quebec","43" +"REFERRAL_TARGET","XXSK  SK-Saskatchewan","44" +"REFERRAL_TARGET","XXYT  YT-Yukon","45" +"REFERRAL_TARGET","XANT  Referral from Netherlands Antilles","46" +"REFERRAL_TARGET","XARE  Referral from United Arab Emirates","47" +"REFERRAL_TARGET","XUSA  Referral from United States","48" +"SUBSTANCE","Alcohol","1" +"SUBSTANCE","Cannabis","2" +"SUBSTANCE","Cocaine","3" +"SUBSTANCE","Hallucinogen","4" +"SUBSTANCE","Barbiturate","5" +"SUBSTANCE","Amphetamine","6" +"SUBSTANCE","Heroin","7" +"SUBSTANCE","Opiate","8" +"SUBSTANCE","Inhalant","9" +"SUBSTANCE","Illicit Methadone","10" +"SUBSTANCE","Benzodiazepine","11" +"SUBSTANCE","Other","12" +"SUBSTANCE","Over the Counter Drugs","13" +"SUBSTANCE","Over the Prescription Drugs","14" +"SUBSTANCE","Crystal Methamphetamine/ Methamphetamine","15" +"STANDALONE_FACILITY_TYPE","SS-EOL","1" +"STANDALONE_FACILITY_TYPE","SS-Respite","2" +"STANDALONE_FACILITY_TYPE","SS-CC","3" +"STANDALONE_FACILITY_TYPE","ABI","4" +"STANDALONE_FACILITY_TYPE","None","5" +"LOCAL_HEALTH_AUTHORITY","111 Fernie","1" +"LOCAL_HEALTH_AUTHORITY","112 Cranbrook","2" +"LOCAL_HEALTH_AUTHORITY","113 Kimberley","3" +"LOCAL_HEALTH_AUTHORITY","114 Windermere","4" +"LOCAL_HEALTH_AUTHORITY","115 Creston","5" +"LOCAL_HEALTH_AUTHORITY","116 Golden","6" +"LOCAL_HEALTH_AUTHORITY","121 Kootenay Lake","7" +"LOCAL_HEALTH_AUTHORITY","122 Nelson","8" +"LOCAL_HEALTH_AUTHORITY","123 Castlegar","9" +"LOCAL_HEALTH_AUTHORITY","124 Arrow Lakes","10" +"LOCAL_HEALTH_AUTHORITY","125 Trail","11" +"LOCAL_HEALTH_AUTHORITY","126 Grand Forks","12" +"LOCAL_HEALTH_AUTHORITY","127 Kettle Valley","13" +"LOCAL_HEALTH_AUTHORITY","131 Southern Okanagan","14" +"LOCAL_HEALTH_AUTHORITY","132 Penticton","15" +"LOCAL_HEALTH_AUTHORITY","133 Keremeos","16" +"LOCAL_HEALTH_AUTHORITY","134 Princeton","17" +"LOCAL_HEALTH_AUTHORITY","135 Armstrong/Spallumcheen","18" +"LOCAL_HEALTH_AUTHORITY","136 Vernon","19" +"LOCAL_HEALTH_AUTHORITY","137 Central Okanagan","20" +"LOCAL_HEALTH_AUTHORITY","138 Summerland","21" +"LOCAL_HEALTH_AUTHORITY","139 Enderby","22" +"LOCAL_HEALTH_AUTHORITY","141 Revelstoke","23" +"LOCAL_HEALTH_AUTHORITY","142 Salmon Arm","24" +"LOCAL_HEALTH_AUTHORITY","143 Kamloops","25" +"LOCAL_HEALTH_AUTHORITY","144 100 Mile House","26" +"LOCAL_HEALTH_AUTHORITY","145 North Thompson","27" +"LOCAL_HEALTH_AUTHORITY","146 Cariboo/Chilcotin","28" +"LOCAL_HEALTH_AUTHORITY","147 Lillooet","29" +"LOCAL_HEALTH_AUTHORITY","148 South Cariboo","30" +"LOCAL_HEALTH_AUTHORITY","149 Merritt","31" +"LOCAL_HEALTH_AUTHORITY","211 Hope","32" +"LOCAL_HEALTH_AUTHORITY","212 Chilliwack","33" +"LOCAL_HEALTH_AUTHORITY","213 Abbotsford","34" +"LOCAL_HEALTH_AUTHORITY","214 Mission","35" +"LOCAL_HEALTH_AUTHORITY","215 Agassiz/Harrison","36" +"LOCAL_HEALTH_AUTHORITY","221 New Westminster","37" +"LOCAL_HEALTH_AUTHORITY","222 Burnaby","38" +"LOCAL_HEALTH_AUTHORITY","223 Maple Ridge/Pitt Meadows","39" +"LOCAL_HEALTH_AUTHORITY","224 Tri-Cities","40" +"LOCAL_HEALTH_AUTHORITY","231 Langley","41" +"LOCAL_HEALTH_AUTHORITY","232 Delta","42" +"LOCAL_HEALTH_AUTHORITY","233 Surrey","43" +"LOCAL_HEALTH_AUTHORITY","234 South Surrey/White Rock","44" +"LOCAL_HEALTH_AUTHORITY","311 Richmond","45" +"LOCAL_HEALTH_AUTHORITY","321 Vancouver - City Centre","46" +"LOCAL_HEALTH_AUTHORITY","322 Vancouver - Centre North","47" +"LOCAL_HEALTH_AUTHORITY","323 Vancouver - Northeast","48" +"LOCAL_HEALTH_AUTHORITY","324 Vancouver - Westside","49" +"LOCAL_HEALTH_AUTHORITY","325 Vancouver - Midtown","50" +"LOCAL_HEALTH_AUTHORITY","326 Vancouver - South","51" +"LOCAL_HEALTH_AUTHORITY","331 North Vancouver","52" +"LOCAL_HEALTH_AUTHORITY","332 West Vancouver/Bowen Island","53" +"LOCAL_HEALTH_AUTHORITY","333 Sunshine Coast","54" +"LOCAL_HEALTH_AUTHORITY","334 Powell River","55" +"LOCAL_HEALTH_AUTHORITY","335 Howe Sound","56" +"LOCAL_HEALTH_AUTHORITY","336 Bella Coola Valley","57" +"LOCAL_HEALTH_AUTHORITY","337 Central Coast","58" +"LOCAL_HEALTH_AUTHORITY","411 Greater Victoria","59" +"LOCAL_HEALTH_AUTHORITY","412 Western Communities","60" +"LOCAL_HEALTH_AUTHORITY","413 Saanich Peninsula","61" +"LOCAL_HEALTH_AUTHORITY","414 Southern Gulf Islands","62" +"LOCAL_HEALTH_AUTHORITY","421 Cowichan Valley South","63" +"LOCAL_HEALTH_AUTHORITY","422 Cowichan Valley West","64" +"LOCAL_HEALTH_AUTHORITY","423 Cowichan Valley North","65" +"LOCAL_HEALTH_AUTHORITY","424 Greater Nanaimo","66" +"LOCAL_HEALTH_AUTHORITY","425 Oceanside","67" +"LOCAL_HEALTH_AUTHORITY","426 Alberni/Clayoquot","68" +"LOCAL_HEALTH_AUTHORITY","431 Comox Valley","69" +"LOCAL_HEALTH_AUTHORITY","432 Greater Campbell River","70" +"LOCAL_HEALTH_AUTHORITY","433 Vancouver Island West","71" +"LOCAL_HEALTH_AUTHORITY","434 Vancouver Island North","72" +"LOCAL_HEALTH_AUTHORITY","510 Haida Gwaii","73" +"LOCAL_HEALTH_AUTHORITY","511 Snow Country","74" +"LOCAL_HEALTH_AUTHORITY","512 Prince Rupert","75" +"LOCAL_HEALTH_AUTHORITY","513 Upper Skeena","76" +"LOCAL_HEALTH_AUTHORITY","514 Smithers","77" +"LOCAL_HEALTH_AUTHORITY","515 Kitimat","78" +"LOCAL_HEALTH_AUTHORITY","516 Stikine","79" +"LOCAL_HEALTH_AUTHORITY","517 Terrace","80" +"LOCAL_HEALTH_AUTHORITY","518 Nisga'a","81" +"LOCAL_HEALTH_AUTHORITY","519 Telegraph Creek","82" +"LOCAL_HEALTH_AUTHORITY","521 Quesnel","83" +"LOCAL_HEALTH_AUTHORITY","522 Burns Lake","84" +"LOCAL_HEALTH_AUTHORITY","523 Nechako","85" +"LOCAL_HEALTH_AUTHORITY","524 Prince George","86" +"LOCAL_HEALTH_AUTHORITY","531 Peace River South","87" +"LOCAL_HEALTH_AUTHORITY","532 Peace River North","88" +"LOCAL_HEALTH_AUTHORITY","533 Fort Nelson","89" +"COMM_HLTH_SVC_AREA","1110 Fernie","1" +"COMM_HLTH_SVC_AREA","1120 Cranbrook","2" +"COMM_HLTH_SVC_AREA","1130 Kimberley","3" +"COMM_HLTH_SVC_AREA","1140 Windermere","4" +"COMM_HLTH_SVC_AREA","1150 Creston","5" +"COMM_HLTH_SVC_AREA","1160 Golden","6" +"COMM_HLTH_SVC_AREA","1210 Kootenay Lake","7" +"COMM_HLTH_SVC_AREA","1220 Nelson","8" +"COMM_HLTH_SVC_AREA","1230 Castlegar","9" +"COMM_HLTH_SVC_AREA","1240 Arrow Lakes","10" +"COMM_HLTH_SVC_AREA","1250 Trail","11" +"COMM_HLTH_SVC_AREA","1260 Grand Forks","12" +"COMM_HLTH_SVC_AREA","1270 Kettle Valley","13" +"COMM_HLTH_SVC_AREA","1310 Southern Okanagan","14" +"COMM_HLTH_SVC_AREA","1320 Penticton","15" +"COMM_HLTH_SVC_AREA","1330 Keremeos","16" +"COMM_HLTH_SVC_AREA","1340 Princeton","17" +"COMM_HLTH_SVC_AREA","1350 Armstrong/Spallumcheen","18" +"COMM_HLTH_SVC_AREA","1361 Vernon Centre/Coldstream","19" +"COMM_HLTH_SVC_AREA","1362 North Okanagan/Lumby","20" +"COMM_HLTH_SVC_AREA","1371 Central Okanagan Rural","21" +"COMM_HLTH_SVC_AREA","1372 West Kelowna","22" +"COMM_HLTH_SVC_AREA","1373 Lake Country","23" +"COMM_HLTH_SVC_AREA","1374 Glenmore","24" +"COMM_HLTH_SVC_AREA","1375 Downtown Kelowna","25" +"COMM_HLTH_SVC_AREA","1376 Rutland","26" +"COMM_HLTH_SVC_AREA","1377 Okanagan Mission","27" +"COMM_HLTH_SVC_AREA","1380 Summerland","28" +"COMM_HLTH_SVC_AREA","1390 Enderby","29" +"COMM_HLTH_SVC_AREA","1410 Revelstoke","30" +"COMM_HLTH_SVC_AREA","1420 Salmon Arm","31" +"COMM_HLTH_SVC_AREA","1431 Kamloops Centre North","32" +"COMM_HLTH_SVC_AREA","1432 Kamloops Centre South","33" +"COMM_HLTH_SVC_AREA","1433 Lower Thompson","34" +"COMM_HLTH_SVC_AREA","1440 100 Mile House","35" +"COMM_HLTH_SVC_AREA","1450 North Thompson","36" +"COMM_HLTH_SVC_AREA","1461 West Cariboo","37" +"COMM_HLTH_SVC_AREA","1462 Williams Lake/East Cariboo","38" +"COMM_HLTH_SVC_AREA","1470 Lillooet","39" +"COMM_HLTH_SVC_AREA","1480 South Cariboo","40" +"COMM_HLTH_SVC_AREA","1490 Merritt","41" +"COMM_HLTH_SVC_AREA","2110 Hope","42" +"COMM_HLTH_SVC_AREA","2121 South Chilliwack","43" +"COMM_HLTH_SVC_AREA","2122 North Chilliwack","44" +"COMM_HLTH_SVC_AREA","2131 Central Abbotsford","45" +"COMM_HLTH_SVC_AREA","2132 East Abbotsford","46" +"COMM_HLTH_SVC_AREA","2133 West Abbotsford","47" +"COMM_HLTH_SVC_AREA","2134 Abbotsford Rural","48" +"COMM_HLTH_SVC_AREA","2141 South Mission","49" +"COMM_HLTH_SVC_AREA","2142 North Mission","50" +"COMM_HLTH_SVC_AREA","2150 Agassiz/Harrison","51" +"COMM_HLTH_SVC_AREA","2210 New Westminster","52" +"COMM_HLTH_SVC_AREA","2221 Burnaby Northwest","53" +"COMM_HLTH_SVC_AREA","2222 Burnaby Northeast","54" +"COMM_HLTH_SVC_AREA","2223 Burnaby Southwest","55" +"COMM_HLTH_SVC_AREA","2224 Burnaby Southeast","56" +"COMM_HLTH_SVC_AREA","2231 Haney","57" +"COMM_HLTH_SVC_AREA","2232 Pitt Meadows","58" +"COMM_HLTH_SVC_AREA","2233 Maple Ridge Rural","59" +"COMM_HLTH_SVC_AREA","2241 North Coquitlam","60" +"COMM_HLTH_SVC_AREA","2242 Southwest Coquitlam","61" +"COMM_HLTH_SVC_AREA","2243 Southeast Coquitlam","62" +"COMM_HLTH_SVC_AREA","2244 Port Coquitlam","63" +"COMM_HLTH_SVC_AREA","2245 Port Moody/Anmore/Belcarra","64" +"COMM_HLTH_SVC_AREA","2311 City of Langley","65" +"COMM_HLTH_SVC_AREA","2312 Walnut Grove/Fort Langley","66" +"COMM_HLTH_SVC_AREA","2313 Willoughby","67" +"COMM_HLTH_SVC_AREA","2314 Brookswood/Murrayville","68" +"COMM_HLTH_SVC_AREA","2315 Aldergrove/Otter","69" +"COMM_HLTH_SVC_AREA","2316 North Langley Township","70" +"COMM_HLTH_SVC_AREA","2317 South Langley Township","71" +"COMM_HLTH_SVC_AREA","2321 North Delta","72" +"COMM_HLTH_SVC_AREA","2322 Ladner","73" +"COMM_HLTH_SVC_AREA","2323 Tsawwassen","74" +"COMM_HLTH_SVC_AREA","2331 Whalley","75" +"COMM_HLTH_SVC_AREA","2332 North Surrey","76" +"COMM_HLTH_SVC_AREA","2333 Cloverdale","77" +"COMM_HLTH_SVC_AREA","2334 Panorama","78" +"COMM_HLTH_SVC_AREA","2335 East Newton","79" +"COMM_HLTH_SVC_AREA","2336 Fleetwood","80" +"COMM_HLTH_SVC_AREA","2337 Guildford","81" +"COMM_HLTH_SVC_AREA","2338 West Newton","82" +"COMM_HLTH_SVC_AREA","2341 South Surrey","83" +"COMM_HLTH_SVC_AREA","2342 White Rock","84" +"COMM_HLTH_SVC_AREA","3111 Richmond City Centre","85" +"COMM_HLTH_SVC_AREA","3112 Blundell","86" +"COMM_HLTH_SVC_AREA","3113 Broadmoor","87" +"COMM_HLTH_SVC_AREA","3114 Thompson/Seafair","88" +"COMM_HLTH_SVC_AREA","3115 Steveston","89" +"COMM_HLTH_SVC_AREA","3116 East and West Cambie/Bridgeport","90" +"COMM_HLTH_SVC_AREA","3117 Gilmore/Shellmont/East/Hamilton","91" +"COMM_HLTH_SVC_AREA","3211 Downtown Vancouver","92" +"COMM_HLTH_SVC_AREA","3212 West End","93" +"COMM_HLTH_SVC_AREA","3213 Fairview","94" +"COMM_HLTH_SVC_AREA","3221 Downtown Eastside","95" +"COMM_HLTH_SVC_AREA","3222 Northeast False Creek","96" +"COMM_HLTH_SVC_AREA","3223 Grandview-Woodland","97" +"COMM_HLTH_SVC_AREA","3231 Cedar Cottage","98" +"COMM_HLTH_SVC_AREA","3232 Hastings-Sunrise","99" +"COMM_HLTH_SVC_AREA","3233 Renfrew-Collingwood","100" +"COMM_HLTH_SVC_AREA","3241 Shaughnessy/Arbutus Ridge/Kerrisdale","101" +"COMM_HLTH_SVC_AREA","3242 West Point Grey/Dunbar-Southlands","102" +"COMM_HLTH_SVC_AREA","3243 University of British Columbia","103" +"COMM_HLTH_SVC_AREA","3244 Kitsilano","104" +"COMM_HLTH_SVC_AREA","3251 Kensington","105" +"COMM_HLTH_SVC_AREA","3252 Mount Pleasant","106" +"COMM_HLTH_SVC_AREA","3253 South Cambie/Riley Park","107" +"COMM_HLTH_SVC_AREA","3261 Killarney","108" +"COMM_HLTH_SVC_AREA","3262 Oakridge/Marpole","109" +"COMM_HLTH_SVC_AREA","3263 Sunset","110" +"COMM_HLTH_SVC_AREA","3264 Victoria-Fraserview","111" +"COMM_HLTH_SVC_AREA","3311 North Vancouver City - East","112" +"COMM_HLTH_SVC_AREA","3312 North Vancouver City - West","113" +"COMM_HLTH_SVC_AREA","3313 North Vancouver DM - Central","114" +"COMM_HLTH_SVC_AREA","3314 North Vancouver DM - East","115" +"COMM_HLTH_SVC_AREA","3315 North Vancouver DM - West","116" +"COMM_HLTH_SVC_AREA","3321 West Vancouver - Lower","117" +"COMM_HLTH_SVC_AREA","3322 West Vancouver - Upper","118" +"COMM_HLTH_SVC_AREA","3323 Bowen Island/Lions Bay","119" +"COMM_HLTH_SVC_AREA","3331 Gibsons","120" +"COMM_HLTH_SVC_AREA","3332 Sechelt","121" +"COMM_HLTH_SVC_AREA","3333 Sunshine Coast Rural","122" +"COMM_HLTH_SVC_AREA","3341 Powell River City","123" +"COMM_HLTH_SVC_AREA","3342 qathet Rural","124" +"COMM_HLTH_SVC_AREA","3351 Squamish","125" +"COMM_HLTH_SVC_AREA","3352 Whistler","126" +"COMM_HLTH_SVC_AREA","3353 Howe Sound Rural","127" +"COMM_HLTH_SVC_AREA","3360 Bella Coola Valley","128" +"COMM_HLTH_SVC_AREA","3370 Central Coast","129" +"COMM_HLTH_SVC_AREA","4111 Downtown Victoria/Vic West","130" +"COMM_HLTH_SVC_AREA","4112 James Bay/Fairfield","131" +"COMM_HLTH_SVC_AREA","4113 Oaklands/Fernwood","132" +"COMM_HLTH_SVC_AREA","4114 Oak Bay","133" +"COMM_HLTH_SVC_AREA","4115 Gordon Head/Shelbourne","134" +"COMM_HLTH_SVC_AREA","4116 Quadra/Swan Lake","135" +"COMM_HLTH_SVC_AREA","4117 Interurban/Tillicum","136" +"COMM_HLTH_SVC_AREA","4118 View Royal","137" +"COMM_HLTH_SVC_AREA","4119 Esquimalt","138" +"COMM_HLTH_SVC_AREA","4121 Colwood","139" +"COMM_HLTH_SVC_AREA","4122 Metchosin","140" +"COMM_HLTH_SVC_AREA","4123 Langford/Highlands","141" +"COMM_HLTH_SVC_AREA","4124 Sooke","142" +"COMM_HLTH_SVC_AREA","4125 Juan de Fuca Coast","143" +"COMM_HLTH_SVC_AREA","4131 Royal Oak/Cordova Bay/Prospect","144" +"COMM_HLTH_SVC_AREA","4132 Central Saanich","145" +"COMM_HLTH_SVC_AREA","4133 North Saanich","146" +"COMM_HLTH_SVC_AREA","4134 Sidney","147" +"COMM_HLTH_SVC_AREA","4141 Salt Spring Island","148" +"COMM_HLTH_SVC_AREA","4142 Pender/Galiano/Saturna/Mayne","149" +"COMM_HLTH_SVC_AREA","4211 South Cowichan","150" +"COMM_HLTH_SVC_AREA","4212 Central Cowichan","151" +"COMM_HLTH_SVC_AREA","4220 Cowichan Valley West","152" +"COMM_HLTH_SVC_AREA","4231 Ladysmith","153" +"COMM_HLTH_SVC_AREA","4232 Ladysmith Rural","154" +"COMM_HLTH_SVC_AREA","4233 Chemainus","155" +"COMM_HLTH_SVC_AREA","4234 Penelakut and Thetis Islands","156" +"COMM_HLTH_SVC_AREA","4241 Downtown Nanaimo","157" +"COMM_HLTH_SVC_AREA","4242 Departure Bay","158" +"COMM_HLTH_SVC_AREA","4243 Nanaimo North/Lantzville","159" +"COMM_HLTH_SVC_AREA","4244 Nanaimo South","160" +"COMM_HLTH_SVC_AREA","4245 Nanaimo West/Rural","161" +"COMM_HLTH_SVC_AREA","4246 Cedar/Wellington","162" +"COMM_HLTH_SVC_AREA","4247 Gabriola Island","163" +"COMM_HLTH_SVC_AREA","4251 Parksville","164" +"COMM_HLTH_SVC_AREA","4252 Qualicum Beach","165" +"COMM_HLTH_SVC_AREA","4253 Oceanside Rural","166" +"COMM_HLTH_SVC_AREA","4261 Port Alberni","167" +"COMM_HLTH_SVC_AREA","4262 Alberni Valley/Bamfield","168" +"COMM_HLTH_SVC_AREA","4263 West Coast","169" +"COMM_HLTH_SVC_AREA","4311 Comox","170" +"COMM_HLTH_SVC_AREA","4312 Comox Valley Rural","171" +"COMM_HLTH_SVC_AREA","4313 Courtenay","172" +"COMM_HLTH_SVC_AREA","4321 Campbell River","173" +"COMM_HLTH_SVC_AREA","4322 Campbell River Rural","174" +"COMM_HLTH_SVC_AREA","4330 Vancouver Island West","175" +"COMM_HLTH_SVC_AREA","4341 Port Hardy/Port Alice","176" +"COMM_HLTH_SVC_AREA","4342 Port McNeill/Sointula","177" +"COMM_HLTH_SVC_AREA","4343 Vancouver Island North Remote","178" +"COMM_HLTH_SVC_AREA","5101 Haida Gwaii South","179" +"COMM_HLTH_SVC_AREA","5102 Haida Gwaii North","180" +"COMM_HLTH_SVC_AREA","5110 Snow Country","181" +"COMM_HLTH_SVC_AREA","5121 Prince Rupert City Centre","182" +"COMM_HLTH_SVC_AREA","5122 Prince Rupert Rural","183" +"COMM_HLTH_SVC_AREA","5130 Upper Skeena","184" +"COMM_HLTH_SVC_AREA","5141 Smithers Town Centre","185" +"COMM_HLTH_SVC_AREA","5142 Smithers Rural","186" +"COMM_HLTH_SVC_AREA","5143 Houston","187" +"COMM_HLTH_SVC_AREA","5150 Kitimat","188" +"COMM_HLTH_SVC_AREA","5160 Stikine","189" +"COMM_HLTH_SVC_AREA","5171 Terrace City Centre","190" +"COMM_HLTH_SVC_AREA","5172 Terrace Rural","191" +"COMM_HLTH_SVC_AREA","5180 Nisga'a","192" +"COMM_HLTH_SVC_AREA","5190 Telegraph Creek","193" +"COMM_HLTH_SVC_AREA","5211 Quesnel City Centre","194" +"COMM_HLTH_SVC_AREA","5212 Quesnel Rural","195" +"COMM_HLTH_SVC_AREA","5221 Burns Lake Town Centre","196" +"COMM_HLTH_SVC_AREA","5222 Burns Lake South","197" +"COMM_HLTH_SVC_AREA","5223 Burns Lake North","198" +"COMM_HLTH_SVC_AREA","5231 Vanderhoof","199" +"COMM_HLTH_SVC_AREA","5232 Vanderhoof Rural","200" +"COMM_HLTH_SVC_AREA","5233 Fort St. James North","201" +"COMM_HLTH_SVC_AREA","5234 Fraser Lake","202" +"COMM_HLTH_SVC_AREA","5241 Prince George City - North","203" +"COMM_HLTH_SVC_AREA","5242 Prince George City - Central","204" +"COMM_HLTH_SVC_AREA","5243 Prince George City - Southwest","205" +"COMM_HLTH_SVC_AREA","5244 Prince George Southwest Rural","206" +"COMM_HLTH_SVC_AREA","5245 Prince George North Fraser Rural","207" +"COMM_HLTH_SVC_AREA","5246 McBride/Valemount","208" +"COMM_HLTH_SVC_AREA","5247 Mackenzie","209" +"COMM_HLTH_SVC_AREA","5311 Dawson Creek","210" +"COMM_HLTH_SVC_AREA","5312 Chetwynd","211" +"COMM_HLTH_SVC_AREA","5313 Tumbler Ridge","212" +"COMM_HLTH_SVC_AREA","5314 Peace River South Rural","213" +"COMM_HLTH_SVC_AREA","5321 Fort St John","214" +"COMM_HLTH_SVC_AREA","5322 Hudson's Hope","215" +"COMM_HLTH_SVC_AREA","5323 Peace River North Rural","216" +"COMM_HLTH_SVC_AREA","5331 Fort Nelson Population Centre","217" +"COMM_HLTH_SVC_AREA","5332 Northern Boreal","218" +"FACILITY_TYPE","Long Term Care (LTC)","1" +"FACILITY_TYPE","Assisted Living (AL)","2" +"FACILITY_TYPE","Family Care Home (FCH)","3" +"FACILITY_TYPE","Group Homes (GH)","4" +"OWNER_TYPE","Health Authority (HA)","1" +"OWNER_TYPE","Private For Profit (PFP)","2" +"OWNER_TYPE","Private Not For Profit (PNP)","3" +"OWNER_TYPE","Fully Private","4" +"LEGISLATION_TYPE","CCALA","1" +"LEGISLATION_TYPE","Hospital Act","2" +"LEGISLATION_TYPE","CCALA and Hospital Act","3" +"SURVEY_CATEGORY","Community","1" +"SURVEY_CATEGORY","Supported","2" +"SURVEY_CATEGORY","Acute","3" +"SURVEY_CATEGORY","Tertiary","4" +"SURVEY_CATEGORY","ED","5" +"HA_WITH_CODE","01 Interior","1" +"HA_WITH_CODE","02 Fraser","2" +"HA_WITH_CODE","03 Vancouver Coastal","3" +"HA_WITH_CODE","04 Vancouver Island","4" +"HA_WITH_CODE","05 Northern","5" +"HA_WITH_CODE","06 Provincial Health","6" +"SURVEY_MONTH","3-Mar","1" +"SURVEY_MONTH","6-Jun","2" +"SURVEY_MONTH","9-Sep","3" +"SURVEY_MONTH","12-Dec","4" +"HA_WITH_SHORT_CODE","1 Interior","1" +"HA_WITH_SHORT_CODE","2 Fraser","2" +"HA_WITH_SHORT_CODE","3 Vancouver Coastal","3" +"HA_WITH_SHORT_CODE","4 Vancouver Island","4" +"HA_WITH_SHORT_CODE","5 Northern","5" +"HA_WITH_SHORT_CODE","6 Provincial Health","6" +"HA_WITH_SHORT_CODE","9 Unknown HA","7" +"HLTH_SVC_DELIVERY_AREA","11 - East Kootenay","1" +"HLTH_SVC_DELIVERY_AREA","12 Kootenay Boundary","2" +"HLTH_SVC_DELIVERY_AREA","13 Okanagan","3" +"HLTH_SVC_DELIVERY_AREA","14 Thompson Cariboo Shuswap","4" +"HLTH_SVC_DELIVERY_AREA","21 Fraser East","5" +"HLTH_SVC_DELIVERY_AREA","22 Fraser North","6" +"HLTH_SVC_DELIVERY_AREA","23 Fraser South","7" +"HLTH_SVC_DELIVERY_AREA","31 Richmond","8" +"HLTH_SVC_DELIVERY_AREA","32 Vancouver","9" +"HLTH_SVC_DELIVERY_AREA","33 North Shore/Coast Garibaldi","10" +"HLTH_SVC_DELIVERY_AREA","41 South Vancouver Island","11" +"HLTH_SVC_DELIVERY_AREA","42 Central Vancouver Island","12" +"HLTH_SVC_DELIVERY_AREA","43 North Vancouver Island","13" +"HLTH_SVC_DELIVERY_AREA","51 Northwest","14" +"HLTH_SVC_DELIVERY_AREA","52 Northern Interior","15" +"HLTH_SVC_DELIVERY_AREA","53 Northeast","16" +"MHSU_FACILITY_TYPE","MH Community Long Term Care","1" +"MHSU_FACILITY_TYPE","MH Community Assisted Living","2" +"MHSU_FACILITY_TYPE","MH Family Care Homes","3" +"MHSU_FACILITY_TYPE","MH Rental Subsidy","4" +"MHSU_FACILITY_TYPE","MH ACT/ICM Rental Subsidy","5" +"MHSU_FACILITY_TYPE","MH Community Crisis Stabilization Units","6" +"MHSU_FACILITY_TYPE","MH Emergency Shelters","7" +"MHSU_ORG_TYPE","Private For Profit","1" +"MHSU_ORG_TYPE","Private Not For Profit","2" +"MHSU_ORG_TYPE","BC Housing","3" +"MHSU_ORG_TYPE","Health Authority","4" +"MHSU_ORG_TYPE","Municipality","5" +"MHSU_ORG_TYPE","First Nations","6" +"MH_ACT_SCHEDULE","A","1" +"MH_ACT_SCHEDULE","B","2" +"MH_ACT_SCHEDULE","C","3" +"MH_ACT_SCHEDULE","NULL","4" +"FACILITY_CLIENT_TYPE","Male only","1" +"FACILITY_CLIENT_TYPE","Female only","2" +"FACILITY_CLIENT_TYPE","Male with Child(ren)","3" +"FACILITY_CLIENT_TYPE","Female with Child(ren)","4" +"FACILITY_CLIENT_TYPE","Male and Female","5" +"FACILITY_CLIENT_TYPE","Male or Female","6" +"FACILITY_CLIENT_TYPE","Transgender","7" +"FACILITY_CLIENT_TYPE","Gender Diverse","8" +"PRIORITY_POPULATION_TYPE","Indigenous ","1" +"PRIORITY_POPULATION_TYPE","Pregnant","2" +"PRIORITY_POPULATION_TYPE","Homeless","3" +"PRIORITY_POPULATION_TYPE","Rural or Remote (living in a rural or remote area)","4" +"PRIORITY_POPULATION_TYPE","Other priority population","5" +"PRIORITY_POPULATION_TYPE","Null (no priority population)","6" +"BEDS_FUNDING_INITIATIVE","Aug 2020 YSU Beds (123 Beds)","1" +"BEDS_FUNDING_INITIATIVE","Budget 2021","2" +"BEDS_FUNDING_INITIATIVE","Multiple Funding Impact","3" +"BEDS_FUNDING_INITIATIVE","Other","4" +"BEDS_FUNDING_INITIATIVE","Null","5" +"AVAIL_BED_CHG_REASON","Facility Opened","1" +"AVAIL_BED_CHG_REASON","Facility Closed (Permanently)","2" +"AVAIL_BED_CHG_REASON","Facility Closed (Temporarily)","3" +"AVAIL_BED_CHG_REASON","Facility Moved","4" +"AVAIL_BED_CHG_REASON","Renovations","5" +"AVAIL_BED_CHG_REASON","Funding Loss","6" +"AVAIL_BED_CHG_REASON","New Funding","7" +"AVAIL_BED_CHG_REASON","Beds Not Being Used","8" +"AVAIL_BED_CHG_REASON","Change in Bed Type","9" +"AVAIL_BED_CHG_REASON","COVID Temporary Reallocation","10" +"AVAIL_BED_CHG_REASON","Change in Population Served","11" +"AVAIL_BED_CHG_REASON","Unknown","12" +"AVAIL_BED_CHG_REASON","Other","13" +"PROGRAM_TYPE","Long-term Care (LTC)","1" +"PROGRAM_TYPE","Assisted Living (AL)","2" +"FACILITY_OWNERSHIP_TYPE","HA owned & operated","1" +"FACILITY_OWNERSHIP_TYPE","Private For Profit (PFP)","2" +"FACILITY_OWNERSHIP_TYPE","Private Not For Profit (PNP)","3" +"HA_ABBREVIATED","FHA ","1" +"HA_ABBREVIATED","IHA","2" +"HA_ABBREVIATED","NHA","3" +"HA_ABBREVIATED","VCH","4" +"HA_ABBREVIATED","VIHA","5" +"REVENUE_TYPE","HA Operating Funding","1" +"REVENUE_TYPE","HA Operating Funding - Minor Equipment","2" +"REVENUE_TYPE","HA Capital Contribution Funding ","3" +"REVENUE_TYPE","Recoveries by HA","4" +"REVENUE_TYPE","Client Revenue","5" +"REVENUE_TYPE","Other Revenue","6" +"REVENUE_NAME","HA Operating Funding ~ current year = base funding","1" +"REVENUE_NAME","Direct care hours ~ additional funding for DCH","2" +"REVENUE_NAME","Others ~ specify ","3" +"REVENUE_NAME","HA Operating Funding - Minor Equipment ","4" +"REVENUE_NAME","HA Operating Funding - Other ","5" +"REVENUE_NAME","HA Capital Contribution Funding","6" +"REVENUE_NAME","Occupancy threshold","7" +"REVENUE_NAME","Client contribution reconciliation","8" +"REVENUE_NAME","Direct care hours","9" +"REVENUE_NAME","HA client user fees paid by the client","10" +"REVENUE_NAME","Client user fees paid by third parties","11" +"REVENUE_NAME","Client user fee paid - for non-eligible residents","12" +"REVENUE_NAME","Investments revenue on operating funds","13" +"REVENUE_NAME","CMHC/BCHMC funding","14" +"REVENUE_NAME","Expense recoveries ","15" +"EXPENDITURE_TYPE","Labour Cost","1" +"EXPENDITURE_TYPE","Benefit Cost","2" +"EXPENDITURE_TYPE","Property Cost","3" +"EXPENDITURE_TYPE","Supplies","4" +"EXPENDITURE_TYPE","Admin Cost  ","5" +"EXPENDITURE_TYPE","Operating Surplus/Deficit","6" +"EXPENDITURE_TYPE","Depreciation/Amortization","7" +"EXPENDITURE_NAME","Direct Care","1" +"EXPENDITURE_NAME","Food Services","2" +"EXPENDITURE_NAME","Laundry Services","3" +"EXPENDITURE_NAME","Housekeeping Services","4" +"EXPENDITURE_NAME","Administration Services","5" +"EXPENDITURE_NAME","Plant Maintenance and Op. Staffing","6" +"EXPENDITURE_NAME","Salary and wages recovered","7" +"EXPENDITURE_NAME","Salaries and wages accrual ","8" +"EXPENDITURE_NAME","Other labour costs","9" +"EXPENDITURE_NAME","Building rent/lease cost","10" +"EXPENDITURE_NAME","Interest on mortgage or long-term debt","11" +"EXPENDITURE_NAME","Property taxes","12" +"EXPENDITURE_NAME","Maintenance and repairs - building, ground and equipment","13" +"EXPENDITURE_NAME","Supplies - for building, ground and equipment ","14" +"EXPENDITURE_NAME","Utilities ","15" +"EXPENDITURE_NAME","Waste management","16" +"EXPENDITURE_NAME","Resident transportation services","17" +"EXPENDITURE_NAME","Others - operating","18" +"EXPENDITURE_NAME","Medical supplies","19" +"EXPENDITURE_NAME","Drugs & pharmaceutical","20" +"EXPENDITURE_NAME","Raw food costs (incl. dietary supplement costs)","21" +"EXPENDITURE_NAME","Dietary supplies","22" +"EXPENDITURE_NAME","Laundry supplies","23" +"EXPENDITURE_NAME","Housekeeping supplies","24" +"EXPENDITURE_NAME","Others - specify ","25" +"EXPENDITURE_NAME","Office expense ","26" +"EXPENDITURE_NAME","Management fees","27" +"EXPENDITURE_NAME","Head office allocation (non-compensation) ","28" +"EXPENDITURE_NAME","Accreditation costs","29" +"EXPENDITURE_NAME","Association dues, professional fees, audit fees","30" +"EXPENDITURE_NAME","Insurances (for property and liability)","31" +"EXPENDITURE_NAME","Other - admin and supplies","32" +"DEPRECIATION_NAME","Building ","1" +"DEPRECIATION_NAME","Furniture and equipment","2" +"YTD_TOTAL_NAME","Total Operating Revenue","1" +"YTD_TOTAL_NAME","Total Operating Expenses","2" +"YTD_TOTAL_NAME","Non-operating Surplus / (Deficit)","3" +"YTD_TOTAL_NAME","Total Before depreciation & amortization","4" +"YTD_TOTAL_NAME","Subtotal - Depreciation / amortization","5" +"YTD_TOTAL_NAME","Total Operating Surplus / (Deficit)","6" +"POSITION_TYPE","Support ","1" +"POSITION_TYPE","Administration","2" +"POSITION_TYPE","Nursing ","3" +"POSITION_TYPE","Allied Professional ","4" +"POSITION_TYPE","Allied Non-Professional ","5" +"POSITION_NAME","Food services","1" +"POSITION_NAME","Laundry services","2" +"POSITION_NAME","Housekeeping services ","3" +"POSITION_NAME","Plant maintenance and operations staffing","4" +"POSITION_NAME","Administrator","5" +"POSITION_NAME","Director of care","6" +"POSITION_NAME","Dept managers","7" +"POSITION_NAME","Administrative support","8" +"POSITION_NAME","Pastoral care worker ","9" +"POSITION_NAME","Clerical clerks","10" +"POSITION_NAME","Clinical coordinator","11" +"POSITION_NAME","Other - specify ","12" +"POSITION_NAME","RN","13" +"POSITION_NAME","LPN","14" +"POSITION_NAME","Care Aides (HCA)","15" +"POSITION_NAME","Other Nursing (specify)","16" +"POSITION_NAME","Occupational therapist ","17" +"POSITION_NAME","Physiotherapist","18" +"POSITION_NAME","Dietitian","19" +"POSITION_NAME","Social worker","20" +"POSITION_NAME","Other allied professional (specify)","21" +"POSITION_NAME","Recreation Therapist","22" +"POSITION_NAME","Rehab Assistant","23" +"POSITION_NAME","Activity Worker","24" +"POSITION_NAME","Music Therapist","25" +"POSITION_NAME","Art Therapist","26" +"ADD_POSITION_TYPE","Allied Non-Professional ","1" +"ADD_POSITION_TYPE","Nursing Care","2" +"ADD_POSITION_TYPE","Allied Professional","3" +"BENEFIT_TYPE","Employment Insurance","1" +"BENEFIT_TYPE","Canada Pension Plan","2" +"BENEFIT_TYPE","Workers Compensation Board","3" +"BENEFIT_TYPE","Employer Health Tax","4" +"BENEFIT_TYPE","Pension Plan","5" +"BENEFIT_TYPE","Extended Health & Dental","6" +"BENEFIT_TYPE","Group Life,  AD&D, LTD","7" +"BENEFIT_TYPE","Other Benefits ~ specify","8" +"BENEFIT_TYPE","Less: Benefit Recovery","9" +"BENEFIT_TYPE","Accrued Sick & Severance","10" +"CARE_UNIT_TYPE","Specialized care","1" +"CARE_UNIT_TYPE","LTC","2" +"CARE_UNIT_TYPE","Other - please specify","3" +"REVISION_REASON","Increase in # Beds","1" +"REVISION_REASON","Increase in HPRD","2" +"REVISION_REASON","Licensing issue","3" +"REVISION_REASON","Other - specify","4" +"ALT_CLINICAL_OVERSITE_TYPE","Clinical oversight to shifts without an RN on-site (on-call RN or other strategies)","1" +"ALT_CLINICAL_OVERSITE_TYPE","Increase LPN hours of care to compensate for the gap in RN on-site hours ","2" +"ALT_CLINICAL_OVERSITE_TYPE","No mitigation strategy ","3" +"ALT_CLINICAL_OVERSITE_TYPE","Other - please specify ","4" +"STAFFING_POSITION_TYPE","RN/RPN","1" +"STAFFING_POSITION_TYPE","LPN","2" +"STAFFING_POSITION_TYPE","HCA ","3" +"STAFFING_POSITION_TYPE","Occupational Therapist","4" +"STAFFING_POSITION_TYPE","Physiotherapist","5" +"STAFFING_POSITION_TYPE","Dietitian","6" +"STAFFING_POSITION_TYPE","Social Worker","7" +"STAFFING_POSITION_TYPE","Medical Lab. Tech.","8" +"STAFFING_POSITION_TYPE","Respiratory Therapist","9" +"STAFFING_POSITION_TYPE","Speech Language Pathologist","10" +"STAFFING_POSITION_TYPE","Recreational Therapist ","11" +"STAFFING_POSITION_TYPE","Rehab Assistant","12" +"STAFFING_POSITION_TYPE","Activity Worker","13" +"STAFFING_POSITION_TYPE","Music Therapist","14" +"STAFFING_POSITION_TYPE","Art Therapist","15" +"STAFFING_SHIFT_TYPE","Days","1" +"STAFFING_SHIFT_TYPE","Evenings","2" +"STAFFING_SHIFT_TYPE","Nights","3" +"STAFF_MITIGATION_STRATEGY","Alternative RN clinical oversight to shifts without an RN on-site? (on-call RN or other strategies?)","1" +"STAFF_MITIGATION_STRATEGY","Increase LPN hours of care to compensate for the gap in RN on-site hours?","2" +"STAFF_MITIGATION_STRATEGY","Other - Please specify","3" +"STAFF_MITIGATION_STRATEGY","No mitigation strategy","4" +"YTD_QUARTER","Inventory ","1" +"YTD_QUARTER","Quarter 1","2" +"YTD_QUARTER","Quarter 2","3" +"YTD_QUARTER","Quarter 3","4" +"YTD_QUARTER","Quarter 4","5" +"BED_FUNDING_TYPE","In Scope 3.36 HPRD","1" +"BED_FUNDING_TYPE","Out Of Scope Public","2" +"BED_FUNDING_TYPE","Private Beds Bed","3" +"BED_SUB_TYPE","LTC","1" +"BED_SUB_TYPE","LTC Temporary","2" +"BED_SUB_TYPE","Convalescent","3" +"BED_SUB_TYPE","Dedicated EOL","4" +"BED_SUB_TYPE","Designated EOL","5" +"BED_SUB_TYPE","Respite ","6" +"BED_SUB_TYPE","Flex Beds","7" +"BED_SUB_TYPE","Other - Specify ","8" +"MONTH","April","1" +"MONTH","May","2" +"MONTH","June","3" +"MONTH","July","4" +"MONTH","Aug","5" +"MONTH","Sept","6" +"MONTH","Oct","7" +"MONTH","Nov","8" +"MONTH","Dec","9" +"MONTH","Jan","10" +"MONTH","Feb","11" +"MONTH","Mar","12" +"ADD_POSITION_NAME","RN","1" +"ADD_POSITION_NAME","LPN","2" +"ADD_POSITION_NAME","Care Aides (HCA)","3" +"ADD_POSITION_NAME","Occupational Therapist","4" +"ADD_POSITION_NAME","Physiotherapist","5" +"ADD_POSITION_NAME","Dietitian","6" +"ADD_POSITION_NAME","Social Worker","7" +"ADD_POSITION_NAME","Recreation Therapist","8" +"ADD_POSITION_NAME","Rehab Assistant","9" +"ADD_POSITION_NAME","Activity Worker","10" +"ADD_POSITION_NAME","Music Therapist","11" +"ADD_POSITION_NAME","Art Therapist","12" +"ADD_POSITION_NAME","Other (specify)","13" +"COMP_SAL_TOTAL_TYPE","Total Per Payroll","1" +"COMP_SAL_TOTAL_TYPE","Recovered Salaries and Wages","2" +"COMP_SAL_TOTAL_TYPE","Accrued Salaries and Wages","3" +"COMP_SAL_TOTAL_TYPE","Other Labour Costs","4" +"COMP_HRS_TOTAL_TYPE","Total Per Payroll","1" +"COMP_HRS_TOTAL_TYPE","Accrued Hours","2" +"BED_OCCUPANCY_TYPE","Planned","1" +"BED_OCCUPANCY_TYPE","YTD","2" +"SUBMISSION_TYPE","Regular submission","1" +"SUBMISSION_TYPE","Revised / Adjustment","2" From 75735f9009b14abd6a5b6f34ff66ec3e6be74577 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 3 Apr 2023 11:44:12 -0400 Subject: [PATCH 045/183] changed body sent by request --- .../processor/LtcQuaterlyYtdApiResponseProcessor.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 1cf1aa81..ed2c607c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -63,9 +63,10 @@ public void process(Exchange exchange) throws Exception { List iModels = (List)(List) parsedLtycYtdSubmissions; Map>> map = CSVUtil.provider(iModels); List filesGenerated = FileUtil.writeToCSVFile(map,Constants.LTC_YTD_SUBMISSION); - SuccessResponse successResponse = new SuccessResponse(); - successResponse.setFiles(filesGenerated); - exchange.getIn().setBody(mapper.writeValueAsString(successResponse)); + //TODO uncomment or remove dead code + // SuccessResponse successResponse = new SuccessResponse(); + // successResponse.setFiles(filesGenerated); + // exchange.getIn().setBody(mapper.writeValueAsString(successResponse)); } From 97e2529ce1f611d51f5d3b025db548c3e6ba917e Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 3 Apr 2023 11:44:24 -0400 Subject: [PATCH 046/183] using test form instead of the real one --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 25d7be99..006ae92b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -36,8 +36,8 @@ public class Constants { public static final String LTC_FACILITY_PREPARER = "LTC_FACILITY_PREPARER"; /* LTC Quaterly YTD */ - public final static String LTC_YTD_USERNAME = "ltc.ytd.username"; - public final static String LTC_YTD_PASSWORD = "ltc.ytd.password"; + public final static String LTC_YTD_USERNAME = "ltc.ytd.test.username"; //TODO remove test once done testing + public final static String LTC_YTD_PASSWORD = "ltc.ytd.test.password"; public final static String IN_SCOPE = "inScope"; public final static String OUT_OF_SCOPE = "outOfScope"; public final static String PRIVATE_BED = "privateBed"; From 7b2c2fa5f0835826bfbd25cb0d38b203a26acc82 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 3 Apr 2023 13:53:53 -0400 Subject: [PATCH 047/183] updated ETL for LTCYtdSubmission --- .../bc/gov/chefs/etl/constant/Constants.java | 2 +- .../ltc/quaterly/model/LtcYtdSubmission.java | 32 ++++++++++++------- .../LtcQuaterlyYtdApiResponseProcessor.java | 3 +- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 006ae92b..f0c5ea15 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -152,7 +152,7 @@ public class Constants { "END_DATE", "NUMBER_OF_BEDS", "MAXIMUM_BED_DAYS", "NOTES" }); HEADERS.put(LTC_YTD_SUBMISSION, - new String[] { "CONFIRMATION_ID", "IS_DELETED", "SUBMISSION_DATE", "SUBMITTED_BY", "FACILITY_SUB_ID", + new String[] { "CONFIRMATION_ID", "IS_DELETED", "SUBMISSION_DATE", "SUBMITTED_BY", "CCIMS_ID", "SUBMISSION_TYPE", "PERIOD","SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD" }); HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS, new String[] { "CONFIRMATION_ID", "OCC_QUARTER", "OCC_MONTH", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java index 91725ed5..e10688e6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java @@ -14,15 +14,16 @@ public class LtcYtdSubmission implements IModel { */ private String confirmationId; + private String isDeleted; private String submissionDate; private String submittedBy; - private String facilitySubId; + private String CCIMSID; + private String submissionType; private String period; private String submissionFy; private String nbTotalBeds; private String nbFundedBeds; private String occRateThreshold; - private String isDeleted; private List ltcBedYtdMaxOccupancy; private List ltcBedYtdOccupancyRate; @@ -68,7 +69,8 @@ public List getCsvElements() { elements.add("false"); // FIXME Replace with elements.add(this.getIsDeleted()) when isDeleted is available in the CHEFS API. elements.add(this.getSubmissionDate()); elements.add(this.getSubmittedBy()); - elements.add(this.getFacilitySubId()); + elements.add(this.getCCIMSID()); + elements.add(this.getSubmissionType()); elements.add(this.getPeriod()); elements.add(this.getSubmissionFy()); elements.add(this.getNbTotalBeds()); @@ -130,14 +132,6 @@ public void setSubmittedBy(String submittedBy) { this.submittedBy = submittedBy; } - public String getFacilitySubId() { - return facilitySubId; - } - - public void setFacilitySubId(String facilitySubId) { - this.facilitySubId = facilitySubId; - } - public String getPeriod() { return period; } @@ -178,6 +172,22 @@ public void setIsDeleted(String isDeleted) { this.isDeleted = isDeleted; } + public String getCCIMSID() { + return CCIMSID; + } + + public void setCCIMSID(String cCIMSID) { + CCIMSID = cCIMSID; + } + + public String getSubmissionType() { + return submissionType; + } + + public void setSubmissionType(String submissionType) { + this.submissionType = submissionType; + } + public List getLtcBedYtdMaxOccupancy() { return ltcBedYtdMaxOccupancy; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index ed2c607c..1c254739 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -101,7 +101,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT /* Form Meta */ ltcYtdSubmission.setConfirmationId(root.getForm().getConfirmationId()); - ltcYtdSubmission.setFacilitySubId(root.getCcmisId()); + ltcYtdSubmission.setCCIMSID(root.getCcmisId()); + ltcYtdSubmission.setSubmissionType(root.getSubmission()); ltcYtdSubmission.setIsDeleted(""); ltcYtdSubmission.setNbFundedBeds(root.getNumberOfTotalFundedBeds()); ltcYtdSubmission.setNbTotalBeds(root.getNumberOfTotalBeds()); From b1ec7b5d341638b0e407573d7d697c3148f20d99 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 3 Apr 2023 14:13:57 -0400 Subject: [PATCH 048/183] reorganised constants file --- .../bc/gov/chefs/etl/constant/Constants.java | 134 +++++++++--------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index f0c5ea15..ebf146e6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -147,37 +147,32 @@ public class Constants { }); // LTC Quaterly YTD - HEADERS.put(LTC_BED_YTD_MAX_OCCUPANCY, - new String[] { "CONFIRMATION_ID", "QUARTER_INVENTORY", "BED_FUNDING_TYPE", "BED_SUBTYPE", "START_DATE", - "END_DATE", "NUMBER_OF_BEDS", "MAXIMUM_BED_DAYS", "NOTES" }); - HEADERS.put(LTC_YTD_SUBMISSION, new String[] { "CONFIRMATION_ID", "IS_DELETED", "SUBMISSION_DATE", "SUBMITTED_BY", "CCIMS_ID", "SUBMISSION_TYPE", "PERIOD","SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD" }); - HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS, new String[] { "CONFIRMATION_ID", "OCC_QUARTER", "OCC_MONTH", - "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", "OCC_DAYS_YTD_PRIVATE","OCC_DAYS_YTD_TOTAL_DAYS" }); + HEADERS.put(LTC_YTD_REV, new String[] { "CONFIRMATION_ID", "REV_TYPE", "REV_NAME", "REV_YTD", "REV_NOTES", }); - HEADERS.put(LTC_BED_YTD_OCCUPANCY_RATE, - new String[] { "CONFIRMATION_ID", "OCC_RATE_QUARTER", "OCC_RATE_BED_TYPES", "PLAN_MAX_OCC_DAYS", - "YTD_MAX_OCC_DAYS", "YTD_OCC_DAYS", "PERCENT_OCC", "OCC_RATE_NOTES", }); + HEADERS.put(LTC_YTD_REV_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "REV_TYPE", "SUB_TOTAL_REV_YTD" }); - HEADERS.put(LTC_YTD_DIRECT_CARE_HRS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "DIR_CARE_NAME", - "DIR_CARE_PROD_HRS_REG_YTD", "DIR_CARE_PROD_HRS_OT_YTD", "DIR_CARE_PROD_HRS_CONTRACTED_YTD", - "DIR_CARE_PROD_HRS_SUBTOTAL_YTD", "DIR_CARE_PROD_HRS_TOTAL_YTD", "DIR_CARE_NON_PROD_HRS_VAC_YTD", - "DIR_CARE_NON_PROD_HRS_SICK_YTD", "DIR_CARE_NON_PROD_HRS_OTHER_YTD", "DIR_CARE_NON_PROD_HRS_TOTAL_YTD", - "DIR_CARE_TOTAL_HRS_PAID_YTD", "DIR_CARE_YTD_NOTES", + HEADERS.put(LTC_YTD_EXP, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "EXP_NAME", "EXP_YTD", "EXP_NOTES", }); - }); - HEADERS.put(LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS, - new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "SUB_TOTAL_DIR_CARE_PROD_HRS_REGULAR_YTD", - "SUB_TOTAL_DIR_CARE_PROD_HRS_OT_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_SUBTOTAL_YTD","SUB_TOTAL_DIR_CARE_PROD_HRS_CONT_SERV_YTD" - ,"SUB_TOTAL_DIR_CARE_PROD_HRS_TOTAL_YTD", - "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_VAC_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_SICK_YTD", - "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_OTHER_SERV_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_TOTAL_YTD", - "SUB_TOTAL_DIR_CARE_TOTAL_HRS_PAID_YTD", + HEADERS.put(LTC_YTD_EXP_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "SUB_TOTAL_EXP_YTD", }); + + HEADERS.put(LTC_YTD_COMP_SAL, + new String[] { "CONFIRMATION_ID", "COMP_SAL_TYPE", "COMP_SAL_NAME", "COMP_SAL_STAFF_YTD", + "COMP_SAL_CONTRACT_SERVICES_YTD", "COMP_SAL_OFFICE_ALLOC_YTD", "Comp_Sal_Total_Cost_YTD" }); + + HEADERS.put(LTC_YTD_COMP_SAL_SUBTOTALS, + new String[] { "Confirmation_ID", "Comp_Sal_Type", "Sub_Total_Comp_Sal_Staff_YTD", + "Sub_Total_Comp_Sal_Contract_Services_YTD", "Sub_Total_Comp_Sal_Office_Alloc_YTD", + "Sub_Total_Comp_Sal_Total_Cost_YTD", }); + + HEADERS.put(LTC_YTD_COMP_SAL_TOTALS, + new String[] { "Confirmation_ID", "Comp_Sal_Total_Type", "Total_Comp_Sal_Staff_YTD", + "Total_Comp_Sal_Contract_Services_YTD", "Total_Comp_Sal_Office_Alloc_YTD", + "Total_Comp_Sal_Total_Cost_YTD", }); - }); HEADERS.put(LTC_YTD_COMP_HRS, new String[] { "CONFIRMATION_ID", "COMP_HRS_TYPE", "COMP_HRS_NAME", "COMP_HRS_STAFF_YTD", "COMP_HRS_CONTRACT_SERVICES_YTD", "COMP_HRS_OFFICE_ALLOC_YTD", @@ -192,36 +187,40 @@ public class Constants { new String[] { "Confirmation_ID", "Comp_Hrs_Total_Type", "Total_Comp_Hrs_Staff_YTD", "Total_Comp_Hrs_Contract_Services_YTD", "Total_Comp_Hrs_Office_Alloc_YTD", "Total_Comp_Hrs_Total_Cost_YTD", }); - - HEADERS.put(LTC_YTD_COMP_SAL, - new String[] { "CONFIRMATION_ID", "COMP_SAL_TYPE", "COMP_SAL_NAME", "COMP_SAL_STAFF_YTD", - "COMP_SAL_CONTRACT_SERVICES_YTD", "COMP_SAL_OFFICE_ALLOC_YTD", "Comp_Sal_Total_Cost_YTD" }); + HEADERS.put(LTC_YTD_COMP_ADD_POS, new String[] { "CONFIRMATION_ID", "ADD_POS_TYPE", "ADD_POS_NAME", + "ADD_POS_LGL_NM_CON_SRV_YTD", "ADD_POS_PCT_SRV_CON_OUT_YTD", }); - - HEADERS.put(LTC_YTD_COMP_SAL_SUBTOTALS, - new String[] { "Confirmation_ID", "Comp_Sal_Type", "Sub_Total_Comp_Sal_Staff_YTD", - "Sub_Total_Comp_Sal_Contract_Services_YTD", "Sub_Total_Comp_Sal_Office_Alloc_YTD", - "Sub_Total_Comp_Sal_Total_Cost_YTD", }); + HEADERS.put(LTC_YTD_COMP_BENEFITS, new String[] { "CONFIRMATION_ID", "BENEFITS_TYPE", "BENEFITS_AMOUNT_YTD","BENEFITS_PERCENTAGE_ALLOCATION" }); - HEADERS.put(LTC_YTD_COMP_SAL_TOTALS, - new String[] { "Confirmation_ID", "Comp_Sal_Total_Type", "Total_Comp_Sal_Staff_YTD", - "Total_Comp_Sal_Contract_Services_YTD", "Total_Comp_Sal_Office_Alloc_YTD", - "Total_Comp_Sal_Total_Cost_YTD", }); + HEADERS.put(LTC_YTD_DIRECT_CARE_HRS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "DIR_CARE_NAME", + "DIR_CARE_PROD_HRS_REG_YTD", "DIR_CARE_PROD_HRS_OT_YTD", "DIR_CARE_PROD_HRS_CONTRACTED_YTD", + "DIR_CARE_PROD_HRS_SUBTOTAL_YTD", "DIR_CARE_PROD_HRS_TOTAL_YTD", "DIR_CARE_NON_PROD_HRS_VAC_YTD", + "DIR_CARE_NON_PROD_HRS_SICK_YTD", "DIR_CARE_NON_PROD_HRS_OTHER_YTD", "DIR_CARE_NON_PROD_HRS_TOTAL_YTD", + "DIR_CARE_TOTAL_HRS_PAID_YTD", "DIR_CARE_YTD_NOTES", + + }); + HEADERS.put(LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS, + new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "SUB_TOTAL_DIR_CARE_PROD_HRS_REGULAR_YTD", + "SUB_TOTAL_DIR_CARE_PROD_HRS_OT_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_SUBTOTAL_YTD","SUB_TOTAL_DIR_CARE_PROD_HRS_CONT_SERV_YTD" + ,"SUB_TOTAL_DIR_CARE_PROD_HRS_TOTAL_YTD", + "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_VAC_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_SICK_YTD", + "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_OTHER_SERV_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_TOTAL_YTD", + "SUB_TOTAL_DIR_CARE_TOTAL_HRS_PAID_YTD", + + }); - HEADERS.put(LTC_YTD_COMP_ADD_POS, new String[] { "CONFIRMATION_ID", "ADD_POS_TYPE", "ADD_POS_NAME", - "ADD_POS_LGL_NM_CON_SRV_YTD", "ADD_POS_PCT_SRV_CON_OUT_YTD", }); HEADERS.put(LTC_YTD_DIRECT_CARE_COST, - new String[] { "CONFIRMATION_ID", "DIR_CARE_COST_TYPE", "DIR_CARE_COST_NAME", - "DIR_CARE_COST_PROD_HRS_REG_YTD", "DIR_CARE_COST_PROD_HRS_OT_YTD", - "DIR_CARE_CST_PROD_HRS_CONTRACTED_YTD", "DIR_CARE_COST_PROD_HRS_SUBTOTAL_YTD", - "DIR_CARE_COST_PROD_HRS_TOTAL_YTD", "DIR_CARE_CST_NON_PROD_HRS_VAC_YTD", - "DRC_CST_NON_PROD_HRS_SICK_YTD", "DIR_CARE_CST_NON_PROD_HRS_OTH_YTD", - "DIR_CARE_COST_NON_PROD_HRS_TOTAL_YTD", "DIR_CARE_COST_TOTAL_HRS_PAID_YTD", - "DIR_CARE_COST_HOURLY_RATE_STAFF_YTD", "DIR_CARE_COST_HOURLY_RATE_CONTRACTED_YTD", - "DIR_CARE_COST_YTD_NOTES", }); + new String[] { "CONFIRMATION_ID", "DIR_CARE_COST_TYPE", "DIR_CARE_COST_NAME", + "DIR_CARE_COST_PROD_HRS_REG_YTD", "DIR_CARE_COST_PROD_HRS_OT_YTD", + "DIR_CARE_CST_PROD_HRS_CONTRACTED_YTD", "DIR_CARE_COST_PROD_HRS_SUBTOTAL_YTD", + "DIR_CARE_COST_PROD_HRS_TOTAL_YTD", "DIR_CARE_CST_NON_PROD_HRS_VAC_YTD", + "DRC_CST_NON_PROD_HRS_SICK_YTD", "DIR_CARE_CST_NON_PROD_HRS_OTH_YTD", + "DIR_CARE_COST_NON_PROD_HRS_TOTAL_YTD", "DIR_CARE_COST_TOTAL_HRS_PAID_YTD", + "DIR_CARE_COST_HOURLY_RATE_STAFF_YTD", "DIR_CARE_COST_HOURLY_RATE_CONTRACTED_YTD", + "DIR_CARE_COST_YTD_NOTES", }); - HEADERS.put(LTC_YTD_DIRECT_CARE_COST_SUBTOTALS,new String[] { + HEADERS.put(LTC_YTD_DIRECT_CARE_COST_SUBTOTALS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_REGULAR_YTD", @@ -237,7 +236,11 @@ public class Constants { "SUB_TOTAL_DIR_CARE_COST_HOURLY_RATE_STAFF_YTD", "SUB_TOTAL_DIR_CARE_COST_HOURLY_RATE_CONTRACTED_YTD", }); - + + HEADERS.put(LTC_BED_YTD_MAX_OCCUPANCY, + new String[] { "CONFIRMATION_ID", "QUARTER_INVENTORY", "BED_FUNDING_TYPE", "BED_SUBTYPE", "START_DATE", + "END_DATE", "NUMBER_OF_BEDS", "MAXIMUM_BED_DAYS", "NOTES" }); + HEADERS.put(LTC_BED_YTD_MAX_OCCUPANCY_TOTALS, new String[] { "CONFIRMATION_ID", "BED_OCCUPANCY_TYPE", @@ -248,6 +251,22 @@ public class Constants { "TOTAL_PLANNED_BED_DAYS" }); + HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS, new String[] { "CONFIRMATION_ID", "OCC_QUARTER", "OCC_MONTH", + "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", "OCC_DAYS_YTD_PRIVATE","OCC_DAYS_YTD_TOTAL_DAYS" }); + + HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS_TOTALS, new String[] { + "CONFIRMATION_ID", + "OCC_QUARTER", + "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", + "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", + "OCC_DAYS_YTD_PRIVATE", + "OCC_DAYS_YTD_TOTAL_DAYS", + }); + + HEADERS.put(LTC_BED_YTD_OCCUPANCY_RATE, + new String[] { "CONFIRMATION_ID", "OCC_RATE_QUARTER", "OCC_RATE_BED_TYPES", "PLAN_MAX_OCC_DAYS", + "YTD_MAX_OCC_DAYS", "YTD_OCC_DAYS", "PERCENT_OCC", "OCC_RATE_NOTES", }); + HEADERS.put(LTC_BED_YTD_OCCUPANCY_RATE_TOTALS, new String[] { "CONFIRMATION_ID", "OCC_RATE_QUARTER", @@ -256,24 +275,5 @@ public class Constants { "TOTAL_YTD_OCC_DAYS", "TOTAL_PERCENT_OCC", }); - - HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS_TOTALS, new String[] { - "CONFIRMATION_ID", - "OCC_QUARTER", - "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", - "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", - "OCC_DAYS_YTD_PRIVATE", - "OCC_DAYS_YTD_TOTAL_DAYS", - }); - - HEADERS.put(LTC_YTD_REV, new String[] { "CONFIRMATION_ID", "REV_TYPE", "REV_NAME", "REV_YTD", "REV_NOTES", }); - HEADERS.put(LTC_YTD_REV_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "REV_TYPE", "SUB_TOTAL_REV_YTD" }); - - HEADERS.put(LTC_YTD_EXP, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "EXP_NAME", "EXP_YTD", "EXP_NOTES", }); - HEADERS.put(LTC_YTD_EXP_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "SUB_TOTAL_EXP_YTD", }); - HEADERS.put(LTC_YTD_COMP_BENEFITS, new String[] { "CONFIRMATION_ID", "BENEFITS_TYPE", "BENEFITS_AMOUNT_YTD","BENEFITS_PERCENTAGE_ALLOCATION" }); - - } - } From 98701a41a16dd916a6cc93588c3d9bab536297b2 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 3 Apr 2023 16:37:56 -0400 Subject: [PATCH 049/183] renaming following ALL CAPS convention --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index ebf146e6..b49866db 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -161,7 +161,7 @@ public class Constants { HEADERS.put(LTC_YTD_COMP_SAL, new String[] { "CONFIRMATION_ID", "COMP_SAL_TYPE", "COMP_SAL_NAME", "COMP_SAL_STAFF_YTD", - "COMP_SAL_CONTRACT_SERVICES_YTD", "COMP_SAL_OFFICE_ALLOC_YTD", "Comp_Sal_Total_Cost_YTD" }); + "COMP_SAL_CONTRACT_SERVICES_YTD", "COMP_SAL_OFFICE_ALLOC_YTD", "COMP_SAL_TOTAL_COST_YTD" }); HEADERS.put(LTC_YTD_COMP_SAL_SUBTOTALS, new String[] { "Confirmation_ID", "Comp_Sal_Type", "Sub_Total_Comp_Sal_Staff_YTD", @@ -262,7 +262,7 @@ public class Constants { "OCC_DAYS_YTD_PRIVATE", "OCC_DAYS_YTD_TOTAL_DAYS", }); - + HEADERS.put(LTC_BED_YTD_OCCUPANCY_RATE, new String[] { "CONFIRMATION_ID", "OCC_RATE_QUARTER", "OCC_RATE_BED_TYPES", "PLAN_MAX_OCC_DAYS", "YTD_MAX_OCC_DAYS", "YTD_OCC_DAYS", "PERCENT_OCC", "OCC_RATE_NOTES", }); From e8278f299fc55de9a69a2652d7462a2007053913 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Mon, 3 Apr 2023 15:56:02 -0700 Subject: [PATCH 050/183] Updating SUBMISSION_TYPE domain values. --- doc/DomainModelDomains.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/DomainModelDomains.txt b/doc/DomainModelDomains.txt index 29abed3e..a97bb1be 100755 --- a/doc/DomainModelDomains.txt +++ b/doc/DomainModelDomains.txt @@ -874,5 +874,5 @@ "COMP_HRS_TOTAL_TYPE","Accrued Hours","2" "BED_OCCUPANCY_TYPE","Planned","1" "BED_OCCUPANCY_TYPE","YTD","2" -"SUBMISSION_TYPE","Regular submission","1" -"SUBMISSION_TYPE","Revised / Adjustment","2" +"SUBMISSION_TYPE","regular","1" +"SUBMISSION_TYPE","revised","2" From 36bc4eb8c30cc003278cb0337925fec98de7643a Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 4 Apr 2023 14:04:20 -0400 Subject: [PATCH 051/183] update of csv headers for all LTC YTD tables --- .../bc/gov/chefs/etl/constant/Constants.java | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index b49866db..eaf96490 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -56,6 +56,8 @@ public class Constants { public final static String LTC_YTD_SUBMISSION = "LTC_YTD_SUBMISSION"; public static final String LTC_YTD_REV_SUB_TOTALS = "LTC_YTD_REV_SUB_TOTALS"; public static final String LTC_YTD_EXP_SUB_TOTALS = "LTC_YTD_EXP_SUB_TOTALS"; + public static final String LTC_YTD_DEP = "LTC_YTD_DEP"; + public static final String LTC_YTD_SUM_TOTALS = "LTC_YTD_SUM_TOTALS"; public final static String LTC_FACILITY = "LTC_FACILITY"; public static final String LTC_YTD_COMP_SAL_SUBTOTALS = "LTC_YTD_COMP_SAL_SUBTOTALS"; public static final String LTC_BED_YTD_MAX_OCCUPANCY_TOTALS = "LTC_BED_YTD_MAX_OCCUPANCY_TOTALS"; @@ -158,6 +160,10 @@ public class Constants { HEADERS.put(LTC_YTD_EXP, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "EXP_NAME", "EXP_YTD", "EXP_NOTES", }); HEADERS.put(LTC_YTD_EXP_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "SUB_TOTAL_EXP_YTD", }); + + HEADERS.put(LTC_YTD_DEP, new String[] { "CONFIRMATION_ID", "DEP_NAME", "DEP_YTD", "DEP_NOTES"}); + + HEADERS.put(LTC_YTD_SUM_TOTALS, new String[] { "CONFIRMATION_ID", "TOT_NAME", "SUM_YTD","TOT_NOTES"}); HEADERS.put(LTC_YTD_COMP_SAL, new String[] { "CONFIRMATION_ID", "COMP_SAL_TYPE", "COMP_SAL_NAME", "COMP_SAL_STAFF_YTD", @@ -181,7 +187,7 @@ public class Constants { HEADERS.put(LTC_YTD_COMP_HRS_SUBTOTALS, new String[] { "Confirmation_ID", "Comp_Hrs_Type", "Sub_Total_Comp_Hrs_Staff_YTD", "Sub_Total_Comp_Hrs_Contract_Services_YTD", "Sub_Total_Comp_Hrs_Office_Alloc_YTD", - "Sub_Total_Comp_Hrs_Total_Cost_YTD", }); + "Sub_Total_Comp_Total_Worked_Hrs_YTD", }); HEADERS.put(LTC_YTD_COMP_HRS_TOTALS, new String[] { "Confirmation_ID", "Comp_Hrs_Total_Type", "Total_Comp_Hrs_Staff_YTD", @@ -189,21 +195,21 @@ public class Constants { "Total_Comp_Hrs_Total_Cost_YTD", }); HEADERS.put(LTC_YTD_COMP_ADD_POS, new String[] { "CONFIRMATION_ID", "ADD_POS_TYPE", "ADD_POS_NAME", - "ADD_POS_LGL_NM_CON_SRV_YTD", "ADD_POS_PCT_SRV_CON_OUT_YTD", }); + "ADD_POS_CONTRACTED_OUT_YTD", "ADD_POS_LEGAL_NAME_CONTRACT_SERVICE_YTD", "ADD_POS_PERCENT_SERVICE_CONTRACT_OUT_YTD", + "ADD_POS_OTHER_NAME" }); HEADERS.put(LTC_YTD_COMP_BENEFITS, new String[] { "CONFIRMATION_ID", "BENEFITS_TYPE", "BENEFITS_AMOUNT_YTD","BENEFITS_PERCENTAGE_ALLOCATION" }); - HEADERS.put(LTC_YTD_DIRECT_CARE_HRS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "DIR_CARE_NAME", + HEADERS.put(LTC_YTD_DIRECT_CARE_HRS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "DIR_CARE_NAME", "DIR_CARE_OTHER_VALUE", "DIR_CARE_PROD_HRS_REG_YTD", "DIR_CARE_PROD_HRS_OT_YTD", "DIR_CARE_PROD_HRS_CONTRACTED_YTD", "DIR_CARE_PROD_HRS_SUBTOTAL_YTD", "DIR_CARE_PROD_HRS_TOTAL_YTD", "DIR_CARE_NON_PROD_HRS_VAC_YTD", "DIR_CARE_NON_PROD_HRS_SICK_YTD", "DIR_CARE_NON_PROD_HRS_OTHER_YTD", "DIR_CARE_NON_PROD_HRS_TOTAL_YTD", - "DIR_CARE_TOTAL_HRS_PAID_YTD", "DIR_CARE_YTD_NOTES", - + "DIR_CARE_TOTAL_HRS_PAID_YTD" }); HEADERS.put(LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "SUB_TOTAL_DIR_CARE_PROD_HRS_REGULAR_YTD", - "SUB_TOTAL_DIR_CARE_PROD_HRS_OT_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_SUBTOTAL_YTD","SUB_TOTAL_DIR_CARE_PROD_HRS_CONT_SERV_YTD" - ,"SUB_TOTAL_DIR_CARE_PROD_HRS_TOTAL_YTD", + "SUB_TOTAL_DIR_CARE_PROD_HRS_OT_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_SUBTOTAL_YTD","SUB_TOTAL_DIR_CARE_PROD_HRS_CONT_SERV_YTD", + "SUB_TOTAL_DIR_CARE_PROD_HRS_TOTAL_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_VAC_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_SICK_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_OTHER_SERV_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_TOTAL_YTD", "SUB_TOTAL_DIR_CARE_TOTAL_HRS_PAID_YTD", @@ -214,11 +220,11 @@ public class Constants { new String[] { "CONFIRMATION_ID", "DIR_CARE_COST_TYPE", "DIR_CARE_COST_NAME", "DIR_CARE_COST_PROD_HRS_REG_YTD", "DIR_CARE_COST_PROD_HRS_OT_YTD", "DIR_CARE_CST_PROD_HRS_CONTRACTED_YTD", "DIR_CARE_COST_PROD_HRS_SUBTOTAL_YTD", - "DIR_CARE_COST_PROD_HRS_TOTAL_YTD", "DIR_CARE_CST_NON_PROD_HRS_VAC_YTD", - "DRC_CST_NON_PROD_HRS_SICK_YTD", "DIR_CARE_CST_NON_PROD_HRS_OTH_YTD", + "DIR_CARE_COST_PROD_HRS_TOTAL_YTD", "DIR_CARE_COST_NON_PROD_HRS_VAC_YTD", + "DIR_CARE_COST_NON_PROD_HRS_SICK_YTD", "DIR_CARE_COST_NON_PROD_HRS_OTHER_YTD", "DIR_CARE_COST_NON_PROD_HRS_TOTAL_YTD", "DIR_CARE_COST_TOTAL_HRS_PAID_YTD", - "DIR_CARE_COST_HOURLY_RATE_STAFF_YTD", "DIR_CARE_COST_HOURLY_RATE_CONTRACTED_YTD", - "DIR_CARE_COST_YTD_NOTES", }); + "DIR_CARE_COST_HOURLY_RATE_STAFF_YTD", "DIR_CARE_COST_HOURLY_RATE_CONTRACTED_YTD" + }); HEADERS.put(LTC_YTD_DIRECT_CARE_COST_SUBTOTALS, new String[] { "CONFIRMATION_ID", @@ -257,10 +263,10 @@ public class Constants { HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS_TOTALS, new String[] { "CONFIRMATION_ID", "OCC_QUARTER", - "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", - "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", - "OCC_DAYS_YTD_PRIVATE", - "OCC_DAYS_YTD_TOTAL_DAYS", + "TOTAL_OCC_DAYS_YTD_IN_SCOPE_PUBLIC", + "TOTAL_OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", + "TOTAL_OCC_DAYS_YTD_PRIVATE", + "TOTAL_OCC_DAYS_YTD_TOTAL_DAYS", }); HEADERS.put(LTC_BED_YTD_OCCUPANCY_RATE, @@ -273,7 +279,7 @@ public class Constants { "TOTAL_PLAN_MAX_OCC_DAYS", "TOTAL_YTD_MAX_OCC_DAYS", "TOTAL_YTD_OCC_DAYS", - "TOTAL_PERCENT_OCC", + "TOTAL_PERCENT_OCC" }); } } From 035c68a8341cf94b2b3c702d0b7c163c9cb2093b Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 4 Apr 2023 14:04:53 -0400 Subject: [PATCH 052/183] update for LtcYtdSubmission --- .../LtcQuaterlyYtdApiResponseProcessor.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 1c254739..5edd88a2 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -101,16 +101,16 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT /* Form Meta */ ltcYtdSubmission.setConfirmationId(root.getForm().getConfirmationId()); + ltcYtdSubmission.setIsDeleted(""); + ltcYtdSubmission.setSubmissionDate(root.getForm().getCreatedAt()); + ltcYtdSubmission.setSubmittedBy(root.getForm().getFullName()); ltcYtdSubmission.setCCIMSID(root.getCcmisId()); ltcYtdSubmission.setSubmissionType(root.getSubmission()); - ltcYtdSubmission.setIsDeleted(""); - ltcYtdSubmission.setNbFundedBeds(root.getNumberOfTotalFundedBeds()); - ltcYtdSubmission.setNbTotalBeds(root.getNumberOfTotalBeds()); - ltcYtdSubmission.setOccRateThreshold(root.getThreshold()); ltcYtdSubmission.setPeriod(root.getQuarter()); - ltcYtdSubmission.setSubmissionDate(root.getForm().getCreatedAt()); // FIXME ltcYtdSubmission.setSubmissionFy(""); - ltcYtdSubmission.setSubmittedBy(root.getForm().getFullName()); + ltcYtdSubmission.setNbTotalBeds(root.getNumberOfTotalBeds()); + ltcYtdSubmission.setNbFundedBeds(root.getNumberOfTotalFundedBeds()); + ltcYtdSubmission.setOccRateThreshold(root.getThreshold()); /* START : Direct Care Hours */ /* Productive and NP Nursing */ // why no subtotal and total? From 0b8e0974c0bdc2d45166f7e2a7b4075ae9a6bb22 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 4 Apr 2023 16:09:53 -0400 Subject: [PATCH 053/183] recovering labels for all Contracted Service Provider (CSP) --- .../etl/forms/ltc/quaterly/json/Root.java | 161 +++++++++++++++++- 1 file changed, 159 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java index 45f70242..691b4d7a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java @@ -1248,11 +1248,48 @@ public class Root{ public String nursingProdH_sub3; public String nursingProdH_sub4; public String nursingProdH_subsum1; - @JsonProperty("nursingProdH_sum1-1") + public String nursing_label_CSP; + public String alliedProf_label_CSP; + public String alliedNP_label_CSP; + @JsonProperty("nursingProdH_sum1-1") public String nursingProdH_sum11; @JsonProperty("nursingProdH_sum2-1") public String nursingProdH_sum21; - public String nursingProdH_THP1; + @JsonProperty("nursing_label_CSP-1") + public String nursing_label_CSP1; + @JsonProperty("nursing_label_CSP-2") + public String nursing_label_CSP2; + @JsonProperty("nursing_label_CSP-3") + public String nursing_label_CSP3; + @JsonProperty("nursing_label_CSP-4") + public String nursing_label_CSP4; + @JsonProperty("alliedProf_label_CSP-1") + public String alliedProf_label_CSP1; + @JsonProperty("alliedProf_label_CSP-2") + public String alliedProf_label_CSP2; + @JsonProperty("alliedProf_label_CSP-3") + public String alliedProf_label_CSP3; + @JsonProperty("alliedProf_label_CSP-4") + public String alliedProf_label_CSP4; + @JsonProperty("alliedProf_label_CSP-5") + public String alliedProf_label_CSP5; + @JsonProperty("alliedProf_label_CSP-6") + public String alliedProf_label_CSP6; + @JsonProperty("alliedProf_label_CSP-7") + public String alliedProf_label_CSP7; + @JsonProperty("alliedNP_label_CSP-1") + public String alliedNP_label_CSP1; + @JsonProperty("alliedNP_label_CSP-2") + public String alliedNP_label_CSP2; + @JsonProperty("alliedNP_label_CSP-3") + public String alliedNP_label_CSP3; + @JsonProperty("alliedNP_label_CSP-4") + public String alliedNP_label_CSP4; + @JsonProperty("alliedNP_label_CSP-5") + public String alliedNP_label_CSP5; + @JsonProperty("alliedNP_label_CSP-6") + public String alliedNP_label_CSP6; + public String nursingProdH_THP1; public String nursingProdH_THP2; public String nursingProdH_THP3; public String nursingProdH_THP4; @@ -6885,6 +6922,126 @@ public String getNursingProdH_sum21() { public void setNursingProdH_sum21(String nursingProdH_sum21) { this.nursingProdH_sum21 = nursingProdH_sum21; } + public String getNursing_label_CSP() { + return nursing_label_CSP; + } + public void setNursing_label_CSP(String nursing_label_CSP) { + this.nursing_label_CSP = nursing_label_CSP; + } + public String getAlliedProf_label_CSP() { + return alliedProf_label_CSP; + } + public void setAlliedProf_label_CSP(String alliedProf_label_CSP) { + this.alliedProf_label_CSP = alliedProf_label_CSP; + } + public String getAlliedNP_label_CSP() { + return alliedNP_label_CSP; + } + public void setAlliedNP_label_CSP(String alliedNP_label_CSP) { + this.alliedNP_label_CSP = alliedNP_label_CSP; + } + public String getNursing_label_CSP1() { + return nursing_label_CSP1; + } + public void setNursing_label_CSP1(String nursing_label_CSP1) { + this.nursing_label_CSP1 = nursing_label_CSP1; + } + public String getNursing_label_CSP2() { + return nursing_label_CSP2; + } + public void setNursing_label_CSP2(String nursing_label_CSP2) { + this.nursing_label_CSP2 = nursing_label_CSP2; + } + public String getNursing_label_CSP3() { + return nursing_label_CSP3; + } + public void setNursing_label_CSP3(String nursing_label_CSP3) { + this.nursing_label_CSP3 = nursing_label_CSP3; + } + public String getNursing_label_CSP4() { + return nursing_label_CSP4; + } + public void setNursing_label_CSP4(String nursing_label_CSP4) { + this.nursing_label_CSP4 = nursing_label_CSP4; + } + public String getAlliedProf_label_CSP1() { + return alliedProf_label_CSP1; + } + public void setAlliedProf_label_CSP1(String alliedProf_label_CSP1) { + this.alliedProf_label_CSP1 = alliedProf_label_CSP1; + } + public String getAlliedProf_label_CSP2() { + return alliedProf_label_CSP2; + } + public void setAlliedProf_label_CSP2(String alliedProf_label_CSP2) { + this.alliedProf_label_CSP2 = alliedProf_label_CSP2; + } + public String getAlliedProf_label_CSP3() { + return alliedProf_label_CSP3; + } + public void setAlliedProf_label_CSP3(String alliedProf_label_CSP3) { + this.alliedProf_label_CSP3 = alliedProf_label_CSP3; + } + public String getAlliedProf_label_CSP4() { + return alliedProf_label_CSP4; + } + public void setAlliedProf_label_CSP4(String alliedProf_label_CSP4) { + this.alliedProf_label_CSP4 = alliedProf_label_CSP4; + } + public String getAlliedProf_label_CSP5() { + return alliedProf_label_CSP5; + } + public void setAlliedProf_label_CSP5(String alliedProf_label_CSP5) { + this.alliedProf_label_CSP5 = alliedProf_label_CSP5; + } + public String getAlliedProf_label_CSP6() { + return alliedProf_label_CSP6; + } + public void setAlliedProf_label_CSP6(String alliedProf_label_CSP6) { + this.alliedProf_label_CSP6 = alliedProf_label_CSP6; + } + public String getAlliedProf_label_CSP7() { + return alliedProf_label_CSP7; + } + public void setAlliedProf_label_CSP7(String alliedProf_label_CSP7) { + this.alliedProf_label_CSP7 = alliedProf_label_CSP7; + } + public String getAlliedNP_label_CSP1() { + return alliedNP_label_CSP1; + } + public void setAlliedNP_label_CSP1(String alliedNP_label_CSP1) { + this.alliedNP_label_CSP1 = alliedNP_label_CSP1; + } + public String getAlliedNP_label_CSP2() { + return alliedNP_label_CSP2; + } + public void setAlliedNP_label_CSP2(String alliedNP_label_CSP2) { + this.alliedNP_label_CSP2 = alliedNP_label_CSP2; + } + public String getAlliedNP_label_CSP3() { + return alliedNP_label_CSP3; + } + public void setAlliedNP_label_CSP3(String alliedNP_label_CSP3) { + this.alliedNP_label_CSP3 = alliedNP_label_CSP3; + } + public String getAlliedNP_label_CSP4() { + return alliedNP_label_CSP4; + } + public void setAlliedNP_label_CSP4(String alliedNP_label_CSP4) { + this.alliedNP_label_CSP4 = alliedNP_label_CSP4; + } + public String getAlliedNP_label_CSP5() { + return alliedNP_label_CSP5; + } + public void setAlliedNP_label_CSP5(String alliedNP_label_CSP5) { + this.alliedNP_label_CSP5 = alliedNP_label_CSP5; + } + public String getAlliedNP_label_CSP6() { + return alliedNP_label_CSP6; + } + public void setAlliedNP_label_CSP6(String alliedNP_label_CSP6) { + this.alliedNP_label_CSP6 = alliedNP_label_CSP6; + } public String getNursingProdH_THP1() { return nursingProdH_THP1; } From e57b2fb9b3fcb14e78d23e12daa0811aa5d2fda7 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 4 Apr 2023 16:10:05 -0400 Subject: [PATCH 054/183] added constant --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index eaf96490..ba849132 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -41,7 +41,11 @@ public class Constants { public final static String IN_SCOPE = "inScope"; public final static String OUT_OF_SCOPE = "outOfScope"; public final static String PRIVATE_BED = "privateBed"; - // form names + + // Constants for Sub table: LTC_YTD_COMP_ADD_POS + public final static String POS_TYPE_OTHER = "Other"; + + /* Form Names */ public final static String LTC_BED_YTD_OCCUPIED_DAYS = "LTC_BED_YTD_OCCUPIED_DAYS"; public final static String LTC_BED_YTD_OCCUPANCY_RATE = "LTC_BED_YTD_OCCUPANCY_RATE"; public final static String LTC_BED_YTD_MAX_OCCUPANCY = "LTC_BED_YTD_MAX_OCCUPANCY"; From 240ef1014dd69398c2e1a3646097348c27a08cf6 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 4 Apr 2023 16:10:43 -0400 Subject: [PATCH 055/183] updated ETL process for sub table LTC_YTD_COMP_ADD_POS --- .../ltc/quaterly/model/LtcYtdCompAddPos.java | 26 +++- .../LtcQuaterlyYtdApiResponseProcessor.java | 141 ++++++++++-------- 2 files changed, 103 insertions(+), 64 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java index 32f9ce9d..f29a6c79 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java @@ -11,9 +11,10 @@ public class LtcYtdCompAddPos implements IModel{ private String confirmationId; private String addPosType; private String addPosName; - //private String addPosContractedOutYtd; + private String addPosContractedOutYtd; private String addPosLegalNameContractServiceYtd; private String addPosPercentServiceContractOutYtd; + private String addPosAnotherName = ""; public String getConfirmationId() { return confirmationId; @@ -33,7 +34,12 @@ public String getAddPosName() { public void setAddPosName(String addPosName) { this.addPosName = addPosName; } - + public String getAddPosContractedOutYtd() { + return this.addPosContractedOutYtd; + } + public void setAddPosContractedOutYtd(String addPosContractedOutYtd) { + this.addPosContractedOutYtd = addPosContractedOutYtd; + } public String getAddPosLegalNameContractServiceYtd() { return addPosLegalNameContractServiceYtd; } @@ -46,6 +52,19 @@ public String getAddPosPercentServiceContractOutYtd() { public void setAddPosPercentServiceContractOutYtd(String addPosPercentServiceContractOutYtd) { this.addPosPercentServiceContractOutYtd = addPosPercentServiceContractOutYtd; } + public String getAddPosAnotherName() { + return addPosAnotherName; + } + public void setAddPosAnotherName(String addPosAnotherName) { + this.addPosAnotherName = addPosAnotherName; + } + + public void determineAddPosContractedOutYtd() { + if(this.getAddPosLegalNameContractServiceYtd() != "" && this.getAddPosLegalNameContractServiceYtd() != null){ + this.addPosContractedOutYtd = "Y"; + } + this.addPosContractedOutYtd = "N"; + } @Override public String getFileName() { @@ -62,9 +81,10 @@ public List getCsvElements() { elements.add(this.getConfirmationId()); elements.add(this.getAddPosType()); elements.add(this.getAddPosName()); - //elements.add(this.getAddPosContractedOutYtd()); + elements.add(this.getAddPosContractedOutYtd()); elements.add(this.getAddPosLegalNameContractServiceYtd()); elements.add(this.getAddPosPercentServiceContractOutYtd()); + elements.add(this.getAddPosAnotherName()); return elements; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 5edd88a2..7df1ff17 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -1457,124 +1457,143 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT /* Add Pos Hrs */ LtcYtdCompAddPos nursingRNAddPos = new LtcYtdCompAddPos(); + nursingRNAddPos.setConfirmationId(root.getForm().getConfirmationId()); + nursingRNAddPos.setAddPosName(root.getNursing_label_CSP()); + nursingRNAddPos.setAddPosType(root.getNursing_label_CSP1()); nursingRNAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider1()); nursingRNAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage1()); - // nursingRNAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - nursingRNAddPos.setAddPosName("RN"); - nursingRNAddPos.setAddPosType("Nursing"); - nursingRNAddPos.setConfirmationId(root.getForm().getConfirmationId()); - + nursingRNAddPos.determineAddPosContractedOutYtd(); + LtcYtdCompAddPos nursingLPNAddPos = new LtcYtdCompAddPos(); + nursingLPNAddPos.setConfirmationId(root.getForm().getConfirmationId()); + nursingLPNAddPos.setAddPosName(root.getNursing_label_CSP()); + nursingLPNAddPos.setAddPosType(root.getNursing_label_CSP2()); nursingLPNAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider2()); nursingLPNAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage2()); - // nursingLPNAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - nursingLPNAddPos.setAddPosName("LPN"); - nursingLPNAddPos.setAddPosType("Nursing"); - nursingLPNAddPos.setConfirmationId(root.getForm().getConfirmationId()); + nursingLPNAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos nursingHCAAddPos = new LtcYtdCompAddPos(); + nursingHCAAddPos.setConfirmationId(root.getForm().getConfirmationId()); + nursingHCAAddPos.setAddPosName(root.getNursing_label_CSP()); + nursingHCAAddPos.setAddPosType(root.getNursing_label_CSP3()); nursingHCAAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider3()); nursingHCAAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage3()); - // nursingHCAAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - nursingHCAAddPos.setAddPosName("Care Aides (HCA)"); - nursingHCAAddPos.setAddPosType("Nursing"); - nursingHCAAddPos.setConfirmationId(root.getForm().getConfirmationId()); + nursingHCAAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos nursingOTHAddPos = new LtcYtdCompAddPos(); + nursingOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); + nursingOTHAddPos.setAddPosName(root.getNursing_label_CSP()); + nursingOTHAddPos.setAddPosType(Constants.POS_TYPE_OTHER); nursingOTHAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider4()); nursingOTHAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage4()); - // nursingOTHAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - nursingOTHAddPos.setAddPosName("Other (specify)"); - nursingOTHAddPos.setAddPosType("Nursing"); - nursingOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); + nursingOTHAddPos.setAddPosAnotherName(root.getNursing_label_CSP4()); + nursingOTHAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfOTAddPos = new LtcYtdCompAddPos(); + alliedProfOTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfOTAddPos.setAddPosName(root.getAlliedProf_label_CSP()); + alliedProfOTAddPos.setAddPosType(root.getAlliedProf_label_CSP1()); alliedProfOTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider1()); alliedProfOTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage1()); - // alliedProfOTAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - alliedProfOTAddPos.setAddPosName("Occupational Therapist"); - alliedProfOTAddPos.setAddPosType("Allied Professional"); - alliedProfOTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfOTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfPTAddPos = new LtcYtdCompAddPos(); + alliedProfPTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfPTAddPos.setAddPosName(root.getAlliedProf_label_CSP()); + alliedProfPTAddPos.setAddPosType(root.getAlliedProf_label_CSP2()); alliedProfPTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider2()); alliedProfPTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage2()); - // alliedProfPTAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - alliedProfPTAddPos.setAddPosName("Physiotherapist"); - alliedProfPTAddPos.setAddPosType("Allied Professional"); - alliedProfPTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfPTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfDTAddPos = new LtcYtdCompAddPos(); + alliedProfDTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfDTAddPos.setAddPosName(root.getAlliedProf_label_CSP()); + alliedProfDTAddPos.setAddPosType(root.getAlliedProf_label_CSP3()); alliedProfDTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider3()); alliedProfDTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage3()); - // alliedProfDTAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - alliedProfDTAddPos.setAddPosName("Dietitian"); - alliedProfDTAddPos.setAddPosType("Allied Professional"); - alliedProfDTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfDTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfSWAddPos = new LtcYtdCompAddPos(); + alliedProfSWAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfSWAddPos.setAddPosName(root.getAlliedProf_label_CSP()); + alliedProfSWAddPos.setAddPosType(root.getAlliedProf_label_CSP4()); alliedProfSWAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider4()); alliedProfSWAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage4()); - // alliedProfSWAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - alliedProfSWAddPos.setAddPosName("Social Worker"); - alliedProfSWAddPos.setAddPosType("Allied Professional"); - alliedProfSWAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfSWAddPos.determineAddPosContractedOutYtd(); + + LtcYtdCompAddPos alliedProfSLPAddPos = new LtcYtdCompAddPos(); + alliedProfSLPAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfSLPAddPos.setAddPosName(root.getAlliedProf_label_CSP()); + alliedProfSLPAddPos.setAddPosType(root.getAlliedProf_label_CSP5()); + alliedProfSLPAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider4()); + alliedProfSLPAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage4()); + alliedProfSLPAddPos.determineAddPosContractedOutYtd(); + + LtcYtdCompAddPos alliedProfRTAddPos = new LtcYtdCompAddPos(); + alliedProfRTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfRTAddPos.setAddPosName(root.getAlliedProf_label_CSP()); + alliedProfRTAddPos.setAddPosType(root.getAlliedProf_label_CSP6()); + alliedProfRTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider4()); + alliedProfRTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage4()); + alliedProfRTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfOTHAddPos = new LtcYtdCompAddPos(); + alliedProfOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfOTHAddPos.setAddPosName(root.getAlliedProf_label_CSP()); + alliedProfOTHAddPos.setAddPosType(Constants.POS_TYPE_OTHER); alliedProfOTHAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider5()); alliedProfOTHAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage5()); - // alliedProfOTHAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - alliedProfOTHAddPos.setAddPosName("Other (specify)"); - alliedProfOTHAddPos.setAddPosType("Allied Professional"); - alliedProfOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfOTHAddPos.setAddPosAnotherName(root.getAlliedProf_label_CSP7()); + alliedProfOTHAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedNPRTAddPos = new LtcYtdCompAddPos(); + alliedNPRTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRTAddPos.setAddPosName(root.getAlliedNP_label_CSP()); + alliedNPRTAddPos.setAddPosType(root.getAlliedNP_label_CSP1()); alliedNPRTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider1()); alliedNPRTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage1()); - // alliedNPRTAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - alliedNPRTAddPos.setAddPosName("Recreation Therapist"); - alliedNPRTAddPos.setAddPosType("Allied Non-professional"); - alliedNPRTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedNPRAAddPos = new LtcYtdCompAddPos(); + alliedNPRAAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRAAddPos.setAddPosName(root.getAlliedNP_label_CSP()); + alliedNPRAAddPos.setAddPosType(root.getAlliedNP_label_CSP2()); alliedNPRAAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider2()); alliedNPRAAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage2()); - // alliedNPRAAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - alliedNPRAAddPos.setAddPosName("Rehab Assistant"); - alliedNPRAAddPos.setAddPosType("Allied Non-professional"); - alliedNPRAAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPRAAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedNPAWAddPos = new LtcYtdCompAddPos(); + alliedNPAWAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPAWAddPos.setAddPosName(root.getAlliedNP_label_CSP()); + alliedNPAWAddPos.setAddPosType(root.getAlliedNP_label_CSP3()); alliedNPAWAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider3()); alliedNPAWAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage3()); - // alliedNPAWAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - alliedNPAWAddPos.setAddPosName("Activity Worker"); - alliedNPAWAddPos.setAddPosType("Allied Non-professional"); - alliedNPAWAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPAWAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedNPMTAddPos = new LtcYtdCompAddPos(); + alliedNPMTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPMTAddPos.setAddPosName(root.getAlliedNP_label_CSP()); + alliedNPMTAddPos.setAddPosType(root.getAlliedNP_label_CSP4()); alliedNPMTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider4()); alliedNPMTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage4()); - // alliedNPMTAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - alliedNPMTAddPos.setAddPosName("Music Therapist"); - alliedNPMTAddPos.setAddPosType("Allied Non-professional"); - alliedNPMTAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPMTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedNPATAddPos = new LtcYtdCompAddPos(); + alliedNPATAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPATAddPos.setAddPosName(root.getAlliedNP_label_CSP()); + alliedNPATAddPos.setAddPosType(root.getAlliedNP_label_CSP5()); alliedNPATAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider5()); alliedNPATAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage5()); - // alliedNPATAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - alliedNPATAddPos.setAddPosName("Art Therapist"); - alliedNPATAddPos.setAddPosType("Allied Non-professional"); - alliedNPATAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPATAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedNPOTHAddPos = new LtcYtdCompAddPos(); + alliedNPOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPOTHAddPos.setAddPosName(root.getAlliedNP_label_CSP()); + alliedNPOTHAddPos.setAddPosType(Constants.POS_TYPE_OTHER); alliedNPOTHAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider6()); alliedNPOTHAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage6()); - // alliedNPOTHAddPos.setAddPosContractedOutYtd(payload); // NOT SURE - alliedNPOTHAddPos.setAddPosName("Other (specify)"); - alliedNPOTHAddPos.setAddPosType("Allied Non-professional"); - alliedNPOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); + alliedNPOTHAddPos.setAddPosAnotherName(root.getAlliedNP_label_CSP6()); + alliedNPOTHAddPos.determineAddPosContractedOutYtd(); Collections.addAll(ltcYtdCompAddPos, nursingRNAddPos, nursingLPNAddPos, nursingHCAAddPos, nursingOTHAddPos, alliedProfOTAddPos, alliedProfPTAddPos, alliedProfDTAddPos, alliedProfSWAddPos, alliedProfOTHAddPos, From 0fc727f16840162e891909554cb524e229b85d0d Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 4 Apr 2023 16:23:30 -0400 Subject: [PATCH 056/183] bug fix --- .../LtcQuaterlyYtdApiResponseProcessor.java | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 7df1ff17..766d9998 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -1458,32 +1458,32 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT /* Add Pos Hrs */ LtcYtdCompAddPos nursingRNAddPos = new LtcYtdCompAddPos(); nursingRNAddPos.setConfirmationId(root.getForm().getConfirmationId()); - nursingRNAddPos.setAddPosName(root.getNursing_label_CSP()); - nursingRNAddPos.setAddPosType(root.getNursing_label_CSP1()); + nursingRNAddPos.setAddPosType(root.getNursing_label_CSP()); + nursingRNAddPos.setAddPosName(root.getNursing_label_CSP1()); nursingRNAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider1()); nursingRNAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage1()); nursingRNAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos nursingLPNAddPos = new LtcYtdCompAddPos(); nursingLPNAddPos.setConfirmationId(root.getForm().getConfirmationId()); - nursingLPNAddPos.setAddPosName(root.getNursing_label_CSP()); - nursingLPNAddPos.setAddPosType(root.getNursing_label_CSP2()); + nursingLPNAddPos.setAddPosType(root.getNursing_label_CSP()); + nursingLPNAddPos.setAddPosName(root.getNursing_label_CSP2()); nursingLPNAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider2()); nursingLPNAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage2()); nursingLPNAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos nursingHCAAddPos = new LtcYtdCompAddPos(); nursingHCAAddPos.setConfirmationId(root.getForm().getConfirmationId()); - nursingHCAAddPos.setAddPosName(root.getNursing_label_CSP()); - nursingHCAAddPos.setAddPosType(root.getNursing_label_CSP3()); + nursingHCAAddPos.setAddPosType(root.getNursing_label_CSP()); + nursingHCAAddPos.setAddPosName(root.getNursing_label_CSP3()); nursingHCAAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider3()); nursingHCAAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage3()); nursingHCAAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos nursingOTHAddPos = new LtcYtdCompAddPos(); nursingOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); - nursingOTHAddPos.setAddPosName(root.getNursing_label_CSP()); - nursingOTHAddPos.setAddPosType(Constants.POS_TYPE_OTHER); + nursingOTHAddPos.setAddPosType(root.getNursing_label_CSP()); + nursingOTHAddPos.setAddPosName(Constants.POS_TYPE_OTHER); nursingOTHAddPos.setAddPosLegalNameContractServiceYtd(root.getNursingProvider4()); nursingOTHAddPos.setAddPosPercentServiceContractOutYtd(root.getNursingPercentage4()); nursingOTHAddPos.setAddPosAnotherName(root.getNursing_label_CSP4()); @@ -1491,56 +1491,56 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcYtdCompAddPos alliedProfOTAddPos = new LtcYtdCompAddPos(); alliedProfOTAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedProfOTAddPos.setAddPosName(root.getAlliedProf_label_CSP()); - alliedProfOTAddPos.setAddPosType(root.getAlliedProf_label_CSP1()); + alliedProfOTAddPos.setAddPosType(root.getAlliedProf_label_CSP()); + alliedProfOTAddPos.setAddPosName(root.getAlliedProf_label_CSP1()); alliedProfOTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider1()); alliedProfOTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage1()); alliedProfOTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfPTAddPos = new LtcYtdCompAddPos(); alliedProfPTAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedProfPTAddPos.setAddPosName(root.getAlliedProf_label_CSP()); - alliedProfPTAddPos.setAddPosType(root.getAlliedProf_label_CSP2()); + alliedProfPTAddPos.setAddPosType(root.getAlliedProf_label_CSP()); + alliedProfPTAddPos.setAddPosName(root.getAlliedProf_label_CSP2()); alliedProfPTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider2()); alliedProfPTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage2()); alliedProfPTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfDTAddPos = new LtcYtdCompAddPos(); alliedProfDTAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedProfDTAddPos.setAddPosName(root.getAlliedProf_label_CSP()); - alliedProfDTAddPos.setAddPosType(root.getAlliedProf_label_CSP3()); + alliedProfDTAddPos.setAddPosType(root.getAlliedProf_label_CSP()); + alliedProfDTAddPos.setAddPosName(root.getAlliedProf_label_CSP3()); alliedProfDTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider3()); alliedProfDTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage3()); alliedProfDTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfSWAddPos = new LtcYtdCompAddPos(); alliedProfSWAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedProfSWAddPos.setAddPosName(root.getAlliedProf_label_CSP()); - alliedProfSWAddPos.setAddPosType(root.getAlliedProf_label_CSP4()); + alliedProfSWAddPos.setAddPosType(root.getAlliedProf_label_CSP()); + alliedProfSWAddPos.setAddPosName(root.getAlliedProf_label_CSP4()); alliedProfSWAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider4()); alliedProfSWAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage4()); alliedProfSWAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfSLPAddPos = new LtcYtdCompAddPos(); alliedProfSLPAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedProfSLPAddPos.setAddPosName(root.getAlliedProf_label_CSP()); - alliedProfSLPAddPos.setAddPosType(root.getAlliedProf_label_CSP5()); + alliedProfSLPAddPos.setAddPosType(root.getAlliedProf_label_CSP()); + alliedProfSLPAddPos.setAddPosName(root.getAlliedProf_label_CSP5()); alliedProfSLPAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider4()); alliedProfSLPAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage4()); alliedProfSLPAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfRTAddPos = new LtcYtdCompAddPos(); alliedProfRTAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedProfRTAddPos.setAddPosName(root.getAlliedProf_label_CSP()); - alliedProfRTAddPos.setAddPosType(root.getAlliedProf_label_CSP6()); + alliedProfRTAddPos.setAddPosType(root.getAlliedProf_label_CSP()); + alliedProfRTAddPos.setAddPosName(root.getAlliedProf_label_CSP6()); alliedProfRTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider4()); alliedProfRTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage4()); alliedProfRTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfOTHAddPos = new LtcYtdCompAddPos(); alliedProfOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedProfOTHAddPos.setAddPosName(root.getAlliedProf_label_CSP()); - alliedProfOTHAddPos.setAddPosType(Constants.POS_TYPE_OTHER); + alliedProfOTHAddPos.setAddPosType(root.getAlliedProf_label_CSP()); + alliedProfOTHAddPos.setAddPosName(Constants.POS_TYPE_OTHER); alliedProfOTHAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider5()); alliedProfOTHAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage5()); alliedProfOTHAddPos.setAddPosAnotherName(root.getAlliedProf_label_CSP7()); @@ -1548,48 +1548,48 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcYtdCompAddPos alliedNPRTAddPos = new LtcYtdCompAddPos(); alliedNPRTAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPRTAddPos.setAddPosName(root.getAlliedNP_label_CSP()); - alliedNPRTAddPos.setAddPosType(root.getAlliedNP_label_CSP1()); + alliedNPRTAddPos.setAddPosType(root.getAlliedNP_label_CSP()); + alliedNPRTAddPos.setAddPosName(root.getAlliedNP_label_CSP1()); alliedNPRTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider1()); alliedNPRTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage1()); alliedNPRTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedNPRAAddPos = new LtcYtdCompAddPos(); alliedNPRAAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPRAAddPos.setAddPosName(root.getAlliedNP_label_CSP()); - alliedNPRAAddPos.setAddPosType(root.getAlliedNP_label_CSP2()); + alliedNPRAAddPos.setAddPosType(root.getAlliedNP_label_CSP()); + alliedNPRAAddPos.setAddPosName(root.getAlliedNP_label_CSP2()); alliedNPRAAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider2()); alliedNPRAAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage2()); alliedNPRAAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedNPAWAddPos = new LtcYtdCompAddPos(); alliedNPAWAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPAWAddPos.setAddPosName(root.getAlliedNP_label_CSP()); - alliedNPAWAddPos.setAddPosType(root.getAlliedNP_label_CSP3()); + alliedNPAWAddPos.setAddPosType(root.getAlliedNP_label_CSP()); + alliedNPAWAddPos.setAddPosName(root.getAlliedNP_label_CSP3()); alliedNPAWAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider3()); alliedNPAWAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage3()); alliedNPAWAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedNPMTAddPos = new LtcYtdCompAddPos(); alliedNPMTAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPMTAddPos.setAddPosName(root.getAlliedNP_label_CSP()); - alliedNPMTAddPos.setAddPosType(root.getAlliedNP_label_CSP4()); + alliedNPMTAddPos.setAddPosType(root.getAlliedNP_label_CSP()); + alliedNPMTAddPos.setAddPosName(root.getAlliedNP_label_CSP4()); alliedNPMTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider4()); alliedNPMTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage4()); alliedNPMTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedNPATAddPos = new LtcYtdCompAddPos(); alliedNPATAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPATAddPos.setAddPosName(root.getAlliedNP_label_CSP()); - alliedNPATAddPos.setAddPosType(root.getAlliedNP_label_CSP5()); + alliedNPATAddPos.setAddPosType(root.getAlliedNP_label_CSP()); + alliedNPATAddPos.setAddPosName(root.getAlliedNP_label_CSP5()); alliedNPATAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider5()); alliedNPATAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage5()); alliedNPATAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedNPOTHAddPos = new LtcYtdCompAddPos(); alliedNPOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPOTHAddPos.setAddPosName(root.getAlliedNP_label_CSP()); - alliedNPOTHAddPos.setAddPosType(Constants.POS_TYPE_OTHER); + alliedNPOTHAddPos.setAddPosType(root.getAlliedNP_label_CSP()); + alliedNPOTHAddPos.setAddPosName(Constants.POS_TYPE_OTHER); alliedNPOTHAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedNPProvider6()); alliedNPOTHAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedNPPercentage6()); alliedNPOTHAddPos.setAddPosAnotherName(root.getAlliedNP_label_CSP6()); From aedde78e072d9ef4e0ae063861900f7a4b2697e7 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Tue, 4 Apr 2023 15:24:51 -0700 Subject: [PATCH 057/183] Fixed REVENUE_TYPE, REVENUE_NAME, EXPENDITURE_TYPE, EXPENDITURE_NAME domain values to match YTD form. --- doc/DomainModelDomains.txt | 172 ++++++++++++++++++++----------------- 1 file changed, 93 insertions(+), 79 deletions(-) diff --git a/doc/DomainModelDomains.txt b/doc/DomainModelDomains.txt index a97bb1be..91c6e8bf 100755 --- a/doc/DomainModelDomains.txt +++ b/doc/DomainModelDomains.txt @@ -71,7 +71,7 @@ "AIMS_REFERRAL_SOURCE","LEGL - Legal System","17" "AIMS_REFERRAL_SOURCE","MULT - Multicultural Centre/Service","18" "AIMS_REFERRAL_SOURCE","CYMH - Child and Youth Mental Health","19" -"AIMS_REFERRAL_SOURCE","MHLT -  Mental Health Services  (Adult or Child)","20" +"AIMS_REFERRAL_SOURCE","MHLT - �Mental Health Services �(Adult or Child)","20" "AIMS_REFERRAL_SOURCE","MHRS - Ministry of Human Resources staff","21" "AIMS_REFERRAL_SOURCE","NADP - National Native A&D Abuse Programs","22" "AIMS_REFERRAL_SOURCE","PUBL - Public Health","23" @@ -197,54 +197,54 @@ "DISCHARGE_PRG_COMP_TYPE","Completed","1" "DISCHARGE_PRG_COMP_TYPE","Incomplete","2" "DISCHARGE_PRG_COMP_TYPE","Client Deceased","3" -"REFERRAL_TARGET","ABCP  Aboriginal Child Protection","1" -"REFERRAL_TARGET","ABOR -  Aboriginal Organization","2" -"REFERRAL_TARGET","BANK -  Bankruptcy Trustee","3" -"REFERRAL_TARGET","CHPR -  Child Protection","4" -"REFERRAL_TARGET","CLGY -  Clergy","5" -"REFERRAL_TARGET","COMM -  Community Service Organization","6" -"REFERRAL_TARGET","CSAM  Corrections Substance Abuse Management","7" -"REFERRAL_TARGET","CYMH  Child and Youth Mental Health","8" -"REFERRAL_TARGET","DEBT  Debtor's Assistance Agency","9" -"REFERRAL_TARGET","EAPL  Employee Assistance Plan","10" -"REFERRAL_TARGET","EDUC  Educational Institute","11" -"REFERRAL_TARGET","EMPL  Employer","12" -"REFERRAL_TARGET","EMPP  Employment Center or Program","13" -"REFERRAL_TARGET","FAMI  Family/Friend","14" -"REFERRAL_TARGET","GAMB  Gambling or Gaming Facility","15" -"REFERRAL_TARGET","HOSP  Hospital","16" -"REFERRAL_TARGET","IRAD  Referral Services for Alcohol and Drug","17" -"REFERRAL_TARGET","IRPG  Referral Services for Problem Gambling","18" -"REFERRAL_TARGET","LEGL  Legal System","19" -"REFERRAL_TARGET","MHLT  Mental Health Services","20" -"REFERRAL_TARGET","MHRS  Ministry of Human Resources","21" -"REFERRAL_TARGET","MULT  Multicultural Centre/Service","22" -"REFERRAL_TARGET","NADP  National Native A&D Programs","23" -"REFERRAL_TARGET","OMCF  Other MCFD Staff","24" -"REFERRAL_TARGET","OSMV  Superintendent of Motor Vehicles","25" -"REFERRAL_TARGET","OTHR  Other","26" -"REFERRAL_TARGET","PHYS  Physician","27" -"REFERRAL_TARGET","PROB  Probation","28" -"REFERRAL_TARGET","PSYC  Psychologist or Psychiatrist","29" -"REFERRAL_TARGET","PUBL  Public Health","30" -"REFERRAL_TARGET","RNAF  Risk Needs Assessment Form8","31" -"REFERRAL_TARGET","SELF  Self Referral","32" -"REFERRAL_TARGET","STEP  Support Group","33" -"REFERRAL_TARGET","XX**  Outside of BC, another Province","34" -"REFERRAL_TARGET","XXAB  AB-Alberta","35" -"REFERRAL_TARGET","XXMB  MB-Manitoba","36" -"REFERRAL_TARGET","XXNB  NB-New Brunswick","37" -"REFERRAL_TARGET","XXNF  NF-Newfoundland","38" -"REFERRAL_TARGET","XXNS  NS-Nova Scotia","39" -"REFERRAL_TARGET","XXNT  NT-Northwest Territories","40" -"REFERRAL_TARGET","XXON  ON-Ontario","41" -"REFERRAL_TARGET","XXPE  PE-Prince Edward Island","42" -"REFERRAL_TARGET","XXQC  QC-Quebec","43" -"REFERRAL_TARGET","XXSK  SK-Saskatchewan","44" -"REFERRAL_TARGET","XXYT  YT-Yukon","45" -"REFERRAL_TARGET","XANT  Referral from Netherlands Antilles","46" -"REFERRAL_TARGET","XARE  Referral from United Arab Emirates","47" -"REFERRAL_TARGET","XUSA  Referral from United States","48" +"REFERRAL_TARGET","ABCP �Aboriginal Child Protection","1" +"REFERRAL_TARGET","ABOR - �Aboriginal Organization","2" +"REFERRAL_TARGET","BANK - �Bankruptcy Trustee","3" +"REFERRAL_TARGET","CHPR - �Child Protection","4" +"REFERRAL_TARGET","CLGY - �Clergy","5" +"REFERRAL_TARGET","COMM - �Community Service Organization","6" +"REFERRAL_TARGET","CSAM �Corrections Substance Abuse Management","7" +"REFERRAL_TARGET","CYMH �Child and Youth Mental Health","8" +"REFERRAL_TARGET","DEBT �Debtor's Assistance Agency","9" +"REFERRAL_TARGET","EAPL �Employee Assistance Plan","10" +"REFERRAL_TARGET","EDUC �Educational Institute","11" +"REFERRAL_TARGET","EMPL �Employer","12" +"REFERRAL_TARGET","EMPP �Employment Center or Program","13" +"REFERRAL_TARGET","FAMI �Family/Friend","14" +"REFERRAL_TARGET","GAMB �Gambling or Gaming Facility","15" +"REFERRAL_TARGET","HOSP �Hospital","16" +"REFERRAL_TARGET","IRAD �Referral Services for Alcohol and Drug","17" +"REFERRAL_TARGET","IRPG �Referral Services for Problem Gambling","18" +"REFERRAL_TARGET","LEGL �Legal System","19" +"REFERRAL_TARGET","MHLT �Mental Health Services","20" +"REFERRAL_TARGET","MHRS �Ministry of Human Resources","21" +"REFERRAL_TARGET","MULT �Multicultural Centre/Service","22" +"REFERRAL_TARGET","NADP �National Native A&D Programs","23" +"REFERRAL_TARGET","OMCF �Other MCFD Staff","24" +"REFERRAL_TARGET","OSMV �Superintendent of Motor Vehicles","25" +"REFERRAL_TARGET","OTHR �Other","26" +"REFERRAL_TARGET","PHYS �Physician","27" +"REFERRAL_TARGET","PROB �Probation","28" +"REFERRAL_TARGET","PSYC �Psychologist or Psychiatrist","29" +"REFERRAL_TARGET","PUBL �Public Health","30" +"REFERRAL_TARGET","RNAF �Risk Needs Assessment Form8","31" +"REFERRAL_TARGET","SELF �Self Referral","32" +"REFERRAL_TARGET","STEP �Support Group","33" +"REFERRAL_TARGET","XX** �Outside of BC, another Province","34" +"REFERRAL_TARGET","XXAB �AB-Alberta","35" +"REFERRAL_TARGET","XXMB �MB-Manitoba","36" +"REFERRAL_TARGET","XXNB �NB-New Brunswick","37" +"REFERRAL_TARGET","XXNF �NF-Newfoundland","38" +"REFERRAL_TARGET","XXNS �NS-Nova Scotia","39" +"REFERRAL_TARGET","XXNT �NT-Northwest Territories","40" +"REFERRAL_TARGET","XXON �ON-Ontario","41" +"REFERRAL_TARGET","XXPE �PE-Prince Edward Island","42" +"REFERRAL_TARGET","XXQC �QC-Quebec","43" +"REFERRAL_TARGET","XXSK �SK-Saskatchewan","44" +"REFERRAL_TARGET","XXYT �YT-Yukon","45" +"REFERRAL_TARGET","XANT �Referral from Netherlands Antilles","46" +"REFERRAL_TARGET","XARE �Referral from United Arab Emirates","47" +"REFERRAL_TARGET","XUSA �Referral from United States","48" "SUBSTANCE","Alcohol","1" "SUBSTANCE","Cannabis","2" "SUBSTANCE","Cocaine","3" @@ -681,13 +681,14 @@ "HA_ABBREVIATED","VCH","4" "HA_ABBREVIATED","VIHA","5" "REVENUE_TYPE","HA Operating Funding","1" -"REVENUE_TYPE","HA Operating Funding - Minor Equipment","2" +"REVENUE_TYPE","HA operating one-time funding","2" "REVENUE_TYPE","HA Capital Contribution Funding ","3" "REVENUE_TYPE","Recoveries by HA","4" "REVENUE_TYPE","Client Revenue","5" "REVENUE_TYPE","Other Revenue","6" -"REVENUE_NAME","HA Operating Funding ~ current year = base funding","1" -"REVENUE_NAME","Direct care hours ~ additional funding for DCH","2" +"REVENUE_TYPE","Non-operating revenue","7" +"REVENUE_NAME","HA Operating Funding","1" +"REVENUE_NAME","Direct care hours ~ additional funding","2" "REVENUE_NAME","Others ~ specify ","3" "REVENUE_NAME","HA Operating Funding - Minor Equipment ","4" "REVENUE_NAME","HA Operating Funding - Other ","5" @@ -697,17 +698,24 @@ "REVENUE_NAME","Direct care hours","9" "REVENUE_NAME","HA client user fees paid by the client","10" "REVENUE_NAME","Client user fees paid by third parties","11" -"REVENUE_NAME","Client user fee paid - for non-eligible residents","12" +"REVENUE_NAME","Client user fee paid: non-eligible residents","12" "REVENUE_NAME","Investments revenue on operating funds","13" "REVENUE_NAME","CMHC/BCHMC funding","14" -"REVENUE_NAME","Expense recoveries ","15" +"REVENUE_NAME","Food Services","15" +"REVENUE_NAME","Laundry Services","16" +"REVENUE_NAME","Cablevision","17" +"REVENUE_NAME","Other Recoveries","18" +"REVENUE_NAME","Other Revenue","19" +"REVENUE_NAME","HA Funding","20" +"REVENUE_NAME","Other - Third party funding","21" "EXPENDITURE_TYPE","Labour Cost","1" "EXPENDITURE_TYPE","Benefit Cost","2" "EXPENDITURE_TYPE","Property Cost","3" "EXPENDITURE_TYPE","Supplies","4" -"EXPENDITURE_TYPE","Admin Cost  ","5" +"EXPENDITURE_TYPE","Admin Cost","5" "EXPENDITURE_TYPE","Operating Surplus/Deficit","6" "EXPENDITURE_TYPE","Depreciation/Amortization","7" +"EXPENDITURE_TYPE","Non-operating Expense",8" "EXPENDITURE_NAME","Direct Care","1" "EXPENDITURE_NAME","Food Services","2" "EXPENDITURE_NAME","Laundry Services","3" @@ -717,29 +725,35 @@ "EXPENDITURE_NAME","Salary and wages recovered","7" "EXPENDITURE_NAME","Salaries and wages accrual ","8" "EXPENDITURE_NAME","Other labour costs","9" -"EXPENDITURE_NAME","Building rent/lease cost","10" -"EXPENDITURE_NAME","Interest on mortgage or long-term debt","11" -"EXPENDITURE_NAME","Property taxes","12" -"EXPENDITURE_NAME","Maintenance and repairs - building, ground and equipment","13" -"EXPENDITURE_NAME","Supplies - for building, ground and equipment ","14" -"EXPENDITURE_NAME","Utilities ","15" -"EXPENDITURE_NAME","Waste management","16" -"EXPENDITURE_NAME","Resident transportation services","17" -"EXPENDITURE_NAME","Others - operating","18" -"EXPENDITURE_NAME","Medical supplies","19" -"EXPENDITURE_NAME","Drugs & pharmaceutical","20" -"EXPENDITURE_NAME","Raw food costs (incl. dietary supplement costs)","21" -"EXPENDITURE_NAME","Dietary supplies","22" -"EXPENDITURE_NAME","Laundry supplies","23" -"EXPENDITURE_NAME","Housekeeping supplies","24" -"EXPENDITURE_NAME","Others - specify ","25" -"EXPENDITURE_NAME","Office expense ","26" -"EXPENDITURE_NAME","Management fees","27" -"EXPENDITURE_NAME","Head office allocation (non-compensation) ","28" -"EXPENDITURE_NAME","Accreditation costs","29" -"EXPENDITURE_NAME","Association dues, professional fees, audit fees","30" -"EXPENDITURE_NAME","Insurances (for property and liability)","31" -"EXPENDITURE_NAME","Other - admin and supplies","32" +"EXPENDITURE_NAME","Benefits","10" +"EXPENDITURE_NAME","Sick, severance and other accrual","11" +"EXPENDITURE_NAME","Building rent/lease cost","12" +"EXPENDITURE_NAME","Interest on mortgage or long-term debt","13" +"EXPENDITURE_NAME","Property taxes","14" +"EXPENDITURE_NAME","Maintenance and repairs - building, ground and equipment","15" +"EXPENDITURE_NAME","Supplies - for building, ground and equipment ","16" +"EXPENDITURE_NAME","Utilities ","17" +"EXPENDITURE_NAME","Waste management","18" +"EXPENDITURE_NAME","Resident transportation services","19" +"EXPENDITURE_NAME","Others - operating","20" +"EXPENDITURE_NAME","Medical supplies","21" +"EXPENDITURE_NAME","Drugs & pharmaceutical","22" +"EXPENDITURE_NAME","Raw food costs (incl. dietary supplement costs)","23" +"EXPENDITURE_NAME","Dietary supplies","24" +"EXPENDITURE_NAME","Laundry supplies","25" +"EXPENDITURE_NAME","Housekeeping supplies","26" +"EXPENDITURE_NAME","Incontinence Supplies","27" +"EXPENDITURE_NAME","Others Supplies ","28" +"EXPENDITURE_NAME","Office expense ","29" +"EXPENDITURE_NAME","Management fees","30" +"EXPENDITURE_NAME","Head office allocation (non-compensation) ","31" +"EXPENDITURE_NAME","Accreditation costs","32" +"EXPENDITURE_NAME","Association dues, professional fees, audit fees","33" +"EXPENDITURE_NAME","Insurances (for property and liability)","34" +"EXPENDITURE_NAME","Administration and Supplies","35" +"EXPENDITURE_NAME","Other - admin and supplies","36" +"EXPENDITURE_NAME","Mortgage Principal Repayment","37" +"EXPENDITURE_NAME","Other Non-operating Expense","38" "DEPRECIATION_NAME","Building ","1" "DEPRECIATION_NAME","Furniture and equipment","2" "YTD_TOTAL_NAME","Total Operating Revenue","1" @@ -788,7 +802,7 @@ "BENEFIT_TYPE","Employer Health Tax","4" "BENEFIT_TYPE","Pension Plan","5" "BENEFIT_TYPE","Extended Health & Dental","6" -"BENEFIT_TYPE","Group Life,  AD&D, LTD","7" +"BENEFIT_TYPE","Group Life, �AD&D, LTD","7" "BENEFIT_TYPE","Other Benefits ~ specify","8" "BENEFIT_TYPE","Less: Benefit Recovery","9" "BENEFIT_TYPE","Accrued Sick & Severance","10" From cd2a89702113c278a9598e5504184ffe41c42578 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Wed, 5 Apr 2023 09:11:13 -0700 Subject: [PATCH 058/183] Removal of special characters and windows line breaks --- doc/DomainModelDomains.txt | 1784 ++++++++++++++++++------------------ 1 file changed, 892 insertions(+), 892 deletions(-) mode change 100755 => 100644 doc/DomainModelDomains.txt diff --git a/doc/DomainModelDomains.txt b/doc/DomainModelDomains.txt old mode 100755 new mode 100644 index 91c6e8bf..4e964fa7 --- a/doc/DomainModelDomains.txt +++ b/doc/DomainModelDomains.txt @@ -1,892 +1,892 @@ -"Domain","Value","Order Sequence" -"BOOLEAN_YES_NO","yes","1" -"BOOLEAN_YES_NO","no","2" -"BOOLEAN_TRUE_FALSE","true","1" -"BOOLEAN_TRUE_FALSE","false","2" -"AIMS_SUBMISSION_TYPE","Intake","1" -"AIMS_SUBMISSION_TYPE","Discharge","2" -"AIMS_PROGRAM_TYPE","DEWW - Day Treatment for Women","1" -"AIMS_PROGRAM_TYPE","DEWM - Day Treatment for Men","2" -"AIMS_PROGRAM_TYPE","DEWC - Co-ed Day Treatment","3" -"AIMS_PROGRAM_TYPE","DEWY - Day Treatment for Youth","4" -"AIMS_PROGRAM_TYPE","RESD - Residential Treatment","5" -"AIMS_PROGRAM_TYPE","WDMT - Withdrawal management","6" -"AIMS_PROGRAM_TYPE","SUPR - Supportive Recovery","7" -"AIMS_PROGRAM_TYPE","PRGA - Problem Gambling","8" -"AIMS_PROGRAM_TYPE","PGTC - Problem Gambling Phone Counselling","9" -"AIMS_PROGRAM_TYPE","OUTP - Outpatient Services","10" -"AIMS_PROGRAM_TYPE","OTRC - Co-ed Outreach Services","11" -"AIMS_PROGRAM_TYPE","BEST - DWI Program","12" -"AIMS_PROGRAM_TYPE","EAPP - Employee Assistance Programs","13" -"AIMS_PROGRAM_TYPE","PHYC - Physician","14" -"AIMS_PROGRAM_TYPE","SBPP - School-based Prevention Program","15" -"AIMS_PROGRAM_TYPE","RESW - Residential Treatment for Women","16" -"AIMS_PROGRAM_TYPE","SUPC - Co-ed Supportive Recovery","17" -"AIMS_PROGRAM_TYPE","SBRC - Sobering Centre","18" -"AIMS_PROGRAM_TYPE","RESM - Residential Treatment for Men","19" -"AIMS_PROGRAM_TYPE","RESY - Residential Treatment for Youth","20" -"AIMS_PROGRAM_TYPE","WDMW - Withdrawal management for Women","21" -"AIMS_PROGRAM_TYPE","WDMM - Withdrawal management for Men","22" -"AIMS_PROGRAM_TYPE","WDMY - Withdrawal management for Youth","23" -"AIMS_PROGRAM_TYPE","SUPW - Supportive Recovery for Women","24" -"AIMS_PROGRAM_TYPE","SUPM - Supportive Recovery for Men","25" -"AIMS_PROGRAM_TYPE","SUPY - Supportive Recovery for Youth","26" -"AIMS_PROGRAM_TYPE","TNSC - Co-ed Transition/Stabilization","27" -"AIMS_PROGRAM_TYPE","TNSM - Transition/Stabilization for Men","28" -"AIMS_PROGRAM_TYPE","TNSW - Transition/Stabilization for Women","29" -"AIMS_PROGRAM_TYPE","OUTY - Outpatient Services for Youth","30" -"AIMS_PROGRAM_TYPE","OTRY - Outreach Services for Youth","31" -"AIMS_PROGRAM_TYPE","DUDX - Dual Diagnosis Program","32" -"AIMS_PROGRAM_TYPE","SAMY - Substance Abuse Management for Youth","33" -"AIMS_PROGRAM_TYPE","YCCP - Youth Custody Centre Addictions Counsellor Program","34" -"AIMS_PROGRAM_TYPE","MCPY - Multi Component Program for Youth","35" -"AIMS_OFFICE_CODE","ABA - Kootenays Region","1" -"AIMS_OFFICE_CODE","DBA - Okanagan Region","2" -"AIMS_OFFICE_CODE","EBA - Thompson/Cariboo Region","3" -"AIMS_OFFICE_CODE","FBA - Upper Fraser Region","4" -"AIMS_OFFICE_CODE","GBA - South Fraser Region","5" -"AIMS_OFFICE_CODE","HBA - Simon Fraser Region","6" -"AIMS_OFFICE_CODE","JBA - Coast/North Shore Region","7" -"AIMS_OFFICE_CODE","KBA - Central/Upper Island Region","8" -"AIMS_OFFICE_CODE","QBA - North Region","9" -"AIMS_OFFICE_CODE","RBA - Vancouver/Richmond Region","10" -"AIMS_OFFICE_CODE","SBA - Vancouver Direct Services","11" -"AIMS_OFFICE_CODE","VBA - Capital Region","12" -"AIMS_REFERRAL_SOURCE","ABOR - Aboriginal Organization","1" -"AIMS_REFERRAL_SOURCE","ABCP - Aboriginal child protection","2" -"AIMS_REFERRAL_SOURCE","BANK - Bankruptcy Trustee","3" -"AIMS_REFERRAL_SOURCE","CHPR - Chid Protection","4" -"AIMS_REFERRAL_SOURCE","CLGY - Clergy","5" -"AIMS_REFERRAL_SOURCE","COMM - Community Service Organization","6" -"AIMS_REFERRAL_SOURCE","CSAM - Substance Abuse Management","7" -"AIMS_REFERRAL_SOURCE","DEBT - Debtors' Assistance Agency","8" -"AIMS_REFERRAL_SOURCE","EAPL - Employee Assistance Plan","9" -"AIMS_REFERRAL_SOURCE","EDUC - Educational Institution","10" -"AIMS_REFERRAL_SOURCE","EMPL - Employer","11" -"AIMS_REFERRAL_SOURCE","FAMI - Family/Friend","12" -"AIMS_REFERRAL_SOURCE","GAMB - Gambling or gaming facility","13" -"AIMS_REFERRAL_SOURCE","HOSP - Hospital","14" -"AIMS_REFERRAL_SOURCE","IRAD - Information and Referral Services - for Alcohol and Drug","15" -"AIMS_REFERRAL_SOURCE","IRPG - Information and Referral Services - for Problem Gambling","16" -"AIMS_REFERRAL_SOURCE","LEGL - Legal System","17" -"AIMS_REFERRAL_SOURCE","MULT - Multicultural Centre/Service","18" -"AIMS_REFERRAL_SOURCE","CYMH - Child and Youth Mental Health","19" -"AIMS_REFERRAL_SOURCE","MHLT - �Mental Health Services �(Adult or Child)","20" -"AIMS_REFERRAL_SOURCE","MHRS - Ministry of Human Resources staff","21" -"AIMS_REFERRAL_SOURCE","NADP - National Native A&D Abuse Programs","22" -"AIMS_REFERRAL_SOURCE","PUBL - Public Health","23" -"AIMS_REFERRAL_SOURCE","PHYS - Physician","24" -"AIMS_REFERRAL_SOURCE","SELF - Self referral","25" -"AIMS_REFERRAL_SOURCE","STEP - Support Group","26" -"AIMS_REFERRAL_SOURCE","OSMV - Superintendent of Motor Vehicles","27" -"AIMS_REFERRAL_SOURCE","OMCF - Other MCF staff","28" -"AIMS_REFERRAL_SOURCE","OTHR - Other","29" -"AIMS_REFERRAL_SOURCE","XXAB - Referral from Alberta","30" -"AIMS_REFERRAL_SOURCE","XXMB - Referral from Manitoba","31" -"AIMS_REFERRAL_SOURCE","XXNB - Referral from New Brunswick","32" -"AIMS_REFERRAL_SOURCE","XXNF - Referral from Newfoundland","33" -"AIMS_REFERRAL_SOURCE","XXPE - Referral from Prince Edward Island","34" -"AIMS_REFERRAL_SOURCE","XXNT - Referral from Northwest Territories","35" -"AIMS_REFERRAL_SOURCE","XXON - Referral from Ontario","36" -"AIMS_REFERRAL_SOURCE","XXQC - Referral from Quebec","37" -"AIMS_REFERRAL_SOURCE","XXYT - Referral from Yukon","38" -"AIMS_REFERRAL_SOURCE","XXNS - Referral from Nova Scotia","39" -"AIMS_REFERRAL_SOURCE","XXSK - Referral from Saskatchewan","40" -"AIMS_REFERRAL_SOURCE","XUSA - Referral from United States","41" -"AIMS_REFERRAL_SOURCE","XANT - Referral from Netherlands Antilles","42" -"AIMS_REFERRAL_SOURCE","XARE - Referral from United Arab Emirates","43" -"AIMS_REFERRAL_SOURCE","PROB - Probation","44" -"AIMS_REFERRAL_SOURCE","EMPP - Employment Centre or program","45" -"AIMS_REFERRAL_SOURCE","PSYC - Psychologist or Psychiatrist","46" -"AIMS_REFERRAL_SOURCE","RNAF - Risk Needs Assessment Form","47" -"HEALTH_AUTHORITY","Fraser","1" -"HEALTH_AUTHORITY","Vancouver Island","2" -"HEALTH_AUTHORITY","Vancouver Coastal","3" -"HEALTH_AUTHORITY","Northern","4" -"HEALTH_AUTHORITY","Interior","5" -"LANGUAGE","ABR - Aboriginal language","1" -"LANGUAGE","ASL - American Sign language","2" -"LANGUAGE","ARA - Arabic","3" -"LANGUAGE","CAN - Cantonese","4" -"LANGUAGE","CZH - Czech","5" -"LANGUAGE","DCH - Dutch","6" -"LANGUAGE","FRS - Farsi","7" -"LANGUAGE","FNN - Finnish","8" -"LANGUAGE","FRE - French","9" -"LANGUAGE","GRM - German","10" -"LANGUAGE","GRK - Greek","11" -"LANGUAGE","HND - Hindi","12" -"LANGUAGE","HNG - Hungarian","13" -"LANGUAGE","IND - Indonesian","14" -"LANGUAGE","ITL - Italian","15" -"LANGUAGE","JPN - Japanese","16" -"LANGUAGE","KRN - Korean","17" -"LANGUAGE","MLY - Malaysian","18" -"LANGUAGE","MAN - Mandarin","19" -"LANGUAGE","NRW - Norwegian","20" -"LANGUAGE","PKS - Pakistani","21" -"LANGUAGE","PLS - Polish","22" -"LANGUAGE","PRG - Portuguese","23" -"LANGUAGE","PNJ - Punjabi","24" -"LANGUAGE","RSS - Russian","25" -"LANGUAGE","SLV - Slovak","26" -"LANGUAGE","SPA - Spanish","27" -"LANGUAGE","SWD - Swedish","28" -"LANGUAGE","TAG - Tagalog (Filipino)","29" -"LANGUAGE","TRK - Turkish","30" -"LANGUAGE","VTN - Vietnamese","31" -"LANGUAGE","OTH - Other language not listed","32" -"LANGUAGE","NVL - Invalid Code","33" -"LANGUAGE","ENG - English","34" -"EDUCATION_LEVEL","ELM - Elementary school or some high school","1" -"EDUCATION_LEVEL","HSG - Graduated high school","2" -"EDUCATION_LEVEL","CVT - Some college, vocational, technical, or trade school completion","3" -"EDUCATION_LEVEL","UND - Undergraduate degree","4" -"EDUCATION_LEVEL","GRD - Graduate degree","5" -"EDUCATION_LEVEL","NVL - Invalid Code","6" -"MARITAL_STATUS","SNG - Single, never been married","7" -"MARITAL_STATUS","CLR - Living common law or in a long term relationship","8" -"MARITAL_STATUS","MAR - Married","9" -"MARITAL_STATUS","DIV - Divorced/Separated","10" -"MARITAL_STATUS","WID - Widow or widower","11" -"MARITAL_STATUS","NVL - Invalid Code","12" -"MARITAL_STATUS","SEP - Separated","13" -"EMPLOYMENT_STATUS","FLT - Full time employment","1" -"EMPLOYMENT_STATUS","FTS - Full time seasonal employment (self-employed)","2" -"EMPLOYMENT_STATUS","HOM - Homemaker","3" -"EMPLOYMENT_STATUS","NLF - Not in the labour force (Ineligible to work)","4" -"EMPLOYMENT_STATUS","PRT - Part time employment","5" -"EMPLOYMENT_STATUS","PTS - Part time seasonal employment","6" -"EMPLOYMENT_STATUS","RET - Retired","7" -"EMPLOYMENT_STATUS","STU - Student, attending any education institution","8" -"EMPLOYMENT_STATUS","UEM - Unemployed","9" -"SUBSTANCE_MIS_AFF","Substance Misuse","1" -"SUBSTANCE_MIS_AFF","Substance Affected","2" -"SUBSTANCE_RELATION","CHL Child of parent with addiction issues","1" -"SUBSTANCE_RELATION","CWK Co-worker of a person with addiction issues","2" -"SUBSTANCE_RELATION","EMP Employer of a person with addiction issues","3" -"SUBSTANCE_RELATION","FRD Friend of a person with addiction issues","4" -"SUBSTANCE_RELATION","OTH Other than any of the above","5" -"SUBSTANCE_RELATION","OTR Other relative of a person with addiction issues","6" -"SUBSTANCE_RELATION","PRT Parent of a child with addiction issues","7" -"SUBSTANCE_RELATION","PTN Partner to a person with addiction issues","8" -"PRIMARY_DRUG_OF_CHOICE","CAN - Cannabis","1" -"PRIMARY_DRUG_OF_CHOICE","COC - Cocaine","2" -"PRIMARY_DRUG_OF_CHOICE","HAL - Hallucinogen","3" -"PRIMARY_DRUG_OF_CHOICE","BAR - Barbiturate","4" -"PRIMARY_DRUG_OF_CHOICE","AMP - Amphetamine","5" -"PRIMARY_DRUG_OF_CHOICE","HER - Heroin","6" -"PRIMARY_DRUG_OF_CHOICE","OPT - Opiate","7" -"PRIMARY_DRUG_OF_CHOICE","INH - Inhalant","8" -"PRIMARY_DRUG_OF_CHOICE","IMT - Illicit Methadone","9" -"PRIMARY_DRUG_OF_CHOICE","BEN - Benzodiazepine","10" -"PRIMARY_DRUG_OF_CHOICE","OTC - Over the counter drugs","11" -"PRIMARY_DRUG_OF_CHOICE","OPD - Other prescription drugs","12" -"PRIMARY_DRUG_OF_CHOICE","OTH - Other drugs not listed","13" -"PRIMARY_DRUG_OF_CHOICE","ALC - Alcohol","14" -"PRIMARY_DRUG_OF_CHOICE","MA - Methamphetamine","15" -"QUARTER","Q1","1" -"QUARTER","Q2","2" -"QUARTER","Q3","3" -"QUARTER","Q4","4" -"ADMIN_SCREEN_REF","Admitted","1" -"ADMIN_SCREEN_REF","Screened","2" -"ADMIN_SCREEN_REF","Referred","3" -"DISCHARGE_TYPE","Discharged","1" -"DISCHARGE_TYPE","Screen only","2" -"DISCHARGE_PRG_COMP_TYPE","Completed","1" -"DISCHARGE_PRG_COMP_TYPE","Incomplete","2" -"DISCHARGE_PRG_COMP_TYPE","Client Deceased","3" -"REFERRAL_TARGET","ABCP �Aboriginal Child Protection","1" -"REFERRAL_TARGET","ABOR - �Aboriginal Organization","2" -"REFERRAL_TARGET","BANK - �Bankruptcy Trustee","3" -"REFERRAL_TARGET","CHPR - �Child Protection","4" -"REFERRAL_TARGET","CLGY - �Clergy","5" -"REFERRAL_TARGET","COMM - �Community Service Organization","6" -"REFERRAL_TARGET","CSAM �Corrections Substance Abuse Management","7" -"REFERRAL_TARGET","CYMH �Child and Youth Mental Health","8" -"REFERRAL_TARGET","DEBT �Debtor's Assistance Agency","9" -"REFERRAL_TARGET","EAPL �Employee Assistance Plan","10" -"REFERRAL_TARGET","EDUC �Educational Institute","11" -"REFERRAL_TARGET","EMPL �Employer","12" -"REFERRAL_TARGET","EMPP �Employment Center or Program","13" -"REFERRAL_TARGET","FAMI �Family/Friend","14" -"REFERRAL_TARGET","GAMB �Gambling or Gaming Facility","15" -"REFERRAL_TARGET","HOSP �Hospital","16" -"REFERRAL_TARGET","IRAD �Referral Services for Alcohol and Drug","17" -"REFERRAL_TARGET","IRPG �Referral Services for Problem Gambling","18" -"REFERRAL_TARGET","LEGL �Legal System","19" -"REFERRAL_TARGET","MHLT �Mental Health Services","20" -"REFERRAL_TARGET","MHRS �Ministry of Human Resources","21" -"REFERRAL_TARGET","MULT �Multicultural Centre/Service","22" -"REFERRAL_TARGET","NADP �National Native A&D Programs","23" -"REFERRAL_TARGET","OMCF �Other MCFD Staff","24" -"REFERRAL_TARGET","OSMV �Superintendent of Motor Vehicles","25" -"REFERRAL_TARGET","OTHR �Other","26" -"REFERRAL_TARGET","PHYS �Physician","27" -"REFERRAL_TARGET","PROB �Probation","28" -"REFERRAL_TARGET","PSYC �Psychologist or Psychiatrist","29" -"REFERRAL_TARGET","PUBL �Public Health","30" -"REFERRAL_TARGET","RNAF �Risk Needs Assessment Form8","31" -"REFERRAL_TARGET","SELF �Self Referral","32" -"REFERRAL_TARGET","STEP �Support Group","33" -"REFERRAL_TARGET","XX** �Outside of BC, another Province","34" -"REFERRAL_TARGET","XXAB �AB-Alberta","35" -"REFERRAL_TARGET","XXMB �MB-Manitoba","36" -"REFERRAL_TARGET","XXNB �NB-New Brunswick","37" -"REFERRAL_TARGET","XXNF �NF-Newfoundland","38" -"REFERRAL_TARGET","XXNS �NS-Nova Scotia","39" -"REFERRAL_TARGET","XXNT �NT-Northwest Territories","40" -"REFERRAL_TARGET","XXON �ON-Ontario","41" -"REFERRAL_TARGET","XXPE �PE-Prince Edward Island","42" -"REFERRAL_TARGET","XXQC �QC-Quebec","43" -"REFERRAL_TARGET","XXSK �SK-Saskatchewan","44" -"REFERRAL_TARGET","XXYT �YT-Yukon","45" -"REFERRAL_TARGET","XANT �Referral from Netherlands Antilles","46" -"REFERRAL_TARGET","XARE �Referral from United Arab Emirates","47" -"REFERRAL_TARGET","XUSA �Referral from United States","48" -"SUBSTANCE","Alcohol","1" -"SUBSTANCE","Cannabis","2" -"SUBSTANCE","Cocaine","3" -"SUBSTANCE","Hallucinogen","4" -"SUBSTANCE","Barbiturate","5" -"SUBSTANCE","Amphetamine","6" -"SUBSTANCE","Heroin","7" -"SUBSTANCE","Opiate","8" -"SUBSTANCE","Inhalant","9" -"SUBSTANCE","Illicit Methadone","10" -"SUBSTANCE","Benzodiazepine","11" -"SUBSTANCE","Other","12" -"SUBSTANCE","Over the Counter Drugs","13" -"SUBSTANCE","Over the Prescription Drugs","14" -"SUBSTANCE","Crystal Methamphetamine/ Methamphetamine","15" -"STANDALONE_FACILITY_TYPE","SS-EOL","1" -"STANDALONE_FACILITY_TYPE","SS-Respite","2" -"STANDALONE_FACILITY_TYPE","SS-CC","3" -"STANDALONE_FACILITY_TYPE","ABI","4" -"STANDALONE_FACILITY_TYPE","None","5" -"LOCAL_HEALTH_AUTHORITY","111 Fernie","1" -"LOCAL_HEALTH_AUTHORITY","112 Cranbrook","2" -"LOCAL_HEALTH_AUTHORITY","113 Kimberley","3" -"LOCAL_HEALTH_AUTHORITY","114 Windermere","4" -"LOCAL_HEALTH_AUTHORITY","115 Creston","5" -"LOCAL_HEALTH_AUTHORITY","116 Golden","6" -"LOCAL_HEALTH_AUTHORITY","121 Kootenay Lake","7" -"LOCAL_HEALTH_AUTHORITY","122 Nelson","8" -"LOCAL_HEALTH_AUTHORITY","123 Castlegar","9" -"LOCAL_HEALTH_AUTHORITY","124 Arrow Lakes","10" -"LOCAL_HEALTH_AUTHORITY","125 Trail","11" -"LOCAL_HEALTH_AUTHORITY","126 Grand Forks","12" -"LOCAL_HEALTH_AUTHORITY","127 Kettle Valley","13" -"LOCAL_HEALTH_AUTHORITY","131 Southern Okanagan","14" -"LOCAL_HEALTH_AUTHORITY","132 Penticton","15" -"LOCAL_HEALTH_AUTHORITY","133 Keremeos","16" -"LOCAL_HEALTH_AUTHORITY","134 Princeton","17" -"LOCAL_HEALTH_AUTHORITY","135 Armstrong/Spallumcheen","18" -"LOCAL_HEALTH_AUTHORITY","136 Vernon","19" -"LOCAL_HEALTH_AUTHORITY","137 Central Okanagan","20" -"LOCAL_HEALTH_AUTHORITY","138 Summerland","21" -"LOCAL_HEALTH_AUTHORITY","139 Enderby","22" -"LOCAL_HEALTH_AUTHORITY","141 Revelstoke","23" -"LOCAL_HEALTH_AUTHORITY","142 Salmon Arm","24" -"LOCAL_HEALTH_AUTHORITY","143 Kamloops","25" -"LOCAL_HEALTH_AUTHORITY","144 100 Mile House","26" -"LOCAL_HEALTH_AUTHORITY","145 North Thompson","27" -"LOCAL_HEALTH_AUTHORITY","146 Cariboo/Chilcotin","28" -"LOCAL_HEALTH_AUTHORITY","147 Lillooet","29" -"LOCAL_HEALTH_AUTHORITY","148 South Cariboo","30" -"LOCAL_HEALTH_AUTHORITY","149 Merritt","31" -"LOCAL_HEALTH_AUTHORITY","211 Hope","32" -"LOCAL_HEALTH_AUTHORITY","212 Chilliwack","33" -"LOCAL_HEALTH_AUTHORITY","213 Abbotsford","34" -"LOCAL_HEALTH_AUTHORITY","214 Mission","35" -"LOCAL_HEALTH_AUTHORITY","215 Agassiz/Harrison","36" -"LOCAL_HEALTH_AUTHORITY","221 New Westminster","37" -"LOCAL_HEALTH_AUTHORITY","222 Burnaby","38" -"LOCAL_HEALTH_AUTHORITY","223 Maple Ridge/Pitt Meadows","39" -"LOCAL_HEALTH_AUTHORITY","224 Tri-Cities","40" -"LOCAL_HEALTH_AUTHORITY","231 Langley","41" -"LOCAL_HEALTH_AUTHORITY","232 Delta","42" -"LOCAL_HEALTH_AUTHORITY","233 Surrey","43" -"LOCAL_HEALTH_AUTHORITY","234 South Surrey/White Rock","44" -"LOCAL_HEALTH_AUTHORITY","311 Richmond","45" -"LOCAL_HEALTH_AUTHORITY","321 Vancouver - City Centre","46" -"LOCAL_HEALTH_AUTHORITY","322 Vancouver - Centre North","47" -"LOCAL_HEALTH_AUTHORITY","323 Vancouver - Northeast","48" -"LOCAL_HEALTH_AUTHORITY","324 Vancouver - Westside","49" -"LOCAL_HEALTH_AUTHORITY","325 Vancouver - Midtown","50" -"LOCAL_HEALTH_AUTHORITY","326 Vancouver - South","51" -"LOCAL_HEALTH_AUTHORITY","331 North Vancouver","52" -"LOCAL_HEALTH_AUTHORITY","332 West Vancouver/Bowen Island","53" -"LOCAL_HEALTH_AUTHORITY","333 Sunshine Coast","54" -"LOCAL_HEALTH_AUTHORITY","334 Powell River","55" -"LOCAL_HEALTH_AUTHORITY","335 Howe Sound","56" -"LOCAL_HEALTH_AUTHORITY","336 Bella Coola Valley","57" -"LOCAL_HEALTH_AUTHORITY","337 Central Coast","58" -"LOCAL_HEALTH_AUTHORITY","411 Greater Victoria","59" -"LOCAL_HEALTH_AUTHORITY","412 Western Communities","60" -"LOCAL_HEALTH_AUTHORITY","413 Saanich Peninsula","61" -"LOCAL_HEALTH_AUTHORITY","414 Southern Gulf Islands","62" -"LOCAL_HEALTH_AUTHORITY","421 Cowichan Valley South","63" -"LOCAL_HEALTH_AUTHORITY","422 Cowichan Valley West","64" -"LOCAL_HEALTH_AUTHORITY","423 Cowichan Valley North","65" -"LOCAL_HEALTH_AUTHORITY","424 Greater Nanaimo","66" -"LOCAL_HEALTH_AUTHORITY","425 Oceanside","67" -"LOCAL_HEALTH_AUTHORITY","426 Alberni/Clayoquot","68" -"LOCAL_HEALTH_AUTHORITY","431 Comox Valley","69" -"LOCAL_HEALTH_AUTHORITY","432 Greater Campbell River","70" -"LOCAL_HEALTH_AUTHORITY","433 Vancouver Island West","71" -"LOCAL_HEALTH_AUTHORITY","434 Vancouver Island North","72" -"LOCAL_HEALTH_AUTHORITY","510 Haida Gwaii","73" -"LOCAL_HEALTH_AUTHORITY","511 Snow Country","74" -"LOCAL_HEALTH_AUTHORITY","512 Prince Rupert","75" -"LOCAL_HEALTH_AUTHORITY","513 Upper Skeena","76" -"LOCAL_HEALTH_AUTHORITY","514 Smithers","77" -"LOCAL_HEALTH_AUTHORITY","515 Kitimat","78" -"LOCAL_HEALTH_AUTHORITY","516 Stikine","79" -"LOCAL_HEALTH_AUTHORITY","517 Terrace","80" -"LOCAL_HEALTH_AUTHORITY","518 Nisga'a","81" -"LOCAL_HEALTH_AUTHORITY","519 Telegraph Creek","82" -"LOCAL_HEALTH_AUTHORITY","521 Quesnel","83" -"LOCAL_HEALTH_AUTHORITY","522 Burns Lake","84" -"LOCAL_HEALTH_AUTHORITY","523 Nechako","85" -"LOCAL_HEALTH_AUTHORITY","524 Prince George","86" -"LOCAL_HEALTH_AUTHORITY","531 Peace River South","87" -"LOCAL_HEALTH_AUTHORITY","532 Peace River North","88" -"LOCAL_HEALTH_AUTHORITY","533 Fort Nelson","89" -"COMM_HLTH_SVC_AREA","1110 Fernie","1" -"COMM_HLTH_SVC_AREA","1120 Cranbrook","2" -"COMM_HLTH_SVC_AREA","1130 Kimberley","3" -"COMM_HLTH_SVC_AREA","1140 Windermere","4" -"COMM_HLTH_SVC_AREA","1150 Creston","5" -"COMM_HLTH_SVC_AREA","1160 Golden","6" -"COMM_HLTH_SVC_AREA","1210 Kootenay Lake","7" -"COMM_HLTH_SVC_AREA","1220 Nelson","8" -"COMM_HLTH_SVC_AREA","1230 Castlegar","9" -"COMM_HLTH_SVC_AREA","1240 Arrow Lakes","10" -"COMM_HLTH_SVC_AREA","1250 Trail","11" -"COMM_HLTH_SVC_AREA","1260 Grand Forks","12" -"COMM_HLTH_SVC_AREA","1270 Kettle Valley","13" -"COMM_HLTH_SVC_AREA","1310 Southern Okanagan","14" -"COMM_HLTH_SVC_AREA","1320 Penticton","15" -"COMM_HLTH_SVC_AREA","1330 Keremeos","16" -"COMM_HLTH_SVC_AREA","1340 Princeton","17" -"COMM_HLTH_SVC_AREA","1350 Armstrong/Spallumcheen","18" -"COMM_HLTH_SVC_AREA","1361 Vernon Centre/Coldstream","19" -"COMM_HLTH_SVC_AREA","1362 North Okanagan/Lumby","20" -"COMM_HLTH_SVC_AREA","1371 Central Okanagan Rural","21" -"COMM_HLTH_SVC_AREA","1372 West Kelowna","22" -"COMM_HLTH_SVC_AREA","1373 Lake Country","23" -"COMM_HLTH_SVC_AREA","1374 Glenmore","24" -"COMM_HLTH_SVC_AREA","1375 Downtown Kelowna","25" -"COMM_HLTH_SVC_AREA","1376 Rutland","26" -"COMM_HLTH_SVC_AREA","1377 Okanagan Mission","27" -"COMM_HLTH_SVC_AREA","1380 Summerland","28" -"COMM_HLTH_SVC_AREA","1390 Enderby","29" -"COMM_HLTH_SVC_AREA","1410 Revelstoke","30" -"COMM_HLTH_SVC_AREA","1420 Salmon Arm","31" -"COMM_HLTH_SVC_AREA","1431 Kamloops Centre North","32" -"COMM_HLTH_SVC_AREA","1432 Kamloops Centre South","33" -"COMM_HLTH_SVC_AREA","1433 Lower Thompson","34" -"COMM_HLTH_SVC_AREA","1440 100 Mile House","35" -"COMM_HLTH_SVC_AREA","1450 North Thompson","36" -"COMM_HLTH_SVC_AREA","1461 West Cariboo","37" -"COMM_HLTH_SVC_AREA","1462 Williams Lake/East Cariboo","38" -"COMM_HLTH_SVC_AREA","1470 Lillooet","39" -"COMM_HLTH_SVC_AREA","1480 South Cariboo","40" -"COMM_HLTH_SVC_AREA","1490 Merritt","41" -"COMM_HLTH_SVC_AREA","2110 Hope","42" -"COMM_HLTH_SVC_AREA","2121 South Chilliwack","43" -"COMM_HLTH_SVC_AREA","2122 North Chilliwack","44" -"COMM_HLTH_SVC_AREA","2131 Central Abbotsford","45" -"COMM_HLTH_SVC_AREA","2132 East Abbotsford","46" -"COMM_HLTH_SVC_AREA","2133 West Abbotsford","47" -"COMM_HLTH_SVC_AREA","2134 Abbotsford Rural","48" -"COMM_HLTH_SVC_AREA","2141 South Mission","49" -"COMM_HLTH_SVC_AREA","2142 North Mission","50" -"COMM_HLTH_SVC_AREA","2150 Agassiz/Harrison","51" -"COMM_HLTH_SVC_AREA","2210 New Westminster","52" -"COMM_HLTH_SVC_AREA","2221 Burnaby Northwest","53" -"COMM_HLTH_SVC_AREA","2222 Burnaby Northeast","54" -"COMM_HLTH_SVC_AREA","2223 Burnaby Southwest","55" -"COMM_HLTH_SVC_AREA","2224 Burnaby Southeast","56" -"COMM_HLTH_SVC_AREA","2231 Haney","57" -"COMM_HLTH_SVC_AREA","2232 Pitt Meadows","58" -"COMM_HLTH_SVC_AREA","2233 Maple Ridge Rural","59" -"COMM_HLTH_SVC_AREA","2241 North Coquitlam","60" -"COMM_HLTH_SVC_AREA","2242 Southwest Coquitlam","61" -"COMM_HLTH_SVC_AREA","2243 Southeast Coquitlam","62" -"COMM_HLTH_SVC_AREA","2244 Port Coquitlam","63" -"COMM_HLTH_SVC_AREA","2245 Port Moody/Anmore/Belcarra","64" -"COMM_HLTH_SVC_AREA","2311 City of Langley","65" -"COMM_HLTH_SVC_AREA","2312 Walnut Grove/Fort Langley","66" -"COMM_HLTH_SVC_AREA","2313 Willoughby","67" -"COMM_HLTH_SVC_AREA","2314 Brookswood/Murrayville","68" -"COMM_HLTH_SVC_AREA","2315 Aldergrove/Otter","69" -"COMM_HLTH_SVC_AREA","2316 North Langley Township","70" -"COMM_HLTH_SVC_AREA","2317 South Langley Township","71" -"COMM_HLTH_SVC_AREA","2321 North Delta","72" -"COMM_HLTH_SVC_AREA","2322 Ladner","73" -"COMM_HLTH_SVC_AREA","2323 Tsawwassen","74" -"COMM_HLTH_SVC_AREA","2331 Whalley","75" -"COMM_HLTH_SVC_AREA","2332 North Surrey","76" -"COMM_HLTH_SVC_AREA","2333 Cloverdale","77" -"COMM_HLTH_SVC_AREA","2334 Panorama","78" -"COMM_HLTH_SVC_AREA","2335 East Newton","79" -"COMM_HLTH_SVC_AREA","2336 Fleetwood","80" -"COMM_HLTH_SVC_AREA","2337 Guildford","81" -"COMM_HLTH_SVC_AREA","2338 West Newton","82" -"COMM_HLTH_SVC_AREA","2341 South Surrey","83" -"COMM_HLTH_SVC_AREA","2342 White Rock","84" -"COMM_HLTH_SVC_AREA","3111 Richmond City Centre","85" -"COMM_HLTH_SVC_AREA","3112 Blundell","86" -"COMM_HLTH_SVC_AREA","3113 Broadmoor","87" -"COMM_HLTH_SVC_AREA","3114 Thompson/Seafair","88" -"COMM_HLTH_SVC_AREA","3115 Steveston","89" -"COMM_HLTH_SVC_AREA","3116 East and West Cambie/Bridgeport","90" -"COMM_HLTH_SVC_AREA","3117 Gilmore/Shellmont/East/Hamilton","91" -"COMM_HLTH_SVC_AREA","3211 Downtown Vancouver","92" -"COMM_HLTH_SVC_AREA","3212 West End","93" -"COMM_HLTH_SVC_AREA","3213 Fairview","94" -"COMM_HLTH_SVC_AREA","3221 Downtown Eastside","95" -"COMM_HLTH_SVC_AREA","3222 Northeast False Creek","96" -"COMM_HLTH_SVC_AREA","3223 Grandview-Woodland","97" -"COMM_HLTH_SVC_AREA","3231 Cedar Cottage","98" -"COMM_HLTH_SVC_AREA","3232 Hastings-Sunrise","99" -"COMM_HLTH_SVC_AREA","3233 Renfrew-Collingwood","100" -"COMM_HLTH_SVC_AREA","3241 Shaughnessy/Arbutus Ridge/Kerrisdale","101" -"COMM_HLTH_SVC_AREA","3242 West Point Grey/Dunbar-Southlands","102" -"COMM_HLTH_SVC_AREA","3243 University of British Columbia","103" -"COMM_HLTH_SVC_AREA","3244 Kitsilano","104" -"COMM_HLTH_SVC_AREA","3251 Kensington","105" -"COMM_HLTH_SVC_AREA","3252 Mount Pleasant","106" -"COMM_HLTH_SVC_AREA","3253 South Cambie/Riley Park","107" -"COMM_HLTH_SVC_AREA","3261 Killarney","108" -"COMM_HLTH_SVC_AREA","3262 Oakridge/Marpole","109" -"COMM_HLTH_SVC_AREA","3263 Sunset","110" -"COMM_HLTH_SVC_AREA","3264 Victoria-Fraserview","111" -"COMM_HLTH_SVC_AREA","3311 North Vancouver City - East","112" -"COMM_HLTH_SVC_AREA","3312 North Vancouver City - West","113" -"COMM_HLTH_SVC_AREA","3313 North Vancouver DM - Central","114" -"COMM_HLTH_SVC_AREA","3314 North Vancouver DM - East","115" -"COMM_HLTH_SVC_AREA","3315 North Vancouver DM - West","116" -"COMM_HLTH_SVC_AREA","3321 West Vancouver - Lower","117" -"COMM_HLTH_SVC_AREA","3322 West Vancouver - Upper","118" -"COMM_HLTH_SVC_AREA","3323 Bowen Island/Lions Bay","119" -"COMM_HLTH_SVC_AREA","3331 Gibsons","120" -"COMM_HLTH_SVC_AREA","3332 Sechelt","121" -"COMM_HLTH_SVC_AREA","3333 Sunshine Coast Rural","122" -"COMM_HLTH_SVC_AREA","3341 Powell River City","123" -"COMM_HLTH_SVC_AREA","3342 qathet Rural","124" -"COMM_HLTH_SVC_AREA","3351 Squamish","125" -"COMM_HLTH_SVC_AREA","3352 Whistler","126" -"COMM_HLTH_SVC_AREA","3353 Howe Sound Rural","127" -"COMM_HLTH_SVC_AREA","3360 Bella Coola Valley","128" -"COMM_HLTH_SVC_AREA","3370 Central Coast","129" -"COMM_HLTH_SVC_AREA","4111 Downtown Victoria/Vic West","130" -"COMM_HLTH_SVC_AREA","4112 James Bay/Fairfield","131" -"COMM_HLTH_SVC_AREA","4113 Oaklands/Fernwood","132" -"COMM_HLTH_SVC_AREA","4114 Oak Bay","133" -"COMM_HLTH_SVC_AREA","4115 Gordon Head/Shelbourne","134" -"COMM_HLTH_SVC_AREA","4116 Quadra/Swan Lake","135" -"COMM_HLTH_SVC_AREA","4117 Interurban/Tillicum","136" -"COMM_HLTH_SVC_AREA","4118 View Royal","137" -"COMM_HLTH_SVC_AREA","4119 Esquimalt","138" -"COMM_HLTH_SVC_AREA","4121 Colwood","139" -"COMM_HLTH_SVC_AREA","4122 Metchosin","140" -"COMM_HLTH_SVC_AREA","4123 Langford/Highlands","141" -"COMM_HLTH_SVC_AREA","4124 Sooke","142" -"COMM_HLTH_SVC_AREA","4125 Juan de Fuca Coast","143" -"COMM_HLTH_SVC_AREA","4131 Royal Oak/Cordova Bay/Prospect","144" -"COMM_HLTH_SVC_AREA","4132 Central Saanich","145" -"COMM_HLTH_SVC_AREA","4133 North Saanich","146" -"COMM_HLTH_SVC_AREA","4134 Sidney","147" -"COMM_HLTH_SVC_AREA","4141 Salt Spring Island","148" -"COMM_HLTH_SVC_AREA","4142 Pender/Galiano/Saturna/Mayne","149" -"COMM_HLTH_SVC_AREA","4211 South Cowichan","150" -"COMM_HLTH_SVC_AREA","4212 Central Cowichan","151" -"COMM_HLTH_SVC_AREA","4220 Cowichan Valley West","152" -"COMM_HLTH_SVC_AREA","4231 Ladysmith","153" -"COMM_HLTH_SVC_AREA","4232 Ladysmith Rural","154" -"COMM_HLTH_SVC_AREA","4233 Chemainus","155" -"COMM_HLTH_SVC_AREA","4234 Penelakut and Thetis Islands","156" -"COMM_HLTH_SVC_AREA","4241 Downtown Nanaimo","157" -"COMM_HLTH_SVC_AREA","4242 Departure Bay","158" -"COMM_HLTH_SVC_AREA","4243 Nanaimo North/Lantzville","159" -"COMM_HLTH_SVC_AREA","4244 Nanaimo South","160" -"COMM_HLTH_SVC_AREA","4245 Nanaimo West/Rural","161" -"COMM_HLTH_SVC_AREA","4246 Cedar/Wellington","162" -"COMM_HLTH_SVC_AREA","4247 Gabriola Island","163" -"COMM_HLTH_SVC_AREA","4251 Parksville","164" -"COMM_HLTH_SVC_AREA","4252 Qualicum Beach","165" -"COMM_HLTH_SVC_AREA","4253 Oceanside Rural","166" -"COMM_HLTH_SVC_AREA","4261 Port Alberni","167" -"COMM_HLTH_SVC_AREA","4262 Alberni Valley/Bamfield","168" -"COMM_HLTH_SVC_AREA","4263 West Coast","169" -"COMM_HLTH_SVC_AREA","4311 Comox","170" -"COMM_HLTH_SVC_AREA","4312 Comox Valley Rural","171" -"COMM_HLTH_SVC_AREA","4313 Courtenay","172" -"COMM_HLTH_SVC_AREA","4321 Campbell River","173" -"COMM_HLTH_SVC_AREA","4322 Campbell River Rural","174" -"COMM_HLTH_SVC_AREA","4330 Vancouver Island West","175" -"COMM_HLTH_SVC_AREA","4341 Port Hardy/Port Alice","176" -"COMM_HLTH_SVC_AREA","4342 Port McNeill/Sointula","177" -"COMM_HLTH_SVC_AREA","4343 Vancouver Island North Remote","178" -"COMM_HLTH_SVC_AREA","5101 Haida Gwaii South","179" -"COMM_HLTH_SVC_AREA","5102 Haida Gwaii North","180" -"COMM_HLTH_SVC_AREA","5110 Snow Country","181" -"COMM_HLTH_SVC_AREA","5121 Prince Rupert City Centre","182" -"COMM_HLTH_SVC_AREA","5122 Prince Rupert Rural","183" -"COMM_HLTH_SVC_AREA","5130 Upper Skeena","184" -"COMM_HLTH_SVC_AREA","5141 Smithers Town Centre","185" -"COMM_HLTH_SVC_AREA","5142 Smithers Rural","186" -"COMM_HLTH_SVC_AREA","5143 Houston","187" -"COMM_HLTH_SVC_AREA","5150 Kitimat","188" -"COMM_HLTH_SVC_AREA","5160 Stikine","189" -"COMM_HLTH_SVC_AREA","5171 Terrace City Centre","190" -"COMM_HLTH_SVC_AREA","5172 Terrace Rural","191" -"COMM_HLTH_SVC_AREA","5180 Nisga'a","192" -"COMM_HLTH_SVC_AREA","5190 Telegraph Creek","193" -"COMM_HLTH_SVC_AREA","5211 Quesnel City Centre","194" -"COMM_HLTH_SVC_AREA","5212 Quesnel Rural","195" -"COMM_HLTH_SVC_AREA","5221 Burns Lake Town Centre","196" -"COMM_HLTH_SVC_AREA","5222 Burns Lake South","197" -"COMM_HLTH_SVC_AREA","5223 Burns Lake North","198" -"COMM_HLTH_SVC_AREA","5231 Vanderhoof","199" -"COMM_HLTH_SVC_AREA","5232 Vanderhoof Rural","200" -"COMM_HLTH_SVC_AREA","5233 Fort St. James North","201" -"COMM_HLTH_SVC_AREA","5234 Fraser Lake","202" -"COMM_HLTH_SVC_AREA","5241 Prince George City - North","203" -"COMM_HLTH_SVC_AREA","5242 Prince George City - Central","204" -"COMM_HLTH_SVC_AREA","5243 Prince George City - Southwest","205" -"COMM_HLTH_SVC_AREA","5244 Prince George Southwest Rural","206" -"COMM_HLTH_SVC_AREA","5245 Prince George North Fraser Rural","207" -"COMM_HLTH_SVC_AREA","5246 McBride/Valemount","208" -"COMM_HLTH_SVC_AREA","5247 Mackenzie","209" -"COMM_HLTH_SVC_AREA","5311 Dawson Creek","210" -"COMM_HLTH_SVC_AREA","5312 Chetwynd","211" -"COMM_HLTH_SVC_AREA","5313 Tumbler Ridge","212" -"COMM_HLTH_SVC_AREA","5314 Peace River South Rural","213" -"COMM_HLTH_SVC_AREA","5321 Fort St John","214" -"COMM_HLTH_SVC_AREA","5322 Hudson's Hope","215" -"COMM_HLTH_SVC_AREA","5323 Peace River North Rural","216" -"COMM_HLTH_SVC_AREA","5331 Fort Nelson Population Centre","217" -"COMM_HLTH_SVC_AREA","5332 Northern Boreal","218" -"FACILITY_TYPE","Long Term Care (LTC)","1" -"FACILITY_TYPE","Assisted Living (AL)","2" -"FACILITY_TYPE","Family Care Home (FCH)","3" -"FACILITY_TYPE","Group Homes (GH)","4" -"OWNER_TYPE","Health Authority (HA)","1" -"OWNER_TYPE","Private For Profit (PFP)","2" -"OWNER_TYPE","Private Not For Profit (PNP)","3" -"OWNER_TYPE","Fully Private","4" -"LEGISLATION_TYPE","CCALA","1" -"LEGISLATION_TYPE","Hospital Act","2" -"LEGISLATION_TYPE","CCALA and Hospital Act","3" -"SURVEY_CATEGORY","Community","1" -"SURVEY_CATEGORY","Supported","2" -"SURVEY_CATEGORY","Acute","3" -"SURVEY_CATEGORY","Tertiary","4" -"SURVEY_CATEGORY","ED","5" -"HA_WITH_CODE","01 Interior","1" -"HA_WITH_CODE","02 Fraser","2" -"HA_WITH_CODE","03 Vancouver Coastal","3" -"HA_WITH_CODE","04 Vancouver Island","4" -"HA_WITH_CODE","05 Northern","5" -"HA_WITH_CODE","06 Provincial Health","6" -"SURVEY_MONTH","3-Mar","1" -"SURVEY_MONTH","6-Jun","2" -"SURVEY_MONTH","9-Sep","3" -"SURVEY_MONTH","12-Dec","4" -"HA_WITH_SHORT_CODE","1 Interior","1" -"HA_WITH_SHORT_CODE","2 Fraser","2" -"HA_WITH_SHORT_CODE","3 Vancouver Coastal","3" -"HA_WITH_SHORT_CODE","4 Vancouver Island","4" -"HA_WITH_SHORT_CODE","5 Northern","5" -"HA_WITH_SHORT_CODE","6 Provincial Health","6" -"HA_WITH_SHORT_CODE","9 Unknown HA","7" -"HLTH_SVC_DELIVERY_AREA","11 - East Kootenay","1" -"HLTH_SVC_DELIVERY_AREA","12 Kootenay Boundary","2" -"HLTH_SVC_DELIVERY_AREA","13 Okanagan","3" -"HLTH_SVC_DELIVERY_AREA","14 Thompson Cariboo Shuswap","4" -"HLTH_SVC_DELIVERY_AREA","21 Fraser East","5" -"HLTH_SVC_DELIVERY_AREA","22 Fraser North","6" -"HLTH_SVC_DELIVERY_AREA","23 Fraser South","7" -"HLTH_SVC_DELIVERY_AREA","31 Richmond","8" -"HLTH_SVC_DELIVERY_AREA","32 Vancouver","9" -"HLTH_SVC_DELIVERY_AREA","33 North Shore/Coast Garibaldi","10" -"HLTH_SVC_DELIVERY_AREA","41 South Vancouver Island","11" -"HLTH_SVC_DELIVERY_AREA","42 Central Vancouver Island","12" -"HLTH_SVC_DELIVERY_AREA","43 North Vancouver Island","13" -"HLTH_SVC_DELIVERY_AREA","51 Northwest","14" -"HLTH_SVC_DELIVERY_AREA","52 Northern Interior","15" -"HLTH_SVC_DELIVERY_AREA","53 Northeast","16" -"MHSU_FACILITY_TYPE","MH Community Long Term Care","1" -"MHSU_FACILITY_TYPE","MH Community Assisted Living","2" -"MHSU_FACILITY_TYPE","MH Family Care Homes","3" -"MHSU_FACILITY_TYPE","MH Rental Subsidy","4" -"MHSU_FACILITY_TYPE","MH ACT/ICM Rental Subsidy","5" -"MHSU_FACILITY_TYPE","MH Community Crisis Stabilization Units","6" -"MHSU_FACILITY_TYPE","MH Emergency Shelters","7" -"MHSU_ORG_TYPE","Private For Profit","1" -"MHSU_ORG_TYPE","Private Not For Profit","2" -"MHSU_ORG_TYPE","BC Housing","3" -"MHSU_ORG_TYPE","Health Authority","4" -"MHSU_ORG_TYPE","Municipality","5" -"MHSU_ORG_TYPE","First Nations","6" -"MH_ACT_SCHEDULE","A","1" -"MH_ACT_SCHEDULE","B","2" -"MH_ACT_SCHEDULE","C","3" -"MH_ACT_SCHEDULE","NULL","4" -"FACILITY_CLIENT_TYPE","Male only","1" -"FACILITY_CLIENT_TYPE","Female only","2" -"FACILITY_CLIENT_TYPE","Male with Child(ren)","3" -"FACILITY_CLIENT_TYPE","Female with Child(ren)","4" -"FACILITY_CLIENT_TYPE","Male and Female","5" -"FACILITY_CLIENT_TYPE","Male or Female","6" -"FACILITY_CLIENT_TYPE","Transgender","7" -"FACILITY_CLIENT_TYPE","Gender Diverse","8" -"PRIORITY_POPULATION_TYPE","Indigenous ","1" -"PRIORITY_POPULATION_TYPE","Pregnant","2" -"PRIORITY_POPULATION_TYPE","Homeless","3" -"PRIORITY_POPULATION_TYPE","Rural or Remote (living in a rural or remote area)","4" -"PRIORITY_POPULATION_TYPE","Other priority population","5" -"PRIORITY_POPULATION_TYPE","Null (no priority population)","6" -"BEDS_FUNDING_INITIATIVE","Aug 2020 YSU Beds (123 Beds)","1" -"BEDS_FUNDING_INITIATIVE","Budget 2021","2" -"BEDS_FUNDING_INITIATIVE","Multiple Funding Impact","3" -"BEDS_FUNDING_INITIATIVE","Other","4" -"BEDS_FUNDING_INITIATIVE","Null","5" -"AVAIL_BED_CHG_REASON","Facility Opened","1" -"AVAIL_BED_CHG_REASON","Facility Closed (Permanently)","2" -"AVAIL_BED_CHG_REASON","Facility Closed (Temporarily)","3" -"AVAIL_BED_CHG_REASON","Facility Moved","4" -"AVAIL_BED_CHG_REASON","Renovations","5" -"AVAIL_BED_CHG_REASON","Funding Loss","6" -"AVAIL_BED_CHG_REASON","New Funding","7" -"AVAIL_BED_CHG_REASON","Beds Not Being Used","8" -"AVAIL_BED_CHG_REASON","Change in Bed Type","9" -"AVAIL_BED_CHG_REASON","COVID Temporary Reallocation","10" -"AVAIL_BED_CHG_REASON","Change in Population Served","11" -"AVAIL_BED_CHG_REASON","Unknown","12" -"AVAIL_BED_CHG_REASON","Other","13" -"PROGRAM_TYPE","Long-term Care (LTC)","1" -"PROGRAM_TYPE","Assisted Living (AL)","2" -"FACILITY_OWNERSHIP_TYPE","HA owned & operated","1" -"FACILITY_OWNERSHIP_TYPE","Private For Profit (PFP)","2" -"FACILITY_OWNERSHIP_TYPE","Private Not For Profit (PNP)","3" -"HA_ABBREVIATED","FHA ","1" -"HA_ABBREVIATED","IHA","2" -"HA_ABBREVIATED","NHA","3" -"HA_ABBREVIATED","VCH","4" -"HA_ABBREVIATED","VIHA","5" -"REVENUE_TYPE","HA Operating Funding","1" -"REVENUE_TYPE","HA operating one-time funding","2" -"REVENUE_TYPE","HA Capital Contribution Funding ","3" -"REVENUE_TYPE","Recoveries by HA","4" -"REVENUE_TYPE","Client Revenue","5" -"REVENUE_TYPE","Other Revenue","6" -"REVENUE_TYPE","Non-operating revenue","7" -"REVENUE_NAME","HA Operating Funding","1" -"REVENUE_NAME","Direct care hours ~ additional funding","2" -"REVENUE_NAME","Others ~ specify ","3" -"REVENUE_NAME","HA Operating Funding - Minor Equipment ","4" -"REVENUE_NAME","HA Operating Funding - Other ","5" -"REVENUE_NAME","HA Capital Contribution Funding","6" -"REVENUE_NAME","Occupancy threshold","7" -"REVENUE_NAME","Client contribution reconciliation","8" -"REVENUE_NAME","Direct care hours","9" -"REVENUE_NAME","HA client user fees paid by the client","10" -"REVENUE_NAME","Client user fees paid by third parties","11" -"REVENUE_NAME","Client user fee paid: non-eligible residents","12" -"REVENUE_NAME","Investments revenue on operating funds","13" -"REVENUE_NAME","CMHC/BCHMC funding","14" -"REVENUE_NAME","Food Services","15" -"REVENUE_NAME","Laundry Services","16" -"REVENUE_NAME","Cablevision","17" -"REVENUE_NAME","Other Recoveries","18" -"REVENUE_NAME","Other Revenue","19" -"REVENUE_NAME","HA Funding","20" -"REVENUE_NAME","Other - Third party funding","21" -"EXPENDITURE_TYPE","Labour Cost","1" -"EXPENDITURE_TYPE","Benefit Cost","2" -"EXPENDITURE_TYPE","Property Cost","3" -"EXPENDITURE_TYPE","Supplies","4" -"EXPENDITURE_TYPE","Admin Cost","5" -"EXPENDITURE_TYPE","Operating Surplus/Deficit","6" -"EXPENDITURE_TYPE","Depreciation/Amortization","7" -"EXPENDITURE_TYPE","Non-operating Expense",8" -"EXPENDITURE_NAME","Direct Care","1" -"EXPENDITURE_NAME","Food Services","2" -"EXPENDITURE_NAME","Laundry Services","3" -"EXPENDITURE_NAME","Housekeeping Services","4" -"EXPENDITURE_NAME","Administration Services","5" -"EXPENDITURE_NAME","Plant Maintenance and Op. Staffing","6" -"EXPENDITURE_NAME","Salary and wages recovered","7" -"EXPENDITURE_NAME","Salaries and wages accrual ","8" -"EXPENDITURE_NAME","Other labour costs","9" -"EXPENDITURE_NAME","Benefits","10" -"EXPENDITURE_NAME","Sick, severance and other accrual","11" -"EXPENDITURE_NAME","Building rent/lease cost","12" -"EXPENDITURE_NAME","Interest on mortgage or long-term debt","13" -"EXPENDITURE_NAME","Property taxes","14" -"EXPENDITURE_NAME","Maintenance and repairs - building, ground and equipment","15" -"EXPENDITURE_NAME","Supplies - for building, ground and equipment ","16" -"EXPENDITURE_NAME","Utilities ","17" -"EXPENDITURE_NAME","Waste management","18" -"EXPENDITURE_NAME","Resident transportation services","19" -"EXPENDITURE_NAME","Others - operating","20" -"EXPENDITURE_NAME","Medical supplies","21" -"EXPENDITURE_NAME","Drugs & pharmaceutical","22" -"EXPENDITURE_NAME","Raw food costs (incl. dietary supplement costs)","23" -"EXPENDITURE_NAME","Dietary supplies","24" -"EXPENDITURE_NAME","Laundry supplies","25" -"EXPENDITURE_NAME","Housekeeping supplies","26" -"EXPENDITURE_NAME","Incontinence Supplies","27" -"EXPENDITURE_NAME","Others Supplies ","28" -"EXPENDITURE_NAME","Office expense ","29" -"EXPENDITURE_NAME","Management fees","30" -"EXPENDITURE_NAME","Head office allocation (non-compensation) ","31" -"EXPENDITURE_NAME","Accreditation costs","32" -"EXPENDITURE_NAME","Association dues, professional fees, audit fees","33" -"EXPENDITURE_NAME","Insurances (for property and liability)","34" -"EXPENDITURE_NAME","Administration and Supplies","35" -"EXPENDITURE_NAME","Other - admin and supplies","36" -"EXPENDITURE_NAME","Mortgage Principal Repayment","37" -"EXPENDITURE_NAME","Other Non-operating Expense","38" -"DEPRECIATION_NAME","Building ","1" -"DEPRECIATION_NAME","Furniture and equipment","2" -"YTD_TOTAL_NAME","Total Operating Revenue","1" -"YTD_TOTAL_NAME","Total Operating Expenses","2" -"YTD_TOTAL_NAME","Non-operating Surplus / (Deficit)","3" -"YTD_TOTAL_NAME","Total Before depreciation & amortization","4" -"YTD_TOTAL_NAME","Subtotal - Depreciation / amortization","5" -"YTD_TOTAL_NAME","Total Operating Surplus / (Deficit)","6" -"POSITION_TYPE","Support ","1" -"POSITION_TYPE","Administration","2" -"POSITION_TYPE","Nursing ","3" -"POSITION_TYPE","Allied Professional ","4" -"POSITION_TYPE","Allied Non-Professional ","5" -"POSITION_NAME","Food services","1" -"POSITION_NAME","Laundry services","2" -"POSITION_NAME","Housekeeping services ","3" -"POSITION_NAME","Plant maintenance and operations staffing","4" -"POSITION_NAME","Administrator","5" -"POSITION_NAME","Director of care","6" -"POSITION_NAME","Dept managers","7" -"POSITION_NAME","Administrative support","8" -"POSITION_NAME","Pastoral care worker ","9" -"POSITION_NAME","Clerical clerks","10" -"POSITION_NAME","Clinical coordinator","11" -"POSITION_NAME","Other - specify ","12" -"POSITION_NAME","RN","13" -"POSITION_NAME","LPN","14" -"POSITION_NAME","Care Aides (HCA)","15" -"POSITION_NAME","Other Nursing (specify)","16" -"POSITION_NAME","Occupational therapist ","17" -"POSITION_NAME","Physiotherapist","18" -"POSITION_NAME","Dietitian","19" -"POSITION_NAME","Social worker","20" -"POSITION_NAME","Other allied professional (specify)","21" -"POSITION_NAME","Recreation Therapist","22" -"POSITION_NAME","Rehab Assistant","23" -"POSITION_NAME","Activity Worker","24" -"POSITION_NAME","Music Therapist","25" -"POSITION_NAME","Art Therapist","26" -"ADD_POSITION_TYPE","Allied Non-Professional ","1" -"ADD_POSITION_TYPE","Nursing Care","2" -"ADD_POSITION_TYPE","Allied Professional","3" -"BENEFIT_TYPE","Employment Insurance","1" -"BENEFIT_TYPE","Canada Pension Plan","2" -"BENEFIT_TYPE","Workers Compensation Board","3" -"BENEFIT_TYPE","Employer Health Tax","4" -"BENEFIT_TYPE","Pension Plan","5" -"BENEFIT_TYPE","Extended Health & Dental","6" -"BENEFIT_TYPE","Group Life, �AD&D, LTD","7" -"BENEFIT_TYPE","Other Benefits ~ specify","8" -"BENEFIT_TYPE","Less: Benefit Recovery","9" -"BENEFIT_TYPE","Accrued Sick & Severance","10" -"CARE_UNIT_TYPE","Specialized care","1" -"CARE_UNIT_TYPE","LTC","2" -"CARE_UNIT_TYPE","Other - please specify","3" -"REVISION_REASON","Increase in # Beds","1" -"REVISION_REASON","Increase in HPRD","2" -"REVISION_REASON","Licensing issue","3" -"REVISION_REASON","Other - specify","4" -"ALT_CLINICAL_OVERSITE_TYPE","Clinical oversight to shifts without an RN on-site (on-call RN or other strategies)","1" -"ALT_CLINICAL_OVERSITE_TYPE","Increase LPN hours of care to compensate for the gap in RN on-site hours ","2" -"ALT_CLINICAL_OVERSITE_TYPE","No mitigation strategy ","3" -"ALT_CLINICAL_OVERSITE_TYPE","Other - please specify ","4" -"STAFFING_POSITION_TYPE","RN/RPN","1" -"STAFFING_POSITION_TYPE","LPN","2" -"STAFFING_POSITION_TYPE","HCA ","3" -"STAFFING_POSITION_TYPE","Occupational Therapist","4" -"STAFFING_POSITION_TYPE","Physiotherapist","5" -"STAFFING_POSITION_TYPE","Dietitian","6" -"STAFFING_POSITION_TYPE","Social Worker","7" -"STAFFING_POSITION_TYPE","Medical Lab. Tech.","8" -"STAFFING_POSITION_TYPE","Respiratory Therapist","9" -"STAFFING_POSITION_TYPE","Speech Language Pathologist","10" -"STAFFING_POSITION_TYPE","Recreational Therapist ","11" -"STAFFING_POSITION_TYPE","Rehab Assistant","12" -"STAFFING_POSITION_TYPE","Activity Worker","13" -"STAFFING_POSITION_TYPE","Music Therapist","14" -"STAFFING_POSITION_TYPE","Art Therapist","15" -"STAFFING_SHIFT_TYPE","Days","1" -"STAFFING_SHIFT_TYPE","Evenings","2" -"STAFFING_SHIFT_TYPE","Nights","3" -"STAFF_MITIGATION_STRATEGY","Alternative RN clinical oversight to shifts without an RN on-site? (on-call RN or other strategies?)","1" -"STAFF_MITIGATION_STRATEGY","Increase LPN hours of care to compensate for the gap in RN on-site hours?","2" -"STAFF_MITIGATION_STRATEGY","Other - Please specify","3" -"STAFF_MITIGATION_STRATEGY","No mitigation strategy","4" -"YTD_QUARTER","Inventory ","1" -"YTD_QUARTER","Quarter 1","2" -"YTD_QUARTER","Quarter 2","3" -"YTD_QUARTER","Quarter 3","4" -"YTD_QUARTER","Quarter 4","5" -"BED_FUNDING_TYPE","In Scope 3.36 HPRD","1" -"BED_FUNDING_TYPE","Out Of Scope Public","2" -"BED_FUNDING_TYPE","Private Beds Bed","3" -"BED_SUB_TYPE","LTC","1" -"BED_SUB_TYPE","LTC Temporary","2" -"BED_SUB_TYPE","Convalescent","3" -"BED_SUB_TYPE","Dedicated EOL","4" -"BED_SUB_TYPE","Designated EOL","5" -"BED_SUB_TYPE","Respite ","6" -"BED_SUB_TYPE","Flex Beds","7" -"BED_SUB_TYPE","Other - Specify ","8" -"MONTH","April","1" -"MONTH","May","2" -"MONTH","June","3" -"MONTH","July","4" -"MONTH","Aug","5" -"MONTH","Sept","6" -"MONTH","Oct","7" -"MONTH","Nov","8" -"MONTH","Dec","9" -"MONTH","Jan","10" -"MONTH","Feb","11" -"MONTH","Mar","12" -"ADD_POSITION_NAME","RN","1" -"ADD_POSITION_NAME","LPN","2" -"ADD_POSITION_NAME","Care Aides (HCA)","3" -"ADD_POSITION_NAME","Occupational Therapist","4" -"ADD_POSITION_NAME","Physiotherapist","5" -"ADD_POSITION_NAME","Dietitian","6" -"ADD_POSITION_NAME","Social Worker","7" -"ADD_POSITION_NAME","Recreation Therapist","8" -"ADD_POSITION_NAME","Rehab Assistant","9" -"ADD_POSITION_NAME","Activity Worker","10" -"ADD_POSITION_NAME","Music Therapist","11" -"ADD_POSITION_NAME","Art Therapist","12" -"ADD_POSITION_NAME","Other (specify)","13" -"COMP_SAL_TOTAL_TYPE","Total Per Payroll","1" -"COMP_SAL_TOTAL_TYPE","Recovered Salaries and Wages","2" -"COMP_SAL_TOTAL_TYPE","Accrued Salaries and Wages","3" -"COMP_SAL_TOTAL_TYPE","Other Labour Costs","4" -"COMP_HRS_TOTAL_TYPE","Total Per Payroll","1" -"COMP_HRS_TOTAL_TYPE","Accrued Hours","2" -"BED_OCCUPANCY_TYPE","Planned","1" -"BED_OCCUPANCY_TYPE","YTD","2" -"SUBMISSION_TYPE","regular","1" -"SUBMISSION_TYPE","revised","2" +"Domain","Value","Order Sequence" +"BOOLEAN_YES_NO","yes","1" +"BOOLEAN_YES_NO","no","2" +"BOOLEAN_TRUE_FALSE","true","1" +"BOOLEAN_TRUE_FALSE","false","2" +"AIMS_SUBMISSION_TYPE","Intake","1" +"AIMS_SUBMISSION_TYPE","Discharge","2" +"AIMS_PROGRAM_TYPE","DEWW - Day Treatment for Women","1" +"AIMS_PROGRAM_TYPE","DEWM - Day Treatment for Men","2" +"AIMS_PROGRAM_TYPE","DEWC - Co-ed Day Treatment","3" +"AIMS_PROGRAM_TYPE","DEWY - Day Treatment for Youth","4" +"AIMS_PROGRAM_TYPE","RESD - Residential Treatment","5" +"AIMS_PROGRAM_TYPE","WDMT - Withdrawal management","6" +"AIMS_PROGRAM_TYPE","SUPR - Supportive Recovery","7" +"AIMS_PROGRAM_TYPE","PRGA - Problem Gambling","8" +"AIMS_PROGRAM_TYPE","PGTC - Problem Gambling Phone Counselling","9" +"AIMS_PROGRAM_TYPE","OUTP - Outpatient Services","10" +"AIMS_PROGRAM_TYPE","OTRC - Co-ed Outreach Services","11" +"AIMS_PROGRAM_TYPE","BEST - DWI Program","12" +"AIMS_PROGRAM_TYPE","EAPP - Employee Assistance Programs","13" +"AIMS_PROGRAM_TYPE","PHYC - Physician","14" +"AIMS_PROGRAM_TYPE","SBPP - School-based Prevention Program","15" +"AIMS_PROGRAM_TYPE","RESW - Residential Treatment for Women","16" +"AIMS_PROGRAM_TYPE","SUPC - Co-ed Supportive Recovery","17" +"AIMS_PROGRAM_TYPE","SBRC - Sobering Centre","18" +"AIMS_PROGRAM_TYPE","RESM - Residential Treatment for Men","19" +"AIMS_PROGRAM_TYPE","RESY - Residential Treatment for Youth","20" +"AIMS_PROGRAM_TYPE","WDMW - Withdrawal management for Women","21" +"AIMS_PROGRAM_TYPE","WDMM - Withdrawal management for Men","22" +"AIMS_PROGRAM_TYPE","WDMY - Withdrawal management for Youth","23" +"AIMS_PROGRAM_TYPE","SUPW - Supportive Recovery for Women","24" +"AIMS_PROGRAM_TYPE","SUPM - Supportive Recovery for Men","25" +"AIMS_PROGRAM_TYPE","SUPY - Supportive Recovery for Youth","26" +"AIMS_PROGRAM_TYPE","TNSC - Co-ed Transition/Stabilization","27" +"AIMS_PROGRAM_TYPE","TNSM - Transition/Stabilization for Men","28" +"AIMS_PROGRAM_TYPE","TNSW - Transition/Stabilization for Women","29" +"AIMS_PROGRAM_TYPE","OUTY - Outpatient Services for Youth","30" +"AIMS_PROGRAM_TYPE","OTRY - Outreach Services for Youth","31" +"AIMS_PROGRAM_TYPE","DUDX - Dual Diagnosis Program","32" +"AIMS_PROGRAM_TYPE","SAMY - Substance Abuse Management for Youth","33" +"AIMS_PROGRAM_TYPE","YCCP - Youth Custody Centre Addictions Counsellor Program","34" +"AIMS_PROGRAM_TYPE","MCPY - Multi Component Program for Youth","35" +"AIMS_OFFICE_CODE","ABA - Kootenays Region","1" +"AIMS_OFFICE_CODE","DBA - Okanagan Region","2" +"AIMS_OFFICE_CODE","EBA - Thompson/Cariboo Region","3" +"AIMS_OFFICE_CODE","FBA - Upper Fraser Region","4" +"AIMS_OFFICE_CODE","GBA - South Fraser Region","5" +"AIMS_OFFICE_CODE","HBA - Simon Fraser Region","6" +"AIMS_OFFICE_CODE","JBA - Coast/North Shore Region","7" +"AIMS_OFFICE_CODE","KBA - Central/Upper Island Region","8" +"AIMS_OFFICE_CODE","QBA - North Region","9" +"AIMS_OFFICE_CODE","RBA - Vancouver/Richmond Region","10" +"AIMS_OFFICE_CODE","SBA - Vancouver Direct Services","11" +"AIMS_OFFICE_CODE","VBA - Capital Region","12" +"AIMS_REFERRAL_SOURCE","ABOR - Aboriginal Organization","1" +"AIMS_REFERRAL_SOURCE","ABCP - Aboriginal child protection","2" +"AIMS_REFERRAL_SOURCE","BANK - Bankruptcy Trustee","3" +"AIMS_REFERRAL_SOURCE","CHPR - Chid Protection","4" +"AIMS_REFERRAL_SOURCE","CLGY - Clergy","5" +"AIMS_REFERRAL_SOURCE","COMM - Community Service Organization","6" +"AIMS_REFERRAL_SOURCE","CSAM - Substance Abuse Management","7" +"AIMS_REFERRAL_SOURCE","DEBT - Debtors' Assistance Agency","8" +"AIMS_REFERRAL_SOURCE","EAPL - Employee Assistance Plan","9" +"AIMS_REFERRAL_SOURCE","EDUC - Educational Institution","10" +"AIMS_REFERRAL_SOURCE","EMPL - Employer","11" +"AIMS_REFERRAL_SOURCE","FAMI - Family/Friend","12" +"AIMS_REFERRAL_SOURCE","GAMB - Gambling or gaming facility","13" +"AIMS_REFERRAL_SOURCE","HOSP - Hospital","14" +"AIMS_REFERRAL_SOURCE","IRAD - Information and Referral Services - for Alcohol and Drug","15" +"AIMS_REFERRAL_SOURCE","IRPG - Information and Referral Services - for Problem Gambling","16" +"AIMS_REFERRAL_SOURCE","LEGL - Legal System","17" +"AIMS_REFERRAL_SOURCE","MULT - Multicultural Centre/Service","18" +"AIMS_REFERRAL_SOURCE","CYMH - Child and Youth Mental Health","19" +"AIMS_REFERRAL_SOURCE","MHLT - Mental Health Services (Adult or Child)","20" +"AIMS_REFERRAL_SOURCE","MHRS - Ministry of Human Resources staff","21" +"AIMS_REFERRAL_SOURCE","NADP - National Native A&D Abuse Programs","22" +"AIMS_REFERRAL_SOURCE","PUBL - Public Health","23" +"AIMS_REFERRAL_SOURCE","PHYS - Physician","24" +"AIMS_REFERRAL_SOURCE","SELF - Self referral","25" +"AIMS_REFERRAL_SOURCE","STEP - Support Group","26" +"AIMS_REFERRAL_SOURCE","OSMV - Superintendent of Motor Vehicles","27" +"AIMS_REFERRAL_SOURCE","OMCF - Other MCF staff","28" +"AIMS_REFERRAL_SOURCE","OTHR - Other","29" +"AIMS_REFERRAL_SOURCE","XXAB - Referral from Alberta","30" +"AIMS_REFERRAL_SOURCE","XXMB - Referral from Manitoba","31" +"AIMS_REFERRAL_SOURCE","XXNB - Referral from New Brunswick","32" +"AIMS_REFERRAL_SOURCE","XXNF - Referral from Newfoundland","33" +"AIMS_REFERRAL_SOURCE","XXPE - Referral from Prince Edward Island","34" +"AIMS_REFERRAL_SOURCE","XXNT - Referral from Northwest Territories","35" +"AIMS_REFERRAL_SOURCE","XXON - Referral from Ontario","36" +"AIMS_REFERRAL_SOURCE","XXQC - Referral from Quebec","37" +"AIMS_REFERRAL_SOURCE","XXYT - Referral from Yukon","38" +"AIMS_REFERRAL_SOURCE","XXNS - Referral from Nova Scotia","39" +"AIMS_REFERRAL_SOURCE","XXSK - Referral from Saskatchewan","40" +"AIMS_REFERRAL_SOURCE","XUSA - Referral from United States","41" +"AIMS_REFERRAL_SOURCE","XANT - Referral from Netherlands Antilles","42" +"AIMS_REFERRAL_SOURCE","XARE - Referral from United Arab Emirates","43" +"AIMS_REFERRAL_SOURCE","PROB - Probation","44" +"AIMS_REFERRAL_SOURCE","EMPP - Employment Centre or program","45" +"AIMS_REFERRAL_SOURCE","PSYC - Psychologist or Psychiatrist","46" +"AIMS_REFERRAL_SOURCE","RNAF - Risk Needs Assessment Form","47" +"HEALTH_AUTHORITY","Fraser","1" +"HEALTH_AUTHORITY","Vancouver Island","2" +"HEALTH_AUTHORITY","Vancouver Coastal","3" +"HEALTH_AUTHORITY","Northern","4" +"HEALTH_AUTHORITY","Interior","5" +"LANGUAGE","ABR - Aboriginal language","1" +"LANGUAGE","ASL - American Sign language","2" +"LANGUAGE","ARA - Arabic","3" +"LANGUAGE","CAN - Cantonese","4" +"LANGUAGE","CZH - Czech","5" +"LANGUAGE","DCH - Dutch","6" +"LANGUAGE","FRS - Farsi","7" +"LANGUAGE","FNN - Finnish","8" +"LANGUAGE","FRE - French","9" +"LANGUAGE","GRM - German","10" +"LANGUAGE","GRK - Greek","11" +"LANGUAGE","HND - Hindi","12" +"LANGUAGE","HNG - Hungarian","13" +"LANGUAGE","IND - Indonesian","14" +"LANGUAGE","ITL - Italian","15" +"LANGUAGE","JPN - Japanese","16" +"LANGUAGE","KRN - Korean","17" +"LANGUAGE","MLY - Malaysian","18" +"LANGUAGE","MAN - Mandarin","19" +"LANGUAGE","NRW - Norwegian","20" +"LANGUAGE","PKS - Pakistani","21" +"LANGUAGE","PLS - Polish","22" +"LANGUAGE","PRG - Portuguese","23" +"LANGUAGE","PNJ - Punjabi","24" +"LANGUAGE","RSS - Russian","25" +"LANGUAGE","SLV - Slovak","26" +"LANGUAGE","SPA - Spanish","27" +"LANGUAGE","SWD - Swedish","28" +"LANGUAGE","TAG - Tagalog (Filipino)","29" +"LANGUAGE","TRK - Turkish","30" +"LANGUAGE","VTN - Vietnamese","31" +"LANGUAGE","OTH - Other language not listed","32" +"LANGUAGE","NVL - Invalid Code","33" +"LANGUAGE","ENG - English","34" +"EDUCATION_LEVEL","ELM - Elementary school or some high school","1" +"EDUCATION_LEVEL","HSG - Graduated high school","2" +"EDUCATION_LEVEL","CVT - Some college, vocational, technical, or trade school completion","3" +"EDUCATION_LEVEL","UND - Undergraduate degree","4" +"EDUCATION_LEVEL","GRD - Graduate degree","5" +"EDUCATION_LEVEL","NVL - Invalid Code","6" +"MARITAL_STATUS","SNG - Single, never been married","7" +"MARITAL_STATUS","CLR - Living common law or in a long term relationship","8" +"MARITAL_STATUS","MAR - Married","9" +"MARITAL_STATUS","DIV - Divorced/Separated","10" +"MARITAL_STATUS","WID - Widow or widower","11" +"MARITAL_STATUS","NVL - Invalid Code","12" +"MARITAL_STATUS","SEP - Separated","13" +"EMPLOYMENT_STATUS","FLT - Full time employment","1" +"EMPLOYMENT_STATUS","FTS - Full time seasonal employment (self-employed)","2" +"EMPLOYMENT_STATUS","HOM - Homemaker","3" +"EMPLOYMENT_STATUS","NLF - Not in the labour force (Ineligible to work)","4" +"EMPLOYMENT_STATUS","PRT - Part time employment","5" +"EMPLOYMENT_STATUS","PTS - Part time seasonal employment","6" +"EMPLOYMENT_STATUS","RET - Retired","7" +"EMPLOYMENT_STATUS","STU - Student, attending any education institution","8" +"EMPLOYMENT_STATUS","UEM - Unemployed","9" +"SUBSTANCE_MIS_AFF","Substance Misuse","1" +"SUBSTANCE_MIS_AFF","Substance Affected","2" +"SUBSTANCE_RELATION","CHL Child of parent with addiction issues","1" +"SUBSTANCE_RELATION","CWK Co-worker of a person with addiction issues","2" +"SUBSTANCE_RELATION","EMP Employer of a person with addiction issues","3" +"SUBSTANCE_RELATION","FRD Friend of a person with addiction issues","4" +"SUBSTANCE_RELATION","OTH Other than any of the above","5" +"SUBSTANCE_RELATION","OTR Other relative of a person with addiction issues","6" +"SUBSTANCE_RELATION","PRT Parent of a child with addiction issues","7" +"SUBSTANCE_RELATION","PTN Partner to a person with addiction issues","8" +"PRIMARY_DRUG_OF_CHOICE","CAN - Cannabis","1" +"PRIMARY_DRUG_OF_CHOICE","COC - Cocaine","2" +"PRIMARY_DRUG_OF_CHOICE","HAL - Hallucinogen","3" +"PRIMARY_DRUG_OF_CHOICE","BAR - Barbiturate","4" +"PRIMARY_DRUG_OF_CHOICE","AMP - Amphetamine","5" +"PRIMARY_DRUG_OF_CHOICE","HER - Heroin","6" +"PRIMARY_DRUG_OF_CHOICE","OPT - Opiate","7" +"PRIMARY_DRUG_OF_CHOICE","INH - Inhalant","8" +"PRIMARY_DRUG_OF_CHOICE","IMT - Illicit Methadone","9" +"PRIMARY_DRUG_OF_CHOICE","BEN - Benzodiazepine","10" +"PRIMARY_DRUG_OF_CHOICE","OTC - Over the counter drugs","11" +"PRIMARY_DRUG_OF_CHOICE","OPD - Other prescription drugs","12" +"PRIMARY_DRUG_OF_CHOICE","OTH - Other drugs not listed","13" +"PRIMARY_DRUG_OF_CHOICE","ALC - Alcohol","14" +"PRIMARY_DRUG_OF_CHOICE","MA - Methamphetamine","15" +"QUARTER","Q1","1" +"QUARTER","Q2","2" +"QUARTER","Q3","3" +"QUARTER","Q4","4" +"ADMIN_SCREEN_REF","Admitted","1" +"ADMIN_SCREEN_REF","Screened","2" +"ADMIN_SCREEN_REF","Referred","3" +"DISCHARGE_TYPE","Discharged","1" +"DISCHARGE_TYPE","Screen only","2" +"DISCHARGE_PRG_COMP_TYPE","Completed","1" +"DISCHARGE_PRG_COMP_TYPE","Incomplete","2" +"DISCHARGE_PRG_COMP_TYPE","Client Deceased","3" +"REFERRAL_TARGET","ABCP Aboriginal Child Protection","1" +"REFERRAL_TARGET","ABOR - Aboriginal Organization","2" +"REFERRAL_TARGET","BANK - Bankruptcy Trustee","3" +"REFERRAL_TARGET","CHPR - Child Protection","4" +"REFERRAL_TARGET","CLGY - Clergy","5" +"REFERRAL_TARGET","COMM - Community Service Organization","6" +"REFERRAL_TARGET","CSAM Corrections Substance Abuse Management","7" +"REFERRAL_TARGET","CYMH Child and Youth Mental Health","8" +"REFERRAL_TARGET","DEBT Debtor's Assistance Agency","9" +"REFERRAL_TARGET","EAPL Employee Assistance Plan","10" +"REFERRAL_TARGET","EDUC Educational Institute","11" +"REFERRAL_TARGET","EMPL Employer","12" +"REFERRAL_TARGET","EMPP Employment Center or Program","13" +"REFERRAL_TARGET","FAMI Family/Friend","14" +"REFERRAL_TARGET","GAMB Gambling or Gaming Facility","15" +"REFERRAL_TARGET","HOSP Hospital","16" +"REFERRAL_TARGET","IRAD Referral Services for Alcohol and Drug","17" +"REFERRAL_TARGET","IRPG Referral Services for Problem Gambling","18" +"REFERRAL_TARGET","LEGL Legal System","19" +"REFERRAL_TARGET","MHLT Mental Health Services","20" +"REFERRAL_TARGET","MHRS Ministry of Human Resources","21" +"REFERRAL_TARGET","MULT Multicultural Centre/Service","22" +"REFERRAL_TARGET","NADP National Native A&D Programs","23" +"REFERRAL_TARGET","OMCF Other MCFD Staff","24" +"REFERRAL_TARGET","OSMV Superintendent of Motor Vehicles","25" +"REFERRAL_TARGET","OTHR Other","26" +"REFERRAL_TARGET","PHYS Physician","27" +"REFERRAL_TARGET","PROB Probation","28" +"REFERRAL_TARGET","PSYC Psychologist or Psychiatrist","29" +"REFERRAL_TARGET","PUBL Public Health","30" +"REFERRAL_TARGET","RNAF Risk Needs Assessment Form8","31" +"REFERRAL_TARGET","SELF Self Referral","32" +"REFERRAL_TARGET","STEP Support Group","33" +"REFERRAL_TARGET","XX** Outside of BC, another Province","34" +"REFERRAL_TARGET","XXAB AB-Alberta","35" +"REFERRAL_TARGET","XXMB MB-Manitoba","36" +"REFERRAL_TARGET","XXNB NB-New Brunswick","37" +"REFERRAL_TARGET","XXNF NF-Newfoundland","38" +"REFERRAL_TARGET","XXNS NS-Nova Scotia","39" +"REFERRAL_TARGET","XXNT NT-Northwest Territories","40" +"REFERRAL_TARGET","XXON ON-Ontario","41" +"REFERRAL_TARGET","XXPE PE-Prince Edward Island","42" +"REFERRAL_TARGET","XXQC QC-Quebec","43" +"REFERRAL_TARGET","XXSK SK-Saskatchewan","44" +"REFERRAL_TARGET","XXYT YT-Yukon","45" +"REFERRAL_TARGET","XANT Referral from Netherlands Antilles","46" +"REFERRAL_TARGET","XARE Referral from United Arab Emirates","47" +"REFERRAL_TARGET","XUSA Referral from United States","48" +"SUBSTANCE","Alcohol","1" +"SUBSTANCE","Cannabis","2" +"SUBSTANCE","Cocaine","3" +"SUBSTANCE","Hallucinogen","4" +"SUBSTANCE","Barbiturate","5" +"SUBSTANCE","Amphetamine","6" +"SUBSTANCE","Heroin","7" +"SUBSTANCE","Opiate","8" +"SUBSTANCE","Inhalant","9" +"SUBSTANCE","Illicit Methadone","10" +"SUBSTANCE","Benzodiazepine","11" +"SUBSTANCE","Other","12" +"SUBSTANCE","Over the Counter Drugs","13" +"SUBSTANCE","Over the Prescription Drugs","14" +"SUBSTANCE","Crystal Methamphetamine/ Methamphetamine","15" +"STANDALONE_FACILITY_TYPE","SS-EOL","1" +"STANDALONE_FACILITY_TYPE","SS-Respite","2" +"STANDALONE_FACILITY_TYPE","SS-CC","3" +"STANDALONE_FACILITY_TYPE","ABI","4" +"STANDALONE_FACILITY_TYPE","None","5" +"LOCAL_HEALTH_AUTHORITY","111 Fernie","1" +"LOCAL_HEALTH_AUTHORITY","112 Cranbrook","2" +"LOCAL_HEALTH_AUTHORITY","113 Kimberley","3" +"LOCAL_HEALTH_AUTHORITY","114 Windermere","4" +"LOCAL_HEALTH_AUTHORITY","115 Creston","5" +"LOCAL_HEALTH_AUTHORITY","116 Golden","6" +"LOCAL_HEALTH_AUTHORITY","121 Kootenay Lake","7" +"LOCAL_HEALTH_AUTHORITY","122 Nelson","8" +"LOCAL_HEALTH_AUTHORITY","123 Castlegar","9" +"LOCAL_HEALTH_AUTHORITY","124 Arrow Lakes","10" +"LOCAL_HEALTH_AUTHORITY","125 Trail","11" +"LOCAL_HEALTH_AUTHORITY","126 Grand Forks","12" +"LOCAL_HEALTH_AUTHORITY","127 Kettle Valley","13" +"LOCAL_HEALTH_AUTHORITY","131 Southern Okanagan","14" +"LOCAL_HEALTH_AUTHORITY","132 Penticton","15" +"LOCAL_HEALTH_AUTHORITY","133 Keremeos","16" +"LOCAL_HEALTH_AUTHORITY","134 Princeton","17" +"LOCAL_HEALTH_AUTHORITY","135 Armstrong/Spallumcheen","18" +"LOCAL_HEALTH_AUTHORITY","136 Vernon","19" +"LOCAL_HEALTH_AUTHORITY","137 Central Okanagan","20" +"LOCAL_HEALTH_AUTHORITY","138 Summerland","21" +"LOCAL_HEALTH_AUTHORITY","139 Enderby","22" +"LOCAL_HEALTH_AUTHORITY","141 Revelstoke","23" +"LOCAL_HEALTH_AUTHORITY","142 Salmon Arm","24" +"LOCAL_HEALTH_AUTHORITY","143 Kamloops","25" +"LOCAL_HEALTH_AUTHORITY","144 100 Mile House","26" +"LOCAL_HEALTH_AUTHORITY","145 North Thompson","27" +"LOCAL_HEALTH_AUTHORITY","146 Cariboo/Chilcotin","28" +"LOCAL_HEALTH_AUTHORITY","147 Lillooet","29" +"LOCAL_HEALTH_AUTHORITY","148 South Cariboo","30" +"LOCAL_HEALTH_AUTHORITY","149 Merritt","31" +"LOCAL_HEALTH_AUTHORITY","211 Hope","32" +"LOCAL_HEALTH_AUTHORITY","212 Chilliwack","33" +"LOCAL_HEALTH_AUTHORITY","213 Abbotsford","34" +"LOCAL_HEALTH_AUTHORITY","214 Mission","35" +"LOCAL_HEALTH_AUTHORITY","215 Agassiz/Harrison","36" +"LOCAL_HEALTH_AUTHORITY","221 New Westminster","37" +"LOCAL_HEALTH_AUTHORITY","222 Burnaby","38" +"LOCAL_HEALTH_AUTHORITY","223 Maple Ridge/Pitt Meadows","39" +"LOCAL_HEALTH_AUTHORITY","224 Tri-Cities","40" +"LOCAL_HEALTH_AUTHORITY","231 Langley","41" +"LOCAL_HEALTH_AUTHORITY","232 Delta","42" +"LOCAL_HEALTH_AUTHORITY","233 Surrey","43" +"LOCAL_HEALTH_AUTHORITY","234 South Surrey/White Rock","44" +"LOCAL_HEALTH_AUTHORITY","311 Richmond","45" +"LOCAL_HEALTH_AUTHORITY","321 Vancouver - City Centre","46" +"LOCAL_HEALTH_AUTHORITY","322 Vancouver - Centre North","47" +"LOCAL_HEALTH_AUTHORITY","323 Vancouver - Northeast","48" +"LOCAL_HEALTH_AUTHORITY","324 Vancouver - Westside","49" +"LOCAL_HEALTH_AUTHORITY","325 Vancouver - Midtown","50" +"LOCAL_HEALTH_AUTHORITY","326 Vancouver - South","51" +"LOCAL_HEALTH_AUTHORITY","331 North Vancouver","52" +"LOCAL_HEALTH_AUTHORITY","332 West Vancouver/Bowen Island","53" +"LOCAL_HEALTH_AUTHORITY","333 Sunshine Coast","54" +"LOCAL_HEALTH_AUTHORITY","334 Powell River","55" +"LOCAL_HEALTH_AUTHORITY","335 Howe Sound","56" +"LOCAL_HEALTH_AUTHORITY","336 Bella Coola Valley","57" +"LOCAL_HEALTH_AUTHORITY","337 Central Coast","58" +"LOCAL_HEALTH_AUTHORITY","411 Greater Victoria","59" +"LOCAL_HEALTH_AUTHORITY","412 Western Communities","60" +"LOCAL_HEALTH_AUTHORITY","413 Saanich Peninsula","61" +"LOCAL_HEALTH_AUTHORITY","414 Southern Gulf Islands","62" +"LOCAL_HEALTH_AUTHORITY","421 Cowichan Valley South","63" +"LOCAL_HEALTH_AUTHORITY","422 Cowichan Valley West","64" +"LOCAL_HEALTH_AUTHORITY","423 Cowichan Valley North","65" +"LOCAL_HEALTH_AUTHORITY","424 Greater Nanaimo","66" +"LOCAL_HEALTH_AUTHORITY","425 Oceanside","67" +"LOCAL_HEALTH_AUTHORITY","426 Alberni/Clayoquot","68" +"LOCAL_HEALTH_AUTHORITY","431 Comox Valley","69" +"LOCAL_HEALTH_AUTHORITY","432 Greater Campbell River","70" +"LOCAL_HEALTH_AUTHORITY","433 Vancouver Island West","71" +"LOCAL_HEALTH_AUTHORITY","434 Vancouver Island North","72" +"LOCAL_HEALTH_AUTHORITY","510 Haida Gwaii","73" +"LOCAL_HEALTH_AUTHORITY","511 Snow Country","74" +"LOCAL_HEALTH_AUTHORITY","512 Prince Rupert","75" +"LOCAL_HEALTH_AUTHORITY","513 Upper Skeena","76" +"LOCAL_HEALTH_AUTHORITY","514 Smithers","77" +"LOCAL_HEALTH_AUTHORITY","515 Kitimat","78" +"LOCAL_HEALTH_AUTHORITY","516 Stikine","79" +"LOCAL_HEALTH_AUTHORITY","517 Terrace","80" +"LOCAL_HEALTH_AUTHORITY","518 Nisga'a","81" +"LOCAL_HEALTH_AUTHORITY","519 Telegraph Creek","82" +"LOCAL_HEALTH_AUTHORITY","521 Quesnel","83" +"LOCAL_HEALTH_AUTHORITY","522 Burns Lake","84" +"LOCAL_HEALTH_AUTHORITY","523 Nechako","85" +"LOCAL_HEALTH_AUTHORITY","524 Prince George","86" +"LOCAL_HEALTH_AUTHORITY","531 Peace River South","87" +"LOCAL_HEALTH_AUTHORITY","532 Peace River North","88" +"LOCAL_HEALTH_AUTHORITY","533 Fort Nelson","89" +"COMM_HLTH_SVC_AREA","1110 Fernie","1" +"COMM_HLTH_SVC_AREA","1120 Cranbrook","2" +"COMM_HLTH_SVC_AREA","1130 Kimberley","3" +"COMM_HLTH_SVC_AREA","1140 Windermere","4" +"COMM_HLTH_SVC_AREA","1150 Creston","5" +"COMM_HLTH_SVC_AREA","1160 Golden","6" +"COMM_HLTH_SVC_AREA","1210 Kootenay Lake","7" +"COMM_HLTH_SVC_AREA","1220 Nelson","8" +"COMM_HLTH_SVC_AREA","1230 Castlegar","9" +"COMM_HLTH_SVC_AREA","1240 Arrow Lakes","10" +"COMM_HLTH_SVC_AREA","1250 Trail","11" +"COMM_HLTH_SVC_AREA","1260 Grand Forks","12" +"COMM_HLTH_SVC_AREA","1270 Kettle Valley","13" +"COMM_HLTH_SVC_AREA","1310 Southern Okanagan","14" +"COMM_HLTH_SVC_AREA","1320 Penticton","15" +"COMM_HLTH_SVC_AREA","1330 Keremeos","16" +"COMM_HLTH_SVC_AREA","1340 Princeton","17" +"COMM_HLTH_SVC_AREA","1350 Armstrong/Spallumcheen","18" +"COMM_HLTH_SVC_AREA","1361 Vernon Centre/Coldstream","19" +"COMM_HLTH_SVC_AREA","1362 North Okanagan/Lumby","20" +"COMM_HLTH_SVC_AREA","1371 Central Okanagan Rural","21" +"COMM_HLTH_SVC_AREA","1372 West Kelowna","22" +"COMM_HLTH_SVC_AREA","1373 Lake Country","23" +"COMM_HLTH_SVC_AREA","1374 Glenmore","24" +"COMM_HLTH_SVC_AREA","1375 Downtown Kelowna","25" +"COMM_HLTH_SVC_AREA","1376 Rutland","26" +"COMM_HLTH_SVC_AREA","1377 Okanagan Mission","27" +"COMM_HLTH_SVC_AREA","1380 Summerland","28" +"COMM_HLTH_SVC_AREA","1390 Enderby","29" +"COMM_HLTH_SVC_AREA","1410 Revelstoke","30" +"COMM_HLTH_SVC_AREA","1420 Salmon Arm","31" +"COMM_HLTH_SVC_AREA","1431 Kamloops Centre North","32" +"COMM_HLTH_SVC_AREA","1432 Kamloops Centre South","33" +"COMM_HLTH_SVC_AREA","1433 Lower Thompson","34" +"COMM_HLTH_SVC_AREA","1440 100 Mile House","35" +"COMM_HLTH_SVC_AREA","1450 North Thompson","36" +"COMM_HLTH_SVC_AREA","1461 West Cariboo","37" +"COMM_HLTH_SVC_AREA","1462 Williams Lake/East Cariboo","38" +"COMM_HLTH_SVC_AREA","1470 Lillooet","39" +"COMM_HLTH_SVC_AREA","1480 South Cariboo","40" +"COMM_HLTH_SVC_AREA","1490 Merritt","41" +"COMM_HLTH_SVC_AREA","2110 Hope","42" +"COMM_HLTH_SVC_AREA","2121 South Chilliwack","43" +"COMM_HLTH_SVC_AREA","2122 North Chilliwack","44" +"COMM_HLTH_SVC_AREA","2131 Central Abbotsford","45" +"COMM_HLTH_SVC_AREA","2132 East Abbotsford","46" +"COMM_HLTH_SVC_AREA","2133 West Abbotsford","47" +"COMM_HLTH_SVC_AREA","2134 Abbotsford Rural","48" +"COMM_HLTH_SVC_AREA","2141 South Mission","49" +"COMM_HLTH_SVC_AREA","2142 North Mission","50" +"COMM_HLTH_SVC_AREA","2150 Agassiz/Harrison","51" +"COMM_HLTH_SVC_AREA","2210 New Westminster","52" +"COMM_HLTH_SVC_AREA","2221 Burnaby Northwest","53" +"COMM_HLTH_SVC_AREA","2222 Burnaby Northeast","54" +"COMM_HLTH_SVC_AREA","2223 Burnaby Southwest","55" +"COMM_HLTH_SVC_AREA","2224 Burnaby Southeast","56" +"COMM_HLTH_SVC_AREA","2231 Haney","57" +"COMM_HLTH_SVC_AREA","2232 Pitt Meadows","58" +"COMM_HLTH_SVC_AREA","2233 Maple Ridge Rural","59" +"COMM_HLTH_SVC_AREA","2241 North Coquitlam","60" +"COMM_HLTH_SVC_AREA","2242 Southwest Coquitlam","61" +"COMM_HLTH_SVC_AREA","2243 Southeast Coquitlam","62" +"COMM_HLTH_SVC_AREA","2244 Port Coquitlam","63" +"COMM_HLTH_SVC_AREA","2245 Port Moody/Anmore/Belcarra","64" +"COMM_HLTH_SVC_AREA","2311 City of Langley","65" +"COMM_HLTH_SVC_AREA","2312 Walnut Grove/Fort Langley","66" +"COMM_HLTH_SVC_AREA","2313 Willoughby","67" +"COMM_HLTH_SVC_AREA","2314 Brookswood/Murrayville","68" +"COMM_HLTH_SVC_AREA","2315 Aldergrove/Otter","69" +"COMM_HLTH_SVC_AREA","2316 North Langley Township","70" +"COMM_HLTH_SVC_AREA","2317 South Langley Township","71" +"COMM_HLTH_SVC_AREA","2321 North Delta","72" +"COMM_HLTH_SVC_AREA","2322 Ladner","73" +"COMM_HLTH_SVC_AREA","2323 Tsawwassen","74" +"COMM_HLTH_SVC_AREA","2331 Whalley","75" +"COMM_HLTH_SVC_AREA","2332 North Surrey","76" +"COMM_HLTH_SVC_AREA","2333 Cloverdale","77" +"COMM_HLTH_SVC_AREA","2334 Panorama","78" +"COMM_HLTH_SVC_AREA","2335 East Newton","79" +"COMM_HLTH_SVC_AREA","2336 Fleetwood","80" +"COMM_HLTH_SVC_AREA","2337 Guildford","81" +"COMM_HLTH_SVC_AREA","2338 West Newton","82" +"COMM_HLTH_SVC_AREA","2341 South Surrey","83" +"COMM_HLTH_SVC_AREA","2342 White Rock","84" +"COMM_HLTH_SVC_AREA","3111 Richmond City Centre","85" +"COMM_HLTH_SVC_AREA","3112 Blundell","86" +"COMM_HLTH_SVC_AREA","3113 Broadmoor","87" +"COMM_HLTH_SVC_AREA","3114 Thompson/Seafair","88" +"COMM_HLTH_SVC_AREA","3115 Steveston","89" +"COMM_HLTH_SVC_AREA","3116 East and West Cambie/Bridgeport","90" +"COMM_HLTH_SVC_AREA","3117 Gilmore/Shellmont/East/Hamilton","91" +"COMM_HLTH_SVC_AREA","3211 Downtown Vancouver","92" +"COMM_HLTH_SVC_AREA","3212 West End","93" +"COMM_HLTH_SVC_AREA","3213 Fairview","94" +"COMM_HLTH_SVC_AREA","3221 Downtown Eastside","95" +"COMM_HLTH_SVC_AREA","3222 Northeast False Creek","96" +"COMM_HLTH_SVC_AREA","3223 Grandview-Woodland","97" +"COMM_HLTH_SVC_AREA","3231 Cedar Cottage","98" +"COMM_HLTH_SVC_AREA","3232 Hastings-Sunrise","99" +"COMM_HLTH_SVC_AREA","3233 Renfrew-Collingwood","100" +"COMM_HLTH_SVC_AREA","3241 Shaughnessy/Arbutus Ridge/Kerrisdale","101" +"COMM_HLTH_SVC_AREA","3242 West Point Grey/Dunbar-Southlands","102" +"COMM_HLTH_SVC_AREA","3243 University of British Columbia","103" +"COMM_HLTH_SVC_AREA","3244 Kitsilano","104" +"COMM_HLTH_SVC_AREA","3251 Kensington","105" +"COMM_HLTH_SVC_AREA","3252 Mount Pleasant","106" +"COMM_HLTH_SVC_AREA","3253 South Cambie/Riley Park","107" +"COMM_HLTH_SVC_AREA","3261 Killarney","108" +"COMM_HLTH_SVC_AREA","3262 Oakridge/Marpole","109" +"COMM_HLTH_SVC_AREA","3263 Sunset","110" +"COMM_HLTH_SVC_AREA","3264 Victoria-Fraserview","111" +"COMM_HLTH_SVC_AREA","3311 North Vancouver City - East","112" +"COMM_HLTH_SVC_AREA","3312 North Vancouver City - West","113" +"COMM_HLTH_SVC_AREA","3313 North Vancouver DM - Central","114" +"COMM_HLTH_SVC_AREA","3314 North Vancouver DM - East","115" +"COMM_HLTH_SVC_AREA","3315 North Vancouver DM - West","116" +"COMM_HLTH_SVC_AREA","3321 West Vancouver - Lower","117" +"COMM_HLTH_SVC_AREA","3322 West Vancouver - Upper","118" +"COMM_HLTH_SVC_AREA","3323 Bowen Island/Lions Bay","119" +"COMM_HLTH_SVC_AREA","3331 Gibsons","120" +"COMM_HLTH_SVC_AREA","3332 Sechelt","121" +"COMM_HLTH_SVC_AREA","3333 Sunshine Coast Rural","122" +"COMM_HLTH_SVC_AREA","3341 Powell River City","123" +"COMM_HLTH_SVC_AREA","3342 qathet Rural","124" +"COMM_HLTH_SVC_AREA","3351 Squamish","125" +"COMM_HLTH_SVC_AREA","3352 Whistler","126" +"COMM_HLTH_SVC_AREA","3353 Howe Sound Rural","127" +"COMM_HLTH_SVC_AREA","3360 Bella Coola Valley","128" +"COMM_HLTH_SVC_AREA","3370 Central Coast","129" +"COMM_HLTH_SVC_AREA","4111 Downtown Victoria/Vic West","130" +"COMM_HLTH_SVC_AREA","4112 James Bay/Fairfield","131" +"COMM_HLTH_SVC_AREA","4113 Oaklands/Fernwood","132" +"COMM_HLTH_SVC_AREA","4114 Oak Bay","133" +"COMM_HLTH_SVC_AREA","4115 Gordon Head/Shelbourne","134" +"COMM_HLTH_SVC_AREA","4116 Quadra/Swan Lake","135" +"COMM_HLTH_SVC_AREA","4117 Interurban/Tillicum","136" +"COMM_HLTH_SVC_AREA","4118 View Royal","137" +"COMM_HLTH_SVC_AREA","4119 Esquimalt","138" +"COMM_HLTH_SVC_AREA","4121 Colwood","139" +"COMM_HLTH_SVC_AREA","4122 Metchosin","140" +"COMM_HLTH_SVC_AREA","4123 Langford/Highlands","141" +"COMM_HLTH_SVC_AREA","4124 Sooke","142" +"COMM_HLTH_SVC_AREA","4125 Juan de Fuca Coast","143" +"COMM_HLTH_SVC_AREA","4131 Royal Oak/Cordova Bay/Prospect","144" +"COMM_HLTH_SVC_AREA","4132 Central Saanich","145" +"COMM_HLTH_SVC_AREA","4133 North Saanich","146" +"COMM_HLTH_SVC_AREA","4134 Sidney","147" +"COMM_HLTH_SVC_AREA","4141 Salt Spring Island","148" +"COMM_HLTH_SVC_AREA","4142 Pender/Galiano/Saturna/Mayne","149" +"COMM_HLTH_SVC_AREA","4211 South Cowichan","150" +"COMM_HLTH_SVC_AREA","4212 Central Cowichan","151" +"COMM_HLTH_SVC_AREA","4220 Cowichan Valley West","152" +"COMM_HLTH_SVC_AREA","4231 Ladysmith","153" +"COMM_HLTH_SVC_AREA","4232 Ladysmith Rural","154" +"COMM_HLTH_SVC_AREA","4233 Chemainus","155" +"COMM_HLTH_SVC_AREA","4234 Penelakut and Thetis Islands","156" +"COMM_HLTH_SVC_AREA","4241 Downtown Nanaimo","157" +"COMM_HLTH_SVC_AREA","4242 Departure Bay","158" +"COMM_HLTH_SVC_AREA","4243 Nanaimo North/Lantzville","159" +"COMM_HLTH_SVC_AREA","4244 Nanaimo South","160" +"COMM_HLTH_SVC_AREA","4245 Nanaimo West/Rural","161" +"COMM_HLTH_SVC_AREA","4246 Cedar/Wellington","162" +"COMM_HLTH_SVC_AREA","4247 Gabriola Island","163" +"COMM_HLTH_SVC_AREA","4251 Parksville","164" +"COMM_HLTH_SVC_AREA","4252 Qualicum Beach","165" +"COMM_HLTH_SVC_AREA","4253 Oceanside Rural","166" +"COMM_HLTH_SVC_AREA","4261 Port Alberni","167" +"COMM_HLTH_SVC_AREA","4262 Alberni Valley/Bamfield","168" +"COMM_HLTH_SVC_AREA","4263 West Coast","169" +"COMM_HLTH_SVC_AREA","4311 Comox","170" +"COMM_HLTH_SVC_AREA","4312 Comox Valley Rural","171" +"COMM_HLTH_SVC_AREA","4313 Courtenay","172" +"COMM_HLTH_SVC_AREA","4321 Campbell River","173" +"COMM_HLTH_SVC_AREA","4322 Campbell River Rural","174" +"COMM_HLTH_SVC_AREA","4330 Vancouver Island West","175" +"COMM_HLTH_SVC_AREA","4341 Port Hardy/Port Alice","176" +"COMM_HLTH_SVC_AREA","4342 Port McNeill/Sointula","177" +"COMM_HLTH_SVC_AREA","4343 Vancouver Island North Remote","178" +"COMM_HLTH_SVC_AREA","5101 Haida Gwaii South","179" +"COMM_HLTH_SVC_AREA","5102 Haida Gwaii North","180" +"COMM_HLTH_SVC_AREA","5110 Snow Country","181" +"COMM_HLTH_SVC_AREA","5121 Prince Rupert City Centre","182" +"COMM_HLTH_SVC_AREA","5122 Prince Rupert Rural","183" +"COMM_HLTH_SVC_AREA","5130 Upper Skeena","184" +"COMM_HLTH_SVC_AREA","5141 Smithers Town Centre","185" +"COMM_HLTH_SVC_AREA","5142 Smithers Rural","186" +"COMM_HLTH_SVC_AREA","5143 Houston","187" +"COMM_HLTH_SVC_AREA","5150 Kitimat","188" +"COMM_HLTH_SVC_AREA","5160 Stikine","189" +"COMM_HLTH_SVC_AREA","5171 Terrace City Centre","190" +"COMM_HLTH_SVC_AREA","5172 Terrace Rural","191" +"COMM_HLTH_SVC_AREA","5180 Nisga'a","192" +"COMM_HLTH_SVC_AREA","5190 Telegraph Creek","193" +"COMM_HLTH_SVC_AREA","5211 Quesnel City Centre","194" +"COMM_HLTH_SVC_AREA","5212 Quesnel Rural","195" +"COMM_HLTH_SVC_AREA","5221 Burns Lake Town Centre","196" +"COMM_HLTH_SVC_AREA","5222 Burns Lake South","197" +"COMM_HLTH_SVC_AREA","5223 Burns Lake North","198" +"COMM_HLTH_SVC_AREA","5231 Vanderhoof","199" +"COMM_HLTH_SVC_AREA","5232 Vanderhoof Rural","200" +"COMM_HLTH_SVC_AREA","5233 Fort St. James North","201" +"COMM_HLTH_SVC_AREA","5234 Fraser Lake","202" +"COMM_HLTH_SVC_AREA","5241 Prince George City - North","203" +"COMM_HLTH_SVC_AREA","5242 Prince George City - Central","204" +"COMM_HLTH_SVC_AREA","5243 Prince George City - Southwest","205" +"COMM_HLTH_SVC_AREA","5244 Prince George Southwest Rural","206" +"COMM_HLTH_SVC_AREA","5245 Prince George North Fraser Rural","207" +"COMM_HLTH_SVC_AREA","5246 McBride/Valemount","208" +"COMM_HLTH_SVC_AREA","5247 Mackenzie","209" +"COMM_HLTH_SVC_AREA","5311 Dawson Creek","210" +"COMM_HLTH_SVC_AREA","5312 Chetwynd","211" +"COMM_HLTH_SVC_AREA","5313 Tumbler Ridge","212" +"COMM_HLTH_SVC_AREA","5314 Peace River South Rural","213" +"COMM_HLTH_SVC_AREA","5321 Fort St John","214" +"COMM_HLTH_SVC_AREA","5322 Hudson's Hope","215" +"COMM_HLTH_SVC_AREA","5323 Peace River North Rural","216" +"COMM_HLTH_SVC_AREA","5331 Fort Nelson Population Centre","217" +"COMM_HLTH_SVC_AREA","5332 Northern Boreal","218" +"FACILITY_TYPE","Long Term Care (LTC)","1" +"FACILITY_TYPE","Assisted Living (AL)","2" +"FACILITY_TYPE","Family Care Home (FCH)","3" +"FACILITY_TYPE","Group Homes (GH)","4" +"OWNER_TYPE","Health Authority (HA)","1" +"OWNER_TYPE","Private For Profit (PFP)","2" +"OWNER_TYPE","Private Not For Profit (PNP)","3" +"OWNER_TYPE","Fully Private","4" +"LEGISLATION_TYPE","CCALA","1" +"LEGISLATION_TYPE","Hospital Act","2" +"LEGISLATION_TYPE","CCALA and Hospital Act","3" +"SURVEY_CATEGORY","Community","1" +"SURVEY_CATEGORY","Supported","2" +"SURVEY_CATEGORY","Acute","3" +"SURVEY_CATEGORY","Tertiary","4" +"SURVEY_CATEGORY","ED","5" +"HA_WITH_CODE","01 Interior","1" +"HA_WITH_CODE","02 Fraser","2" +"HA_WITH_CODE","03 Vancouver Coastal","3" +"HA_WITH_CODE","04 Vancouver Island","4" +"HA_WITH_CODE","05 Northern","5" +"HA_WITH_CODE","06 Provincial Health","6" +"SURVEY_MONTH","3-Mar","1" +"SURVEY_MONTH","6-Jun","2" +"SURVEY_MONTH","9-Sep","3" +"SURVEY_MONTH","12-Dec","4" +"HA_WITH_SHORT_CODE","1 Interior","1" +"HA_WITH_SHORT_CODE","2 Fraser","2" +"HA_WITH_SHORT_CODE","3 Vancouver Coastal","3" +"HA_WITH_SHORT_CODE","4 Vancouver Island","4" +"HA_WITH_SHORT_CODE","5 Northern","5" +"HA_WITH_SHORT_CODE","6 Provincial Health","6" +"HA_WITH_SHORT_CODE","9 Unknown HA","7" +"HLTH_SVC_DELIVERY_AREA","11 - East Kootenay","1" +"HLTH_SVC_DELIVERY_AREA","12 Kootenay Boundary","2" +"HLTH_SVC_DELIVERY_AREA","13 Okanagan","3" +"HLTH_SVC_DELIVERY_AREA","14 Thompson Cariboo Shuswap","4" +"HLTH_SVC_DELIVERY_AREA","21 Fraser East","5" +"HLTH_SVC_DELIVERY_AREA","22 Fraser North","6" +"HLTH_SVC_DELIVERY_AREA","23 Fraser South","7" +"HLTH_SVC_DELIVERY_AREA","31 Richmond","8" +"HLTH_SVC_DELIVERY_AREA","32 Vancouver","9" +"HLTH_SVC_DELIVERY_AREA","33 North Shore/Coast Garibaldi","10" +"HLTH_SVC_DELIVERY_AREA","41 South Vancouver Island","11" +"HLTH_SVC_DELIVERY_AREA","42 Central Vancouver Island","12" +"HLTH_SVC_DELIVERY_AREA","43 North Vancouver Island","13" +"HLTH_SVC_DELIVERY_AREA","51 Northwest","14" +"HLTH_SVC_DELIVERY_AREA","52 Northern Interior","15" +"HLTH_SVC_DELIVERY_AREA","53 Northeast","16" +"MHSU_FACILITY_TYPE","MH Community Long Term Care","1" +"MHSU_FACILITY_TYPE","MH Community Assisted Living","2" +"MHSU_FACILITY_TYPE","MH Family Care Homes","3" +"MHSU_FACILITY_TYPE","MH Rental Subsidy","4" +"MHSU_FACILITY_TYPE","MH ACT/ICM Rental Subsidy","5" +"MHSU_FACILITY_TYPE","MH Community Crisis Stabilization Units","6" +"MHSU_FACILITY_TYPE","MH Emergency Shelters","7" +"MHSU_ORG_TYPE","Private For Profit","1" +"MHSU_ORG_TYPE","Private Not For Profit","2" +"MHSU_ORG_TYPE","BC Housing","3" +"MHSU_ORG_TYPE","Health Authority","4" +"MHSU_ORG_TYPE","Municipality","5" +"MHSU_ORG_TYPE","First Nations","6" +"MH_ACT_SCHEDULE","A","1" +"MH_ACT_SCHEDULE","B","2" +"MH_ACT_SCHEDULE","C","3" +"MH_ACT_SCHEDULE","NULL","4" +"FACILITY_CLIENT_TYPE","Male only","1" +"FACILITY_CLIENT_TYPE","Female only","2" +"FACILITY_CLIENT_TYPE","Male with Child(ren)","3" +"FACILITY_CLIENT_TYPE","Female with Child(ren)","4" +"FACILITY_CLIENT_TYPE","Male and Female","5" +"FACILITY_CLIENT_TYPE","Male or Female","6" +"FACILITY_CLIENT_TYPE","Transgender","7" +"FACILITY_CLIENT_TYPE","Gender Diverse","8" +"PRIORITY_POPULATION_TYPE","Indigenous ","1" +"PRIORITY_POPULATION_TYPE","Pregnant","2" +"PRIORITY_POPULATION_TYPE","Homeless","3" +"PRIORITY_POPULATION_TYPE","Rural or Remote (living in a rural or remote area)","4" +"PRIORITY_POPULATION_TYPE","Other priority population","5" +"PRIORITY_POPULATION_TYPE","Null (no priority population)","6" +"BEDS_FUNDING_INITIATIVE","Aug 2020 YSU Beds (123 Beds)","1" +"BEDS_FUNDING_INITIATIVE","Budget 2021","2" +"BEDS_FUNDING_INITIATIVE","Multiple Funding Impact","3" +"BEDS_FUNDING_INITIATIVE","Other","4" +"BEDS_FUNDING_INITIATIVE","Null","5" +"AVAIL_BED_CHG_REASON","Facility Opened","1" +"AVAIL_BED_CHG_REASON","Facility Closed (Permanently)","2" +"AVAIL_BED_CHG_REASON","Facility Closed (Temporarily)","3" +"AVAIL_BED_CHG_REASON","Facility Moved","4" +"AVAIL_BED_CHG_REASON","Renovations","5" +"AVAIL_BED_CHG_REASON","Funding Loss","6" +"AVAIL_BED_CHG_REASON","New Funding","7" +"AVAIL_BED_CHG_REASON","Beds Not Being Used","8" +"AVAIL_BED_CHG_REASON","Change in Bed Type","9" +"AVAIL_BED_CHG_REASON","COVID Temporary Reallocation","10" +"AVAIL_BED_CHG_REASON","Change in Population Served","11" +"AVAIL_BED_CHG_REASON","Unknown","12" +"AVAIL_BED_CHG_REASON","Other","13" +"PROGRAM_TYPE","Long-term Care (LTC)","1" +"PROGRAM_TYPE","Assisted Living (AL)","2" +"FACILITY_OWNERSHIP_TYPE","HA owned & operated","1" +"FACILITY_OWNERSHIP_TYPE","Private For Profit (PFP)","2" +"FACILITY_OWNERSHIP_TYPE","Private Not For Profit (PNP)","3" +"HA_ABBREVIATED","FHA ","1" +"HA_ABBREVIATED","IHA","2" +"HA_ABBREVIATED","NHA","3" +"HA_ABBREVIATED","VCH","4" +"HA_ABBREVIATED","VIHA","5" +"REVENUE_TYPE","HA Operating Funding","1" +"REVENUE_TYPE","HA operating one-time funding","2" +"REVENUE_TYPE","HA Capital Contribution Funding ","3" +"REVENUE_TYPE","Recoveries by HA","4" +"REVENUE_TYPE","Client Revenue","5" +"REVENUE_TYPE","Other Revenue","6" +"REVENUE_TYPE","Non-operating revenue","7" +"REVENUE_NAME","HA Operating Funding","1" +"REVENUE_NAME","Direct care hours ~ additional funding","2" +"REVENUE_NAME","Others ~ specify ","3" +"REVENUE_NAME","HA Operating Funding - Minor Equipment ","4" +"REVENUE_NAME","HA Operating Funding - Other ","5" +"REVENUE_NAME","HA Capital Contribution Funding","6" +"REVENUE_NAME","Occupancy threshold","7" +"REVENUE_NAME","Client contribution reconciliation","8" +"REVENUE_NAME","Direct care hours","9" +"REVENUE_NAME","HA client user fees paid by the client","10" +"REVENUE_NAME","Client user fees paid by third parties","11" +"REVENUE_NAME","Client user fee paid: non-eligible residents","12" +"REVENUE_NAME","Investments revenue on operating funds","13" +"REVENUE_NAME","CMHC/BCHMC funding","14" +"REVENUE_NAME","Food Services","15" +"REVENUE_NAME","Laundry Services","16" +"REVENUE_NAME","Cablevision","17" +"REVENUE_NAME","Other Recoveries","18" +"REVENUE_NAME","Other Revenue","19" +"REVENUE_NAME","HA Funding","20" +"REVENUE_NAME","Other - Third party funding","21" +"EXPENDITURE_TYPE","Labour Cost","1" +"EXPENDITURE_TYPE","Benefit Cost","2" +"EXPENDITURE_TYPE","Property Cost","3" +"EXPENDITURE_TYPE","Supplies","4" +"EXPENDITURE_TYPE","Admin Cost","5" +"EXPENDITURE_TYPE","Operating Surplus/Deficit","6" +"EXPENDITURE_TYPE","Depreciation/Amortization","7" +"EXPENDITURE_TYPE","Non-operating Expense",8" +"EXPENDITURE_NAME","Direct Care","1" +"EXPENDITURE_NAME","Food Services","2" +"EXPENDITURE_NAME","Laundry Services","3" +"EXPENDITURE_NAME","Housekeeping Services","4" +"EXPENDITURE_NAME","Administration Services","5" +"EXPENDITURE_NAME","Plant Maintenance and Op. Staffing","6" +"EXPENDITURE_NAME","Salary and wages recovered","7" +"EXPENDITURE_NAME","Salaries and wages accrual ","8" +"EXPENDITURE_NAME","Other labour costs","9" +"EXPENDITURE_NAME","Benefits","10" +"EXPENDITURE_NAME","Sick, severance and other accrual","11" +"EXPENDITURE_NAME","Building rent/lease cost","12" +"EXPENDITURE_NAME","Interest on mortgage or long-term debt","13" +"EXPENDITURE_NAME","Property taxes","14" +"EXPENDITURE_NAME","Maintenance and repairs - building, ground and equipment","15" +"EXPENDITURE_NAME","Supplies - for building, ground and equipment ","16" +"EXPENDITURE_NAME","Utilities ","17" +"EXPENDITURE_NAME","Waste management","18" +"EXPENDITURE_NAME","Resident transportation services","19" +"EXPENDITURE_NAME","Others - operating","20" +"EXPENDITURE_NAME","Medical supplies","21" +"EXPENDITURE_NAME","Drugs & pharmaceutical","22" +"EXPENDITURE_NAME","Raw food costs (incl. dietary supplement costs)","23" +"EXPENDITURE_NAME","Dietary supplies","24" +"EXPENDITURE_NAME","Laundry supplies","25" +"EXPENDITURE_NAME","Housekeeping supplies","26" +"EXPENDITURE_NAME","Incontinence Supplies","27" +"EXPENDITURE_NAME","Others Supplies ","28" +"EXPENDITURE_NAME","Office expense ","29" +"EXPENDITURE_NAME","Management fees","30" +"EXPENDITURE_NAME","Head office allocation (non-compensation) ","31" +"EXPENDITURE_NAME","Accreditation costs","32" +"EXPENDITURE_NAME","Association dues, professional fees, audit fees","33" +"EXPENDITURE_NAME","Insurances (for property and liability)","34" +"EXPENDITURE_NAME","Administration and Supplies","35" +"EXPENDITURE_NAME","Other - admin and supplies","36" +"EXPENDITURE_NAME","Mortgage Principal Repayment","37" +"EXPENDITURE_NAME","Other Non-operating Expense","38" +"DEPRECIATION_NAME","Building ","1" +"DEPRECIATION_NAME","Furniture and equipment","2" +"YTD_TOTAL_NAME","Total Operating Revenue","1" +"YTD_TOTAL_NAME","Total Operating Expenses","2" +"YTD_TOTAL_NAME","Non-operating Surplus / (Deficit)","3" +"YTD_TOTAL_NAME","Total Before depreciation & amortization","4" +"YTD_TOTAL_NAME","Subtotal - Depreciation / amortization","5" +"YTD_TOTAL_NAME","Total Operating Surplus / (Deficit)","6" +"POSITION_TYPE","Support ","1" +"POSITION_TYPE","Administration","2" +"POSITION_TYPE","Nursing ","3" +"POSITION_TYPE","Allied Professional ","4" +"POSITION_TYPE","Allied Non-Professional ","5" +"POSITION_NAME","Food services","1" +"POSITION_NAME","Laundry services","2" +"POSITION_NAME","Housekeeping services ","3" +"POSITION_NAME","Plant maintenance and operations staffing","4" +"POSITION_NAME","Administrator","5" +"POSITION_NAME","Director of care","6" +"POSITION_NAME","Dept managers","7" +"POSITION_NAME","Administrative support","8" +"POSITION_NAME","Pastoral care worker ","9" +"POSITION_NAME","Clerical clerks","10" +"POSITION_NAME","Clinical coordinator","11" +"POSITION_NAME","Other - specify ","12" +"POSITION_NAME","RN","13" +"POSITION_NAME","LPN","14" +"POSITION_NAME","Care Aides (HCA)","15" +"POSITION_NAME","Other Nursing (specify)","16" +"POSITION_NAME","Occupational therapist ","17" +"POSITION_NAME","Physiotherapist","18" +"POSITION_NAME","Dietitian","19" +"POSITION_NAME","Social worker","20" +"POSITION_NAME","Other allied professional (specify)","21" +"POSITION_NAME","Recreation Therapist","22" +"POSITION_NAME","Rehab Assistant","23" +"POSITION_NAME","Activity Worker","24" +"POSITION_NAME","Music Therapist","25" +"POSITION_NAME","Art Therapist","26" +"ADD_POSITION_TYPE","Allied Non-Professional ","1" +"ADD_POSITION_TYPE","Nursing Care","2" +"ADD_POSITION_TYPE","Allied Professional","3" +"BENEFIT_TYPE","Employment Insurance","1" +"BENEFIT_TYPE","Canada Pension Plan","2" +"BENEFIT_TYPE","Workers Compensation Board","3" +"BENEFIT_TYPE","Employer Health Tax","4" +"BENEFIT_TYPE","Pension Plan","5" +"BENEFIT_TYPE","Extended Health & Dental","6" +"BENEFIT_TYPE","Group Life, AD&D, LTD","7" +"BENEFIT_TYPE","Other Benefits ~ specify","8" +"BENEFIT_TYPE","Less: Benefit Recovery","9" +"BENEFIT_TYPE","Accrued Sick & Severance","10" +"CARE_UNIT_TYPE","Specialized care","1" +"CARE_UNIT_TYPE","LTC","2" +"CARE_UNIT_TYPE","Other - please specify","3" +"REVISION_REASON","Increase in # Beds","1" +"REVISION_REASON","Increase in HPRD","2" +"REVISION_REASON","Licensing issue","3" +"REVISION_REASON","Other - specify","4" +"ALT_CLINICAL_OVERSITE_TYPE","Clinical oversight to shifts without an RN on-site (on-call RN or other strategies)","1" +"ALT_CLINICAL_OVERSITE_TYPE","Increase LPN hours of care to compensate for the gap in RN on-site hours ","2" +"ALT_CLINICAL_OVERSITE_TYPE","No mitigation strategy ","3" +"ALT_CLINICAL_OVERSITE_TYPE","Other - please specify ","4" +"STAFFING_POSITION_TYPE","RN/RPN","1" +"STAFFING_POSITION_TYPE","LPN","2" +"STAFFING_POSITION_TYPE","HCA ","3" +"STAFFING_POSITION_TYPE","Occupational Therapist","4" +"STAFFING_POSITION_TYPE","Physiotherapist","5" +"STAFFING_POSITION_TYPE","Dietitian","6" +"STAFFING_POSITION_TYPE","Social Worker","7" +"STAFFING_POSITION_TYPE","Medical Lab. Tech.","8" +"STAFFING_POSITION_TYPE","Respiratory Therapist","9" +"STAFFING_POSITION_TYPE","Speech Language Pathologist","10" +"STAFFING_POSITION_TYPE","Recreational Therapist ","11" +"STAFFING_POSITION_TYPE","Rehab Assistant","12" +"STAFFING_POSITION_TYPE","Activity Worker","13" +"STAFFING_POSITION_TYPE","Music Therapist","14" +"STAFFING_POSITION_TYPE","Art Therapist","15" +"STAFFING_SHIFT_TYPE","Days","1" +"STAFFING_SHIFT_TYPE","Evenings","2" +"STAFFING_SHIFT_TYPE","Nights","3" +"STAFF_MITIGATION_STRATEGY","Alternative RN clinical oversight to shifts without an RN on-site? (on-call RN or other strategies?)","1" +"STAFF_MITIGATION_STRATEGY","Increase LPN hours of care to compensate for the gap in RN on-site hours?","2" +"STAFF_MITIGATION_STRATEGY","Other - Please specify","3" +"STAFF_MITIGATION_STRATEGY","No mitigation strategy","4" +"YTD_QUARTER","Inventory ","1" +"YTD_QUARTER","Quarter 1","2" +"YTD_QUARTER","Quarter 2","3" +"YTD_QUARTER","Quarter 3","4" +"YTD_QUARTER","Quarter 4","5" +"BED_FUNDING_TYPE","In Scope 3.36 HPRD","1" +"BED_FUNDING_TYPE","Out Of Scope Public","2" +"BED_FUNDING_TYPE","Private Beds Bed","3" +"BED_SUB_TYPE","LTC","1" +"BED_SUB_TYPE","LTC Temporary","2" +"BED_SUB_TYPE","Convalescent","3" +"BED_SUB_TYPE","Dedicated EOL","4" +"BED_SUB_TYPE","Designated EOL","5" +"BED_SUB_TYPE","Respite ","6" +"BED_SUB_TYPE","Flex Beds","7" +"BED_SUB_TYPE","Other - Specify ","8" +"MONTH","April","1" +"MONTH","May","2" +"MONTH","June","3" +"MONTH","July","4" +"MONTH","Aug","5" +"MONTH","Sept","6" +"MONTH","Oct","7" +"MONTH","Nov","8" +"MONTH","Dec","9" +"MONTH","Jan","10" +"MONTH","Feb","11" +"MONTH","Mar","12" +"ADD_POSITION_NAME","RN","1" +"ADD_POSITION_NAME","LPN","2" +"ADD_POSITION_NAME","Care Aides (HCA)","3" +"ADD_POSITION_NAME","Occupational Therapist","4" +"ADD_POSITION_NAME","Physiotherapist","5" +"ADD_POSITION_NAME","Dietitian","6" +"ADD_POSITION_NAME","Social Worker","7" +"ADD_POSITION_NAME","Recreation Therapist","8" +"ADD_POSITION_NAME","Rehab Assistant","9" +"ADD_POSITION_NAME","Activity Worker","10" +"ADD_POSITION_NAME","Music Therapist","11" +"ADD_POSITION_NAME","Art Therapist","12" +"ADD_POSITION_NAME","Other (specify)","13" +"COMP_SAL_TOTAL_TYPE","Total Per Payroll","1" +"COMP_SAL_TOTAL_TYPE","Recovered Salaries and Wages","2" +"COMP_SAL_TOTAL_TYPE","Accrued Salaries and Wages","3" +"COMP_SAL_TOTAL_TYPE","Other Labour Costs","4" +"COMP_HRS_TOTAL_TYPE","Total Per Payroll","1" +"COMP_HRS_TOTAL_TYPE","Accrued Hours","2" +"BED_OCCUPANCY_TYPE","Planned","1" +"BED_OCCUPANCY_TYPE","YTD","2" +"SUBMISSION_TYPE","regular","1" +"SUBMISSION_TYPE","revised","2" From e3a0ec29916fefccdd5f9766a02c170bd5526aea Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 5 Apr 2023 17:27:33 -0400 Subject: [PATCH 059/183] added constant for LTC_YTD_DIRECT_CARE_HRS --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index ba849132..44290e4b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -42,6 +42,9 @@ public class Constants { public final static String OUT_OF_SCOPE = "outOfScope"; public final static String PRIVATE_BED = "privateBed"; + // Constants for Sub table: LTC_YTD_DIRECT_CARE_HRS + public final static String DC_HRS_OTHER = "Other"; + // Constants for Sub table: LTC_YTD_COMP_ADD_POS public final static String POS_TYPE_OTHER = "Other"; From 24b5d65f059fcbcb591759d4fc30c395f54a5900 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 5 Apr 2023 17:30:04 -0400 Subject: [PATCH 060/183] full ETL update for LTC_YTD_DIRECT_CARE_HRS --- .../etl/forms/ltc/quaterly/json/Root.java | 326 +++++++++++++++++- .../quaterly/model/LtcYtdDirectCareHrs.java | 22 +- .../LtcQuaterlyYtdApiResponseProcessor.java | 142 ++++---- 3 files changed, 405 insertions(+), 85 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java index 691b4d7a..59912748 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java @@ -333,7 +333,9 @@ public class Root{ public String alliedProfNProdH_calc3; public String alliedProfNProdH_calc4; public String alliedProfNProdH_calc5; - public String alliedProfNProdH_calcsum1; + public String alliedProfNProdH_calc6; + public String alliedProfNProdH_calc7; + public String alliedProfNProdH_calcsum1; @JsonProperty("alliedProfNProdH_item1-1") public String alliedProfNProdH_item11; @JsonProperty("alliedProfNProdH_item1-2") @@ -344,7 +346,11 @@ public class Root{ public String alliedProfNProdH_item14; @JsonProperty("alliedProfNProdH_item1-5") public String alliedProfNProdH_item15; - @JsonProperty("alliedProfNProdH_item2-1") + @JsonProperty("alliedProfNProdH_item1-6") + public String alliedProfNProdH_item16; + @JsonProperty("alliedProfNProdH_item1-7") + public String alliedProfNProdH_item17; + @JsonProperty("alliedProfNProdH_item2-1") public String alliedProfNProdH_item21; @JsonProperty("alliedProfNProdH_item2-2") public String alliedProfNProdH_item22; @@ -354,7 +360,11 @@ public class Root{ public String alliedProfNProdH_item24; @JsonProperty("alliedProfNProdH_item2-5") public String alliedProfNProdH_item25; - @JsonProperty("alliedProfNProdH_item3-1") + @JsonProperty("alliedProfNProdH_item2-6") + public String alliedProfNProdH_item26; + @JsonProperty("alliedProfNProdH_item2-7") + public String alliedProfNProdH_item27; + @JsonProperty("alliedProfNProdH_item3-1") public String alliedProfNProdH_item31; @JsonProperty("alliedProfNProdH_item3-2") public String alliedProfNProdH_item32; @@ -364,7 +374,11 @@ public class Root{ public String alliedProfNProdH_item34; @JsonProperty("alliedProfNProdH_item3-5") public String alliedProfNProdH_item35; - @JsonProperty("alliedProfNProdH_sum1-1") + @JsonProperty("alliedProfNProdH_item3-6") + public String alliedProfNProdH_item36; + @JsonProperty("alliedProfNProdH_item3-7") + public String alliedProfNProdH_item37; + @JsonProperty("alliedProfNProdH_sum1-1") public String alliedProfNProdH_sum11; @JsonProperty("alliedProfNProdH_sum3-1") public String alliedProfNProdH_sum31; @@ -433,7 +447,9 @@ public class Root{ public String alliedProfProdH_calc3; public String alliedProfProdH_calc4; public String alliedProfProdH_calc5; - public String alliedProfProdH_calcsum1; + public String alliedProfProdH_calc6; + public String alliedProfProdH_calc7; + public String alliedProfProdH_calcsum1; @JsonProperty("alliedProfProdH_item1-1") public String alliedProfProdH_item11; @JsonProperty("alliedProfProdH_item1-2") @@ -444,6 +460,10 @@ public class Root{ public String alliedProfProdH_item14; @JsonProperty("alliedProfProdH_item1-5") public String alliedProfProdH_item15; + @JsonProperty("alliedProfProdH_item1-6") + public String alliedProfProdH_item16; + @JsonProperty("alliedProfProdH_item1-7") + public String alliedProfProdH_item17; @JsonProperty("alliedProfProdH_item2-1") public String alliedProfProdH_item21; @JsonProperty("alliedProfProdH_item2-2") @@ -454,12 +474,18 @@ public class Root{ public String alliedProfProdH_item24; @JsonProperty("alliedProfProdH_item2-5") public String alliedProfProdH_item25; - public String alliedProfProdH_sub1; + @JsonProperty("alliedProfProdH_item2-6") + public String alliedProfProdH_item26; + @JsonProperty("alliedProfProdH_item2-7") + public String alliedProfProdH_item27; + public String alliedProfProdH_sub1; public String alliedProfProdH_sub2; public String alliedProfProdH_sub3; public String alliedProfProdH_sub4; public String alliedProfProdH_sub5; - public String alliedProfProdH_subsum1; + public String alliedProfProdH_sub6; + public String alliedProfProdH_sub7; + public String alliedProfProdH_subsum1; @JsonProperty("alliedProfProdH_sum11") public String alliedProfProdH_sum11; @JsonProperty("alliedProfProdH_sum2-1") @@ -469,14 +495,18 @@ public class Root{ public String alliedProfProdH_THP3; public String alliedProfProdH_THP4; public String alliedProfProdH_THP5; - public String alliedProfProdH_THPsum1; + public String alliedProfProdH_THP6; + public String alliedProfProdH_THP7; + public String alliedProfProdH_THPsum1; public String alliedProfProdHCS_subsum1; public String alliedProfProdHCS1; public String alliedProfProdHCS2; public String alliedProfProdHCS3; public String alliedProfProdHCS4; public String alliedProfProdHCS5; - public String alliedProfProvider1; + public String alliedProfProdHCS6; + public String alliedProfProdHCS7; + public String alliedProfProvider1; public String alliedProfProvider2; public String alliedProfProvider3; public String alliedProfProvider4; @@ -1248,6 +1278,43 @@ public class Root{ public String nursingProdH_sub3; public String nursingProdH_sub4; public String nursingProdH_subsum1; + public String nursing_label; + public String alliedProf_label; + public String alliedNP_label; + @JsonProperty("nursing_label-1") + public String nursing_label1; + @JsonProperty("nursing_label-2") + public String nursing_label2; + @JsonProperty("nursing_label-3") + public String nursing_label3; + @JsonProperty("nursing_label-4") + public String nursing_label4; + @JsonProperty("alliedProf_label-1") + public String alliedProf_label1; + @JsonProperty("alliedProf_label-2") + public String alliedProf_label2; + @JsonProperty("alliedProf_label-3") + public String alliedProf_label3; + @JsonProperty("alliedProf_label-4") + public String alliedProf_label4; + @JsonProperty("alliedProf_label-5") + public String alliedProf_label5; + @JsonProperty("alliedProf_label-6") + public String alliedProf_label6; + @JsonProperty("alliedProf_label-7") + public String alliedProf_label7; + @JsonProperty("alliedNP_label-1") + public String alliedNP_label1; + @JsonProperty("alliedNP_label-2") + public String alliedNP_label2; + @JsonProperty("alliedNP_label-3") + public String alliedNP_label3; + @JsonProperty("alliedNP_label-4") + public String alliedNP_label4; + @JsonProperty("alliedNP_label-5") + public String alliedNP_label5; + @JsonProperty("alliedNP_label-6") + public String alliedNP_label6; public String nursing_label_CSP; public String alliedProf_label_CSP; public String alliedNP_label_CSP; @@ -6922,6 +6989,126 @@ public String getNursingProdH_sum21() { public void setNursingProdH_sum21(String nursingProdH_sum21) { this.nursingProdH_sum21 = nursingProdH_sum21; } + public String getNursing_label() { + return nursing_label; + } + public void setNursing_label(String nursing_label) { + this.nursing_label = nursing_label; + } + public String getAlliedProf_label() { + return alliedProf_label; + } + public void setAlliedProf_label(String alliedProf_label) { + this.alliedProf_label = alliedProf_label; + } + public String getAlliedNP_label() { + return alliedNP_label; + } + public void setAlliedNP_label(String alliedNP_label) { + this.alliedNP_label = alliedNP_label; + } public String getNursing_label1() { + return nursing_label1; + } + public void setNursing_label1(String nursing_label1) { + this.nursing_label1 = nursing_label1; + } + public String getNursing_label2() { + return nursing_label2; + } + public void setNursing_label2(String nursing_label2) { + this.nursing_label2 = nursing_label2; + } + public String getNursing_label3() { + return nursing_label3; + } + public void setNursing_label3(String nursing_label3) { + this.nursing_label3 = nursing_label3; + } + public String getNursing_label4() { + return nursing_label4; + } + public void setNursing_label4(String nursing_label4) { + this.nursing_label4 = nursing_label4; + } + public String getAlliedProf_label1() { + return alliedProf_label1; + } + public void setAlliedProf_label1(String alliedProf_label1) { + this.alliedProf_label1 = alliedProf_label1; + } + public String getAlliedProf_label2() { + return alliedProf_label2; + } + public void setAlliedProf_label2(String alliedProf_label2) { + this.alliedProf_label2 = alliedProf_label2; + } + public String getAlliedProf_label3() { + return alliedProf_label3; + } + public void setAlliedProf_label3(String alliedProf_label3) { + this.alliedProf_label3 = alliedProf_label3; + } + public String getAlliedProf_label4() { + return alliedProf_label4; + } + public void setAlliedProf_label4(String alliedProf_label4) { + this.alliedProf_label4 = alliedProf_label4; + } + public String getAlliedProf_label5() { + return alliedProf_label5; + } + public void setAlliedProf_label5(String alliedProf_label5) { + this.alliedProf_label5 = alliedProf_label5; + } + public String getAlliedProf_label6() { + return alliedProf_label6; + } + public void setAlliedProf_label6(String alliedProf_label6) { + this.alliedProf_label6 = alliedProf_label6; + } + public String getAlliedProf_label7() { + return alliedProf_label7; + } + public void setAlliedProf_label7(String alliedProf_label7) { + this.alliedProf_label7 = alliedProf_label7; + } + public String getAlliedNP_label1() { + return alliedNP_label1; + } + public void setAlliedNP_label1(String alliedNP_label1) { + this.alliedNP_label1 = alliedNP_label1; + } + public String getAlliedNP_label2() { + return alliedNP_label2; + } + public void setAlliedNP_label2(String alliedNP_label2) { + this.alliedNP_label2 = alliedNP_label2; + } + public String getAlliedNP_label3() { + return alliedNP_label3; + } + public void setAlliedNP_label3(String alliedNP_label3) { + this.alliedNP_label3 = alliedNP_label3; + } + public String getAlliedNP_label4() { + return alliedNP_label4; + } + public void setAlliedNP_label4(String alliedNP_label4) { + this.alliedNP_label4 = alliedNP_label4; + } + public String getAlliedNP_label5() { + return alliedNP_label5; + } + public void setAlliedNP_label5(String alliedNP_label5) { + this.alliedNP_label5 = alliedNP_label5; + } + public String getAlliedNP_label6() { + return alliedNP_label6; + } + public void setAlliedNP_label6(String alliedNP_label6) { + this.alliedNP_label6 = alliedNP_label6; + } + public String getNursing_label_CSP() { return nursing_label_CSP; } @@ -9064,6 +9251,125 @@ public String getyTDPlannedTotalQ4() { public void setyTDPlannedTotalQ4(String yTDPlannedTotalQ4) { this.yTDPlannedTotalQ4 = yTDPlannedTotalQ4; } - + public String getAlliedProfProdH_item16() { + return alliedProfProdH_item16; + } + public void setAlliedProfProdH_item16(String alliedProfProdH_item16) { + this.alliedProfProdH_item16 = alliedProfProdH_item16; + } + public String getAlliedProfProdH_item17() { + return alliedProfProdH_item17; + } + public void setAlliedProfProdH_item17(String alliedProfProdH_item17) { + this.alliedProfProdH_item17 = alliedProfProdH_item17; + } + public String getAlliedProfProdH_item26() { + return alliedProfProdH_item26; + } + public void setAlliedProfProdH_item26(String alliedProfProdH_item26) { + this.alliedProfProdH_item26 = alliedProfProdH_item26; + } + public String getAlliedProfProdH_item27() { + return alliedProfProdH_item27; + } + public void setAlliedProfProdH_item27(String alliedProfProdH_item27) { + this.alliedProfProdH_item27 = alliedProfProdH_item27; + } + public String getAlliedProfProdHCS6() { + return alliedProfProdHCS6; + } + public void setAlliedProfProdHCS6(String alliedProfProdHCS6) { + this.alliedProfProdHCS6 = alliedProfProdHCS6; + } + public String getAlliedProfProdHCS7() { + return alliedProfProdHCS7; + } + public void setAlliedProfProdHCS7(String alliedProfProdHCS7) { + this.alliedProfProdHCS7 = alliedProfProdHCS7; + } + public String getAlliedProfNProdH_item16() { + return alliedProfNProdH_item16; + } + public void setAlliedProfNProdH_item16(String alliedProfNProdH_item16) { + this.alliedProfNProdH_item16 = alliedProfNProdH_item16; + } + public String getAlliedProfNProdH_item17() { + return alliedProfNProdH_item17; + } + public void setAlliedProfNProdH_item17(String alliedProfNProdH_item17) { + this.alliedProfNProdH_item17 = alliedProfNProdH_item17; + } + public String getAlliedProfNProdH_item26() { + return alliedProfNProdH_item26; + } + public void setAlliedProfNProdH_item26(String alliedProfNProdH_item26) { + this.alliedProfNProdH_item26 = alliedProfNProdH_item26; + } + public String getAlliedProfNProdH_item27() { + return alliedProfNProdH_item27; + } + public void setAlliedProfNProdH_item27(String alliedProfNProdH_item27) { + this.alliedProfNProdH_item27 = alliedProfNProdH_item27; + } + public String getAlliedProfNProdH_item36() { + return alliedProfNProdH_item36; + } + public void setAlliedProfNProdH_item36(String alliedProfNProdH_item36) { + this.alliedProfNProdH_item36 = alliedProfNProdH_item36; + } + public String getAlliedProfNProdH_item37() { + return alliedProfNProdH_item37; + } + public void setAlliedProfNProdH_item37(String alliedProfNProdH_item37) { + this.alliedProfNProdH_item37 = alliedProfNProdH_item37; + } + public String getAlliedProfProdH_calc6() { + return alliedProfProdH_calc6; + } + public void setAlliedProfProdH_calc6(String alliedProfProdH_calc6) { + this.alliedProfProdH_calc6 = alliedProfProdH_calc6; + } + public String getAlliedProfProdH_calc7() { + return alliedProfProdH_calc7; + } + public void setAlliedProfProdH_calc7(String alliedProfProdH_calc7) { + this.alliedProfProdH_calc7 = alliedProfProdH_calc7; + } + public String getAlliedProfProdH_sub6() { + return alliedProfProdH_sub6; + } + public void setAlliedProfProdH_sub6(String alliedProfProdH_sub6) { + this.alliedProfProdH_sub6 = alliedProfProdH_sub6; + } + public String getAlliedProfProdH_sub7() { + return alliedProfProdH_sub7; + } + public void setAlliedProfProdH_sub7(String alliedProfProdH_sub7) { + this.alliedProfProdH_sub7 = alliedProfProdH_sub7; + } + public String getAlliedProfProdH_THP6() { + return alliedProfProdH_THP6; + } + public void setAlliedProfProdH_THP6(String alliedProfProdH_THP6) { + this.alliedProfProdH_THP6 = alliedProfProdH_THP6; + } + public String getAlliedProfProdH_THP7() { + return alliedProfProdH_THP7; + } + public void setAlliedProfProdH_THP7(String alliedProfProdH_THP7) { + this.alliedProfProdH_THP7 = alliedProfProdH_THP7; + } + public String getAlliedProfNProdH_calc6() { + return alliedProfNProdH_calc6; + } + public void setAlliedProfNProdH_calc6(String alliedProfNProdH_calc6) { + this.alliedProfNProdH_calc6 = alliedProfNProdH_calc6; + } + public String getAlliedProfNProdH_calc7() { + return alliedProfNProdH_calc7; + } + public void setAlliedProfNProdH_calc7(String alliedProfNProdH_calc7) { + this.alliedProfNProdH_calc7 = alliedProfNProdH_calc7; + } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java index d342f6bc..455e73c7 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java @@ -13,6 +13,7 @@ public class LtcYtdDirectCareHrs implements IModel{ private String confirmationId; private String dirCareType; // nursing, allied, etc private String dirCareName; // RN, OcP etc + private String dirCareOtherValue; // RN, OcP etc private String dirCareProdHrsRegYtd; private String dirCareProdHrsOtYtd; private String dirCareProdHrsContractedYtd; @@ -23,7 +24,6 @@ public class LtcYtdDirectCareHrs implements IModel{ private String dirCareNonProdHrsOtherYtd; private String dirCareNonProdHrsTotalYtd; private String dirCareTotalHrsPaidYtd; - private String dirCareYtdNotes; public String getConfirmationId() { return confirmationId; @@ -43,6 +43,12 @@ public String getDirCareName() { public void setDirCareName(String dirCareName) { this.dirCareName = dirCareName; } + public String getDirCareOtherValue() { + return dirCareOtherValue; + } + public void setDirCareOtherValue(String dirCareOtherValue) { + this.dirCareOtherValue = dirCareOtherValue; + } public String getDirCareProdHrsRegYtd() { return StringUtils.isBlank(dirCareProdHrsRegYtd) ? "0" : dirCareProdHrsRegYtd; } @@ -78,14 +84,7 @@ public String getDirCareNonProdHrsOtherYtd() { } public void setDirCareNonProdHrsOtherYtd(String dirCareNonProdHrsOtherYtd) { this.dirCareNonProdHrsOtherYtd = dirCareNonProdHrsOtherYtd; - } - public String getDirCareYtdNotes() { - return dirCareYtdNotes; - } - public void setDirCareYtdNotes(String dirCareYtdNotes) { - this.dirCareYtdNotes = dirCareYtdNotes; - } - + } public String getDirCareProdHrsSubtotalYtd() { return dirCareProdHrsSubtotalYtd; } @@ -125,6 +124,7 @@ public List getCsvElements() { elements.add(this.getConfirmationId()); elements.add(this.getDirCareType()); elements.add(this.getDirCareName()); + elements.add(this.getDirCareOtherValue()); elements.add(this.getDirCareProdHrsRegYtd()); elements.add(this.getDirCareProdHrsOtYtd()); elements.add(this.getDirCareProdHrsContractedYtd()); @@ -134,13 +134,11 @@ public List getCsvElements() { elements.add(this.getDirCareNonProdHrsSickYtd()); elements.add(this.getDirCareNonProdHrsOtherYtd()); elements.add(this.getDirCareNonProdHrsTotalYtd()); - elements.add(this.getDirCareTotalHrsPaidYtd()); - elements.add(this.getDirCareYtdNotes()); + elements.add(this.getDirCareTotalHrsPaidYtd()); return elements; } @Override public List getObjects() { return new ArrayList<>(); } - } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 766d9998..dfa571c9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -122,9 +122,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingRNProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item21()); nursingRNProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item31()); nursingRNProdH.setConfirmationId(root.getForm().getConfirmationId()); - nursingRNProdH.setDirCareName("Nursing"); - nursingRNProdH.setDirCareType("RN"); - nursingRNProdH.setDirCareYtdNotes(""); // not known. + nursingRNProdH.setDirCareName(root.getNursing_label()); + nursingRNProdH.setDirCareType(root.getNursing_label1()); nursingRNProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc1()); nursingRNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub1()); nursingRNProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP1()); @@ -138,9 +137,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingLPNProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item22()); nursingLPNProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item32()); nursingLPNProdH.setConfirmationId(root.getForm().getConfirmationId()); - nursingLPNProdH.setDirCareName("Nursing"); - nursingLPNProdH.setDirCareType("LPN"); - nursingLPNProdH.setDirCareYtdNotes(""); // not known. + nursingLPNProdH.setDirCareName(root.getNursing_label()); + nursingLPNProdH.setDirCareType(root.getNursing_label2()); nursingLPNProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc2()); nursingLPNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub2()); nursingLPNProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP2()); @@ -155,9 +153,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingHCAProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item23()); nursingHCAProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item33()); nursingHCAProdH.setConfirmationId(root.getForm().getConfirmationId()); - nursingHCAProdH.setDirCareName("Nursing"); - nursingHCAProdH.setDirCareType("Care Aides (HCA)"); - nursingHCAProdH.setDirCareYtdNotes(""); // not known. + nursingHCAProdH.setDirCareName(root.getNursing_label()); + nursingHCAProdH.setDirCareType(root.getNursing_label3()); nursingHCAProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc3()); nursingHCAProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub3()); nursingHCAProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP3()); @@ -171,13 +168,13 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingOthProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item24()); nursingOthProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item34()); nursingOthProdH.setConfirmationId(root.getForm().getConfirmationId()); - nursingOthProdH.setDirCareName("Nursing"); - nursingOthProdH.setDirCareType("Other"); - nursingOthProdH.setDirCareYtdNotes(""); // not known. + nursingOthProdH.setDirCareName(root.getNursing_label()); + nursingOthProdH.setDirCareType(Constants.DC_HRS_OTHER); nursingOthProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc4()); nursingOthProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub4()); nursingOthProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP4()); nursingOthProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc4()); + nursingOthProdH.setDirCareOtherValue(root.getNursing_label4()); // to check what is with the subtotal fields @@ -190,9 +187,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedOTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item21()); alliedOTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item31()); alliedOTProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedOTProfH.setDirCareName("Allied"); - alliedOTProfH.setDirCareType("Occupational Therapist"); - alliedOTProfH.setDirCareYtdNotes(""); // not known. + alliedOTProfH.setDirCareName(root.getAlliedProf_label()); + alliedOTProfH.setDirCareType(root.getAlliedProf_label1()); alliedOTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc1()); alliedOTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub1()); alliedOTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP1()); @@ -207,9 +203,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedPTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item22()); alliedPTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item32()); alliedPTProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedPTProfH.setDirCareName("Allied"); - alliedPTProfH.setDirCareType("Physiotherapist"); - alliedPTProfH.setDirCareYtdNotes(""); // not known. + alliedPTProfH.setDirCareName(root.getAlliedProf_label()); + alliedPTProfH.setDirCareType(root.getAlliedProf_label2()); alliedPTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc2()); alliedPTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub2()); alliedPTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP2()); @@ -223,9 +218,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedDTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item23()); alliedDTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item33()); alliedDTProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedDTProfH.setDirCareName("Allied"); - alliedDTProfH.setDirCareType("Dietitian"); - alliedDTProfH.setDirCareYtdNotes(""); // not known. + alliedDTProfH.setDirCareName(root.getAlliedProf_label()); + alliedDTProfH.setDirCareType(root.getAlliedProf_label3()); alliedDTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc3()); alliedDTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub3()); alliedDTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP3()); @@ -240,29 +234,58 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedSWProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item24()); alliedSWProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item34()); alliedSWProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedSWProfH.setDirCareName("Allied"); - alliedSWProfH.setDirCareType("Social Worker"); - alliedSWProfH.setDirCareYtdNotes(""); // not known. + alliedSWProfH.setDirCareName(root.getAlliedProf_label()); + alliedSWProfH.setDirCareType(root.getAlliedProf_label4()); alliedSWProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc4()); alliedSWProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub4()); alliedSWProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP4()); alliedSWProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc4()); + LtcYtdDirectCareHrs alliedSLPProfH = new LtcYtdDirectCareHrs(); + alliedSLPProfH.setDirCareProdHrsRegYtd(root.getAlliedProfProdH_item15()); + alliedSLPProfH.setDirCareProdHrsOtYtd(root.getAlliedProfProdH_item25()); + alliedSLPProfH.setDirCareProdHrsContractedYtd(root.getAlliedProfProdHCS5()); + alliedSLPProfH.setDirCareNonProdHrsVacYtd(root.getAlliedProfNProdH_item15()); + alliedSLPProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item25()); + alliedSLPProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item35()); + alliedSLPProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedSLPProfH.setDirCareName(root.getAlliedProf_label()); + alliedSLPProfH.setDirCareType(root.getAlliedProf_label5()); + alliedSLPProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc5()); + alliedSLPProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub5()); + alliedSLPProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP5()); + alliedSLPProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc5()); + + LtcYtdDirectCareHrs alliedRTProfH = new LtcYtdDirectCareHrs(); + alliedRTProfH.setDirCareProdHrsRegYtd(root.getAlliedProfProdH_item16()); + alliedRTProfH.setDirCareProdHrsOtYtd(root.getAlliedProfProdH_item26()); + alliedRTProfH.setDirCareProdHrsContractedYtd(root.getAlliedProfProdHCS6()); + alliedRTProfH.setDirCareNonProdHrsVacYtd(root.getAlliedProfNProdH_item16()); + alliedRTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item26()); + alliedRTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item36()); + alliedRTProfH.setConfirmationId(root.getForm().getConfirmationId()); + alliedRTProfH.setDirCareName(root.getAlliedProf_label()); + alliedRTProfH.setDirCareType(root.getAlliedProf_label6()); + alliedRTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc6()); + alliedRTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub6()); + alliedRTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP6()); + alliedRTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc6()); + LtcYtdDirectCareHrs alliedOTHProfH = new LtcYtdDirectCareHrs(); - alliedOTHProfH.setDirCareProdHrsRegYtd(root.getAlliedProfProdH_item15()); - alliedOTHProfH.setDirCareProdHrsOtYtd(root.getAlliedProfProdH_item25()); - alliedOTHProfH.setDirCareProdHrsContractedYtd(root.getAlliedProfProdHCS5()); - alliedOTHProfH.setDirCareNonProdHrsVacYtd(root.getAlliedProfNProdH_item15()); - alliedOTHProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item25()); - alliedOTHProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item35()); + alliedOTHProfH.setDirCareProdHrsRegYtd(root.getAlliedProfProdH_item17()); + alliedOTHProfH.setDirCareProdHrsOtYtd(root.getAlliedProfProdH_item27()); + alliedOTHProfH.setDirCareProdHrsContractedYtd(root.getAlliedProfProdHCS7()); + alliedOTHProfH.setDirCareNonProdHrsVacYtd(root.getAlliedProfNProdH_item17()); + alliedOTHProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item27()); + alliedOTHProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item37()); alliedOTHProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedOTHProfH.setDirCareName("Allied"); - alliedOTHProfH.setDirCareType("Social Worker"); - alliedOTHProfH.setDirCareYtdNotes(""); // not known. - alliedOTHProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc5()); - alliedOTHProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub5()); - alliedOTHProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP5()); - alliedOTHProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc5()); + alliedOTHProfH.setDirCareName(root.getAlliedProf_label()); + alliedOTHProfH.setDirCareType(Constants.DC_HRS_OTHER); + alliedOTHProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc7()); + alliedOTHProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub7()); + alliedOTHProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP7()); + alliedOTHProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc7()); + alliedOTHProfH.setDirCareOtherValue(root.getAlliedProf_label7()); /* Allied Non Professional */ LtcYtdDirectCareHrs alliedNPRTProfH = new LtcYtdDirectCareHrs(); @@ -273,9 +296,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPRTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item21()); alliedNPRTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item31()); alliedNPRTProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPRTProfH.setDirCareName("Recreation Therapist"); - alliedNPRTProfH.setDirCareType("Allied Non Professional"); - alliedNPRTProfH.setDirCareYtdNotes(""); // not known. + alliedNPRTProfH.setDirCareName(root.getAlliedNP_label()); + alliedNPRTProfH.setDirCareType(root.getAlliedNP_label1()); alliedNPRTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc1()); alliedNPRTProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub1()); alliedNPRTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP1()); @@ -290,9 +312,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPRAProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item22()); alliedNPRAProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item32()); alliedNPRAProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPRAProfH.setDirCareName("Rehab Assistant"); - alliedNPRAProfH.setDirCareType("Allied Non Professional"); - alliedNPRAProfH.setDirCareYtdNotes(""); // not known. + alliedNPRAProfH.setDirCareName(root.getAlliedNP_label()); + alliedNPRAProfH.setDirCareType(root.getAlliedNP_label2()); alliedNPRAProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc2()); alliedNPRAProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub2()); alliedNPRAProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP2()); @@ -307,9 +328,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPAWProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item23()); alliedNPAWProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item33()); alliedNPAWProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPAWProfH.setDirCareName("Activity Worker"); - alliedNPAWProfH.setDirCareType("Allied Non Professional"); - alliedNPAWProfH.setDirCareYtdNotes(""); // not known. + alliedNPAWProfH.setDirCareName(root.getAlliedNP_label()); + alliedNPAWProfH.setDirCareType(root.getAlliedNP_label3()); alliedNPAWProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc3()); alliedNPAWProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub3()); alliedNPAWProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP3()); @@ -324,9 +344,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPMTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item24()); alliedNPMTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item34()); alliedNPMTProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPMTProfH.setDirCareName("Music Therapist"); - alliedNPMTProfH.setDirCareType("Allied Non Professional"); - alliedNPMTProfH.setDirCareYtdNotes(""); // not known. + alliedNPMTProfH.setDirCareName(root.getAlliedNP_label()); + alliedNPMTProfH.setDirCareType(root.getAlliedNP_label4()); alliedNPMTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc4()); alliedNPMTProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub4()); alliedNPMTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP4()); @@ -341,9 +360,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPATProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item25()); alliedNPATProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item35()); alliedNPATProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPATProfH.setDirCareName("Art Therapist"); - alliedNPATProfH.setDirCareType("Allied Non Professional"); - alliedNPATProfH.setDirCareYtdNotes(""); // not known. + alliedNPATProfH.setDirCareName(root.getAlliedNP_label()); + alliedNPATProfH.setDirCareType(root.getAlliedNP_label5()); alliedNPATProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc5()); alliedNPATProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub5()); alliedNPATProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP5()); @@ -357,20 +375,18 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPOTHProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item26()); alliedNPOTHProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item36()); alliedNPOTHProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPOTHProfH.setDirCareName("Art Therapist"); - alliedNPOTHProfH.setDirCareType("Allied Non Professional"); - alliedNPOTHProfH.setDirCareYtdNotes(""); // not known. + alliedNPOTHProfH.setDirCareName(root.getAlliedNP_label()); + alliedNPOTHProfH.setDirCareType(Constants.DC_HRS_OTHER); alliedNPOTHProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc6()); alliedNPOTHProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub6()); alliedNPOTHProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP6()); alliedNPOTHProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc6()); - + alliedNPOTHProfH.setDirCareOtherValue(root.getAlliedNP_label6()); Collections.addAll(ltcYtdDcHrs, nursingRNProdH, nursingLPNProdH, nursingHCAProdH, alliedOTProfH, - alliedPTProfH, alliedDTProfH, alliedSWProfH, alliedNPRTProfH, alliedNPRAProfH, alliedNPAWProfH, - alliedNPMTProfH, alliedNPATProfH,nursingOthProdH, - alliedOTHProfH, - alliedNPOTHProfH); + alliedPTProfH, alliedDTProfH, alliedSWProfH, alliedSLPProfH, alliedRTProfH, alliedNPRTProfH, + alliedNPRAProfH, alliedNPAWProfH, alliedNPMTProfH, alliedNPATProfH,nursingOthProdH, + alliedOTHProfH, alliedNPOTHProfH); /* END : Direct Care Hours */ @@ -1596,9 +1612,9 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPOTHAddPos.determineAddPosContractedOutYtd(); Collections.addAll(ltcYtdCompAddPos, nursingRNAddPos, nursingLPNAddPos, nursingHCAAddPos, nursingOTHAddPos, - alliedProfOTAddPos, alliedProfPTAddPos, alliedProfDTAddPos, alliedProfSWAddPos, alliedProfOTHAddPos, - alliedNPRTAddPos, alliedNPRAAddPos, alliedNPAWAddPos, alliedNPMTAddPos, alliedNPATAddPos, - alliedNPOTHAddPos); + alliedProfOTAddPos, alliedProfPTAddPos, alliedProfDTAddPos, alliedProfSWAddPos, alliedProfRTAddPos, + alliedProfSLPAddPos, alliedProfOTHAddPos, alliedNPRTAddPos, alliedNPRAAddPos, alliedNPAWAddPos, + alliedNPMTAddPos, alliedNPATAddPos, alliedNPOTHAddPos); /* Benefits Where is %Allocation stored */ LtcYtdCompBenefits empInsBenefit = new LtcYtdCompBenefits(); From 69e5f4e41ef07596c1b60c64839969fcfce4b636 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 6 Apr 2023 12:08:06 -0400 Subject: [PATCH 061/183] inverting DIRCARETYPE and DIRCARENAME --- .../LtcQuaterlyYtdApiResponseProcessor.java | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index dfa571c9..7b901340 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -122,8 +122,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingRNProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item21()); nursingRNProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item31()); nursingRNProdH.setConfirmationId(root.getForm().getConfirmationId()); - nursingRNProdH.setDirCareName(root.getNursing_label()); - nursingRNProdH.setDirCareType(root.getNursing_label1()); + nursingRNProdH.setDirCareType(root.getNursing_label()); + nursingRNProdH.setDirCareName(root.getNursing_label1()); nursingRNProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc1()); nursingRNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub1()); nursingRNProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP1()); @@ -137,8 +137,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingLPNProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item22()); nursingLPNProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item32()); nursingLPNProdH.setConfirmationId(root.getForm().getConfirmationId()); - nursingLPNProdH.setDirCareName(root.getNursing_label()); - nursingLPNProdH.setDirCareType(root.getNursing_label2()); + nursingLPNProdH.setDirCareType(root.getNursing_label()); + nursingLPNProdH.setDirCareName(root.getNursing_label2()); nursingLPNProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc2()); nursingLPNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub2()); nursingLPNProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP2()); @@ -153,8 +153,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingHCAProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item23()); nursingHCAProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item33()); nursingHCAProdH.setConfirmationId(root.getForm().getConfirmationId()); - nursingHCAProdH.setDirCareName(root.getNursing_label()); - nursingHCAProdH.setDirCareType(root.getNursing_label3()); + nursingHCAProdH.setDirCareType(root.getNursing_label()); + nursingHCAProdH.setDirCareName(root.getNursing_label3()); nursingHCAProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc3()); nursingHCAProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub3()); nursingHCAProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP3()); @@ -168,8 +168,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingOthProdH.setDirCareNonProdHrsSickYtd(root.getNursingNProdH_item24()); nursingOthProdH.setDirCareNonProdHrsOtherYtd(root.getNursingNProdH_item34()); nursingOthProdH.setConfirmationId(root.getForm().getConfirmationId()); - nursingOthProdH.setDirCareName(root.getNursing_label()); - nursingOthProdH.setDirCareType(Constants.DC_HRS_OTHER); + nursingOthProdH.setDirCareType(root.getNursing_label()); + nursingOthProdH.setDirCareName(Constants.DC_HRS_OTHER); nursingOthProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc4()); nursingOthProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub4()); nursingOthProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP4()); @@ -187,8 +187,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedOTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item21()); alliedOTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item31()); alliedOTProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedOTProfH.setDirCareName(root.getAlliedProf_label()); - alliedOTProfH.setDirCareType(root.getAlliedProf_label1()); + alliedOTProfH.setDirCareType(root.getAlliedProf_label()); + alliedOTProfH.setDirCareName(root.getAlliedProf_label1()); alliedOTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc1()); alliedOTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub1()); alliedOTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP1()); @@ -203,8 +203,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedPTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item22()); alliedPTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item32()); alliedPTProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedPTProfH.setDirCareName(root.getAlliedProf_label()); - alliedPTProfH.setDirCareType(root.getAlliedProf_label2()); + alliedPTProfH.setDirCareType(root.getAlliedProf_label()); + alliedPTProfH.setDirCareName(root.getAlliedProf_label2()); alliedPTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc2()); alliedPTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub2()); alliedPTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP2()); @@ -218,8 +218,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedDTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item23()); alliedDTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item33()); alliedDTProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedDTProfH.setDirCareName(root.getAlliedProf_label()); - alliedDTProfH.setDirCareType(root.getAlliedProf_label3()); + alliedDTProfH.setDirCareType(root.getAlliedProf_label()); + alliedDTProfH.setDirCareName(root.getAlliedProf_label3()); alliedDTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc3()); alliedDTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub3()); alliedDTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP3()); @@ -234,8 +234,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedSWProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item24()); alliedSWProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item34()); alliedSWProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedSWProfH.setDirCareName(root.getAlliedProf_label()); - alliedSWProfH.setDirCareType(root.getAlliedProf_label4()); + alliedSWProfH.setDirCareType(root.getAlliedProf_label()); + alliedSWProfH.setDirCareName(root.getAlliedProf_label4()); alliedSWProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc4()); alliedSWProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub4()); alliedSWProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP4()); @@ -249,8 +249,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedSLPProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item25()); alliedSLPProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item35()); alliedSLPProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedSLPProfH.setDirCareName(root.getAlliedProf_label()); - alliedSLPProfH.setDirCareType(root.getAlliedProf_label5()); + alliedSLPProfH.setDirCareType(root.getAlliedProf_label()); + alliedSLPProfH.setDirCareName(root.getAlliedProf_label5()); alliedSLPProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc5()); alliedSLPProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub5()); alliedSLPProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP5()); @@ -264,8 +264,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedRTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item26()); alliedRTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item36()); alliedRTProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedRTProfH.setDirCareName(root.getAlliedProf_label()); - alliedRTProfH.setDirCareType(root.getAlliedProf_label6()); + alliedRTProfH.setDirCareType(root.getAlliedProf_label()); + alliedRTProfH.setDirCareName(root.getAlliedProf_label6()); alliedRTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc6()); alliedRTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub6()); alliedRTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP6()); @@ -279,8 +279,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedOTHProfH.setDirCareNonProdHrsSickYtd(root.getAlliedProfNProdH_item27()); alliedOTHProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedProfNProdH_item37()); alliedOTHProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedOTHProfH.setDirCareName(root.getAlliedProf_label()); - alliedOTHProfH.setDirCareType(Constants.DC_HRS_OTHER); + alliedOTHProfH.setDirCareType(root.getAlliedProf_label()); + alliedOTHProfH.setDirCareName(Constants.DC_HRS_OTHER); alliedOTHProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc7()); alliedOTHProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub7()); alliedOTHProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP7()); @@ -296,8 +296,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPRTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item21()); alliedNPRTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item31()); alliedNPRTProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPRTProfH.setDirCareName(root.getAlliedNP_label()); - alliedNPRTProfH.setDirCareType(root.getAlliedNP_label1()); + alliedNPRTProfH.setDirCareType(root.getAlliedNP_label()); + alliedNPRTProfH.setDirCareName(root.getAlliedNP_label1()); alliedNPRTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc1()); alliedNPRTProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub1()); alliedNPRTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP1()); @@ -312,8 +312,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPRAProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item22()); alliedNPRAProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item32()); alliedNPRAProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPRAProfH.setDirCareName(root.getAlliedNP_label()); - alliedNPRAProfH.setDirCareType(root.getAlliedNP_label2()); + alliedNPRAProfH.setDirCareType(root.getAlliedNP_label()); + alliedNPRAProfH.setDirCareName(root.getAlliedNP_label2()); alliedNPRAProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc2()); alliedNPRAProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub2()); alliedNPRAProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP2()); @@ -328,8 +328,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPAWProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item23()); alliedNPAWProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item33()); alliedNPAWProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPAWProfH.setDirCareName(root.getAlliedNP_label()); - alliedNPAWProfH.setDirCareType(root.getAlliedNP_label3()); + alliedNPAWProfH.setDirCareType(root.getAlliedNP_label()); + alliedNPAWProfH.setDirCareName(root.getAlliedNP_label3()); alliedNPAWProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc3()); alliedNPAWProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub3()); alliedNPAWProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP3()); @@ -344,8 +344,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPMTProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item24()); alliedNPMTProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item34()); alliedNPMTProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPMTProfH.setDirCareName(root.getAlliedNP_label()); - alliedNPMTProfH.setDirCareType(root.getAlliedNP_label4()); + alliedNPMTProfH.setDirCareType(root.getAlliedNP_label()); + alliedNPMTProfH.setDirCareName(root.getAlliedNP_label4()); alliedNPMTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc4()); alliedNPMTProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub4()); alliedNPMTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP4()); @@ -360,8 +360,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPATProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item25()); alliedNPATProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item35()); alliedNPATProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPATProfH.setDirCareName(root.getAlliedNP_label()); - alliedNPATProfH.setDirCareType(root.getAlliedNP_label5()); + alliedNPATProfH.setDirCareType(root.getAlliedNP_label()); + alliedNPATProfH.setDirCareName(root.getAlliedNP_label5()); alliedNPATProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc5()); alliedNPATProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub5()); alliedNPATProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP5()); @@ -375,8 +375,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPOTHProfH.setDirCareNonProdHrsSickYtd(root.getAlliedNPNProdH_item26()); alliedNPOTHProfH.setDirCareNonProdHrsOtherYtd(root.getAlliedNPNProdH_item36()); alliedNPOTHProfH.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPOTHProfH.setDirCareName(root.getAlliedNP_label()); - alliedNPOTHProfH.setDirCareType(Constants.DC_HRS_OTHER); + alliedNPOTHProfH.setDirCareType(root.getAlliedNP_label()); + alliedNPOTHProfH.setDirCareName(Constants.DC_HRS_OTHER); alliedNPOTHProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc6()); alliedNPOTHProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub6()); alliedNPOTHProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP6()); From 9be82aab1f3b49ab0883ca6546094a86efa4247d Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 6 Apr 2023 13:23:42 -0400 Subject: [PATCH 062/183] full etl update for LTCDirectCareCost, including many bug fixes --- .../etl/forms/ltc/quaterly/json/Root.java | 203 ++++++++++++++++-- .../quaterly/model/LtcYtdDirectCareCost.java | 18 +- .../LtcQuaterlyYtdApiResponseProcessor.java | 187 +++++++++------- 3 files changed, 302 insertions(+), 106 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java index 59912748..558e102c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java @@ -276,7 +276,9 @@ public class Root{ public String alliedProfContractRate3; public String alliedProfContractRate4; public String alliedProfContractRate5; - public String alliedProfCost_total; + public String alliedProfContractRate6; + public String alliedProfContractRate7; + public String alliedProfCost_total; public String alliedProfCost1; public String alliedProfCost2; public String alliedProfCost3; @@ -287,7 +289,9 @@ public class Root{ public String alliedProfNProdC_calc3; public String alliedProfNProdC_calc4; public String alliedProfNProdC_calc5; - public String alliedProfNProdC_calcsum1; + public String alliedProfNProdC_calc6; + public String alliedProfNProdC_calc7; + public String alliedProfNProdC_calcsum1; @JsonProperty("alliedProfNProdC_item1-1") public String alliedProfNProdC_item11; @JsonProperty("alliedProfNProdC_item1-2") @@ -298,7 +302,11 @@ public class Root{ public String alliedProfNProdC_item14; @JsonProperty("alliedProfNProdC_item1-5") public String alliedProfNProdC_item15; - @JsonProperty("alliedProfNProdC_item2-1") + @JsonProperty("alliedProfNProdC_item1-6") + public String alliedProfNProdC_item16; + @JsonProperty("alliedProfNProdC_item1-7") + public String alliedProfNProdC_item17; + @JsonProperty("alliedProfNProdC_item2-1") public String alliedProfNProdC_item21; @JsonProperty("alliedProfNProdC_item2-2") public String alliedProfNProdC_item22; @@ -308,7 +316,11 @@ public class Root{ public String alliedProfNProdC_item24; @JsonProperty("alliedProfNProdC_item2-5") public String alliedProfNProdC_item25; - @JsonProperty("alliedProfNProdC_item3-1") + @JsonProperty("alliedProfNProdC_item2-6") + public String alliedProfNProdC_item26; + @JsonProperty("alliedProfNProdC_item2-7") + public String alliedProfNProdC_item27; + @JsonProperty("alliedProfNProdC_item3-1") public String alliedProfNProdC_item31; @JsonProperty("alliedProfNProdC_item3-2") public String alliedProfNProdC_item32; @@ -318,7 +330,11 @@ public class Root{ public String alliedProfNProdC_item34; @JsonProperty("alliedProfNProdC_item3-5") public String alliedProfNProdC_item35; - @JsonProperty("alliedProfNProdC_sum1-1") + @JsonProperty("alliedProfNProdC_item3-6") + public String alliedProfNProdC_item36; + @JsonProperty("alliedProfNProdC_item3-7") + public String alliedProfNProdC_item37; + @JsonProperty("alliedProfNProdC_sum1-1") public String alliedProfNProdC_sum11; @JsonProperty("alliedProfNProdC_sum3-1") public String alliedProfNProdC_sum31; @@ -398,7 +414,9 @@ public class Root{ public String alliedProfProdC_calc3; public String alliedProfProdC_calc4; public String alliedProfProdC_calc5; - public String alliedProfProdC_calcsum1; + public String alliedProfProdC_calc6; + public String alliedProfProdC_calc7; + public String alliedProfProdC_calcsum1; @JsonProperty("alliedProfProdC_item1-1") public String alliedProfProdC_item11; @@ -410,7 +428,11 @@ public class Root{ public String alliedProfProdC_item14; @JsonProperty("alliedProfProdC_item1-5") public String alliedProfProdC_item15; - @JsonProperty("alliedProfProdC_item2-1") + @JsonProperty("alliedProfProdC_item1-6") + public String alliedProfProdC_item16; + @JsonProperty("alliedProfProdC_item1-7") + public String alliedProfProdC_item17; + @JsonProperty("alliedProfProdC_item2-1") public String alliedProfProdC_item21; @JsonProperty("alliedProfProdC_item2-2") public String alliedProfProdC_item22; @@ -420,12 +442,18 @@ public class Root{ public String alliedProfProdC_item24; @JsonProperty("alliedProfProdC_item2-5") public String alliedProfProdC_item25; - public String alliedProfProdC_sub1; + @JsonProperty("alliedProfProdC_item2-6") + public String alliedProfProdC_item26; + @JsonProperty("alliedProfProdC_item2-7") + public String alliedProfProdC_item27; + public String alliedProfProdC_sub1; public String alliedProfProdC_sub2; public String alliedProfProdC_sub3; public String alliedProfProdC_sub4; public String alliedProfProdC_sub5; - public String alliedProfProdC_subsum1; + public String alliedProfProdC_sub6; + public String alliedProfProdC_sub7; + public String alliedProfProdC_subsum1; @JsonProperty("alliedProfProdC_sum1-1") public String alliedProfProdC_sum11; @JsonProperty("alliedProfProdC_sum2-1") @@ -435,14 +463,18 @@ public class Root{ public String alliedProfProdC_THP3; public String alliedProfProdC_THP4; public String alliedProfProdC_THP5; - public String alliedProfProdC_THPsum1; + public String alliedProfProdC_THP6; + public String alliedProfProdC_THP7; + public String alliedProfProdC_THPsum1; public String alliedProfProdCCS_subsum1; public String alliedProfProdCCS1; public String alliedProfProdCCS2; public String alliedProfProdCCS3; public String alliedProfProdCCS4; public String alliedProfProdCCS5; - public String alliedProfProdH_calc1; + public String alliedProfProdCCS6; + public String alliedProfProdCCS7; + public String alliedProfProdH_calc1; public String alliedProfProdH_calc2; public String alliedProfProdH_calc3; public String alliedProfProdH_calc4; @@ -517,7 +549,9 @@ public class Root{ public String alliedProfStaffRate3; public String alliedProfStaffRate4; public String alliedProfStaffRate5; - public ArrayList bedGrid0; + public String alliedProfStaffRate6; + public String alliedProfStaffRate7; + public ArrayList bedGrid0; public ArrayList bedGrid1; public ArrayList bedGrid2; public ArrayList bedGrid3; @@ -9371,5 +9405,148 @@ public String getAlliedProfNProdH_calc7() { public void setAlliedProfNProdH_calc7(String alliedProfNProdH_calc7) { this.alliedProfNProdH_calc7 = alliedProfNProdH_calc7; } - + public String getAlliedProfProdC_item16() { + return alliedProfProdC_item16; + } + public void setAlliedProfProdC_item16(String alliedProfProdC_item16) { + this.alliedProfProdC_item16 = alliedProfProdC_item16; + } + public String getAlliedProfProdC_item17() { + return alliedProfProdC_item17; + } + public void setAlliedProfProdC_item17(String alliedProfProdC_item17) { + this.alliedProfProdC_item17 = alliedProfProdC_item17; + } + public String getAlliedProfProdC_item26() { + return alliedProfProdC_item26; + } + public void setAlliedProfProdC_item26(String alliedProfProdC_item26) { + this.alliedProfProdC_item26 = alliedProfProdC_item26; + } + public String getAlliedProfProdC_item27() { + return alliedProfProdC_item27; + } + public void setAlliedProfProdC_item27(String alliedProfProdC_item27) { + this.alliedProfProdC_item27 = alliedProfProdC_item27; + } + public String getAlliedProfProdCCS6() { + return alliedProfProdCCS6; + } + public void setAlliedProfProdCCS6(String alliedProfProdCCS6) { + this.alliedProfProdCCS6 = alliedProfProdCCS6; + } + public String getAlliedProfProdCCS7() { + return alliedProfProdCCS7; + } + public void setAlliedProfProdCCS7(String alliedProfProdCCS7) { + this.alliedProfProdCCS7 = alliedProfProdCCS7; + } + public String getAlliedProfNProdC_item16() { + return alliedProfNProdC_item16; + } + public void setAlliedProfNProdC_item16(String alliedProfNProdC_item16) { + this.alliedProfNProdC_item16 = alliedProfNProdC_item16; + } + public String getAlliedProfNProdC_item17() { + return alliedProfNProdC_item17; + } + public void setAlliedProfNProdC_item17(String alliedProfNProdC_item17) { + this.alliedProfNProdC_item17 = alliedProfNProdC_item17; + } + public String getAlliedProfNProdC_item26() { + return alliedProfNProdC_item26; + } + public void setAlliedProfNProdC_item26(String alliedProfNProdC_item26) { + this.alliedProfNProdC_item26 = alliedProfNProdC_item26; + } + public String getAlliedProfNProdC_item27() { + return alliedProfNProdC_item27; + } + public void setAlliedProfNProdC_item27(String alliedProfNProdC_item27) { + this.alliedProfNProdC_item27 = alliedProfNProdC_item27; + } + public String getAlliedProfNProdC_item36() { + return alliedProfNProdC_item36; + } + public void setAlliedProfNProdC_item36(String alliedProfNProdC_item36) { + this.alliedProfNProdC_item36 = alliedProfNProdC_item36; + } + public String getAlliedProfNProdC_item37() { + return alliedProfNProdC_item37; + } + public void setAlliedProfNProdC_item37(String alliedProfNProdC_item37) { + this.alliedProfNProdC_item37 = alliedProfNProdC_item37; + } + public String getAlliedProfProdC_calc6() { + return alliedProfProdC_calc6; + } + public void setAlliedProfProdC_calc6(String alliedProfProdC_calc6) { + this.alliedProfProdC_calc6 = alliedProfProdC_calc6; + } + public String getAlliedProfProdC_calc7() { + return alliedProfProdC_calc7; + } + public void setAlliedProfProdC_calc7(String alliedProfProdC_calc7) { + this.alliedProfProdC_calc7 = alliedProfProdC_calc7; + } + public String getAlliedProfProdC_sub6() { + return alliedProfProdC_sub6; + } + public void setAlliedProfProdC_sub6(String alliedProfProdC_sub6) { + this.alliedProfProdC_sub6 = alliedProfProdC_sub6; + } + public String getAlliedProfProdC_sub7() { + return alliedProfProdC_sub7; + } + public void setAlliedProfProdC_sub7(String alliedProfProdC_sub7) { + this.alliedProfProdC_sub7 = alliedProfProdC_sub7; + } + public String getAlliedProfProdC_THP6() { + return alliedProfProdC_THP6; + } + public void setAlliedProfProdC_THP6(String alliedProfProdC_THP6) { + this.alliedProfProdC_THP6 = alliedProfProdC_THP6; + } + public String getAlliedProfProdC_THP7() { + return alliedProfProdC_THP7; + } + public void setAlliedProfProdC_THP7(String alliedProfProdC_THP7) { + this.alliedProfProdC_THP7 = alliedProfProdC_THP7; + } + public String getAlliedProfNProdC_calc6() { + return alliedProfNProdC_calc6; + } + public void setAlliedProfNProdC_calc6(String alliedProfNProdC_calc6) { + this.alliedProfNProdC_calc6 = alliedProfNProdC_calc6; + } + public String getAlliedProfNProdC_calc7() { + return alliedProfNProdC_calc7; + } + public void setAlliedProfNProdC_calc7(String alliedProfNProdC_calc7) { + this.alliedProfNProdC_calc7 = alliedProfNProdC_calc7; + } + public String getAlliedProfStaffRate6() { + return alliedProfStaffRate6; + } + public void setAlliedProfStaffRate6(String alliedProfStaffRate6) { + this.alliedProfStaffRate6 = alliedProfStaffRate6; + } + public String getAlliedProfStaffRate7() { + return alliedProfStaffRate7; + } + public void setAlliedProfStaffRate7(String alliedProfStaffRate7) { + this.alliedProfStaffRate7 = alliedProfStaffRate7; + } + public String getAlliedProfContractRate6() { + return alliedProfContractRate6; + } + public void setAlliedProfContractRate6(String alliedProfContractRate6) { + this.alliedProfContractRate6 = alliedProfContractRate6; + } + public String getAlliedProfContractRate7() { + return alliedProfContractRate7; + } + public void setAlliedProfContractRate7(String alliedProfContractRate7) { + this.alliedProfContractRate7 = alliedProfContractRate7; + } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java index f3667822..68500fc5 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java @@ -12,6 +12,7 @@ public class LtcYtdDirectCareCost implements IModel{ private String confirmationId; private String dirCareCostType; private String dirCareCostName; + private String dirCareOtherValue = ""; private String dirCareCostProdHrsRegYtd; private String dirCareCostProdHrsOtYtd; private String dirCareCostProdHrsContractedYtd; @@ -24,8 +25,6 @@ public class LtcYtdDirectCareCost implements IModel{ private String dirCareCostTotalHrsPaidYtd; private String dirCareCostHourlyRateStaffYtd; private String dirCareCostHourlyRateContractedYtd; - - private String dirCareCostYtdNotes; public String getConfirmationId() { return confirmationId; @@ -45,6 +44,12 @@ public String getDirCareCostName() { public void setDirCareCostName(String dirCareCostName) { this.dirCareCostName = dirCareCostName; } + public String getDirCareOtherValue() { + return dirCareOtherValue; + } + public void setDirCareOtherValue(String dirCareOtherValue) { + this.dirCareOtherValue = dirCareOtherValue; + } public String getDirCareCostProdHrsRegYtd() { return StringUtils.isBlank(dirCareCostProdHrsRegYtd) ? "0" : dirCareCostProdHrsRegYtd; } @@ -81,13 +86,6 @@ public String getDirCareCostNonProdHrsOtherYtd() { public void setDirCareCostNonProdHrsOtherYtd(String dirCareCostNonProdHrsOtherYtd) { this.dirCareCostNonProdHrsOtherYtd = dirCareCostNonProdHrsOtherYtd; } - public String getDirCareCostYtdNotes() { - return dirCareCostYtdNotes; - } - public void setDirCareCostYtdNotes(String dirCareCostYtdNotes) { - this.dirCareCostYtdNotes = dirCareCostYtdNotes; - } - public String getDirCareCostProdHrsSubtotalYtd() { return dirCareCostProdHrsSubtotalYtd; } @@ -140,6 +138,7 @@ public List getCsvElements() { elements.add(this.getConfirmationId()); elements.add(this.getDirCareCostType()); elements.add(this.getDirCareCostName()); + elements.add(this.getDirCareOtherValue()); elements.add(this.getDirCareCostProdHrsRegYtd()); elements.add(this.getDirCareCostProdHrsOtYtd()); elements.add(this.getDirCareCostProdHrsContractedYtd()); @@ -152,7 +151,6 @@ public List getCsvElements() { elements.add(this.getDirCareCostTotalHrsPaidYtd()); elements.add(this.getDirCareCostHourlyRateStaffYtd()); elements.add(this.getDirCareCostHourlyRateContractedYtd()); - elements.add(this.getDirCareCostYtdNotes()); return elements; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 7b901340..9b3a4f43 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -448,9 +448,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingRNProdC.setDirCareCostNonProdHrsSickYtd(root.getNursingNProdC_item21()); nursingRNProdC.setDirCareCostNonProdHrsOtherYtd(root.getNursingNProdC_item31()); nursingRNProdC.setConfirmationId(root.getForm().getConfirmationId()); - nursingRNProdC.setDirCareCostName("Nursing"); - nursingRNProdC.setDirCareCostType("RN"); - nursingRNProdC.setDirCareCostYtdNotes(""); // not known. + nursingRNProdC.setDirCareCostType(root.getNursing_label()); + nursingRNProdC.setDirCareCostName(root.getNursing_label1()); nursingRNProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc1()); nursingRNProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub1()); nursingRNProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP1()); @@ -467,9 +466,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingLPNProdC.setDirCareCostNonProdHrsSickYtd(root.getNursingNProdC_item22()); nursingLPNProdC.setDirCareCostNonProdHrsOtherYtd(root.getNursingNProdC_item32()); nursingLPNProdC.setConfirmationId(root.getForm().getConfirmationId()); - nursingLPNProdC.setDirCareCostName("Nursing"); - nursingLPNProdC.setDirCareCostType("LPN"); - nursingLPNProdC.setDirCareCostYtdNotes(""); // not known. + nursingLPNProdC.setDirCareCostType(root.getNursing_label()); + nursingLPNProdC.setDirCareCostName(root.getNursing_label2()); nursingLPNProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc2()); nursingLPNProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub2()); nursingLPNProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP2()); @@ -487,9 +485,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingHCAProdC.setDirCareCostNonProdHrsSickYtd(root.getNursingNProdC_item23()); nursingHCAProdC.setDirCareCostNonProdHrsOtherYtd(root.getNursingNProdC_item33()); nursingHCAProdC.setConfirmationId(root.getForm().getConfirmationId()); - nursingHCAProdC.setDirCareCostName("Nursing"); - nursingHCAProdC.setDirCareCostType("Care Aides (HCA)"); - nursingHCAProdC.setDirCareCostYtdNotes(""); // not known. + nursingHCAProdC.setDirCareCostType(root.getNursing_label()); + nursingHCAProdC.setDirCareCostName(root.getNursing_label3()); nursingHCAProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc3()); nursingHCAProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub3()); nursingHCAProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP3()); @@ -506,15 +503,15 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT nursingOthProdC.setDirCareCostNonProdHrsSickYtd(root.getNursingNProdC_item24()); nursingOthProdC.setDirCareCostNonProdHrsOtherYtd(root.getNursingNProdC_item34()); nursingOthProdC.setConfirmationId(root.getForm().getConfirmationId()); - nursingOthProdC.setDirCareCostName("Nursing"); - nursingOthProdC.setDirCareCostType("Other (specify)"); - nursingOthProdC.setDirCareCostYtdNotes(""); // not known. + nursingOthProdC.setDirCareCostType(root.getNursing_label()); + nursingOthProdC.setDirCareCostName(Constants.DC_HRS_OTHER); nursingOthProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc4()); nursingOthProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub4()); nursingOthProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP4()); nursingOthProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc4()); nursingOthProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate4()); nursingOthProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate4()); + nursingOthProdC.setDirCareOtherValue(root.getNursing_label4()); @@ -528,13 +525,12 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedOTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item21()); alliedOTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item31()); alliedOTProfC.setConfirmationId(root.getForm().getConfirmationId()); - alliedOTProfC.setDirCareCostName("Occupational Therapist"); - alliedOTProfC.setDirCareCostType("Allied Professional"); - alliedOTProfC.setDirCareCostYtdNotes(""); // not known. + alliedOTProfC.setDirCareCostType(root.getAlliedProf_label()); + alliedOTProfC.setDirCareCostName(root.getAlliedProf_label1()); alliedOTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc1()); alliedOTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub1()); alliedOTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP1()); - alliedOTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPProdC_calc1()); + alliedOTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc1()); alliedOTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate1()); alliedOTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate1()); @@ -543,17 +539,16 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedPTProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item12()); alliedPTProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item22()); alliedPTProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS2()); - alliedPTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item22()); + alliedPTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item12()); alliedPTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item22()); alliedPTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item32()); alliedPTProfC.setConfirmationId(root.getForm().getConfirmationId()); - alliedPTProfC.setDirCareCostName("Physiotherapist"); - alliedPTProfC.setDirCareCostType("Allied Professional"); - alliedPTProfC.setDirCareCostYtdNotes(""); // not known. + alliedPTProfC.setDirCareCostType(root.getAlliedProf_label()); + alliedPTProfC.setDirCareCostName(root.getAlliedProf_label2()); alliedPTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc2()); alliedPTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub2()); alliedPTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP2()); - alliedPTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPProdC_calc2()); + alliedPTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc2()); alliedPTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate2()); alliedPTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate2()); @@ -563,17 +558,16 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedDTProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item13()); alliedDTProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item23()); alliedDTProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS3()); - alliedDTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item23()); + alliedDTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item13()); alliedDTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item23()); alliedDTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item33()); alliedDTProfC.setConfirmationId(root.getForm().getConfirmationId()); - alliedDTProfC.setDirCareCostName("Dietitian"); - alliedDTProfC.setDirCareCostType("Allied Professional"); - alliedDTProfC.setDirCareCostYtdNotes(""); // not known. + alliedDTProfC.setDirCareCostType(root.getAlliedProf_label()); + alliedDTProfC.setDirCareCostName(root.getAlliedProf_label3()); alliedDTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc3()); alliedDTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub3()); alliedDTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP3()); - alliedDTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPProdC_calc3()); + alliedDTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc3()); alliedDTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate3()); alliedDTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate3()); @@ -583,38 +577,70 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedSWProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item14()); alliedSWProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item24()); alliedSWProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS4()); - alliedSWProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item24()); + alliedSWProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item14()); alliedSWProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item24()); alliedSWProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item34()); alliedSWProfC.setConfirmationId(root.getForm().getConfirmationId()); - alliedSWProfC.setDirCareCostName("Physiotherapist"); - alliedSWProfC.setDirCareCostType("Allied Professional"); - alliedSWProfC.setDirCareCostYtdNotes(""); // not known. + alliedSWProfC.setDirCareCostType(root.getAlliedProf_label()); + alliedSWProfC.setDirCareCostName(root.getAlliedProf_label4()); alliedSWProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc4()); alliedSWProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub4()); alliedSWProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP4()); - alliedSWProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPProdC_calc4()); + alliedSWProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc4()); alliedSWProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate4()); alliedSWProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate4()); + LtcYtdDirectCareCost alliedSLPProfC = new LtcYtdDirectCareCost(); + alliedSLPProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item15()); + alliedSLPProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item25()); + alliedSLPProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS5()); + alliedSLPProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item15()); + alliedSLPProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item25()); + alliedSLPProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item35()); + alliedSLPProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedSLPProfC.setDirCareCostType(root.getAlliedProf_label()); + alliedSLPProfC.setDirCareCostName(root.getAlliedProf_label5()); + alliedSLPProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc5()); + alliedSLPProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub5()); + alliedSLPProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP5()); + alliedSLPProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc5()); + alliedSLPProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate5()); + alliedSLPProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate5()); + + LtcYtdDirectCareCost alliedRTProfC = new LtcYtdDirectCareCost(); + alliedRTProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item16()); + alliedRTProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item26()); + alliedRTProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS6()); + alliedRTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item16()); + alliedRTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item26()); + alliedRTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item36()); + alliedRTProfC.setConfirmationId(root.getForm().getConfirmationId()); + alliedRTProfC.setDirCareCostType(root.getAlliedProf_label()); + alliedRTProfC.setDirCareCostName(root.getAlliedProf_label6()); + alliedRTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc6()); + alliedRTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub6()); + alliedRTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP6()); + alliedRTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc6()); + alliedRTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate6()); + alliedRTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate6()); LtcYtdDirectCareCost alliedOTHProfC = new LtcYtdDirectCareCost(); - alliedOTHProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item15()); - alliedOTHProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item25()); - alliedOTHProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS5()); - alliedOTHProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item25()); - alliedOTHProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item25()); - alliedOTHProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item35()); + alliedOTHProfC.setDirCareCostProdHrsRegYtd(root.getAlliedProfProdC_item17()); + alliedOTHProfC.setDirCareCostProdHrsOtYtd(root.getAlliedProfProdC_item27()); + alliedOTHProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedProfProdCCS7()); + alliedOTHProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedProfNProdC_item17()); + alliedOTHProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedProfNProdC_item27()); + alliedOTHProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedProfNProdC_item37()); alliedOTHProfC.setConfirmationId(root.getForm().getConfirmationId()); - alliedOTHProfC.setDirCareCostName("Physiotherapist"); - alliedOTHProfC.setDirCareCostType("Allied Professional"); - alliedOTHProfC.setDirCareCostYtdNotes(""); // not known. - alliedOTHProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc5()); - alliedOTHProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub5()); - alliedOTHProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP5()); - alliedOTHProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPProdC_calc5()); - alliedOTHProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate5()); - alliedOTHProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate5()); + alliedOTHProfC.setDirCareCostType(root.getAlliedProf_label()); + alliedOTHProfC.setDirCareCostName(Constants.DC_HRS_OTHER); + alliedOTHProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc7()); + alliedOTHProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub7()); + alliedOTHProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP7()); + alliedOTHProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc7()); + alliedOTHProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate7()); + alliedOTHProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate7()); + alliedOTHProfC.setDirCareOtherValue(root.getAlliedProf_label7()); // Allied Non Professional @@ -626,9 +652,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPRTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item21()); alliedNPRTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item31()); alliedNPRTProfC.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPRTProfC.setDirCareCostName("Recreation Therapist"); - alliedNPRTProfC.setDirCareCostType("Allied Non-professional"); - alliedNPRTProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPRTProfC.setDirCareCostType(root.getAlliedNP_label()); + alliedNPRTProfC.setDirCareCostName(root.getAlliedNP_label1()); alliedNPRTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc1()); alliedNPRTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub1()); alliedNPRTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP1()); @@ -645,9 +670,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPRAProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item22()); alliedNPRAProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item32()); alliedNPRAProfC.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPRAProfC.setDirCareCostName("Rehab Assistant"); - alliedNPRAProfC.setDirCareCostType("Allied Non-professional"); - alliedNPRAProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPRAProfC.setDirCareCostType(root.getAlliedNP_label()); + alliedNPRAProfC.setDirCareCostName(root.getAlliedNP_label2()); alliedNPRAProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc2()); alliedNPRAProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub2()); alliedNPRAProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP2()); @@ -665,9 +689,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT alliedNPAWProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item23()); alliedNPAWProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item33()); alliedNPAWProfC.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPAWProfC.setDirCareCostName("Activity Worker"); - alliedNPAWProfC.setDirCareCostType("Allied Non-professional"); - alliedNPAWProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPAWProfC.setDirCareCostType(root.getAlliedNP_label()); + alliedNPAWProfC.setDirCareCostName(root.getAlliedNP_label3()); alliedNPAWProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc3()); alliedNPAWProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub3()); alliedNPAWProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP3()); @@ -678,16 +701,15 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcYtdDirectCareCost alliedNPMTProfC = new LtcYtdDirectCareCost(); - alliedNPMTProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item13()); - alliedNPMTProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item23()); - alliedNPMTProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS3()); - alliedNPMTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item13()); - alliedNPMTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item23()); - alliedNPMTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item33()); + alliedNPMTProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item14()); + alliedNPMTProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item24()); + alliedNPMTProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS4()); + alliedNPMTProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item14()); + alliedNPMTProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item24()); + alliedNPMTProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item34()); alliedNPMTProfC.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPMTProfC.setDirCareCostName("Music Therapist"); - alliedNPMTProfC.setDirCareCostType("Allied Non-professional"); - alliedNPMTProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPMTProfC.setDirCareCostType(root.getAlliedNP_label()); + alliedNPMTProfC.setDirCareCostName(root.getAlliedNP_label4()); alliedNPMTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc4()); alliedNPMTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub4()); alliedNPMTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP4()); @@ -698,16 +720,15 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcYtdDirectCareCost alliedNPATProfC = new LtcYtdDirectCareCost(); - alliedNPATProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item14()); - alliedNPATProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item24()); - alliedNPATProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS4()); - alliedNPATProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item14()); - alliedNPATProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item24()); - alliedNPATProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item34()); + alliedNPATProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item15()); + alliedNPATProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item25()); + alliedNPATProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS5()); + alliedNPATProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item15()); + alliedNPATProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item25()); + alliedNPATProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item35()); alliedNPATProfC.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPATProfC.setDirCareCostName("Art Therapist"); - alliedNPATProfC.setDirCareCostType("Allied Non-professional"); - alliedNPATProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPATProfC.setDirCareCostType(root.getAlliedNP_label()); + alliedNPATProfC.setDirCareCostName(root.getAlliedNP_label5()); alliedNPATProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc5()); alliedNPATProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub5()); alliedNPATProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP5()); @@ -718,25 +739,25 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcYtdDirectCareCost alliedNPOTHProfC = new LtcYtdDirectCareCost(); - alliedNPOTHProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item14()); - alliedNPOTHProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item24()); - alliedNPOTHProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS4()); - alliedNPOTHProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item14()); - alliedNPOTHProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item24()); - alliedNPOTHProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item34()); + alliedNPOTHProfC.setDirCareCostProdHrsRegYtd(root.getAlliedNPProdC_item16()); + alliedNPOTHProfC.setDirCareCostProdHrsOtYtd(root.getAlliedNPProdC_item26()); + alliedNPOTHProfC.setDirCareCostProdHrsContractedYtd(root.getAlliedNPProdCCS6()); + alliedNPOTHProfC.setDirCareCostNonProdHrsVacYtd(root.getAlliedNPNProdC_item16()); + alliedNPOTHProfC.setDirCareCostNonProdHrsSickYtd(root.getAlliedNPProdC_item26()); + alliedNPOTHProfC.setDirCareCostNonProdHrsOtherYtd(root.getAlliedNPNProdC_item36()); alliedNPOTHProfC.setConfirmationId(root.getForm().getConfirmationId()); - alliedNPOTHProfC.setDirCareCostName("Art Therapist"); - alliedNPOTHProfC.setDirCareCostType("Allied Non-professional"); - alliedNPOTHProfC.setDirCareCostYtdNotes(""); // not known. + alliedNPOTHProfC.setDirCareCostType(root.getAlliedNP_label()); + alliedNPOTHProfC.setDirCareCostName(Constants.DC_HRS_OTHER); alliedNPOTHProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc6()); alliedNPOTHProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub6()); alliedNPOTHProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP6()); alliedNPOTHProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc6()); alliedNPOTHProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate6()); alliedNPOTHProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate6()); + alliedNPOTHProfC.setDirCareOtherValue(root.getAlliedNP_label6()); Collections.addAll(ltcYtdDcCost, nursingRNProdC, nursingLPNProdC, nursingHCAProdC,nursingOthProdC, alliedOTProfC, - alliedPTProfC, alliedDTProfC, alliedSWProfC, alliedNPRTProfC, alliedNPRAProfC, alliedNPAWProfC, + alliedPTProfC, alliedDTProfC, alliedSWProfC, alliedSLPProfC, alliedRTProfC, alliedNPRTProfC, alliedNPRAProfC, alliedNPAWProfC, alliedNPMTProfC, alliedNPATProfC,alliedOTHProfC, alliedNPOTHProfC); From 090bb79ee13e3360f93eb5d3bca710d447c49cc8 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 6 Apr 2023 16:18:24 -0400 Subject: [PATCH 063/183] created two new files corresponding to the new tables --- .../forms/ltc/quaterly/model/LtcYtdDep.java | 62 +++++++++++++++++ .../ltc/quaterly/model/LtcYtdSumTotals.java | 66 +++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDep.java create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSumTotals.java diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDep.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDep.java new file mode 100644 index 00000000..8ed5b792 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDep.java @@ -0,0 +1,62 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.core.model.IModel; + +public class LtcYtdDep implements IModel { + + private String confirmationId; + private String depName; + private String depYtd; + private String depNotes; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getDepName() { + return depName; + } + public void setDepName(String depName) { + this.depName = depName; + } + public String getDepYtd() { + return depYtd; + } + public void setDepYtd(String depYtd) { + this.depYtd = depYtd; + } + public String getDepNotes() { + return depNotes; + } + public void setDepNotes(String depNotes) { + this.depNotes = depNotes; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_DEP; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add(this.getDepName()); + elements.add(this.getDepYtd()); + elements.add(this.getDepNotes()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSumTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSumTotals.java new file mode 100644 index 00000000..3c3f4db2 --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSumTotals.java @@ -0,0 +1,66 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; + +import java.util.ArrayList; +import java.util.List; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.core.model.IModel; + +public class LtcYtdSumTotals implements IModel { + + private String confirmationId; + private String totName; + private String sumYTD; + private String totNotes; + + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getTotName() { + return totName; + } + public void setTotName(String totName) { + this.totName = totName; + } + public String getSumYTD() { + return sumYTD; + } + public void setSumYTD(String sumYTD) { + this.sumYTD = sumYTD; + } + public String getTotNotes() { + return totNotes; + } + public void setTotNotes(String totNotes) { + this.totNotes = totNotes; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_SUM_TOTALS; + } + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.getConfirmationId()); + elements.add(this.getTotName()); + elements.add(this.getSumYTD()); + elements.add(this.getTotNotes()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + + +} From 0af4eb0ce033c6c087d99ce71868960c055386bd Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 6 Apr 2023 16:19:47 -0400 Subject: [PATCH 064/183] full etl process update for the newly added tables --- .../etl/forms/ltc/quaterly/json/Root.java | 23 ++++++++++++- .../ltc/quaterly/model/LtcYtdSubmission.java | 20 ++++++++++- .../LtcQuaterlyYtdApiResponseProcessor.java | 33 +++++++++++++++++++ 3 files changed, 74 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java index 558e102c..420f517a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java @@ -1437,7 +1437,10 @@ public class Root{ public String opEx_item138; @JsonProperty("opEx_item1-39") public String opEx_item139; - public String opEx_note_sum6; + public String opEx_data_total_label; + public String opRev_YTD_total_label; + public String opSu_data_total_label; + public String opEx_note_sum6; public String opEx_note1; public String opEx_note10; public String opEx_note11; @@ -9549,4 +9552,22 @@ public String getAlliedProfContractRate7() { public void setAlliedProfContractRate7(String alliedProfContractRate7) { this.alliedProfContractRate7 = alliedProfContractRate7; } + public String getOpEx_data_total_label() { + return opEx_data_total_label; + } + public void setOpEx_data_total_label(String opEx_data_total_label) { + this.opEx_data_total_label = opEx_data_total_label; + } + public String getOpRev_YTD_total_label() { + return opRev_YTD_total_label; + } + public void setOpRev_YTD_total_label(String opRev_YTD_total_label) { + this.opRev_YTD_total_label = opRev_YTD_total_label; + } + public String getOpSu_data_total_label() { + return opSu_data_total_label; + } + public void setOpSu_data_total_label(String opSu_data_total_label) { + this.opSu_data_total_label = opSu_data_total_label; + } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java index e10688e6..279e956b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java @@ -35,9 +35,11 @@ public class LtcYtdSubmission implements IModel { private List ltcYtdDirectCareCost; private List ltcYtdDirectCareHrs; private List ltcYtdExp; + private List ltcYtdDep; private List ltcYtdRev; private List ltcYtdExpSubttls; private List ltcYtdRevSubttls; + private List ltcYtdSumTotals; private List ltcYtdCompSalSubttls; private List ltcYtdCompSalTtls; private List ltcYtdCompHrsSubttls; @@ -93,6 +95,8 @@ public List getObjects() { ltcQtdInstances.addAll(this.getLtcYtdDirectCareHrs()); ltcQtdInstances.addAll(this.getLtcYtdExp()); ltcQtdInstances.addAll(this.getLtcYtdRev()); + ltcQtdInstances.addAll(this.getLtcYtdDep()); + ltcQtdInstances.addAll(this.getLtcYtdSumTotals()); ltcQtdInstances.addAll(this.getLtcYtdExpSubttls()); ltcQtdInstances.addAll(this.getLtcYtdRevSubttls()); ltcQtdInstances.addAll(this.getLtcYtdCompSalSubttls()); @@ -371,7 +375,21 @@ public String getSubmissionFy() { public void setSubmissionFy(String submissionFy) { this.submissionFy = submissionFy; } - + public List getLtcYtdDep() { + return ltcYtdDep; + } + + public void setLtcYtdDep(List ltcYtdDep) { + this.ltcYtdDep = ltcYtdDep; + } + + public List getLtcYtdSumTotals() { + return ltcYtdSumTotals; + } + + public void setLtcYtdSumTotals(List ltcYtdSumTotals) { + this.ltcYtdSumTotals = ltcYtdSumTotals; + } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 9b3a4f43..cce7b4bb 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -36,6 +36,7 @@ import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompSal; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompSalSubtotals; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompSalTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDep; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDirectCareCost; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDirectCareCostSubtotals; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDirectCareHrs; @@ -45,6 +46,7 @@ import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdRev; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdRevSubTotals; import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdSubmission; +import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdSumTotals; import ca.bc.gov.chefs.etl.util.CSVUtil; import ca.bc.gov.chefs.etl.util.FileUtil; @@ -91,6 +93,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT List ltcYtdRevSubTtls = new ArrayList(); List ltcYtdExpSubttls = new ArrayList(); List ltcYtdExp = new ArrayList<>(); + List ltcYtdDep = new ArrayList<>(); + List ltcYtdSumTotals = new ArrayList<>(); List ltcBedYtdOccupancyRates = new ArrayList<>(); List ltcBedYtdMaxOccupancies = new ArrayList<>(); List ltcBedYtdMaxOccTtls = new ArrayList<>(); @@ -2107,6 +2111,33 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT Collections.addAll(ltcYtdExpSubttls,staffCost1ASubtotal,staffCost1BSubtotal,propertyCostSubtotal,suppliesSubtotal,adminCostSubtotal,operatingCostSubtotal); + /* END */ + + /*LtcYtdDep */ + LtcYtdDep buildingDep = new LtcYtdDep(); + buildingDep.setConfirmationId(root.getForm().getConfirmationId()); + buildingDep.setDepName("Building"); + buildingDep.setDepYtd(root.getOpEx_item138()); + buildingDep.setDepNotes(root.getOpEx_note38()); + + LtcYtdDep furnitureEquipmentDep = new LtcYtdDep(); + furnitureEquipmentDep.setConfirmationId(root.getForm().getConfirmationId()); + furnitureEquipmentDep.setDepName("Furniture & equipment"); + furnitureEquipmentDep.setDepYtd(root.getOpEx_item139()); + furnitureEquipmentDep.setDepNotes(root.getOpEx_note39()); + + Collections.addAll(ltcYtdDep, buildingDep, furnitureEquipmentDep); + /* END */ + + /* LtcYtdSumTotals */ + LtcYtdSumTotals YtdTotal = new LtcYtdSumTotals(); + YtdTotal.setConfirmationId(root.getForm().getConfirmationId()); + YtdTotal.setTotName(root.getOpSu_data_total_label()); + YtdTotal.setSumYTD(root.getOpSu_data_total()); + YtdTotal.setTotNotes(root.getOpSu_data_total_note()); + + ltcYtdSumTotals.add(YtdTotal); + /* END */ LtcYtdExp offExpAdCost = new LtcYtdExp(); @@ -2698,6 +2729,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT ltcYtdSubmission.setLtcYtdDirectCareCost(ltcYtdDcCost); ltcYtdSubmission.setLtcYtdDirectCareHrs(ltcYtdDcHrs); ltcYtdSubmission.setLtcYtdExp(ltcYtdExp); + ltcYtdSubmission.setLtcYtdDep(ltcYtdDep); + ltcYtdSubmission.setLtcYtdSumTotals(ltcYtdSumTotals); ltcYtdSubmission.setLtcYtdRev(ltcYtdRev); ltcYtdSubmission.setLtcYtdExpSubttls(ltcYtdExpSubttls); ltcYtdSubmission.setLtcYtdRevSubttls(ltcYtdRevSubTtls); From 1ef98ebc277f61f48985d8d7e6bb978b35f8d592 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 6 Apr 2023 17:34:12 -0400 Subject: [PATCH 065/183] added non operating expanses and revenue in the ETL process --- .../etl/forms/ltc/quaterly/json/Root.java | 8 +-- .../LtcQuaterlyYtdApiResponseProcessor.java | 59 ++++++++++++++++--- 2 files changed, 56 insertions(+), 11 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java index 420f517a..3ee903ca 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java @@ -1129,18 +1129,18 @@ public class Root{ public String nopEx_sub_note; @JsonProperty("nopEx_sum1-1") public String nopEx_sum11; - @JsonProperty("nopEx_YTD1") + @JsonProperty("nopEx_YTD-1") public String nopEx_YTD1; - @JsonProperty("nopEx_YTD2") + @JsonProperty("nopEx_YTD-2") public String nopEx_YTD2; public String nopRev_note1; public String nopRev_note2; public String nopRev_sub_note; @JsonProperty("nopRev_sum1-1") public String nopRev_sum11; - @JsonProperty("nopRev_YTD1") + @JsonProperty("nopRev_YTD-1") public String nopRev_YTD1; - @JsonProperty("nopRev_YTD2") + @JsonProperty("nopRev_YTD-2") public String nopRev_YTD2; public String nopSu_data1; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index cce7b4bb..f07d9bfe 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -1690,7 +1690,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcYtdRev revFrmHA1Adj = new LtcYtdRev(); revFrmHA1Adj.setRevYTD(root.getOpRev_YTD1()); revFrmHA1Adj.setRevNotes(root.getOpRev_note1()); - revFrmHA1Adj.setRevName("Adjustments"); + revFrmHA1Adj.setRevName("HA Operating Funding"); revFrmHA1Adj.setRevType("Revenue from HA (1)"); revFrmHA1Adj.setConfirmationId(root.getForm().getConfirmationId()); @@ -1759,10 +1759,26 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT LtcYtdRev revFrmHA4Oth = new LtcYtdRev(); revFrmHA4Oth.setRevYTD(root.getOpRev_YTD10()); revFrmHA4Oth.setRevNotes(root.getOpRev_note10()); - revFrmHA4Oth.setRevName("Others - specify"); + revFrmHA4Oth.setRevName("Other"); revFrmHA4Oth.setRevType("Revenue from HA (4)"); revFrmHA4Oth.setConfirmationId(root.getForm().getConfirmationId()); + /* Non operating revenu */ + LtcYtdRev nonOperatingRevOth = new LtcYtdRev(); + nonOperatingRevOth.setRevYTD(root.getNopRev_YTD1()); + nonOperatingRevOth.setRevNotes(root.getNopRev_note1()); + nonOperatingRevOth.setRevName("Other"); + nonOperatingRevOth.setRevType("Non-operating Revenue"); + nonOperatingRevOth.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdRev nonOperatingRevOthThirdParty = new LtcYtdRev(); + nonOperatingRevOthThirdParty.setRevYTD(root.getNopRev_YTD2()); + nonOperatingRevOthThirdParty.setRevNotes(root.getNopRev_note2()); + nonOperatingRevOthThirdParty.setRevName("Other - 3rd party funding "); + nonOperatingRevOthThirdParty.setRevType("Non-operating Revenue"); + nonOperatingRevOthThirdParty.setConfirmationId(root.getForm().getConfirmationId()); + /* END */ + // skipping subtotal for now LtcYtdRev clntRvnHAClient = new LtcYtdRev(); @@ -1838,8 +1854,8 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT Collections.addAll(ltcYtdRev, revFrmHA1Adj, revFrmHA1DirCare, revFrmHA1Others, revFrmHA2OpFundMinEq, revFrmHA2OpFundOth, revFrmHA3, revFrmHA4OccThld, revFrmHA4CliConReconc, revFrmHA4DirCare, revFrmHA4Oth, clntRvnHAClient, clntRvnFeePaidParties, clntRvnFeePaidNonEligible, othRevInvstOpFund, - othRevInvstCmBcFund, othRevFoodServ, othRevLdryServ, othRevCabl, othRevOthRec, othRevOthSpcfy); - // skipping total field for now + othRevInvstCmBcFund, othRevFoodServ, othRevLdryServ, othRevCabl, othRevOthRec, othRevOthSpcfy, + nonOperatingRevOth, nonOperatingRevOthThirdParty); /* Subtotals */ LtcYtdRevSubTotals revFromHA1Subttl = new LtcYtdRevSubTotals(); @@ -1872,7 +1888,12 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT opRevSubttl.setRevType("Operating Revenue"); opRevSubttl.setSubTotalRevYtd(root.getOpRev_YTD_total()); - Collections.addAll(ltcYtdRevSubTtls, revFromHA1Subttl,revFromHA2Subttl,revFromHA4Subttl,clntRevSubttl,othRevSubttl,opRevSubttl); + LtcYtdRevSubTotals nonOpRevSubttl = new LtcYtdRevSubTotals(); + nonOpRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); + nonOpRevSubttl.setRevType("Non-operating revenue"); + nonOpRevSubttl.setSubTotalRevYtd(root.getNopRev_sum11()); + + Collections.addAll(ltcYtdRevSubTtls, revFromHA1Subttl,revFromHA2Subttl,revFromHA4Subttl,clntRevSubttl,othRevSubttl,opRevSubttl, nonOpRevSubttl); LtcYtdExp dirCareCostExp = new LtcYtdExp(); dirCareCostExp.setExpYtd(root.getOpEx_YTD1()); @@ -2109,7 +2130,13 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT operatingCostSubtotal.setExpType("Operating Expenses"); operatingCostSubtotal.setSubTotalRevYtd(root.getOpEx_sum16()); - Collections.addAll(ltcYtdExpSubttls,staffCost1ASubtotal,staffCost1BSubtotal,propertyCostSubtotal,suppliesSubtotal,adminCostSubtotal,operatingCostSubtotal); + LtcYtdExpSubTotals nonOperationalExpSubtotal = new LtcYtdExpSubTotals(); + nonOperationalExpSubtotal.setConfirmationId(root.getForm().getConfirmationId()); + nonOperationalExpSubtotal.setExpType("Non-operating expenses"); + nonOperationalExpSubtotal.setSubTotalRevYtd(root.getNopEx_sum11()); + + Collections.addAll(ltcYtdExpSubttls,staffCost1ASubtotal,staffCost1BSubtotal,propertyCostSubtotal,suppliesSubtotal,adminCostSubtotal,operatingCostSubtotal, + nonOperationalExpSubtotal); /* END */ @@ -2197,12 +2224,30 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT othAdCost.setConfirmationId(root.getForm().getConfirmationId()); + /* Non operating expanse */ + LtcYtdExp dirCareNonOpExpMortgage = new LtcYtdExp(); + dirCareNonOpExpMortgage.setExpYtd(root.getNopEx_YTD1()); + dirCareNonOpExpMortgage.setExpNotes(root.getNopEx_note1()); + dirCareNonOpExpMortgage.setExpName("Mortgage Principle Repayment"); + dirCareNonOpExpMortgage.setExpType("Non-operating Expense"); + dirCareNonOpExpMortgage.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp dirCareNonOpExpOther = new LtcYtdExp(); + dirCareNonOpExpOther.setExpYtd(root.getNopEx_YTD2()); + dirCareNonOpExpOther.setExpNotes(root.getNopEx_note2()); + dirCareNonOpExpOther.setExpName("Other"); + dirCareNonOpExpOther.setExpType("Non-operating Expense"); + dirCareNonOpExpOther.setConfirmationId(root.getForm().getConfirmationId()); + /* END */ + + Collections.addAll(ltcYtdExp, dirCareCostExp, foodCostExp, ldryServExp, housekeepingCostExp, adminServCostExp, plantMainOpStaffExp, salWagRecvExp, salWagAccExp, othLabCostExp, bnftCostExp, sickSevrnceAccExp, buildingRentExp, intrstMortgageLngTrmExp, propertyTaxesExp, mntnceExp, suppliesExp, utilitiesExp, wasteMgmntExp, resTranServExp, othExp, medSupExp, rawFoodCostExp, drgsPharmaExp, dietSupExp, ldrySupExp, houseSupExp, othSupExp, offExpAdCost, mgmntAdCost, - hoAllocpAdCost, accAdCost, apaAdCost, insuranceAdCost, othSupAdCost, othAdCost); + hoAllocpAdCost, accAdCost, apaAdCost, insuranceAdCost, othSupAdCost, othAdCost, dirCareNonOpExpMortgage, + dirCareNonOpExpOther); // subtotal // total operating expenses From 7d3e6147b745e69a242e9f414f9f437b660fb851 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 6 Apr 2023 17:35:08 -0400 Subject: [PATCH 066/183] using actual form instead of the test one --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 44290e4b..f211d85f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -36,8 +36,8 @@ public class Constants { public static final String LTC_FACILITY_PREPARER = "LTC_FACILITY_PREPARER"; /* LTC Quaterly YTD */ - public final static String LTC_YTD_USERNAME = "ltc.ytd.test.username"; //TODO remove test once done testing - public final static String LTC_YTD_PASSWORD = "ltc.ytd.test.password"; + public final static String LTC_YTD_USERNAME = "ltc.ytd.username"; + public final static String LTC_YTD_PASSWORD = "ltc.ytd.password"; public final static String IN_SCOPE = "inScope"; public final static String OUT_OF_SCOPE = "outOfScope"; public final static String PRIVATE_BED = "privateBed"; From f540922ab9b76da1a10b8a71603e477984dd20f1 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 11 Apr 2023 12:49:04 -0400 Subject: [PATCH 067/183] bugfix for mapping ccimsid and the fiscal year --- .../etl/forms/ltc/quaterly/json/Root.java | 19 +++++++++++++------ .../LtcQuaterlyYtdApiResponseProcessor.java | 4 ++-- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java index 3ee903ca..236a4f11 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java @@ -585,7 +585,7 @@ public class Root{ public String bTotal_salaryWage; public String bTotal_value_sum1; public String bTotal_YTDSalaryWage; - public String ccmisId; + public String ccimsid; public String compB_accrued; public String compB_accrued1; public String compB_accrued2; @@ -1734,7 +1734,8 @@ public class Root{ public String totalBed2; public String totalBed3; public String totalBed4; - public String totalBedYTD; + public String fiscalYear; + public String totalBedYTD; public String totalMonth1; public String totalMonth10; public String totalMonth11; @@ -4134,11 +4135,11 @@ public String getbTotal_YTDSalaryWage() { public void setbTotal_YTDSalaryWage(String bTotal_YTDSalaryWage) { this.bTotal_YTDSalaryWage = bTotal_YTDSalaryWage; } - public String getCcmisId() { - return ccmisId; + public String getCcimsid() { + return ccimsid; } - public void setCcmisId(String ccmisId) { - this.ccmisId = ccmisId; + public void setCcimsid(String ccimsid) { + this.ccimsid = ccimsid; } public String getCompB_accrued() { return compB_accrued; @@ -8892,6 +8893,12 @@ public String getTotalBed4() { public void setTotalBed4(String totalBed4) { this.totalBed4 = totalBed4; } + public String getFiscalYear() { + return fiscalYear; + } + public void setFiscalYear(String fiscalYear) { + this.fiscalYear = fiscalYear; + } public String getTotalBedYTD() { return totalBedYTD; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index f07d9bfe..434db18f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -108,10 +108,10 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT ltcYtdSubmission.setIsDeleted(""); ltcYtdSubmission.setSubmissionDate(root.getForm().getCreatedAt()); ltcYtdSubmission.setSubmittedBy(root.getForm().getFullName()); - ltcYtdSubmission.setCCIMSID(root.getCcmisId()); + ltcYtdSubmission.setCCIMSID(root.getCcimsid()); ltcYtdSubmission.setSubmissionType(root.getSubmission()); ltcYtdSubmission.setPeriod(root.getQuarter()); - // FIXME ltcYtdSubmission.setSubmissionFy(""); + ltcYtdSubmission.setSubmissionFy(root.getFiscalYear()); ltcYtdSubmission.setNbTotalBeds(root.getNumberOfTotalBeds()); ltcYtdSubmission.setNbFundedBeds(root.getNumberOfTotalFundedBeds()); ltcYtdSubmission.setOccRateThreshold(root.getThreshold()); From c609b33ae432d6c8e5b6dab72c880ed492c5e572 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 11 Apr 2023 13:13:48 -0400 Subject: [PATCH 068/183] code clean up --- .../processor/LtcQuaterlyYtdApiResponseProcessor.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 434db18f..303bf924 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -1708,8 +1708,6 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT revFrmHA1Others.setRevType("Revenue from HA (1)"); revFrmHA1Others.setConfirmationId(root.getForm().getConfirmationId()); - // TODO: add non-operating revenue and expense - // skipping subtotal for now LtcYtdRev revFrmHA2OpFundMinEq = new LtcYtdRev(); @@ -2224,7 +2222,7 @@ private List parseYtdQuaterlyRequest(List ltcQuarterlyYT othAdCost.setConfirmationId(root.getForm().getConfirmationId()); - /* Non operating expanse */ + /* Non operating expense */ LtcYtdExp dirCareNonOpExpMortgage = new LtcYtdExp(); dirCareNonOpExpMortgage.setExpYtd(root.getNopEx_YTD1()); dirCareNonOpExpMortgage.setExpNotes(root.getNopEx_note1()); From 10e60c7570af0b9a65c6502bdb2f1eb39d886858 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 13 Apr 2023 16:05:24 -0400 Subject: [PATCH 069/183] added missing provider for encryption --- src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java index f567ae8f..8b28b547 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java +++ b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java @@ -3,8 +3,10 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; +import java.security.Security; import org.apache.camel.main.Main; +import org.bouncycastle.jce.provider.BouncyCastleProvider; import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.routes.HelloRoute; @@ -31,6 +33,7 @@ public class ChefsETLMainMethod { public static void main(String... args) throws Exception { Main main = new Main(); + Security.addProvider(new BouncyCastleProvider()); main.configure().addRoutesBuilder(HelloRoute.class); main.configure().addRoutesBuilder(AIMSFormRoute.class); main.configure().addRoutesBuilder(FacilityFormRoute.class); From 0cd43a6e13f9d18929743cc76df00852a1612c02 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 13 Apr 2023 16:06:40 -0400 Subject: [PATCH 070/183] building path to file containing publicKey --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index f211d85f..7573155b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -94,6 +94,11 @@ public class Constants { public static final String LTC_QUARTERLY_YTD_UNENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_QUATERLY_DIR, false); public static final String LTC_QUARTERLY_YTD_ENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_QUATERLY_DIR, true); + /* public Encryption Key */ + public final static String PUBLIC_KEY_NAME_PROPERTY = "public-key-file-name"; + public final static String PUBLIC_KEY_PATH = FileUtil.buildPublicKeyPath(PUBLIC_KEY_NAME_PROPERTY); + + static { From e71d494367f4fd5875f5c48dbb250374e6f7613a Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 13 Apr 2023 16:07:12 -0400 Subject: [PATCH 071/183] enabling encryption for all generated csv files --- .../ca/bc/gov/chefs/etl/util/FileUtil.java | 50 ++++++++++++++----- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index fc66ccea..2143c402 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -75,28 +75,29 @@ public void encrypt(OutputStream encryptOut, InputStream clearIn, long length, I } public static void encryptFilesInDirectory(String directoryPath, String publicKeyFilePath, - String outputDirectoryPath) throws Exception { + String outputDirectoryPath) throws Exception { FileUtil fU = new FileUtil(); // Read the public key from the file - InputStream publicKeyInputStream = new BufferedInputStream(new FileInputStream(publicKeyFilePath)); - System.out.println(publicKeyFilePath); + InputStream publicKeyInputStream = new BufferedInputStream(new FileInputStream(new File(publicKeyFilePath))); // Get a list of all the files in the directory File dir = new File(directoryPath); File[] files = dir.listFiles(); - + // Compress and encrypt each file for (File file : files) { String inputFilePath = file.getAbsolutePath(); - String outputFilePath = outputDirectoryPath + "/" + file.getName() + ".gz" + ".gpg"; - String gzipFilePath = outputDirectoryPath + "/" + file.getName() + ".gz"; - File outputFile = new File(outputFilePath); + String outputFileName = file.getName() + ".gz" + ".gpg"; + String gzipFileName = file.getName() + ".gz"; + String outputFilePath = outputDirectoryPath + "/" + outputFileName; + String gzipFilePath = outputDirectoryPath + "/" + gzipFileName; + File outputFile = new File(outputDirectoryPath, outputFileName); if (!outputFile.exists()) { outputFile.createNewFile(); } - if (!new File(gzipFilePath).exists()) { - new File(gzipFilePath).createNewFile(); + if (!new File(outputDirectoryPath, gzipFileName).exists()) { + new File(outputDirectoryPath, gzipFileName).createNewFile(); } fU.compressFileG(inputFilePath, gzipFilePath); @@ -107,7 +108,7 @@ public static void encryptFilesInDirectory(String directoryPath, String publicKe encryptedOutputStream.close(); // Clean up the gzip file - new File(gzipFilePath).delete(); + new File(outputDirectoryPath, gzipFileName).delete(); } } @@ -133,8 +134,6 @@ private void compressFileG(String sourceFilePath, String destinationFilePath) { gzipOuputStream.finish(); gzipOuputStream.close(); - System.out.println("The file was compressed successfully!"); - } catch (IOException ex) { ex.printStackTrace(); } @@ -186,9 +185,32 @@ public static List writeToCSVFile(Map>> map, } filesGenerated.add(flagFileName.substring(flagFileName.lastIndexOf(File.separator)+1)); fileWriter.close(); + try{ + encryptAllFiles(dateTime, fileProperties); + } catch(Exception e){ + e.printStackTrace(); + } return filesGenerated; } + + public static void encryptAllFiles(String dateTime, FileProperties fileProperties) throws Exception{ + String directoryPath = generateFolderName(dateTime, fileProperties.getUnEncDirForThisExchange()); + String publicKeyFilePath = Constants.PUBLIC_KEY_PATH; + String outputDirectoryPath = generateFolderName(dateTime, fileProperties.getEncDirForThisExchange()); + try { + Files.createDirectories(Paths.get(directoryPath)); + Files.createDirectories(Paths.get(outputDirectoryPath)); + } catch (IOException e) { + e.printStackTrace(); + } + encryptFilesInDirectory(directoryPath, publicKeyFilePath, outputDirectoryPath); + } + + public static String generateFolderName(String dateTime, String directoryName) { + return directoryName.concat(File.separator).concat(dateTime).replace(File.separator, "/"); + } + public static String generateFileName(String fileType,String dateTime,FileProperties fileProperties) { String directoryForThisExchange = fileProperties.getUnEncDirForThisExchange(); String directoryPath = directoryForThisExchange.concat(File.separator).concat(dateTime).concat(File.separator); @@ -214,4 +236,8 @@ public static String buildDestinationPath(String propertyName, boolean isDataEnc public static String buildDirectoryPath(String propertyName){ return PropertiesUtil.getValue(propertyName); } + + public static String buildPublicKeyPath(String propertyName){ + return "src/main/resources/"+PropertiesUtil.getValue(propertyName); + } } From f63c095658b8a754111e651887adeaac8299cdc1 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 13 Apr 2023 16:07:47 -0400 Subject: [PATCH 072/183] bugfix, reset of the publicKey inputStream --- src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java b/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java index 8a631fab..fb329506 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java @@ -70,9 +70,11 @@ static PGPPublicKey getPublicKey(InputStream keyInputStream) throws IOException, PGPPublicKeyRing pgpPublicKeyRing = keyRingIterator.next(); Optional pgpPublicKey = extractPGPKeyFromRing(pgpPublicKeyRing); if (pgpPublicKey.isPresent()) { + keyInputStream.reset(); return pgpPublicKey.get(); } } + keyInputStream.reset(); throw new PGPException("Invalid public key"); } From 3163771d91e631aaf836908923e1125f5d108cf1 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 13 Apr 2023 16:11:23 -0400 Subject: [PATCH 073/183] updated config --- src/main/resources/application-dev.properties | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index e7f884eb..3480cbd4 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -14,6 +14,8 @@ aims-dir=aims ltc-facility-dir=ltc-facility ltc-quaterly-dir=ltc-quaterly +public-key-file-name=public-UAT.txt + chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&bridgeEndpoint=true&version=%s&type=submissions&minDate=%s&maxDate=%s aims.username=2f173b2b-2f3a-407a-aecf-6b4bdc9431ae @@ -25,5 +27,5 @@ ltc.facility.password=cde8b788-36c7-4258-8f43-2e26fceea9a4 ltc.staffing.username=16ce36ca-9b4b-4ec6-bb75-96c2e1f258bb ltc.staffing.password=ef31830d-e0f5-4eb9-b4e1-7900a3fcd2ae -ltc.ytd.username=7eb3c107-5adb-435a-adbf-b8683a56ecc0 -ltc.ytd.password=65fdc5e3-4232-42bc-bfe3-7a0a51eeacfa \ No newline at end of file +ltc.ytd.username=256760e7-6e8b-44c4-8b63-51fb72c8c2cf +ltc.ytd.password=0878a7de-3a63-4749-8101-d152844e186c \ No newline at end of file From 70470f93370301b95118e073d2acb0f7af6e2df1 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 13 Apr 2023 16:11:50 -0400 Subject: [PATCH 074/183] added public key file to resources repository --- src/main/resources/public-UAT.txt | 52 +++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/main/resources/public-UAT.txt diff --git a/src/main/resources/public-UAT.txt b/src/main/resources/public-UAT.txt new file mode 100644 index 00000000..78e13893 --- /dev/null +++ b/src/main/resources/public-UAT.txt @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBGN1FvcBEAC47wWF2fsCIYQbCEXhDOGh+sCuqVG7eLxs+AerwKzsF91KaKTd +mQBBkvuIvR03rjUIo8KIQAWsbcp3wv0JW6nCoBS3rsElDCNTzNQnSd3NviBe5FxT +Lcdh+XtlHRnV/9c0jJmGBhfE8JVhykfoYdbctToUI3S1lweAqPW5R/Lvn5B39pfz ++EHxhjjYpSCSSh17ao29TLjzdD3fHsZWGA8bOnpAuAdoLXA3qZonGKdKfFBBM15H +v6DlnqJVqMHKZA4eG1vkPTFZ+aDSIj1BxGXQ2GFgWUQHIkb6Q41WQfSb5Xt/TuIL +nc/dMYOUvx3BaHv8ZgDq4lXpMYbyNhwbNIz0lJ3+V9XoYraAhwkH+JDewB1XiN65 +mMYbUuMCKZB8PNnFOIYLnGo+WB5CY7jUeRTelJb704tUbD2tOtWSSpK7DKMy6GY+ +BtcOzaeX1/ToZ3k6DBwjXE34iffnPiebkdH5MtRhI4qAMq5SoQR6WHmUKIeS1nYd +njbfQkGh1JVT8b7HdDcXAZw8htFIjI3qd8sX6psFCAhQfJ0OvZ83XcGLbTLRAPdf +TvN5U0sC94vMOajeKY4YcP4Ft29g6gxO5Uai7UJ/L3SDTPSLH/qe0yBw2BshyVAS +3vI869aK0IVnn7BCVW7tOOXhN95LqP8eCfAA03Q32IyPNTW2I2yFQln7mwARAQAB +tExBSElQIFBSRCBLZXkgMjAyMi0xMS0xNiAoRGV2ZWxvcG1lbnQgR1BHIEtleSkg +PEhBSElQTVRTQHZpY3RvcmlhMS5nb3YuYmMuY2E+iQJOBBMBCAA4FiEEPhgP5oD+ +9AHymMcmMSESIcwEvLUFAmN1FvcCGyMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AA +CgkQMSESIcwEvLW0aBAAtt8msBos/9l6XiKeMXJgH8vH7Nx8ZCLcbygsqPsL4fRw +g9/ErGP5nH5v1HqWuYEtCpLgiw/7udMd7XjZ8sUmZB5lKdGXRr0prXTPSt6bDb2l +z3R9uUq+Yzim7KmleZc8trzWC7LlEi1+cz6QyBd8raS+eBlF2fq9leqyHB0GvtfB +JuzAtA7jKozsVlTeWFax0gnx0aQO4+wS5Q3D+9foF7nMEI4yykY0KbGAI7aBPZRi +RTqqEdh33KpG2QIfACaLEnEXG9KiaMrtvwBvn6g3lu3LvK9Ex7LWWzv4t/8wur3x +mxkEck4UKsFMqisHOcICl0lz9e51H2TbseuirAD/skEqk+RYZ7Bg/Y9LckhpjBfw +TyhOedsqP26fDFMfM7GJTLqu4vPCgKIeJegayWUXYCr8S6NkvzcnCkKM1I/5mMmU +iEoRmiSCOu3jJcRc/Jm3T4FyFy61jyaGb8PLMGQAq8lcc+XaFO++5p4LAlrtFJsk +lHkv0RHP2O6C1RbImZhAtRfxPv54IJwVNAJVmIqTNzEnJoKASfbFVPj/cjG0t0UH +8OExsF4T1uz7QoIfMTAUHJ+zdCW3CIslJ44fZ4Gaub1kejr9fvU31+EQpRuAYdZS +fTk1AOB6+8W7lvo7if49Jx1PZPC+ywMQzF6YA8/KSozt9D//H0JL0Hp/2jtQbuu5 +Ag0EY3UW9wEQALtfGkPWqKx1JDXJWghZACA237ApUjbK4jqqmU6h0J1H78Dq/flg +N+YxtJynloMph3j76DPdssPYQJ/MvaDpV1aTv/N/QOGqtIfl0X1QhK7XTTlb4xDC +dUJ2k1a4+8nUVLW8ZowHoNvsj6+ojBXyMj8PsRJjRTpaGbA3x9tHJrazORNpC0oV +QIqr3rMxr2UYQLKRzZIOcYQzveBzqygPgmZkKCJQSTJ6XmNkwgK9VED+yJcwkhIf +mtZqWNwMreVebNx+Zu9E5jnYAGeYuW9gWMbnmDG7znwstnPGrpoCEzEZTPoRnwz8 +HP1f82+DGQ+M22Q0ZBQOOXBasQBqlitZA9qKUF331KBomTNNIE0ly1I/AuV2vyAf +euYR/fnvmMHqGSS7a8ovE0Bjs8UGOjxVQYnRuv82PeHKaNRiT01QpnjfN10UbOBG +57fnKXrh290TpFkTCYA8TRy/8WQQHenZ0CdohOordYazoqRAxU0JGuA5Uf1Rin1b +qOLIxSI1dNqCY5fRnFB4FA/Irjs7kHvYScCE40cphqd2PtePd/B/p5nA9FzJy3be +hyMd9tHdZFgVO4VrOUpqtViNK57X8qyVV8dcZ4pDv8TnjOZ2xj09gvSstzWx8VAV +GTcZetbdX2Fvuu97p9/yxl9O0OmJiadEHcsswrsFkMeF5TeiNrPg/DV/ABEBAAGJ +AjYEGAEIACAWIQQ+GA/mgP70AfKYxyYxIRIhzAS8tQUCY3UW9wIbDAAKCRAxIRIh +zAS8tYXrD/9cvgofNplYNy8yfX1x3BG5rNTYK9mT25+jv5lRto+PIXAafRcACTY7 +dNEZt6pX/RbsCEUBPMZbLuqno43cIWAREFJzj/4yy7E6VlDWmTwbzPSJiT6N/8BH +gRLEn6gV57mLtVm+XOn/AqGJrcVpW9xUFPRyTc0iHht+o5vpppZzm/vi4wxeXWc2 +VuEyhX+shbHxUnL6gF68kmOwlM8pBrySTIRu51UYtnVMf34WpsbimzZZjrmLms8e +G+fqfTChfwiv/lntJqj2zHniCoH9tzvX0UgRoql0+a0/uHEfJUx4i42wAk30azWi +PfyxZjCBI+X2E33got9n3aoPUIgNKlE70F0kLn9kNFJkac8E59kjbUovlGX/oNNc +DKIqfaQEPOOxkB3vEVdpzJ7+3+qjmq1Mh5Tt6CaejF58KR1v5qEr0j0bVPxVNr3L +R9edgZY5yOt+cqqyK5uC3VxI4Ax1uW9EGN+xegc0a0wwaMBg1hHF6g8Pueq1SUFC +rSrHaac1IAdL4o40CvciX2K1f5wgsfxABx6sQrr/xJw4utKpUuW21mcSwLjKgSZl +B9xD4IBEmJ2CH3mWs4mWMvJplERd9FtKZLj4hCi4Bs98dTLMXHO10QqOtUcWC7k1 +PMjO0yXmG7VDR4KxqUTBWY/iKmzigHYiHRLpOnc8OdZHPPc43KoM+Q== +=R1nT +-----END PGP PUBLIC KEY BLOCK----- From 551e5a30ba9a8c8289c2b85038a29da0665b130d Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 14 Apr 2023 14:30:37 -0400 Subject: [PATCH 075/183] added necessary dependence for decryption --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index 5db815e3..5b492cde 100644 --- a/pom.xml +++ b/pom.xml @@ -156,6 +156,14 @@ ${apache-commons-version} + + + commons-io + commons-io + 2.11.0 + + + From 7313d1897327fb3261752b4b603adb9c90aaedf2 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 14 Apr 2023 14:31:11 -0400 Subject: [PATCH 076/183] Added methods to handle decryption --- .../ca/bc/gov/chefs/etl/util/CommonUtils.java | 50 +++++++++++ .../ca/bc/gov/chefs/etl/util/FileUtil.java | 85 +++++++++++++++++++ 2 files changed, 135 insertions(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java b/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java index fb329506..fc23d69e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/CommonUtils.java @@ -1,15 +1,25 @@ package ca.bc.gov.chefs.etl.util; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.openpgp.PGPCompressedData; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPLiteralData; import org.bouncycastle.openpgp.PGPLiteralDataGenerator; +import org.bouncycastle.openpgp.PGPOnePassSignatureList; +import org.bouncycastle.openpgp.PGPPrivateKey; import org.bouncycastle.openpgp.PGPPublicKey; +import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; import org.bouncycastle.openpgp.PGPPublicKeyRing; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.bouncycastle.openpgp.PGPUtil; +import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory; import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyDataDecryptorFactoryBuilder; +import org.apache.commons.io.IOUtils; +import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -87,4 +97,44 @@ private static Optional extractPGPKeyFromRing(PGPPublicKeyRing pgp return Optional.empty(); } + /** + * Decrypts the public Key encrypted data using the provided private key and writes it to the output stream + * + * @param clearOut the output stream to which data is to be written + * @param pgpPrivateKey the private key instance + * @param publicKeyEncryptedData the public key encrypted data instance + * @throws IOException for IO related error + * @throws PGPException for pgp related errors + */ + //TODO This part is for testing purposes only, remove when done + static void decrypt(OutputStream clearOut, PGPPrivateKey pgpPrivateKey, PGPPublicKeyEncryptedData publicKeyEncryptedData) throws IOException, PGPException { + PublicKeyDataDecryptorFactory decryptorFactory = new JcePublicKeyDataDecryptorFactoryBuilder() + .setProvider(BouncyCastleProvider.PROVIDER_NAME).build(pgpPrivateKey); + InputStream decryptedCompressedIn = publicKeyEncryptedData.getDataStream(decryptorFactory); + + JcaPGPObjectFactory decCompObjFac = new JcaPGPObjectFactory(decryptedCompressedIn); + PGPCompressedData pgpCompressedData = (PGPCompressedData) decCompObjFac.nextObject(); + + InputStream compressedDataStream = new BufferedInputStream(pgpCompressedData.getDataStream()); + JcaPGPObjectFactory pgpCompObjFac = new JcaPGPObjectFactory(compressedDataStream); + + Object message = pgpCompObjFac.nextObject(); + + if (message instanceof PGPLiteralData) { + PGPLiteralData pgpLiteralData = (PGPLiteralData) message; + InputStream decDataStream = pgpLiteralData.getInputStream(); + IOUtils.copy(decDataStream, clearOut); + clearOut.close(); + } else if (message instanceof PGPOnePassSignatureList) { + throw new PGPException("Encrypted message contains a signed message not literal data"); + } else { + throw new PGPException("Message is not a simple encrypted file - Type Unknown"); + } + // Performing Integrity check + if (publicKeyEncryptedData.isIntegrityProtected()) { + if (!publicKeyEncryptedData.verify()) { + throw new PGPException("Message failed integrity check"); + } + } + } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index 2143c402..c001f642 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -7,8 +7,18 @@ import org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags; import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.bouncycastle.openpgp.PGPCompressedDataGenerator; +import org.bouncycastle.openpgp.PGPEncryptedData; import org.bouncycastle.openpgp.PGPEncryptedDataGenerator; +import org.bouncycastle.openpgp.PGPEncryptedDataList; import org.bouncycastle.openpgp.PGPException; +import org.bouncycastle.openpgp.PGPPrivateKey; +import org.bouncycastle.openpgp.PGPPublicKeyEncryptedData; +import org.bouncycastle.openpgp.PGPSecretKey; +import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; +import org.bouncycastle.openpgp.PGPUtil; +import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory; +import org.bouncycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator; +import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder; import org.bouncycastle.openpgp.operator.jcajce.JcePGPDataEncryptorBuilder; import org.bouncycastle.openpgp.operator.jcajce.JcePublicKeyKeyEncryptionMethodGenerator; import org.slf4j.Logger; @@ -38,8 +48,10 @@ import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.zip.GZIPOutputStream; public class FileUtil { @@ -240,4 +252,77 @@ public static String buildDirectoryPath(String propertyName){ public static String buildPublicKeyPath(String propertyName){ return "src/main/resources/"+PropertiesUtil.getValue(propertyName); } + + /** ----------------decryption starts here, testing encryption ------------------- + * TODO This part is for testing purposes only, remove when done */ + + private static PGPPrivateKey findSecretKey(long keyID) throws Exception, PGPException { + String privateKeyInPath = "src/main/resources/secret-Test.txt"; + String password = "789456123"; + char[] passCode = password.toCharArray(); + InputStream privateKeyIn = new BufferedInputStream(new FileInputStream(new File(privateKeyInPath))); + PGPSecretKeyRingCollection pgpSecretKeyRingCollection = new PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(privateKeyIn) + , new JcaKeyFingerprintCalculator()); + PGPSecretKey pgpSecretKey = pgpSecretKeyRingCollection.getSecretKey(keyID); + return pgpSecretKey == null ? null : pgpSecretKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder() + .setProvider(BouncyCastleProvider.PROVIDER_NAME).build(passCode)); + } + + public static void decrypt(InputStream encryptedIn, OutputStream clearOut) + throws PGPException, IOException, Exception { + // Removing armour and returning the underlying binary encrypted stream + encryptedIn = PGPUtil.getDecoderStream(encryptedIn); + JcaPGPObjectFactory pgpObjectFactory = new JcaPGPObjectFactory(encryptedIn); + + Object obj = pgpObjectFactory.nextObject(); + //The first object might be a marker packet + PGPEncryptedDataList pgpEncryptedDataList = (obj instanceof PGPEncryptedDataList) + ? (PGPEncryptedDataList) obj : (PGPEncryptedDataList) pgpObjectFactory.nextObject(); + + PGPPrivateKey pgpPrivateKey = null; + PGPPublicKeyEncryptedData publicKeyEncryptedData = null; + + Iterator encryptedDataItr = pgpEncryptedDataList.getEncryptedDataObjects(); + while (pgpPrivateKey == null && encryptedDataItr.hasNext()) { + publicKeyEncryptedData = (PGPPublicKeyEncryptedData) encryptedDataItr.next(); + pgpPrivateKey = FileUtil.findSecretKey(publicKeyEncryptedData.getKeyID()); + } + + if (Objects.isNull(publicKeyEncryptedData)) { + throw new PGPException("Could not generate PGPPublicKeyEncryptedData object"); + } + + if (pgpPrivateKey == null) { + throw new PGPException("Could Not Extract private key"); + } + CommonUtils.decrypt(clearOut, pgpPrivateKey, publicKeyEncryptedData); + } + + public static void decryptAllFiles(String directoryPath, String outputDirectoryPath) throws IOException, PGPException, Exception{ + // Get a list of all the files in the directory + File dir = new File(directoryPath); + File[] files = dir.listFiles(); + try { + Files.createDirectories(Paths.get(outputDirectoryPath)); + } catch (IOException e) { + e.printStackTrace(); + } + + for (File file : files) { + + //String inputFilePath = file.getAbsolutePath(); + String outputFileName = file.getName().replace(".gpg", ""); + //String outputFilePath = outputDirectoryPath + "/" + outputFileName; + File outputFile = new File(outputDirectoryPath, outputFileName); + if (!outputFile.exists()) { + outputFile.createNewFile(); + } + + InputStream encryptedDataInputStream = new BufferedInputStream(new FileInputStream(file)); + + OutputStream encryptedOutputStream = new BufferedOutputStream(new FileOutputStream(outputFile)); + FileUtil.decrypt(encryptedDataInputStream, encryptedOutputStream); + encryptedOutputStream.close(); + } + } } From 6b0ba41fe82ae0776d021a2110c1d1ff73183751 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 14 Apr 2023 14:31:44 -0400 Subject: [PATCH 077/183] added comment where test was executed --- src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java index 8b28b547..20746215 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java +++ b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java @@ -34,6 +34,8 @@ public class ChefsETLMainMethod { public static void main(String... args) throws Exception { Main main = new Main(); Security.addProvider(new BouncyCastleProvider()); + // TODO : remove next line, for testing purposes only + //FileUtil.decryptAllFiles("encrypted/ltc-quaterly/230414140122", "encrypted/ltc-quaterly/230414140122/test"); main.configure().addRoutesBuilder(HelloRoute.class); main.configure().addRoutesBuilder(AIMSFormRoute.class); main.configure().addRoutesBuilder(FacilityFormRoute.class); From b3d16a4115acd8fb39077be187e8ff013808d0b3 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 14 Apr 2023 15:44:24 -0400 Subject: [PATCH 078/183] removed unused import --- .../facility/processor/FacilityInfoFormApiResponseProcessor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java index 844c6f22..71232d03 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java @@ -12,7 +12,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import ca.bc.gov.chefs.etl.constant.Constants; -import ca.bc.gov.chefs.etl.core.model.FileProperties; import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.core.model.SuccessResponse; import ca.bc.gov.chefs.etl.forms.ltc.facility.json.Root; From 03b505b5d1739c3c9e368823fd951b86bcb3801c Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 14 Apr 2023 15:45:29 -0400 Subject: [PATCH 079/183] replaced all visible API keys --- src/main/resources/application-dev.properties | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index e7f884eb..7551c1b1 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -16,14 +16,14 @@ ltc-quaterly-dir=ltc-quaterly chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&bridgeEndpoint=true&version=%s&type=submissions&minDate=%s&maxDate=%s -aims.username=2f173b2b-2f3a-407a-aecf-6b4bdc9431ae -aims.password=5e056c7b-1b1e-4501-9711-facc44c6e66f +aims.username=tbd +aims.password=tbd -ltc.facility.username=e1f4761f-efdd-4529-805e-677d3ae21601 -ltc.facility.password=cde8b788-36c7-4258-8f43-2e26fceea9a4 +ltc.facility.username=tbd +ltc.facility.password=tbd -ltc.staffing.username=16ce36ca-9b4b-4ec6-bb75-96c2e1f258bb -ltc.staffing.password=ef31830d-e0f5-4eb9-b4e1-7900a3fcd2ae +ltc.staffing.username=tbd +ltc.staffing.password=tbd -ltc.ytd.username=7eb3c107-5adb-435a-adbf-b8683a56ecc0 -ltc.ytd.password=65fdc5e3-4232-42bc-bfe3-7a0a51eeacfa \ No newline at end of file +ltc.ytd.username=tbd +ltc.ytd.password=tbd \ No newline at end of file From 718bae08abe114c7fe4bfca77912794f6fc0e2b9 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Mon, 17 Apr 2023 12:47:54 -0700 Subject: [PATCH 080/183] Removing calculation for directory that contains pgp public key. Instead the app will rely on the value of PUBLIC_KEY_NAME_PROPERTY property. --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 7573155b..bd44a996 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -96,7 +96,7 @@ public class Constants { /* public Encryption Key */ public final static String PUBLIC_KEY_NAME_PROPERTY = "public-key-file-name"; - public final static String PUBLIC_KEY_PATH = FileUtil.buildPublicKeyPath(PUBLIC_KEY_NAME_PROPERTY); + public final static String PUBLIC_KEY_PATH = PUBLIC_KEY_NAME_PROPERTY; diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index c001f642..7d314955 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -249,10 +249,6 @@ public static String buildDirectoryPath(String propertyName){ return PropertiesUtil.getValue(propertyName); } - public static String buildPublicKeyPath(String propertyName){ - return "src/main/resources/"+PropertiesUtil.getValue(propertyName); - } - /** ----------------decryption starts here, testing encryption ------------------- * TODO This part is for testing purposes only, remove when done */ From 7073d0d255e0d6b6ff5ba7af3e0e07b98d529016 Mon Sep 17 00:00:00 2001 From: Evgeny Pluzhnikov Date: Mon, 17 Apr 2023 13:11:02 -0700 Subject: [PATCH 081/183] Reverting previous changes. Alsodropping the prefix for public key location. --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index bd44a996..7573155b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -96,7 +96,7 @@ public class Constants { /* public Encryption Key */ public final static String PUBLIC_KEY_NAME_PROPERTY = "public-key-file-name"; - public final static String PUBLIC_KEY_PATH = PUBLIC_KEY_NAME_PROPERTY; + public final static String PUBLIC_KEY_PATH = FileUtil.buildPublicKeyPath(PUBLIC_KEY_NAME_PROPERTY); diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index 7d314955..27ef0eaa 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -249,6 +249,10 @@ public static String buildDirectoryPath(String propertyName){ return PropertiesUtil.getValue(propertyName); } + public static String buildPublicKeyPath(String propertyName){ + return PropertiesUtil.getValue(propertyName); + } + /** ----------------decryption starts here, testing encryption ------------------- * TODO This part is for testing purposes only, remove when done */ From e3d536e81bb071497f31b82671714e0d7fdaefa8 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 19 Apr 2023 14:39:09 -0400 Subject: [PATCH 082/183] changed used algorithm for encryption --- src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index c001f642..01e93fb5 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -57,7 +57,7 @@ public class FileUtil { private int compressionAlgorithm = CompressionAlgorithmTags.ZIP; - private int symmetricKeyAlgorithm = SymmetricKeyAlgorithmTags.AES_128; + private int symmetricKeyAlgorithm = SymmetricKeyAlgorithmTags.AES_256; private boolean armor = true; private boolean withIntegrityCheck = true; private int bufferSize = 1 << 16; @@ -250,7 +250,7 @@ public static String buildDirectoryPath(String propertyName){ } public static String buildPublicKeyPath(String propertyName){ - return "src/main/resources/"+PropertiesUtil.getValue(propertyName); + return PropertiesUtil.getValue(propertyName); } /** ----------------decryption starts here, testing encryption ------------------- From 08f91e2a67f48e58ec14f27c30a33052e5a5cbe4 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 20 Apr 2023 12:46:05 -0400 Subject: [PATCH 083/183] modified folder destination for encrypted files --- src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index 27ef0eaa..e1231034 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -209,7 +209,7 @@ public static List writeToCSVFile(Map>> map, public static void encryptAllFiles(String dateTime, FileProperties fileProperties) throws Exception{ String directoryPath = generateFolderName(dateTime, fileProperties.getUnEncDirForThisExchange()); String publicKeyFilePath = Constants.PUBLIC_KEY_PATH; - String outputDirectoryPath = generateFolderName(dateTime, fileProperties.getEncDirForThisExchange()); + String outputDirectoryPath = fileProperties.getEncDirForThisExchange(); try { Files.createDirectories(Paths.get(directoryPath)); Files.createDirectories(Paths.get(outputDirectoryPath)); From 1f44896badac8bca1709427e24f9785fb9385897 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 20 Apr 2023 15:08:32 -0400 Subject: [PATCH 084/183] updated comment --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5b492cde..55dec187 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ ${apache-commons-version} - + commons-io commons-io From 82c6d35308b45e931823218704ca547e450c9ccc Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 20 Apr 2023 15:09:27 -0400 Subject: [PATCH 085/183] updated encryption process, all encrypted files end up in the same directory. Flag files no longer encrypted --- .../ca/bc/gov/chefs/etl/util/FileUtil.java | 61 +++++++++++-------- 1 file changed, 35 insertions(+), 26 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index e1231034..164a7d2d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -1,5 +1,7 @@ package ca.bc.gov.chefs.etl.util; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; //import org.apache.commons.io.IOUtils; import org.bouncycastle.bcpg.ArmoredOutputStream; @@ -88,6 +90,7 @@ public void encrypt(OutputStream encryptOut, InputStream clearIn, long length, I public static void encryptFilesInDirectory(String directoryPath, String publicKeyFilePath, String outputDirectoryPath) throws Exception { + final String txtExtentesion = "txt"; FileUtil fU = new FileUtil(); // Read the public key from the file InputStream publicKeyInputStream = new BufferedInputStream(new FileInputStream(new File(publicKeyFilePath))); @@ -98,29 +101,37 @@ public static void encryptFilesInDirectory(String directoryPath, String publicKe // Compress and encrypt each file for (File file : files) { - String inputFilePath = file.getAbsolutePath(); - String outputFileName = file.getName() + ".gz" + ".gpg"; - String gzipFileName = file.getName() + ".gz"; - String outputFilePath = outputDirectoryPath + "/" + outputFileName; - String gzipFilePath = outputDirectoryPath + "/" + gzipFileName; - File outputFile = new File(outputDirectoryPath, outputFileName); - if (!outputFile.exists()) { - outputFile.createNewFile(); - } - if (!new File(outputDirectoryPath, gzipFileName).exists()) { - new File(outputDirectoryPath, gzipFileName).createNewFile(); + if (FilenameUtils.getExtension(file.getName()).equals(txtExtentesion)) { + String outputFileName = file.getName() + ".gz" + ".gpg"; + String gzipFileName = file.getName() + ".gz"; + String outputFilePath = outputDirectoryPath + "/" + outputFileName; + String gzipFilePath = outputDirectoryPath + "/" + gzipFileName; + File outputFile = new File(outputDirectoryPath, outputFileName); + if (!outputFile.exists()) { + outputFile.createNewFile(); + } + if (!new File(outputDirectoryPath, gzipFileName).exists()) { + new File(outputDirectoryPath, gzipFileName).createNewFile(); + } + + fU.compressFileG(inputFilePath, gzipFilePath); + InputStream gzipInputStream = new BufferedInputStream(new FileInputStream(gzipFilePath)); + + OutputStream encryptedOutputStream = new BufferedOutputStream(new FileOutputStream(outputFilePath)); + fU.encrypt(encryptedOutputStream, gzipInputStream, file.length(), publicKeyInputStream); + encryptedOutputStream.close(); + // Clean up the gzip file + new File(outputDirectoryPath, gzipFileName).delete(); + + } else { + File outputFile = new File(outputDirectoryPath, file.getName()); + try { + FileUtils.copyFile(file, outputFile); + } catch (IOException e) { + e.printStackTrace(); + } } - - fU.compressFileG(inputFilePath, gzipFilePath); - InputStream gzipInputStream = new BufferedInputStream(new FileInputStream(gzipFilePath)); - - OutputStream encryptedOutputStream = new BufferedOutputStream(new FileOutputStream(outputFilePath)); - fU.encrypt(encryptedOutputStream, gzipInputStream, file.length(), publicKeyInputStream); - encryptedOutputStream.close(); - - // Clean up the gzip file - new File(outputDirectoryPath, gzipFileName).delete(); } } @@ -187,7 +198,8 @@ public static List writeToCSVFile(Map>> map, } fileProperties.setExtension(".flag"); - String flagFileName = generateFileName("medis-etl", dateTime, fileProperties); + final String flagFilePrefix = "medis_etl_"; + String flagFileName = generateFileName(flagFilePrefix+directoryKey, dateTime, fileProperties); File file = new File(flagFileName); FileWriter fileWriter = new FileWriter(file); logger.info("--------Generating Flag File---------------{}---------------", flagFileName); @@ -232,15 +244,12 @@ public static String generateFileName(String fileType,String dateTime,FileProper logger.error("File Write Exception: "+e.getMessage()); e.printStackTrace(); } - if(fileProperties.getExtension().equals(".flag")) { - return directoryPath+fileType.toLowerCase().concat(fileProperties.getExtension()); - } return directoryPath+fileType.toLowerCase()+"_".concat(dateTime).concat(fileProperties.getExtension()); } public static String buildDestinationPath(String propertyName, boolean isDataEncrypted){ if (isDataEncrypted){ - return PropertiesUtil.getValue(Constants.PROPERTIES_ENC_DATA_DIR)+File.separator+PropertiesUtil.getValue(propertyName); + return PropertiesUtil.getValue(Constants.PROPERTIES_ENC_DATA_DIR); } return PropertiesUtil.getValue(Constants.PROPERTIES_DATA_DIR)+File.separator+PropertiesUtil.getValue(propertyName); } From 292fb3a4d188dac633a1d3183331f2f943acc061 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 20 Apr 2023 15:30:43 -0400 Subject: [PATCH 086/183] using the form name the file path map --- .../ca/bc/gov/chefs/etl/constant/Constants.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 7573155b..bef6e0ba 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -83,14 +83,17 @@ public class Constants { public static final String ENCRYPTED_DATA_DIRECTORY = FileUtil.buildDirectoryPath(PROPERTIES_ENC_DATA_DIR); public final static String PROPERTIES_LTC_FACILITY_DIR = "ltc-facility-dir"; + public final static String LTC_FACILITY_DIR = FileUtil.getDirectoryName(PROPERTIES_LTC_FACILITY_DIR); public static final String LTC_FACILITY_UNENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_FACILITY_DIR, false); public static final String LTC_FACILITY_ENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_FACILITY_DIR, true); public final static String PROPERTIES_AIMS_DIR = "aims-dir"; + public final static String AIMS_DIR = FileUtil.getDirectoryName(PROPERTIES_AIMS_DIR); public static final String AIMS_UNENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_AIMS_DIR, false); public static final String AIMS_ENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_AIMS_DIR, true); public final static String PROPERTIES_LTC_QUATERLY_DIR = "ltc-quaterly-dir"; + public final static String LTC_QUATERLY_DIR = FileUtil.getDirectoryName(PROPERTIES_LTC_QUATERLY_DIR); public static final String LTC_QUARTERLY_YTD_UNENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_QUATERLY_DIR, false); public static final String LTC_QUARTERLY_YTD_ENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_QUATERLY_DIR, true); @@ -102,13 +105,13 @@ public class Constants { static { - UNENC_FILE_PATH.put(LTC_FACILITY, LTC_FACILITY_UNENCRYPTED_FP); - UNENC_FILE_PATH.put(LTC_YTD_SUBMISSION, LTC_QUARTERLY_YTD_UNENCRYPTED_FP); - UNENC_FILE_PATH.put(AIMS_FORM,AIMS_UNENCRYPTED_FP); + UNENC_FILE_PATH.put(LTC_FACILITY_DIR, LTC_FACILITY_UNENCRYPTED_FP); + UNENC_FILE_PATH.put(LTC_QUATERLY_DIR, LTC_QUARTERLY_YTD_UNENCRYPTED_FP); + UNENC_FILE_PATH.put(AIMS_DIR,AIMS_UNENCRYPTED_FP); - ENC_FILE_PATH.put(AIMS_FORM, AIMS_ENCRYPTED_FP); - ENC_FILE_PATH.put(LTC_FACILITY, LTC_FACILITY_ENCRYPTED_FP); - ENC_FILE_PATH.put(LTC_YTD_SUBMISSION, LTC_QUARTERLY_YTD_ENCRYPTED_FP); + ENC_FILE_PATH.put(AIMS_DIR, AIMS_ENCRYPTED_FP); + ENC_FILE_PATH.put(LTC_FACILITY_DIR, LTC_FACILITY_ENCRYPTED_FP); + ENC_FILE_PATH.put(LTC_QUATERLY_DIR, LTC_QUARTERLY_YTD_ENCRYPTED_FP); HEADERS.put("TestModel#Main", new String[] { "confirmationId", "formName", "version", "createdAt", "fullName", "username", "email", "status", "assignee", "assigneeEmail", }); From 7fc784b35348f8572a31c90e8ae2746b4fde7ada Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 20 Apr 2023 15:31:40 -0400 Subject: [PATCH 087/183] using the actual form name when giving directoryKey --- .../etl/forms/aims/processor/AIMSFormApiResponseProcessor.java | 2 +- .../processor/FacilityInfoFormApiResponseProcessor.java | 2 +- .../quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java index e56f8fdb..e249e14f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/aims/processor/AIMSFormApiResponseProcessor.java @@ -34,7 +34,7 @@ public void process(Exchange exchange) throws Exception { Map>> map = CSVUtil.provider(iModels); - FileUtil.writeToCSVFile(map,Constants.AIMS_FORM); + FileUtil.writeToCSVFile(map,Constants.AIMS_DIR); } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java index 71232d03..8540e904 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java @@ -37,7 +37,7 @@ public void process(Exchange exchange) throws Exception { List iModels = (List) (List) parsedFacilityInfo; Map>> map = CSVUtil.provider(iModels); - List filesGenerated = FileUtil.writeToCSVFile(map,Constants.LTC_FACILITY); + List filesGenerated = FileUtil.writeToCSVFile(map,Constants.LTC_FACILITY_DIR); SuccessResponse successResponse = new SuccessResponse(); successResponse.setFiles(filesGenerated); exchange.getIn().setBody(mapper.writeValueAsString(successResponse)); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 303bf924..88929745 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -64,7 +64,7 @@ public void process(Exchange exchange) throws Exception { List parsedLtycYtdSubmissions = parseYtdQuaterlyRequest(ltcYtdForms); List iModels = (List)(List) parsedLtycYtdSubmissions; Map>> map = CSVUtil.provider(iModels); - List filesGenerated = FileUtil.writeToCSVFile(map,Constants.LTC_YTD_SUBMISSION); + List filesGenerated = FileUtil.writeToCSVFile(map,Constants.LTC_QUATERLY_DIR); //TODO uncomment or remove dead code // SuccessResponse successResponse = new SuccessResponse(); // successResponse.setFiles(filesGenerated); From a6e4bea18cc4ac27d15a39d849b38a7f67a19712 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 20 Apr 2023 15:31:51 -0400 Subject: [PATCH 088/183] updated flag files name --- src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index 5dd160b2..1fe3b9ab 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -198,8 +198,7 @@ public static List writeToCSVFile(Map>> map, } fileProperties.setExtension(".flag"); - final String flagFilePrefix = "medis_etl_"; - String flagFileName = generateFileName(flagFilePrefix+directoryKey, dateTime, fileProperties); + String flagFileName = generateFileName(directoryKey, dateTime, fileProperties); File file = new File(flagFileName); FileWriter fileWriter = new FileWriter(file); logger.info("--------Generating Flag File---------------{}---------------", flagFileName); @@ -258,6 +257,10 @@ public static String buildDirectoryPath(String propertyName){ return PropertiesUtil.getValue(propertyName); } + public static String getDirectoryName(String propertyName){ + return PropertiesUtil.getValue(propertyName); + } + public static String buildPublicKeyPath(String propertyName){ return PropertiesUtil.getValue(propertyName); } From 8f3532c9ec4743bf3aee08da5225ac8ac3d3242d Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 21 Apr 2023 13:00:30 -0400 Subject: [PATCH 089/183] renamed quaterly folder and updated all imports --- .../json/BedGrid0.java | 2 +- .../json/BedGrid1.java | 2 +- .../json/BedGrid2.java | 2 +- .../json/BedGrid3.java | 2 +- .../json/BedGrid4.java | 2 +- .../{quaterly => quarterly}/json/Form.java | 2 +- .../{quaterly => quarterly}/json/Root.java | 2 +- .../model/LtcBedYtdMaxOccupancy.java | 2 +- .../model/LtcBedYtdMaxOccupancyTotals.java | 2 +- .../model/LtcBedYtdOccupancyRate.java | 2 +- .../model/LtcBedYtdOccupancyRateTotals.java | 2 +- .../model/LtcBedYtdOccupiedDays.java | 2 +- .../model/LtcBedYtdOccupiedDaysTotals.java | 2 +- .../model/LtcYtdCompAddPos.java | 2 +- .../model/LtcYtdCompBenefits.java | 2 +- .../model/LtcYtdCompHrs.java | 2 +- .../model/LtcYtdCompHrsSubtotals.java | 2 +- .../model/LtcYtdCompHrsTotals.java | 2 +- .../model/LtcYtdCompSal.java | 2 +- .../model/LtcYtdCompSalSubtotals.java | 2 +- .../model/LtcYtdCompSalTotals.java | 2 +- .../model/LtcYtdDep.java | 2 +- .../model/LtcYtdDirectCareCost.java | 2 +- .../model/LtcYtdDirectCareCostSubtotals.java | 2 +- .../model/LtcYtdDirectCareHrs.java | 2 +- .../model/LtcYtdDirectCareHrsSubTotals.java | 2 +- .../model/LtcYtdExp.java | 2 +- .../model/LtcYtdExpSubTotals.java | 2 +- .../model/LtcYtdRev.java | 2 +- .../model/LtcYtdRevSubTotals.java | 2 +- .../model/LtcYtdSubmission.java | 2 +- .../model/LtcYtdSumTotals.java | 2 +- .../processor/LtcQuaterlyYtdApiProcessor.java | 2 +- .../LtcQuaterlyYtdApiResponseProcessor.java | 64 +++++++++---------- .../LtcQuaterlyYtdFileProcessor.java | 2 +- .../processor/LtcQuaterlyYtdProcessor.java | 2 +- .../route/LtcQuaterlyYtdRoute.java | 8 +-- 37 files changed, 71 insertions(+), 71 deletions(-) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/json/BedGrid0.java (99%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/json/BedGrid1.java (99%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/json/BedGrid2.java (99%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/json/BedGrid3.java (99%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/json/BedGrid4.java (99%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/json/Form.java (97%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/json/Root.java (99%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcBedYtdMaxOccupancy.java (97%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcBedYtdMaxOccupancyTotals.java (97%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcBedYtdOccupancyRate.java (97%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcBedYtdOccupancyRateTotals.java (97%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcBedYtdOccupiedDays.java (97%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcBedYtdOccupiedDaysTotals.java (97%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdCompAddPos.java (98%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdCompBenefits.java (97%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdCompHrs.java (97%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdCompHrsSubtotals.java (98%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdCompHrsTotals.java (98%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdCompSal.java (97%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdCompSalSubtotals.java (98%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdCompSalTotals.java (97%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdDep.java (96%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdDirectCareCost.java (99%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdDirectCareCostSubtotals.java (99%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdDirectCareHrs.java (98%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdDirectCareHrsSubTotals.java (98%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdExp.java (96%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdExpSubTotals.java (95%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdRev.java (96%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdRevSubTotals.java (95%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdSubmission.java (99%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/model/LtcYtdSumTotals.java (96%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/processor/LtcQuaterlyYtdApiProcessor.java (95%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/processor/LtcQuaterlyYtdApiResponseProcessor.java (98%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/processor/LtcQuaterlyYtdFileProcessor.java (84%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/processor/LtcQuaterlyYtdProcessor.java (89%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/{quaterly => quarterly}/route/LtcQuaterlyYtdRoute.java (82%) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid0.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid0.java similarity index 99% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid0.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid0.java index 295d4225..9e6207ac 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid0.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid0.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid1.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid1.java similarity index 99% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid1.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid1.java index b22eb460..0f83fdb9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid1.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid1.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid2.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid2.java similarity index 99% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid2.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid2.java index 3cd6e30f..8d296d35 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid2.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid2.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid3.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid3.java similarity index 99% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid3.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid3.java index e2873b17..4316b14d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid3.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid3.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid4.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid4.java similarity index 99% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid4.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid4.java index 0fa0026c..82d1abfe 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/BedGrid4.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid4.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Form.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Form.java similarity index 97% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Form.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Form.java index e880031b..51e9ba1f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Form.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Form.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java similarity index 99% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 236a4f11..a3812d8d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.json; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; import java.util.ArrayList; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java similarity index 97% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java index 473e0ffd..68755459 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancy.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancyTotals.java similarity index 97% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancyTotals.java index 836f1ca1..f201db0d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdMaxOccupancyTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancyTotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRate.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRate.java similarity index 97% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRate.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRate.java index f81b40c1..b5c26757 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRate.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRate.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRateTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRateTotals.java similarity index 97% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRateTotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRateTotals.java index ff6733ac..15fe8bfa 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupancyRateTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRateTotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDays.java similarity index 97% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDays.java index 867d7db5..a44e0c61 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDays.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDays.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDaysTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java similarity index 97% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDaysTotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java index f8425327..6e535ca4 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcBedYtdOccupiedDaysTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java similarity index 98% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java index f29a6c79..6bf2ab8b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompAddPos.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java similarity index 97% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java index 45e207aa..7f1009f8 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompBenefits.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java similarity index 97% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java index 8c51a6e6..d062e7c3 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsSubtotals.java similarity index 98% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsSubtotals.java index ef392350..e151f0ca 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsSubtotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsTotals.java similarity index 98% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsTotals.java index 8f512c28..fff4d485 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompHrsTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsTotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java similarity index 97% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java index 6365796d..058cab11 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSal.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalSubtotals.java similarity index 98% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalSubtotals.java index ae8da431..e9779aa8 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalSubtotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java similarity index 97% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java index d48ebc3c..7e87393e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdCompSalTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDep.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDep.java similarity index 96% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDep.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDep.java index 8ed5b792..0d65e7a7 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDep.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDep.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java similarity index 99% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java index 68500fc5..5c07ebc2 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCost.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCostSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java similarity index 99% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCostSubtotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java index f9d0a2a9..9e1c84e9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareCostSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java similarity index 98% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java index 455e73c7..6624f0be 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrsSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java similarity index 98% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrsSubTotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java index 37064f81..03f4b9e8 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdDirectCareHrsSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExp.java similarity index 96% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExp.java index f51e37b7..128c9653 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExp.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExp.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExpSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java similarity index 95% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExpSubTotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java index 2edf82bc..d9547b8a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdExpSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRev.java similarity index 96% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRev.java index cf704b26..dedc2dc1 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRev.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRev.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRevSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java similarity index 95% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRevSubTotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java index c7d7e0c7..56dac00b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdRevSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java similarity index 99% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java index 279e956b..b43c01d9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSumTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSumTotals.java similarity index 96% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSumTotals.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSumTotals.java index 3c3f4db2..b5c7889a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/model/LtcYtdSumTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSumTotals.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.model; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiProcessor.java similarity index 95% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiProcessor.java index 11e4a52f..f0fcb535 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiProcessor.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor; import java.util.Map; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiResponseProcessor.java similarity index 98% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiResponseProcessor.java index 88929745..7f50eb07 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiResponseProcessor.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor; import java.util.ArrayList; @@ -16,37 +16,37 @@ import ca.bc.gov.chefs.etl.core.model.FileProperties; import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.core.model.SuccessResponse; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid0; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid1; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid2; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid3; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.BedGrid4; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.json.Root; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdMaxOccupancy; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdMaxOccupancyTotals; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdOccupancyRate; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdOccupancyRateTotals; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdOccupiedDays; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcBedYtdOccupiedDaysTotals; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompAddPos; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompBenefits; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompHrs; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompHrsSubtotals; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompHrsTotals; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompSal; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompSalSubtotals; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdCompSalTotals; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDep; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDirectCareCost; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDirectCareCostSubtotals; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDirectCareHrs; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdDirectCareHrsSubTotals; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdExp; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdExpSubTotals; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdRev; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdRevSubTotals; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdSubmission; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.model.LtcYtdSumTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.json.BedGrid0; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.json.BedGrid1; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.json.BedGrid2; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.json.BedGrid3; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.json.BedGrid4; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.json.Root; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcBedYtdMaxOccupancy; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcBedYtdMaxOccupancyTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcBedYtdOccupancyRate; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcBedYtdOccupancyRateTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcBedYtdOccupiedDays; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcBedYtdOccupiedDaysTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdCompAddPos; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdCompBenefits; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdCompHrs; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdCompHrsSubtotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdCompHrsTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdCompSal; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdCompSalSubtotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdCompSalTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDep; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDirectCareCost; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDirectCareCostSubtotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDirectCareHrs; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDirectCareHrsSubTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdExp; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdExpSubTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdRev; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdRevSubTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdSubmission; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdSumTotals; import ca.bc.gov.chefs.etl.util.CSVUtil; import ca.bc.gov.chefs.etl.util.FileUtil; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdFileProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdFileProcessor.java similarity index 84% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdFileProcessor.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdFileProcessor.java index 17d2df63..f061f469 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdFileProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdFileProcessor.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor; import org.apache.camel.Exchange; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdProcessor.java similarity index 89% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdProcessor.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdProcessor.java index 5f11c6ea..7bb350d8 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/processor/LtcQuaterlyYtdProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdProcessor.java @@ -1,4 +1,4 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor; import org.apache.camel.Exchange; import org.apache.camel.Processor; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuaterlyYtdRoute.java similarity index 82% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuaterlyYtdRoute.java index da301b7f..d601ff82 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quaterly/route/LtcQuaterlyYtdRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuaterlyYtdRoute.java @@ -1,13 +1,13 @@ -package ca.bc.gov.chefs.etl.forms.ltc.quaterly.route; +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.route; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ca.bc.gov.chefs.etl.core.routes.BaseRoute; import ca.bc.gov.chefs.etl.forms.aims.route.AIMSFormRoute; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor.LtcQuaterlyYtdApiProcessor; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor.LtcQuaterlyYtdApiResponseProcessor; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.processor.LtcQuaterlyYtdProcessor; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor.LtcQuaterlyYtdApiProcessor; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor.LtcQuaterlyYtdApiResponseProcessor; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor.LtcQuaterlyYtdProcessor; public class LtcQuaterlyYtdRoute extends BaseRoute { From 9c1de47cfa6b17051511d1719c8c2c9b8855f812 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 21 Apr 2023 13:00:58 -0400 Subject: [PATCH 090/183] renamed quaterly folder and updated all imports --- src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java index 20746215..a7d98924 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java +++ b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java @@ -11,7 +11,7 @@ import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.routes.HelloRoute; import ca.bc.gov.chefs.etl.forms.ltc.facility.route.FacilityFormRoute; -import ca.bc.gov.chefs.etl.forms.ltc.quaterly.route.LtcQuaterlyYtdRoute; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.route.LtcQuaterlyYtdRoute; import ca.bc.gov.chefs.etl.forms.aims.route.AIMSFormRoute; /** * Camel Class runner. From baeb6072ce7f7169d8e6b2e55dfb3b0891832c08 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 21 Apr 2023 13:04:34 -0400 Subject: [PATCH 091/183] renaming of all class using quaterly --- ...essor.java => LtcQuarterlyYtdApiProcessor.java} | 4 ++-- ...va => LtcQuarterlyYtdApiResponseProcessor.java} | 2 +- ...ssor.java => LtcQuarterlyYtdFileProcessor.java} | 2 +- ...rocessor.java => LtcQuarterlyYtdProcessor.java} | 4 ++-- ...erlyYtdRoute.java => LtcQuarterlyYtdRoute.java} | 14 +++++++------- 5 files changed, 13 insertions(+), 13 deletions(-) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/{LtcQuaterlyYtdApiProcessor.java => LtcQuarterlyYtdApiProcessor.java} (90%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/{LtcQuaterlyYtdApiResponseProcessor.java => LtcQuarterlyYtdApiResponseProcessor.java} (99%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/{LtcQuaterlyYtdFileProcessor.java => LtcQuarterlyYtdFileProcessor.java} (83%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/{LtcQuaterlyYtdProcessor.java => LtcQuarterlyYtdProcessor.java} (83%) rename src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/{LtcQuaterlyYtdRoute.java => LtcQuarterlyYtdRoute.java} (70%) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiProcessor.java similarity index 90% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiProcessor.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiProcessor.java index f0fcb535..56fcd0f6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiProcessor.java @@ -11,10 +11,10 @@ import ca.bc.gov.chefs.etl.util.JsonUtil; import ca.bc.gov.chefs.etl.util.PropertiesUtil; -public class LtcQuaterlyYtdApiProcessor implements Processor{ +public class LtcQuarterlyYtdApiProcessor implements Processor{ private Map sharedData; - public LtcQuaterlyYtdApiProcessor(Map sharedData) { + public LtcQuarterlyYtdApiProcessor(Map sharedData) { this.sharedData = sharedData; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java similarity index 99% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiResponseProcessor.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 7f50eb07..8642951c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -50,7 +50,7 @@ import ca.bc.gov.chefs.etl.util.CSVUtil; import ca.bc.gov.chefs.etl.util.FileUtil; -public class LtcQuaterlyYtdApiResponseProcessor implements Processor { +public class LtcQuarterlyYtdApiResponseProcessor implements Processor { @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdFileProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdFileProcessor.java similarity index 83% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdFileProcessor.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdFileProcessor.java index f061f469..34e66c35 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdFileProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdFileProcessor.java @@ -6,7 +6,7 @@ //import ca.bc.gov.chefs.etl.parser.FileModel; -public class LtcQuaterlyYtdFileProcessor implements Processor{ +public class LtcQuarterlyYtdFileProcessor implements Processor{ @Override public void process(Exchange exchange) throws Exception { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdProcessor.java similarity index 83% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdProcessor.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdProcessor.java index 7bb350d8..05de770d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuaterlyYtdProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdProcessor.java @@ -6,8 +6,8 @@ import org.slf4j.LoggerFactory; -public class LtcQuaterlyYtdProcessor implements Processor { - private static final Logger logger = LoggerFactory.getLogger(LtcQuaterlyYtdApiProcessor.class); +public class LtcQuarterlyYtdProcessor implements Processor { + private static final Logger logger = LoggerFactory.getLogger(LtcQuarterlyYtdApiProcessor.class); @Override public void process(Exchange exchange) throws Exception { logger.info("Hello! Processing Now: current timestamp is: {}",System.currentTimeMillis()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuaterlyYtdRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuarterlyYtdRoute.java similarity index 70% rename from src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuaterlyYtdRoute.java rename to src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuarterlyYtdRoute.java index d601ff82..251cdd5f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuaterlyYtdRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuarterlyYtdRoute.java @@ -5,11 +5,11 @@ import ca.bc.gov.chefs.etl.core.routes.BaseRoute; import ca.bc.gov.chefs.etl.forms.aims.route.AIMSFormRoute; -import ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor.LtcQuaterlyYtdApiProcessor; -import ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor.LtcQuaterlyYtdApiResponseProcessor; -import ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor.LtcQuaterlyYtdProcessor; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor.LtcQuarterlyYtdApiProcessor; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor.LtcQuarterlyYtdApiResponseProcessor; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.processor.LtcQuarterlyYtdProcessor; -public class LtcQuaterlyYtdRoute extends BaseRoute { +public class LtcQuarterlyYtdRoute extends BaseRoute { private static final Logger logger = LoggerFactory.getLogger(AIMSFormRoute.class); @Override @@ -26,15 +26,15 @@ public void configure() throws Exception { from("jetty:http://{{hostname}}:{{port}}/ltc-quaterly-ytd").routeId("ltc-quaterly-ytd-form") .log("CHEFS-ETL received a request for LTCQ Form extraction")//.bean(AIMSFormPayloadExtractor.class) .process(exchange -> sharedData.put("body", exchange.getIn().getBody(String.class))) - .process(new LtcQuaterlyYtdProcessor()).to("direct:ltc-quaterly-ytd").end(); + .process(new LtcQuarterlyYtdProcessor()).to("direct:ltc-quaterly-ytd").end(); from("direct:ltc-quaterly-ytd") // to the http uri - .process(new LtcQuaterlyYtdApiProcessor(sharedData)) + .process(new LtcQuarterlyYtdApiProcessor(sharedData)) .toD("${header.RequestUri}") .log("This is the status code from the response: ${header.CamelHttpResponseCode}") .log("Trying to convert the received body OK").convertBodyTo(String.class) - .process(new LtcQuaterlyYtdApiResponseProcessor()).end(); + .process(new LtcQuarterlyYtdApiResponseProcessor()).end(); // file conversion /* From 92c79c75a45b8ffb5bc9e8d8a518b5684e1c525a Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 21 Apr 2023 13:05:26 -0400 Subject: [PATCH 092/183] renaming quaterly in properties file --- src/main/resources/application-dev.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 4965c380..a2b099b6 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -12,7 +12,7 @@ data-dir=unencrypted enc-data-dir=encrypted aims-dir=aims ltc-facility-dir=ltc-facility -ltc-quaterly-dir=ltc-quaterly +ltc-quarterly-dir=ltc-quarterly public-key-file-name=public-UAT.txt From 175edde56dad1fa7da2de76c0be3693d96fa181f Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 21 Apr 2023 13:08:01 -0400 Subject: [PATCH 093/183] ranamming of methods and constants --- .../ca/bc/gov/chefs/etl/ChefsETLMainMethod.java | 6 +++--- .../ca/bc/gov/chefs/etl/constant/Constants.java | 16 ++++++++-------- .../LtcQuarterlyYtdApiResponseProcessor.java | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java index a7d98924..86746cc2 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java +++ b/src/main/java/ca/bc/gov/chefs/etl/ChefsETLMainMethod.java @@ -11,7 +11,7 @@ import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.routes.HelloRoute; import ca.bc.gov.chefs.etl.forms.ltc.facility.route.FacilityFormRoute; -import ca.bc.gov.chefs.etl.forms.ltc.quarterly.route.LtcQuaterlyYtdRoute; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.route.LtcQuarterlyYtdRoute; import ca.bc.gov.chefs.etl.forms.aims.route.AIMSFormRoute; /** * Camel Class runner. @@ -35,11 +35,11 @@ public static void main(String... args) throws Exception { Main main = new Main(); Security.addProvider(new BouncyCastleProvider()); // TODO : remove next line, for testing purposes only - //FileUtil.decryptAllFiles("encrypted/ltc-quaterly/230414140122", "encrypted/ltc-quaterly/230414140122/test"); + //FileUtil.decryptAllFiles("encrypted/ltc-quarterly/230414140122", "encrypted/ltc-quarterly/230414140122/test"); main.configure().addRoutesBuilder(HelloRoute.class); main.configure().addRoutesBuilder(AIMSFormRoute.class); main.configure().addRoutesBuilder(FacilityFormRoute.class); - main.configure().addRoutesBuilder(LtcQuaterlyYtdRoute.class); + main.configure().addRoutesBuilder(LtcQuarterlyYtdRoute.class); main.run(args); } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index bef6e0ba..d669c949 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -35,7 +35,7 @@ public class Constants { public static final String LTC_FACILITY_APPROVER = "LTC_FACILITY_APPROVER"; public static final String LTC_FACILITY_PREPARER = "LTC_FACILITY_PREPARER"; - /* LTC Quaterly YTD */ + /* LTC Quarterly YTD */ public final static String LTC_YTD_USERNAME = "ltc.ytd.username"; public final static String LTC_YTD_PASSWORD = "ltc.ytd.password"; public final static String IN_SCOPE = "inScope"; @@ -92,10 +92,10 @@ public class Constants { public static final String AIMS_UNENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_AIMS_DIR, false); public static final String AIMS_ENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_AIMS_DIR, true); - public final static String PROPERTIES_LTC_QUATERLY_DIR = "ltc-quaterly-dir"; - public final static String LTC_QUATERLY_DIR = FileUtil.getDirectoryName(PROPERTIES_LTC_QUATERLY_DIR); - public static final String LTC_QUARTERLY_YTD_UNENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_QUATERLY_DIR, false); - public static final String LTC_QUARTERLY_YTD_ENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_QUATERLY_DIR, true); + public final static String PROPERTIES_LTC_QUARTERLY_DIR = "ltc-quarterly-dir"; + public final static String LTC_QUARTERLY_DIR = FileUtil.getDirectoryName(PROPERTIES_LTC_QUARTERLY_DIR); + public static final String LTC_QUARTERLY_YTD_UNENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_QUARTERLY_DIR, false); + public static final String LTC_QUARTERLY_YTD_ENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_QUARTERLY_DIR, true); /* public Encryption Key */ public final static String PUBLIC_KEY_NAME_PROPERTY = "public-key-file-name"; @@ -106,12 +106,12 @@ public class Constants { static { UNENC_FILE_PATH.put(LTC_FACILITY_DIR, LTC_FACILITY_UNENCRYPTED_FP); - UNENC_FILE_PATH.put(LTC_QUATERLY_DIR, LTC_QUARTERLY_YTD_UNENCRYPTED_FP); + UNENC_FILE_PATH.put(LTC_QUARTERLY_DIR, LTC_QUARTERLY_YTD_UNENCRYPTED_FP); UNENC_FILE_PATH.put(AIMS_DIR,AIMS_UNENCRYPTED_FP); ENC_FILE_PATH.put(AIMS_DIR, AIMS_ENCRYPTED_FP); ENC_FILE_PATH.put(LTC_FACILITY_DIR, LTC_FACILITY_ENCRYPTED_FP); - ENC_FILE_PATH.put(LTC_QUATERLY_DIR, LTC_QUARTERLY_YTD_ENCRYPTED_FP); + ENC_FILE_PATH.put(LTC_QUARTERLY_DIR, LTC_QUARTERLY_YTD_ENCRYPTED_FP); HEADERS.put("TestModel#Main", new String[] { "confirmationId", "formName", "version", "createdAt", "fullName", "username", "email", "status", "assignee", "assigneeEmail", }); @@ -163,7 +163,7 @@ public class Constants { "PREPARER_CONTACT_EMAIL", }); - // LTC Quaterly YTD + // LTC Quarterly YTD HEADERS.put(LTC_YTD_SUBMISSION, new String[] { "CONFIRMATION_ID", "IS_DELETED", "SUBMISSION_DATE", "SUBMITTED_BY", "CCIMS_ID", "SUBMISSION_TYPE", "PERIOD","SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD" }); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 8642951c..d6e4e02b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -61,10 +61,10 @@ public void process(Exchange exchange) throws Exception { ObjectMapper mapper = new ObjectMapper(); List ltcYtdForms = mapper.readValue(payload, new TypeReference>() { }); - List parsedLtycYtdSubmissions = parseYtdQuaterlyRequest(ltcYtdForms); + List parsedLtycYtdSubmissions = parseYtdQuarterlyRequest(ltcYtdForms); List iModels = (List)(List) parsedLtycYtdSubmissions; Map>> map = CSVUtil.provider(iModels); - List filesGenerated = FileUtil.writeToCSVFile(map,Constants.LTC_QUATERLY_DIR); + List filesGenerated = FileUtil.writeToCSVFile(map,Constants.LTC_QUARTERLY_DIR); //TODO uncomment or remove dead code // SuccessResponse successResponse = new SuccessResponse(); // successResponse.setFiles(filesGenerated); @@ -73,7 +73,7 @@ public void process(Exchange exchange) throws Exception { } - private List parseYtdQuaterlyRequest(List ltcQuarterlyYTDSubmissions) { + private List parseYtdQuarterlyRequest(List ltcQuarterlyYTDSubmissions) { List ltcYtdSubmissions = new ArrayList<>(); for (Root root : ltcQuarterlyYTDSubmissions) { LtcYtdSubmission ltcYtdSubmission = new LtcYtdSubmission(); From e711b7ac7617c1d0be3aaf1c070edddd2359fd17 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 21 Apr 2023 13:09:22 -0400 Subject: [PATCH 094/183] modified route of ltc-quaterly to ltc-quarterly --- .../etl/forms/ltc/quarterly/route/LtcQuarterlyYtdRoute.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuarterlyYtdRoute.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuarterlyYtdRoute.java index 251cdd5f..4be449e6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuarterlyYtdRoute.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/route/LtcQuarterlyYtdRoute.java @@ -23,12 +23,12 @@ public void configure() throws Exception { * */ // trigger - from("jetty:http://{{hostname}}:{{port}}/ltc-quaterly-ytd").routeId("ltc-quaterly-ytd-form") + from("jetty:http://{{hostname}}:{{port}}/ltc-quarterly-ytd").routeId("ltc-quarterly-ytd-form") .log("CHEFS-ETL received a request for LTCQ Form extraction")//.bean(AIMSFormPayloadExtractor.class) .process(exchange -> sharedData.put("body", exchange.getIn().getBody(String.class))) - .process(new LtcQuarterlyYtdProcessor()).to("direct:ltc-quaterly-ytd").end(); + .process(new LtcQuarterlyYtdProcessor()).to("direct:ltc-quarterly-ytd").end(); - from("direct:ltc-quaterly-ytd") + from("direct:ltc-quarterly-ytd") // to the http uri .process(new LtcQuarterlyYtdApiProcessor(sharedData)) .toD("${header.RequestUri}") From 32aa37fa82741846590de8f3a17fb03a7868a198 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 24 Apr 2023 17:04:06 -0400 Subject: [PATCH 095/183] recovering labels from Json payload --- .../etl/forms/ltc/quarterly/json/Root.java | 648 ++++++++++++++++++ 1 file changed, 648 insertions(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index a3812d8d..deb57d28 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -1849,6 +1849,654 @@ public class Root{ public String yTDPlannedTotalQ3; @JsonProperty("YTDPlannedTotalQ4") public String yTDPlannedTotalQ4; + //newly added labels + public String opRev_1_label; + public String opRev_2_label; + public String opRev_3_label; + public String opRev_4_label; + @JsonProperty("opRev_YTD_label-1") + public String opRev_YTD_label_1; + @JsonProperty("opRev_YTD_label-2") + public String opRev_YTD_label_2; + @JsonProperty("opRev_YTD_label-3") + public String opRev_YTD_label_3; + @JsonProperty("opRev_YTD_label-4") + public String opRev_YTD_label_4; + @JsonProperty("opRev_YTD_label-5") + public String opRev_YTD_label_5; + @JsonProperty("opRev_YTD_label-6") + public String opRev_YTD_label_6; + @JsonProperty("opRev_YTD_label-7") + public String opRev_YTD_label_7; + @JsonProperty("opRev_YTD_label-8") + public String opRev_YTD_label_8; + @JsonProperty("opRev_YTD_label-9") + public String opRev_YTD_label_9; + @JsonProperty("opRev_YTD_label-10") + public String opRev_YTD_label_10; + @JsonProperty("opRev_YTD_label-11") + public String opRev_YTD_label_11; + @JsonProperty("opRev_YTD_label-12") + public String opRev_YTD_label_12; + @JsonProperty("opRev_YTD_label-13") + public String opRev_YTD_label_13; + @JsonProperty("opRev_YTD_label-14") + public String opRev_YTD_label_14; + @JsonProperty("opRev_YTD_label-15") + public String opRev_YTD_label_15; + @JsonProperty("opRev_YTD_label-16") + public String opRev_YTD_label_16; + @JsonProperty("opRev_YTD_label-17") + public String opRev_YTD_label_17; + @JsonProperty("opRev_YTD_label-18") + public String opRev_YTD_label_18; + @JsonProperty("opRev_YTD_label-19") + public String opRev_YTD_label_19; + @JsonProperty("opRev_YTD_label-20") + public String opRev_YTD_label_20; + @JsonProperty("opRev_YTD_label-21") + public String opRev_YTD_label_21; + @JsonProperty("opRev_YTD_label-22") + public String opRev_YTD_label_22; + @JsonProperty("opRev_YTD_label-23") + public String opRev_YTD_label_23; + @JsonProperty("opRev_YTD_label-24") + public String opRev_YTD_label_24; + @JsonProperty("opRev_YTD_label-25") + public String opRev_YTD_label_25; + @JsonProperty("opRev_YTD_label-26") + public String opRev_YTD_label_26; + @JsonProperty("opRev_YTD_label-27") + public String opRev_YTD_label_27; + @JsonProperty("opRev_YTD_label-28") + public String opRev_YTD_label_28; + @JsonProperty("opRev_YTD_label-29") + public String opRev_YTD_label_29; + @JsonProperty("opRev_YTD_label-30") + public String opRev_YTD_label_30; + @JsonProperty("opRev_YTD_label-31") + public String opRev_YTD_label_31; + @JsonProperty("opRev_YTD_label-32") + public String opRev_YTD_label_32; + @JsonProperty("opRev_YTD_label-33") + public String opRev_YTD_label_33; + @JsonProperty("opRev_YTD_label-34") + public String opRev_YTD_label_34; + @JsonProperty("opRev_YTD_label-35") + public String opRev_YTD_label_35; + @JsonProperty("opRev_YTD_label-36") + public String opRev_YTD_label_36; + @JsonProperty("opRev_YTD_label-38") + public String opRev_YTD_label_38; + @JsonProperty("opRev_YTD_label-39") + public String opRev_YTD_label_39; + public String support_label; + @JsonProperty("support_label-1") + public String support_label1; + @JsonProperty("support_label-2") + public String support_label2; + @JsonProperty("support_label-3") + public String support_label3; + @JsonProperty("support_label-4") + public String support_label4; + public String support_label_subtotal; + + public String admin_label; + @JsonProperty("admin_label-1") + public String admin_label1; + @JsonProperty("admin_label-2") + public String admin_label2; + @JsonProperty("admin_label-3") + public String admin_label3; + @JsonProperty("admin_label-4") + public String admin_label4; + @JsonProperty("admin_label-5") + public String admin_label5; + @JsonProperty("admin_label-6") + public String admin_label6; + @JsonProperty("admin_label-7") + public String admin_label7; + @JsonProperty("admin_label-8") + public String admin_label8; + public String admin_label_subtotal; + + public String nursing_label_comp; + @JsonProperty("nursing_label_comp-1") + public String nursing_label_comp1; + @JsonProperty("nursing_label_comp-2") + public String nursing_label_comp2; + @JsonProperty("nursing_label_comp-3") + public String nursing_label_comp3; + @JsonProperty("nursing_label_comp-4") + public String nursing_label_comp4; + public String nursing_label_comp_subtotal; + + public String alliedProf_label_comp; + @JsonProperty("alliedProf_label_comp-1") + public String alliedProf_label_comp1; + @JsonProperty("alliedProf_label_comp-2") + public String alliedProf_label_comp2; + @JsonProperty("alliedProf_label_comp-3") + public String alliedProf_label_comp3; + @JsonProperty("alliedProf_label_comp-4") + public String alliedProf_label_comp4; + @JsonProperty("alliedProf_label_comp-5") + public String alliedProf_label_comp5; + @JsonProperty("alliedProf_label_comp-6") + public String alliedProf_label_comp6; + @JsonProperty("alliedProf_label_comp-7") + public String alliedProf_label_comp7; + public String alliedProf_label_comp_subtotal; + + public String alliedNP_label_comp; + @JsonProperty("alliedNP_label_comp-1") + public String alliedNP_label_comp1; + @JsonProperty("alliedNP_label_comp-2") + public String alliedNP_label_comp2; + @JsonProperty("alliedNP_label_comp-3") + public String alliedNP_label_comp3; + @JsonProperty("alliedNP_label_comp-4") + public String alliedNP_label_comp4; + @JsonProperty("alliedNP_label_comp-5") + public String alliedNP_label_comp5; + @JsonProperty("alliedNP_label_comp-6") + public String alliedNP_label_comp6; + public String alliedNP_label_comp_subtotal; + + public String directCare_label_comp_subtotal; + + public String getSupport_label() { + return support_label; + } + public void setSupport_label(String support_label) { + this.support_label = support_label; + } + public String getSupport_label1() { + return support_label1; + } + public void setSupport_label1(String support_label1) { + this.support_label1 = support_label1; + } + public String getSupport_label2() { + return support_label2; + } + public void setSupport_label2(String support_label2) { + this.support_label2 = support_label2; + } + public String getSupport_label3() { + return support_label3; + } + public void setSupport_label3(String support_label3) { + this.support_label3 = support_label3; + } + public String getSupport_label4() { + return support_label4; + } + public void setSupport_label4(String support_label4) { + this.support_label4 = support_label4; + } + public String getSupport_label_subtotal() { + return support_label_subtotal; + } + public void setSupport_label_subtotal(String support_label_subtotal) { + this.support_label_subtotal = support_label_subtotal; + } + public String getAdmin_label() { + return admin_label; + } + public void setAdmin_label(String admin_label) { + this.admin_label = admin_label; + } + public String getAdmin_label1() { + return admin_label1; + } + public void setAdmin_label1(String admin_label1) { + this.admin_label1 = admin_label1; + } + public String getAdmin_label2() { + return admin_label2; + } + public void setAdmin_label2(String admin_label2) { + this.admin_label2 = admin_label2; + } + public String getAdmin_label3() { + return admin_label3; + } + public void setAdmin_label3(String admin_label3) { + this.admin_label3 = admin_label3; + } + public String getAdmin_label4() { + return admin_label4; + } + public void setAdmin_label4(String admin_label4) { + this.admin_label4 = admin_label4; + } + public String getAdmin_label5() { + return admin_label5; + } + public void setAdmin_label5(String admin_label5) { + this.admin_label5 = admin_label5; + } + public String getAdmin_label6() { + return admin_label6; + } + public void setAdmin_label6(String admin_label6) { + this.admin_label6 = admin_label6; + } + public String getAdmin_label7() { + return admin_label7; + } + public void setAdmin_label7(String admin_label7) { + this.admin_label7 = admin_label7; + } + public String getAdmin_label8() { + return admin_label8; + } + public void setAdmin_label8(String admin_label8) { + this.admin_label8 = admin_label8; + } + public String getAdmin_label_subtotal() { + return admin_label_subtotal; + } + public void setAdmin_label_subtotal(String admin_label_subtotal) { + this.admin_label_subtotal = admin_label_subtotal; + } + public String getNursing_label_comp() { + return nursing_label_comp; + } + public void setNursing_label_comp(String nursing_label_comp) { + this.nursing_label_comp = nursing_label_comp; + } + public String getNursing_label_comp1() { + return nursing_label_comp1; + } + public void setNursing_label_comp1(String nursing_label_comp1) { + this.nursing_label_comp1 = nursing_label_comp1; + } + public String getNursing_label_comp2() { + return nursing_label_comp2; + } + public void setNursing_label_comp2(String nursing_label_comp2) { + this.nursing_label_comp2 = nursing_label_comp2; + } + public String getNursing_label_comp3() { + return nursing_label_comp3; + } + public void setNursing_label_comp3(String nursing_label_comp3) { + this.nursing_label_comp3 = nursing_label_comp3; + } + public String getNursing_label_comp4() { + return nursing_label_comp4; + } + public void setNursing_label_comp4(String nursing_label_comp4) { + this.nursing_label_comp4 = nursing_label_comp4; + } + public String getNursing_label_comp_subtotal() { + return nursing_label_comp_subtotal; + } + public void setNursing_label_comp_subtotal(String nursing_label_comp_subtotal) { + this.nursing_label_comp_subtotal = nursing_label_comp_subtotal; + } + public String getAlliedProf_label_comp() { + return alliedProf_label_comp; + } + public void setAlliedProf_label_comp(String alliedProf_label_comp) { + this.alliedProf_label_comp = alliedProf_label_comp; + } + public String getAlliedProf_label_comp1() { + return alliedProf_label_comp1; + } + public void setAlliedProf_label_comp1(String alliedProf_label_comp1) { + this.alliedProf_label_comp1 = alliedProf_label_comp1; + } + public String getAlliedProf_label_comp2() { + return alliedProf_label_comp2; + } + public void setAlliedProf_label_comp2(String alliedProf_label_comp2) { + this.alliedProf_label_comp2 = alliedProf_label_comp2; + } + public String getAlliedProf_label_comp3() { + return alliedProf_label_comp3; + } + public void setAlliedProf_label_comp3(String alliedProf_label_comp3) { + this.alliedProf_label_comp3 = alliedProf_label_comp3; + } + public String getAlliedProf_label_comp4() { + return alliedProf_label_comp4; + } + public void setAlliedProf_label_comp4(String alliedProf_label_comp4) { + this.alliedProf_label_comp4 = alliedProf_label_comp4; + } + public String getAlliedProf_label_comp5() { + return alliedProf_label_comp5; + } + public void setAlliedProf_label_comp5(String alliedProf_label_comp5) { + this.alliedProf_label_comp5 = alliedProf_label_comp5; + } + public String getAlliedProf_label_comp6() { + return alliedProf_label_comp6; + } + public void setAlliedProf_label_comp6(String alliedProf_label_comp6) { + this.alliedProf_label_comp6 = alliedProf_label_comp6; + } + public String getAlliedProf_label_comp7() { + return alliedProf_label_comp7; + } + public void setAlliedProf_label_comp7(String alliedProf_label_comp7) { + this.alliedProf_label_comp7 = alliedProf_label_comp7; + } + public String getAlliedProf_label_comp_subtotal() { + return alliedProf_label_comp_subtotal; + } + public void setAlliedProf_label_comp_subtotal(String alliedProf_label_comp_subtotal) { + this.alliedProf_label_comp_subtotal = alliedProf_label_comp_subtotal; + } + public String getAlliedNP_label_comp() { + return alliedNP_label_comp; + } + public void setAlliedNP_label_comp(String alliedNP_label_comp) { + this.alliedNP_label_comp = alliedNP_label_comp; + } + public String getAlliedNP_label_comp1() { + return alliedNP_label_comp1; + } + public void setAlliedNP_label_comp1(String alliedNP_label_comp1) { + this.alliedNP_label_comp1 = alliedNP_label_comp1; + } + public String getAlliedNP_label_comp2() { + return alliedNP_label_comp2; + } + public void setAlliedNP_label_comp2(String alliedNP_label_comp2) { + this.alliedNP_label_comp2 = alliedNP_label_comp2; + } + public String getAlliedNP_label_comp3() { + return alliedNP_label_comp3; + } + public void setAlliedNP_label_comp3(String alliedNP_label_comp3) { + this.alliedNP_label_comp3 = alliedNP_label_comp3; + } + public String getAlliedNP_label_comp4() { + return alliedNP_label_comp4; + } + public void setAlliedNP_label_comp4(String alliedNP_label_comp4) { + this.alliedNP_label_comp4 = alliedNP_label_comp4; + } + public String getAlliedNP_label_comp5() { + return alliedNP_label_comp5; + } + public void setAlliedNP_label_comp5(String alliedNP_label_comp5) { + this.alliedNP_label_comp5 = alliedNP_label_comp5; + } + public String getAlliedNP_label_comp6() { + return alliedNP_label_comp6; + } + public void setAlliedNP_label_comp6(String alliedNP_label_comp6) { + this.alliedNP_label_comp6 = alliedNP_label_comp6; + } + public String getAlliedNP_label_comp_subtotal() { + return alliedNP_label_comp_subtotal; + } + public void setAlliedNP_label_comp_subtotal(String alliedNP_label_comp_subtotal) { + this.alliedNP_label_comp_subtotal = alliedNP_label_comp_subtotal; + } + public String getDirectCare_label_comp_subtotal() { + return directCare_label_comp_subtotal; + } + public void setDirectCare_label_comp_subtotal(String directCare_label_comp_subtotal) { + this.directCare_label_comp_subtotal = directCare_label_comp_subtotal; + } + public String getOpRev_1_label() { + return opRev_1_label; + } + public void setOpRev_1_label(String opRev_1_label) { + this.opRev_1_label = opRev_1_label; + } + public String getOpRev_2_label() { + return opRev_2_label; + } + public void setOpRev_2_label(String opRev_2_label) { + this.opRev_2_label = opRev_2_label; + } + public String getOpRev_3_label() { + return opRev_3_label; + } + public void setOpRev_3_label(String opRev_3_label) { + this.opRev_3_label = opRev_3_label; + } + public String getOpRev_4_label() { + return opRev_4_label; + } + public void setOpRev_4_label(String opRev_4_label) { + this.opRev_4_label = opRev_4_label; + } + public String getOpRev_YTD_label_1() { + return opRev_YTD_label_1; + } + public void setOpRev_YTD_label_1(String opRev_YTD_label_1) { + this.opRev_YTD_label_1 = opRev_YTD_label_1; + } + public String getOpRev_YTD_label_2() { + return opRev_YTD_label_2; + } + public void setOpRev_YTD_label_2(String opRev_YTD_label_2) { + this.opRev_YTD_label_2 = opRev_YTD_label_2; + } + public String getOpRev_YTD_label_3() { + return opRev_YTD_label_3; + } + public void setOpRev_YTD_label_3(String opRev_YTD_label_3) { + this.opRev_YTD_label_3 = opRev_YTD_label_3; + } + public String getOpRev_YTD_label_4() { + return opRev_YTD_label_4; + } + public void setOpRev_YTD_label_4(String opRev_YTD_label_4) { + this.opRev_YTD_label_4 = opRev_YTD_label_4; + } + public String getOpRev_YTD_label_5() { + return opRev_YTD_label_5; + } + public void setOpRev_YTD_label_5(String opRev_YTD_label_5) { + this.opRev_YTD_label_5 = opRev_YTD_label_5; + } + public String getOpRev_YTD_label_6() { + return opRev_YTD_label_6; + } + public void setOpRev_YTD_label_6(String opRev_YTD_label_6) { + this.opRev_YTD_label_6 = opRev_YTD_label_6; + } + public String getOpRev_YTD_label_7() { + return opRev_YTD_label_7; + } + public void setOpRev_YTD_label_7(String opRev_YTD_label_7) { + this.opRev_YTD_label_7 = opRev_YTD_label_7; + } + public String getOpRev_YTD_label_8() { + return opRev_YTD_label_8; + } + public void setOpRev_YTD_label_8(String opRev_YTD_label_8) { + this.opRev_YTD_label_8 = opRev_YTD_label_8; + } + public String getOpRev_YTD_label_9() { + return opRev_YTD_label_9; + } + public void setOpRev_YTD_label_9(String opRev_YTD_label_9) { + this.opRev_YTD_label_9 = opRev_YTD_label_9; + } + public String getOpRev_YTD_label_10() { + return opRev_YTD_label_10; + } + public void setOpRev_YTD_label_10(String opRev_YTD_label_10) { + this.opRev_YTD_label_10 = opRev_YTD_label_10; + } + public String getOpRev_YTD_label_11() { + return opRev_YTD_label_11; + } + public void setOpRev_YTD_label_11(String opRev_YTD_label_11) { + this.opRev_YTD_label_11 = opRev_YTD_label_11; + } + public String getOpRev_YTD_label_12() { + return opRev_YTD_label_12; + } + public void setOpRev_YTD_label_12(String opRev_YTD_label_12) { + this.opRev_YTD_label_12 = opRev_YTD_label_12; + } + public String getOpRev_YTD_label_13() { + return opRev_YTD_label_13; + } + public void setOpRev_YTD_label_13(String opRev_YTD_label_13) { + this.opRev_YTD_label_13 = opRev_YTD_label_13; + } + public String getOpRev_YTD_label_14() { + return opRev_YTD_label_14; + } + public void setOpRev_YTD_label_14(String opRev_YTD_label_14) { + this.opRev_YTD_label_14 = opRev_YTD_label_14; + } + public String getOpRev_YTD_label_15() { + return opRev_YTD_label_15; + } + public void setOpRev_YTD_label_15(String opRev_YTD_label_15) { + this.opRev_YTD_label_15 = opRev_YTD_label_15; + } + public String getOpRev_YTD_label_16() { + return opRev_YTD_label_16; + } + public void setOpRev_YTD_label_16(String opRev_YTD_label_16) { + this.opRev_YTD_label_16 = opRev_YTD_label_16; + } + public String getOpRev_YTD_label_17() { + return opRev_YTD_label_17; + } + public void setOpRev_YTD_label_17(String opRev_YTD_label_17) { + this.opRev_YTD_label_17 = opRev_YTD_label_17; + } + public String getOpRev_YTD_label_18() { + return opRev_YTD_label_18; + } + public void setOpRev_YTD_label_18(String opRev_YTD_label_18) { + this.opRev_YTD_label_18 = opRev_YTD_label_18; + } + public String getOpRev_YTD_label_19() { + return opRev_YTD_label_19; + } + public void setOpRev_YTD_label_19(String opRev_YTD_label_19) { + this.opRev_YTD_label_19 = opRev_YTD_label_19; + } + public String getOpRev_YTD_label_20() { + return opRev_YTD_label_20; + } + public void setOpRev_YTD_label_20(String opRev_YTD_label_20) { + this.opRev_YTD_label_20 = opRev_YTD_label_20; + } + public String getOpRev_YTD_label_21() { + return opRev_YTD_label_21; + } + public void setOpRev_YTD_label_21(String opRev_YTD_label_21) { + this.opRev_YTD_label_21 = opRev_YTD_label_21; + } + public String getOpRev_YTD_label_22() { + return opRev_YTD_label_22; + } + public void setOpRev_YTD_label_22(String opRev_YTD_label_22) { + this.opRev_YTD_label_22 = opRev_YTD_label_22; + } + public String getOpRev_YTD_label_23() { + return opRev_YTD_label_23; + } + public void setOpRev_YTD_label_23(String opRev_YTD_label_23) { + this.opRev_YTD_label_23 = opRev_YTD_label_23; + } + public String getOpRev_YTD_label_24() { + return opRev_YTD_label_24; + } + public void setOpRev_YTD_label_24(String opRev_YTD_label_24) { + this.opRev_YTD_label_24 = opRev_YTD_label_24; + } + public String getOpRev_YTD_label_25() { + return opRev_YTD_label_25; + } + public void setOpRev_YTD_label_25(String opRev_YTD_label_25) { + this.opRev_YTD_label_25 = opRev_YTD_label_25; + } + public String getOpRev_YTD_label_26() { + return opRev_YTD_label_26; + } + public void setOpRev_YTD_label_26(String opRev_YTD_label_26) { + this.opRev_YTD_label_26 = opRev_YTD_label_26; + } + public String getOpRev_YTD_label_27() { + return opRev_YTD_label_27; + } + public void setOpRev_YTD_label_27(String opRev_YTD_label_27) { + this.opRev_YTD_label_27 = opRev_YTD_label_27; + } + public String getOpRev_YTD_label_28() { + return opRev_YTD_label_28; + } + public void setOpRev_YTD_label_28(String opRev_YTD_label_28) { + this.opRev_YTD_label_28 = opRev_YTD_label_28; + } + public String getOpRev_YTD_label_29() { + return opRev_YTD_label_29; + } + public void setOpRev_YTD_label_29(String opRev_YTD_label_29) { + this.opRev_YTD_label_29 = opRev_YTD_label_29; + } + public String getOpRev_YTD_label_30() { + return opRev_YTD_label_30; + } + public void setOpRev_YTD_label_30(String opRev_YTD_label_30) { + this.opRev_YTD_label_30 = opRev_YTD_label_30; + } + public String getOpRev_YTD_label_31() { + return opRev_YTD_label_31; + } + public void setOpRev_YTD_label_31(String opRev_YTD_label_31) { + this.opRev_YTD_label_31 = opRev_YTD_label_31; + } + public String getOpRev_YTD_label_32() { + return opRev_YTD_label_32; + } + public void setOpRev_YTD_label_32(String opRev_YTD_label_32) { + this.opRev_YTD_label_32 = opRev_YTD_label_32; + } + public String getOpRev_YTD_label_33() { + return opRev_YTD_label_33; + } + public void setOpRev_YTD_label_33(String opRev_YTD_label_33) { + this.opRev_YTD_label_33 = opRev_YTD_label_33; + } + public String getOpRev_YTD_label_34() { + return opRev_YTD_label_34; + } + public void setOpRev_YTD_label_34(String opRev_YTD_label_34) { + this.opRev_YTD_label_34 = opRev_YTD_label_34; + } + public String getOpRev_YTD_label_35() { + return opRev_YTD_label_35; + } + public void setOpRev_YTD_label_35(String opRev_YTD_label_35) { + this.opRev_YTD_label_35 = opRev_YTD_label_35; + } + public String getOpRev_YTD_label_36() { + return opRev_YTD_label_36; + } + public void setOpRev_YTD_label_36(String opRev_YTD_label_36) { + this.opRev_YTD_label_36 = opRev_YTD_label_36; + } + public String getOpRev_YTD_label_38() { + return opRev_YTD_label_38; + } + public void setOpRev_YTD_label_38(String opRev_YTD_label_38) { + this.opRev_YTD_label_38 = opRev_YTD_label_38; + } + public String getOpRev_YTD_label_39() { + return opRev_YTD_label_39; + } + public void setOpRev_YTD_label_39(String opRev_YTD_label_39) { + this.opRev_YTD_label_39 = opRev_YTD_label_39; + } public String getAlliedNPContractRate_total() { return alliedNPContractRate_total; } From c88d855a3c8c6adc1f81de89c048cd1c7839d0e0 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 24 Apr 2023 17:04:27 -0400 Subject: [PATCH 096/183] mapping to labels instead of hard coded strings --- .../LtcQuarterlyYtdApiResponseProcessor.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index d6e4e02b..7504366c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -396,7 +396,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY /* Direct Care Hours Subtotals */ LtcYtdDirectCareHrsSubTotals nursingDirCareHrsSubTotal = new LtcYtdDirectCareHrsSubTotals(); - nursingDirCareHrsSubTotal.setDirCareType("Nursing"); + nursingDirCareHrsSubTotal.setDirCareType(root.getNursing_label()); nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsRegularYTD(root.getNursingProdH_sum11()); nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsOTYTD(root.getNursingProdH_sum21()); nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsSubtotalYTD(root.getNursingProdH_calcsum1()); @@ -411,7 +411,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdDirectCareHrsSubTotals alliedDirCareHrsSubTotal = new LtcYtdDirectCareHrsSubTotals(); - alliedDirCareHrsSubTotal.setDirCareType("Allied Professional"); + alliedDirCareHrsSubTotal.setDirCareType(root.getAlliedProf_label()); alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsRegularYTD(root.getAlliedProfProdH_sum11()); alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsOTYTD(root.getAlliedProfProdH_sum21()); @@ -426,7 +426,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedDirCareHrsSubTotal.setConfirmationID(root.getForm().getConfirmationId()); LtcYtdDirectCareHrsSubTotals alliedNPDirCareHrsSubTotal = new LtcYtdDirectCareHrsSubTotals(); - alliedNPDirCareHrsSubTotal.setDirCareType("Allied Non-professional"); + alliedNPDirCareHrsSubTotal.setDirCareType(root.getAlliedNP_label()); alliedNPDirCareHrsSubTotal.setSubTotalDirCareProdHrsRegularYTD(root.getAlliedNPProdH_sum11()); alliedNPDirCareHrsSubTotal.setSubTotalDirCareProdHrsOTYTD(root.getAlliedNPProdH_sum21()); alliedNPDirCareHrsSubTotal.setSubTotalDirCareProdHrsSubtotalYTD(root.getAlliedNPProdH_calcsum1()); @@ -768,7 +768,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY /* Direct Care Cost Subtotals */ LtcYtdDirectCareCostSubtotals nursingCareCostSubtotals = new LtcYtdDirectCareCostSubtotals(); nursingCareCostSubtotals.setConfirmationID(root.getForm().getConfirmationId()); - nursingCareCostSubtotals.setDirCareType("Nursing"); + nursingCareCostSubtotals.setDirCareType(root.getNursing_label()); nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsRegularYTD(root.getNursingProdC_sum11()); nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsOTYTD(root.getNursingProdC_sum21()); nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getNursingProdC_calc1()); @@ -784,7 +784,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdDirectCareCostSubtotals alliedCareCostSubtotals = new LtcYtdDirectCareCostSubtotals(); alliedCareCostSubtotals.setConfirmationID(root.getForm().getConfirmationId()); - alliedCareCostSubtotals.setDirCareType("Allied Professional"); + alliedCareCostSubtotals.setDirCareType(root.getAlliedProf_label()); alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsRegularYTD(root.getAlliedProfProdC_sum11()); alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsOTYTD(root.getAlliedProfProdC_sum21()); alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getAlliedProfProdC_calc1()); @@ -800,7 +800,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdDirectCareCostSubtotals alliedNProfCareCostSubtotals = new LtcYtdDirectCareCostSubtotals(); alliedNProfCareCostSubtotals.setConfirmationID(root.getForm().getConfirmationId()); - alliedNProfCareCostSubtotals.setDirCareType("Allied Non-professional"); + alliedNProfCareCostSubtotals.setDirCareType(root.getAlliedNP_label()); alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsRegularYTD(root.getAlliedNPProdC_sum11()); alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsOTYTD(root.getAlliedNPProdC_sum21()); alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getAlliedNPProdC_calc1()); @@ -824,8 +824,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportFoodServices.setCompSalStaffYtd(root.getCompB_item11()); supportFoodServices.setCompSalContractServicesYtd(root.getCompB_item21()); supportFoodServices.setCompSalOfficeAllocYtd(root.getCompB_item31()); - supportFoodServices.setCompSalName("Food Services"); - supportFoodServices.setCompSalType("Support"); + supportFoodServices.setCompSalName(root.getSupport_label1()); + supportFoodServices.setCompSalType(root.getSupport_label()); supportFoodServices.setConfirmationId(root.getForm().getConfirmationId()); supportFoodServices.setCompSalTotalCostYtd(root.getCompB_calc1()); @@ -833,8 +833,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportLaundryServices.setCompSalStaffYtd(root.getCompB_item12()); supportLaundryServices.setCompSalContractServicesYtd(root.getCompB_item22()); supportLaundryServices.setCompSalOfficeAllocYtd(root.getCompB_item32()); - supportLaundryServices.setCompSalName("Laundry Services"); - supportLaundryServices.setCompSalType("Support/Administration"); + supportLaundryServices.setCompSalName(root.getSupport_label2()); + supportLaundryServices.setCompSalType(root.getSupport_label()); supportLaundryServices.setConfirmationId(root.getForm().getConfirmationId()); supportLaundryServices.setCompSalTotalCostYtd(root.getCompB_calc2()); @@ -842,8 +842,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportHousekeeping.setCompSalStaffYtd(root.getCompB_item13()); supportHousekeeping.setCompSalContractServicesYtd(root.getCompB_item23()); supportHousekeeping.setCompSalOfficeAllocYtd(root.getCompB_item33()); - supportHousekeeping.setCompSalName("Housekeeping Services"); - supportHousekeeping.setCompSalType("Support/Administration"); + supportHousekeeping.setCompSalName(root.getSupport_label3()); + supportHousekeeping.setCompSalType(root.getSupport_label()); supportHousekeeping.setConfirmationId(root.getForm().getConfirmationId()); supportHousekeeping.setCompSalTotalCostYtd(root.getCompB_calc3()); @@ -851,8 +851,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportPlantMntnce.setCompSalStaffYtd(root.getCompB_item14()); supportPlantMntnce.setCompSalContractServicesYtd(root.getCompB_item24()); supportPlantMntnce.setCompSalOfficeAllocYtd(root.getCompB_item34()); - supportPlantMntnce.setCompSalName("Plant Maintenance & Op. Staffins"); - supportPlantMntnce.setCompSalType("Support/Administration"); + supportPlantMntnce.setCompSalName(root.getSupport_label4()); + supportPlantMntnce.setCompSalType(root.getSupport_label()); supportPlantMntnce.setConfirmationId(root.getForm().getConfirmationId()); supportPlantMntnce.setCompSalTotalCostYtd(root.getCompB_calc4()); // Administration From b47053a9327af0d630d06cb50b6b2b832363c8b4 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 24 Apr 2023 18:20:29 -0400 Subject: [PATCH 097/183] added default values for empty Strings and numbers --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index d669c949..0c9801b3 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -18,6 +18,10 @@ public class Constants { /* CHEFS API */ public final static String CHEFS_API_URL = "chefs.http.uri"; + + /* Default values for empty Strings and Numbers */ + public final static String DEFAULT_STRING_VALUE = ""; + public final static String DEFAULT_DECIMAL_VALUE = "0"; /* AIMS */ public final static String AIMS_USERNAME = "aims.username"; From 8f20b4c880a9318fcee2ba5e935ecf79985516a1 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 24 Apr 2023 18:21:24 -0400 Subject: [PATCH 098/183] All required fields for LTC YTD now have default value instead of null or empty. --- .../model/LtcBedYtdMaxOccupancy.java | 16 +++++++++------- .../model/LtcBedYtdMaxOccupancyTotals.java | 8 +++++--- .../model/LtcBedYtdOccupancyRate.java | 8 +++++--- .../model/LtcBedYtdOccupancyRateTotals.java | 6 ++++-- .../model/LtcBedYtdOccupiedDays.java | 8 +++++--- .../model/LtcBedYtdOccupiedDaysTotals.java | 6 ++++-- .../ltc/quarterly/model/LtcYtdCompAddPos.java | 14 ++++++++++---- .../quarterly/model/LtcYtdCompBenefits.java | 6 +++--- .../ltc/quarterly/model/LtcYtdCompHrs.java | 14 +++++++------- .../model/LtcYtdCompHrsSubtotals.java | 4 ++-- .../quarterly/model/LtcYtdCompHrsTotals.java | 4 ++-- .../ltc/quarterly/model/LtcYtdCompSal.java | 18 +++++++++--------- .../model/LtcYtdCompSalSubtotals.java | 4 ++-- .../quarterly/model/LtcYtdCompSalTotals.java | 4 ++-- .../forms/ltc/quarterly/model/LtcYtdDep.java | 9 ++++++--- .../quarterly/model/LtcYtdDirectCareCost.java | 12 ++++++------ .../model/LtcYtdDirectCareCostSubtotals.java | 6 ++++-- .../quarterly/model/LtcYtdDirectCareHrs.java | 18 +++++++++--------- .../model/LtcYtdDirectCareHrsSubTotals.java | 6 ++++-- .../forms/ltc/quarterly/model/LtcYtdExp.java | 10 +++++----- .../quarterly/model/LtcYtdExpSubTotals.java | 6 ++++-- .../forms/ltc/quarterly/model/LtcYtdRev.java | 8 ++++---- .../quarterly/model/LtcYtdRevSubTotals.java | 6 ++++-- .../ltc/quarterly/model/LtcYtdSubmission.java | 19 +++++++++++-------- .../ltc/quarterly/model/LtcYtdSumTotals.java | 8 +++++--- 25 files changed, 131 insertions(+), 97 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java index 68755459..35eca4d9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; @@ -23,19 +25,19 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getQuarterInventory() { return quarterInventory; } public void setQuarterInventory(String quarterInventory) { - this.quarterInventory = quarterInventory; + this.quarterInventory = StringUtils.defaultIfEmpty(quarterInventory, Constants.DEFAULT_STRING_VALUE); } public String getBedFundingType() { return bedFundingType; } public void setBedFundingType(String bedFundingType) { - this.bedFundingType = bedFundingType; + this.bedFundingType = StringUtils.defaultIfEmpty(bedFundingType, Constants.DEFAULT_STRING_VALUE); } public String getBedSubype() { return bedSubype; @@ -47,25 +49,25 @@ public String getStartDate() { return CSVUtil.getFormattedDate(startDate); } public void setStartDate(String startDate) { - this.startDate = startDate; + this.startDate = StringUtils.defaultIfEmpty(startDate, Constants.DEFAULT_STRING_VALUE); } public String getEndDate() { return CSVUtil.getFormattedDate(endDate); } public void setEndDate(String endDate) { - this.endDate = endDate; + this.endDate = StringUtils.defaultIfEmpty(endDate, Constants.DEFAULT_STRING_VALUE); } public String getNumberOfBeds() { return numberOfBeds; } public void setNumberOfBeds(String numberOfBeds) { - this.numberOfBeds = numberOfBeds; + this.numberOfBeds = StringUtils.defaultIfEmpty(numberOfBeds, Constants.DEFAULT_DECIMAL_VALUE); } public String getMaximumBedDays() { return maximumBedDays; } public void setMaximumBedDays(String maximumBedDays) { - this.maximumBedDays = maximumBedDays; + this.maximumBedDays = StringUtils.defaultIfEmpty(maximumBedDays, Constants.DEFAULT_DECIMAL_VALUE); } public String getNotes() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancyTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancyTotals.java index f201db0d..9ce2e2b0 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancyTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancyTotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -22,7 +24,7 @@ public String getConfirmationID() { } public void setConfirmationID(String confirmationID) { - this.confirmationID = confirmationID; + this.confirmationID = StringUtils.defaultIfEmpty(confirmationID, Constants.DEFAULT_STRING_VALUE); } public String getBedFundingType() { @@ -30,7 +32,7 @@ public String getBedFundingType() { } public void setBedFundingType(String bedFundingType) { - this.bedFundingType = bedFundingType; + this.bedFundingType = StringUtils.defaultIfEmpty(bedFundingType, Constants.DEFAULT_STRING_VALUE); } public String getTotalBedQuarter1() { @@ -78,7 +80,7 @@ public String getOccupancyType() { } public void setOccupancyType(String occupancyType) { - this.occupancyType = occupancyType; + this.occupancyType = StringUtils.defaultIfEmpty(occupancyType, Constants.DEFAULT_STRING_VALUE); } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRate.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRate.java index b5c26757..81754ce9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRate.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRate.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -22,19 +24,19 @@ public String getConfirmationID() { return confirmationID; } public void setConfirmationID(String confirmationID) { - this.confirmationID = confirmationID; + this.confirmationID = StringUtils.defaultIfEmpty(confirmationID, Constants.DEFAULT_STRING_VALUE); } public String getOccRateQuarter() { return occRateQuarter; } public void setOccRateQuarter(String occRateQuarter) { - this.occRateQuarter = occRateQuarter; + this.occRateQuarter = StringUtils.defaultIfEmpty(occRateQuarter, Constants.DEFAULT_STRING_VALUE); } public String getOccRateBedTypes() { return occRateBedTypes; } public void setOccRateBedTypes(String occRateBedTypes) { - this.occRateBedTypes = occRateBedTypes; + this.occRateBedTypes = StringUtils.defaultIfEmpty(occRateBedTypes, Constants.DEFAULT_STRING_VALUE); } public String getPlanMaxOccDays() { return planMaxOccDays; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRateTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRateTotals.java index 15fe8bfa..72551c34 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRateTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRateTotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -20,7 +22,7 @@ public String getConfirmationID() { } public void setConfirmationID(String confirmationID) { - this.confirmationID = confirmationID; + this.confirmationID = StringUtils.defaultIfEmpty(confirmationID, Constants.DEFAULT_STRING_VALUE); } public String getOccRateQuarter() { @@ -28,7 +30,7 @@ public String getOccRateQuarter() { } public void setOccRateQuarter(String occRateQuarter) { - this.occRateQuarter = occRateQuarter; + this.occRateQuarter = StringUtils.defaultIfEmpty(occRateQuarter, Constants.DEFAULT_STRING_VALUE); } public String getTotalPlanMaxOccDays() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDays.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDays.java index a44e0c61..e771d98b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDays.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDays.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -20,19 +22,19 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getOccQuarter() { return occQuarter; } public void setOccQuarter(String occQuarter) { - this.occQuarter = occQuarter; + this.occQuarter = StringUtils.defaultIfEmpty(occQuarter, Constants.DEFAULT_STRING_VALUE); } public String getOccMonth() { return occMonth; } public void setOccMonth(String occMonth) { - this.occMonth = occMonth; + this.occMonth = StringUtils.defaultIfEmpty(occMonth, Constants.DEFAULT_STRING_VALUE); } public String getOccDaysYTDInScopePublic() { return occDaysYTDInScopePublic; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java index 6e535ca4..0b41b825 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -18,13 +20,13 @@ public String getConfirmationID() { return ConfirmationID; } public void setConfirmationID(String confirmationID) { - ConfirmationID = confirmationID; + ConfirmationID = StringUtils.defaultIfEmpty(confirmationID, Constants.DEFAULT_STRING_VALUE); } public String getOccQuarter() { return occQuarter; } public void setOccQuarter(String occQuarter) { - this.occQuarter = occQuarter; + this.occQuarter = StringUtils.defaultIfEmpty(occQuarter, Constants.DEFAULT_STRING_VALUE); } public String getOccDaysYTDInScopePublic() { return occDaysYTDInScopePublic; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java index 6bf2ab8b..bf88d525 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -20,7 +22,7 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getAddPosType() { return addPosType; @@ -37,8 +39,9 @@ public void setAddPosName(String addPosName) { public String getAddPosContractedOutYtd() { return this.addPosContractedOutYtd; } + // TODO set to Constant.DEFAULT_BOOLEAN_VALUE if needed public void setAddPosContractedOutYtd(String addPosContractedOutYtd) { - this.addPosContractedOutYtd = addPosContractedOutYtd; + this.addPosContractedOutYtd = StringUtils.defaultIfEmpty(addPosContractedOutYtd, Constants.DEFAULT_STRING_VALUE); } public String getAddPosLegalNameContractServiceYtd() { return addPosLegalNameContractServiceYtd; @@ -59,11 +62,14 @@ public void setAddPosAnotherName(String addPosAnotherName) { this.addPosAnotherName = addPosAnotherName; } + //TODO Verify that we have to right logic with Wagner public void determineAddPosContractedOutYtd() { if(this.getAddPosLegalNameContractServiceYtd() != "" && this.getAddPosLegalNameContractServiceYtd() != null){ - this.addPosContractedOutYtd = "Y"; + //this.setAddPosContractedOutYtd("Y"); + this.setAddPosContractedOutYtd(""); } - this.addPosContractedOutYtd = "N"; + //this.setAddPosContractedOutYtd("N"); + this.setAddPosContractedOutYtd(""); } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java index 7f1009f8..fa0f1865 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java @@ -19,19 +19,19 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getBenefitsType() { return benefitsType; } public void setBenefitsType(String benefitsType) { - this.benefitsType = benefitsType; + this.benefitsType = StringUtils.defaultIfEmpty(benefitsType, Constants.DEFAULT_STRING_VALUE); } public String getBenefitsAmountYtd() { return StringUtils.isEmpty(benefitsAmountYtd) ? "0" : benefitsAmountYtd; } public void setBenefitsAmountYtd(String benefitsAmountYtd) { - this.benefitsAmountYtd = benefitsAmountYtd; + this.benefitsAmountYtd = StringUtils.defaultIfEmpty(benefitsAmountYtd, Constants.DEFAULT_DECIMAL_VALUE); } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java index d062e7c3..ec3813d3 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java @@ -23,45 +23,45 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getCompHrsType() { return compHrsType; } public void setCompHrsType(String compHrsType) { - this.compHrsType = compHrsType; + this.compHrsType = StringUtils.defaultIfEmpty(compHrsType, Constants.DEFAULT_STRING_VALUE); } public String getCompHrsName() { return compHrsName; } public void setCompHrsName(String compHrsName) { - this.compHrsName = compHrsName; + this.compHrsName = StringUtils.defaultIfEmpty(compHrsName, Constants.DEFAULT_STRING_VALUE); } public String getCompHrsStaffYtd() { return StringUtils.isEmpty(compHrsStaffYtd) ? "0" : compHrsStaffYtd; } public void setCompHrsStaffYtd(String compHrsStaffYtd) { - this.compHrsStaffYtd = compHrsStaffYtd; + this.compHrsStaffYtd = StringUtils.defaultIfEmpty(compHrsStaffYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getCompHrsContractServicesYtd() { return compHrsContractServicesYtd.isBlank() ? "0" : compHrsContractServicesYtd; } public void setCompHrsContractServicesYtd(String compHrsContractServicesYtd) { - this.compHrsContractServicesYtd = compHrsContractServicesYtd; + this.compHrsContractServicesYtd = StringUtils.defaultIfEmpty(compHrsContractServicesYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getCompHrsOfficeAllocYtd() { return StringUtils.isEmpty(compHrsOfficeAllocYtd) ? "0" : compHrsOfficeAllocYtd; } public void setCompHrsOfficeAllocYtd(String compHrsOfficeAllocYtd) { - this.compHrsOfficeAllocYtd = compHrsOfficeAllocYtd; + this.compHrsOfficeAllocYtd = StringUtils.defaultIfEmpty(compHrsOfficeAllocYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getCompTotalWorkedHrsYtd() { return compTotalWorkedHrsYtd.isBlank() ? "0" : compTotalWorkedHrsYtd; } public void setCompTotalWorkedHrsYtd(String compTotalWorkedHrsYtd) { - this.compTotalWorkedHrsYtd = compTotalWorkedHrsYtd; + this.compTotalWorkedHrsYtd = StringUtils.defaultIfEmpty(compTotalWorkedHrsYtd, Constants.DEFAULT_DECIMAL_VALUE); } @Override public String getFileName() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsSubtotals.java index e151f0ca..fe46ee6d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsSubtotals.java @@ -21,13 +21,13 @@ public String getConfirmationID() { return confirmationID; } public void setConfirmationID(String confirmationID) { - this.confirmationID = confirmationID; + this.confirmationID = StringUtils.defaultIfEmpty(confirmationID, Constants.DEFAULT_STRING_VALUE); } public String getCompHrsType() { return compHrsType; } public void setCompHrsType(String compHrsType) { - this.compHrsType = compHrsType; + this.compHrsType = StringUtils.defaultIfEmpty(compHrsType, Constants.DEFAULT_STRING_VALUE); } public String getSubTotalCompHrsStaffYTD() { return StringUtils.isBlank(subTotalCompHrsStaffYTD) ? "0" : subTotalCompHrsStaffYTD; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsTotals.java index fff4d485..4ede1c76 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsTotals.java @@ -24,7 +24,7 @@ public String getConfirmationID() { } public void setConfirmationID(String confirmationID) { - this.confirmationID = confirmationID; + this.confirmationID = StringUtils.defaultIfEmpty(confirmationID, Constants.DEFAULT_STRING_VALUE); } public String getCompHrsTotalType() { @@ -32,7 +32,7 @@ public String getCompHrsTotalType() { } public void setCompHrsTotalType(String compHrsTotalType) { - this.compHrsTotalType = compHrsTotalType; + this.compHrsTotalType = StringUtils.defaultIfEmpty(compHrsTotalType, Constants.DEFAULT_STRING_VALUE); } public String getTotalCompHrsStaffYTD() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java index 058cab11..fbf53f73 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java @@ -27,37 +27,37 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getCompSalType() { return compSalType; } public void setCompSalType(String compSalType) { - this.compSalType = compSalType; + this.compSalType = StringUtils.defaultIfEmpty(compSalType, Constants.DEFAULT_STRING_VALUE); } public String getCompSalName() { return compSalName; } public void setCompSalName(String compSalName) { - this.compSalName = compSalName; + this.compSalName = StringUtils.defaultIfEmpty(compSalName, Constants.DEFAULT_STRING_VALUE); } public String getCompSalStaffYtd() { - return StringUtils.isBlank(compSalStaffYtd) ? "0" : compSalStaffYtd; + return compSalStaffYtd; } public void setCompSalStaffYtd(String compSalStaffYtd) { - this.compSalStaffYtd = compSalStaffYtd; + this.compSalStaffYtd = StringUtils.defaultIfEmpty(compSalStaffYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getCompSalContractServicesYtd() { - return StringUtils.isBlank(compSalContractServicesYtd) ? "0" : compSalContractServicesYtd; + return compSalContractServicesYtd; } public void setCompSalContractServicesYtd(String compSalContractServicesYtd) { - this.compSalContractServicesYtd = compSalContractServicesYtd; + this.compSalContractServicesYtd = StringUtils.defaultIfEmpty(compSalContractServicesYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getCompSalOfficeAllocYtd() { - return StringUtils.isBlank(compSalOfficeAllocYtd) ? "0" : compSalOfficeAllocYtd; + return compSalOfficeAllocYtd; } public void setCompSalOfficeAllocYtd(String compSalOfficeAllocYtd) { - this.compSalOfficeAllocYtd = compSalOfficeAllocYtd; + this.compSalOfficeAllocYtd = StringUtils.defaultIfEmpty(compSalOfficeAllocYtd, Constants.DEFAULT_DECIMAL_VALUE); } @Override public String getFileName() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalSubtotals.java index e9779aa8..51cb66ed 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalSubtotals.java @@ -22,7 +22,7 @@ public String getConfirmationId() { } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getCompSalType() { @@ -30,7 +30,7 @@ public String getCompSalType() { } public void setCompSalType(String compSalType) { - this.compSalType = compSalType; + this.compSalType = StringUtils.defaultIfEmpty(compSalType, Constants.DEFAULT_STRING_VALUE); } public String getSubTotalCompSalStaffYTD() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java index 7e87393e..ff9aee3c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java @@ -22,7 +22,7 @@ public String getConfirmationId() { } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getCompSalType() { @@ -30,7 +30,7 @@ public String getCompSalType() { } public void setCompSalType(String compSalType) { - this.compSalType = compSalType; + this.compSalType = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getTotalCompSalStaffYTD() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDep.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDep.java index 0d65e7a7..acff341a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDep.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDep.java @@ -2,6 +2,9 @@ import java.util.ArrayList; import java.util.List; + +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -16,19 +19,19 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getDepName() { return depName; } public void setDepName(String depName) { - this.depName = depName; + this.depName = StringUtils.defaultIfEmpty(depName, Constants.DEFAULT_STRING_VALUE); } public String getDepYtd() { return depYtd; } public void setDepYtd(String depYtd) { - this.depYtd = depYtd; + this.depYtd = StringUtils.defaultIfEmpty(depYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getDepNotes() { return depNotes; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java index 5c07ebc2..882dce59 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java @@ -30,19 +30,19 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getDirCareCostType() { return dirCareCostType; } public void setDirCareCostType(String dirCareCostType) { - this.dirCareCostType = dirCareCostType; + this.dirCareCostType = StringUtils.defaultIfEmpty(dirCareCostType, Constants.DEFAULT_STRING_VALUE); } public String getDirCareCostName() { return dirCareCostName; } public void setDirCareCostName(String dirCareCostName) { - this.dirCareCostName = dirCareCostName; + this.dirCareCostName = StringUtils.defaultIfEmpty(dirCareCostName, Constants.DEFAULT_STRING_VALUE); } public String getDirCareOtherValue() { return dirCareOtherValue; @@ -54,19 +54,19 @@ public String getDirCareCostProdHrsRegYtd() { return StringUtils.isBlank(dirCareCostProdHrsRegYtd) ? "0" : dirCareCostProdHrsRegYtd; } public void setDirCareCostProdHrsRegYtd(String dirCareCostProdHrsRegYtd) { - this.dirCareCostProdHrsRegYtd = dirCareCostProdHrsRegYtd; + this.dirCareCostProdHrsRegYtd = StringUtils.defaultIfEmpty(dirCareCostProdHrsRegYtd, Constants.DEFAULT_STRING_VALUE); } public String getDirCareCostProdHrsOtYtd() { return StringUtils.isBlank(dirCareCostProdHrsOtYtd) ? "0" : dirCareCostProdHrsOtYtd; } public void setDirCareCostProdHrsOtYtd(String dirCareCostProdHrsOtYtd) { - this.dirCareCostProdHrsOtYtd = dirCareCostProdHrsOtYtd; + this.dirCareCostProdHrsOtYtd = StringUtils.defaultIfEmpty(dirCareCostProdHrsOtYtd, Constants.DEFAULT_STRING_VALUE); } public String getDirCareCostProdHrsContractedYtd() { return StringUtils.isBlank(dirCareCostProdHrsContractedYtd) ? "0" : dirCareCostProdHrsContractedYtd; } public void setDirCareCostProdHrsContractedYtd(String dirCareCostProdHrsContractedYtd) { - this.dirCareCostProdHrsContractedYtd = dirCareCostProdHrsContractedYtd; + this.dirCareCostProdHrsContractedYtd = StringUtils.defaultIfEmpty(dirCareCostProdHrsContractedYtd, Constants.DEFAULT_STRING_VALUE); } public String getDirCareCostNonProdHrsVacYtd() { return dirCareCostNonProdHrsVacYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java index 9e1c84e9..f994cb1e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -29,7 +31,7 @@ public String getConfirmationID() { } public void setConfirmationID(String confirmationID) { - this.confirmationID = confirmationID; + this.confirmationID = StringUtils.defaultIfEmpty(confirmationID, Constants.DEFAULT_STRING_VALUE); } public String getDirCareType() { @@ -37,7 +39,7 @@ public String getDirCareType() { } public void setDirCareType(String dirCareType) { - this.dirCareType = dirCareType; + this.dirCareType = StringUtils.defaultIfEmpty(dirCareType, Constants.DEFAULT_STRING_VALUE); } public String getSubTotalDirCareCostProdHrsRegularYTD() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java index 6624f0be..1f1b2e3b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java @@ -29,19 +29,19 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getDirCareType() { return dirCareType; } public void setDirCareType(String dirCareType) { - this.dirCareType = dirCareType; + this.dirCareType = StringUtils.defaultIfEmpty(dirCareType, Constants.DEFAULT_STRING_VALUE); } public String getDirCareName() { return dirCareName; } public void setDirCareName(String dirCareName) { - this.dirCareName = dirCareName; + this.dirCareName = StringUtils.defaultIfEmpty(dirCareName, Constants.DEFAULT_STRING_VALUE); } public String getDirCareOtherValue() { return dirCareOtherValue; @@ -50,22 +50,22 @@ public void setDirCareOtherValue(String dirCareOtherValue) { this.dirCareOtherValue = dirCareOtherValue; } public String getDirCareProdHrsRegYtd() { - return StringUtils.isBlank(dirCareProdHrsRegYtd) ? "0" : dirCareProdHrsRegYtd; + return dirCareProdHrsRegYtd; } public void setDirCareProdHrsRegYtd(String dirCareProdHrsRegYtd) { - this.dirCareProdHrsRegYtd = dirCareProdHrsRegYtd; + this.dirCareProdHrsRegYtd = StringUtils.defaultIfEmpty(dirCareProdHrsRegYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getDirCareProdHrsOtYtd() { - return StringUtils.isBlank(dirCareProdHrsOtYtd) ? "0" : dirCareProdHrsOtYtd; + return dirCareProdHrsOtYtd; } public void setDirCareProdHrsOtYtd(String dirCareProdHrsOtYtd) { - this.dirCareProdHrsOtYtd = dirCareProdHrsOtYtd; + this.dirCareProdHrsOtYtd = StringUtils.defaultIfEmpty(dirCareProdHrsOtYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getDirCareProdHrsContractedYtd() { - return StringUtils.isBlank(dirCareProdHrsContractedYtd) ? "0" : dirCareProdHrsContractedYtd; + return dirCareProdHrsContractedYtd; } public void setDirCareProdHrsContractedYtd(String dirCareProdHrsContractedYtd) { - this.dirCareProdHrsContractedYtd = dirCareProdHrsContractedYtd; + this.dirCareProdHrsContractedYtd = StringUtils.defaultIfEmpty(dirCareProdHrsContractedYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getDirCareNonProdHrsVacYtd() { return dirCareNonProdHrsVacYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java index 03f4b9e8..856a59f5 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -27,7 +29,7 @@ public String getConfirmationID() { } public void setConfirmationID(String confirmationID) { - this.confirmationID = confirmationID; + this.confirmationID = StringUtils.defaultIfEmpty(confirmationID, Constants.DEFAULT_STRING_VALUE); } public String getDirCareType() { @@ -35,7 +37,7 @@ public String getDirCareType() { } public void setDirCareType(String dirCareType) { - this.dirCareType = dirCareType; + this.dirCareType = StringUtils.defaultIfEmpty(dirCareType, Constants.DEFAULT_STRING_VALUE); } public String getSubTotalDirCareProdHrsRegularYTD() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExp.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExp.java index 128c9653..39efffee 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExp.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExp.java @@ -20,25 +20,25 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getExpType() { return expType; } public void setExpType(String expType) { - this.expType = expType; + this.expType = StringUtils.defaultIfEmpty(expType, Constants.DEFAULT_STRING_VALUE); } public String getExpName() { return expName; } public void setExpName(String expName) { - this.expName = expName; + this.expName = StringUtils.defaultIfEmpty(expName, Constants.DEFAULT_STRING_VALUE); } public String getExpYtd() { - return StringUtils.isBlank(expYtd) ? "0" : expYtd; + return expYtd; } public void setExpYtd(String expYtd) { - this.expYtd = expYtd; + this.expYtd = StringUtils.defaultIfEmpty(expYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getExpNotes() { return expNotes; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java index d9547b8a..d54d0b91 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -16,13 +18,13 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getExpType() { return expType; } public void setExpType(String expType) { - this.expType = expType; + this.expType = StringUtils.defaultIfEmpty(expType, Constants.DEFAULT_STRING_VALUE); } public String getSubTotalRevYtd() { return subTotalRevYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRev.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRev.java index dedc2dc1..f4e94b5b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRev.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRev.java @@ -20,25 +20,25 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getRevType() { return revType; } public void setRevType(String revType) { - this.revType = revType; + this.revType = StringUtils.defaultIfEmpty(revType, Constants.DEFAULT_STRING_VALUE); } public String getRevName() { return revName; } public void setRevName(String revName) { - this.revName = revName; + this.revName = StringUtils.defaultIfEmpty(revName, Constants.DEFAULT_STRING_VALUE); } public String getRevYTD() { return StringUtils.isBlank(revYTD) ? "0" : revYTD; } public void setRevYTD(String revYTD) { - this.revYTD = revYTD; + this.revYTD = StringUtils.defaultIfEmpty(revYTD, Constants.DEFAULT_DECIMAL_VALUE); } public String getRevNotes() { return revNotes; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java index 56dac00b..f3f1f188 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -17,13 +19,13 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getRevType() { return revType; } public void setRevType(String revType) { - this.revType = revType; + this.revType = StringUtils.defaultIfEmpty(revType, Constants.DEFAULT_STRING_VALUE); } public String getSubTotalRevYtd() { return subTotalRevYtd; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java index b43c01d9..e5aead9d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java @@ -3,6 +3,9 @@ import java.util.ArrayList; import java.util.List; + +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; @@ -117,7 +120,7 @@ public String getConfirmationId() { } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getSubmissionDate() { @@ -125,7 +128,7 @@ public String getSubmissionDate() { } public void setSubmissionDate(String submissionDate) { - this.submissionDate = submissionDate; + this.submissionDate = StringUtils.defaultIfEmpty(submissionDate, Constants.DEFAULT_STRING_VALUE);; } public String getSubmittedBy() { @@ -133,7 +136,7 @@ public String getSubmittedBy() { } public void setSubmittedBy(String submittedBy) { - this.submittedBy = submittedBy; + this.submittedBy = StringUtils.defaultIfEmpty(submittedBy, Constants.DEFAULT_STRING_VALUE);; } public String getPeriod() { @@ -141,7 +144,7 @@ public String getPeriod() { } public void setPeriod(String period) { - this.period = period; + this.period = StringUtils.defaultIfEmpty(period, Constants.DEFAULT_STRING_VALUE); } public String getNbTotalBeds() { @@ -173,7 +176,7 @@ public String getIsDeleted() { } public void setIsDeleted(String isDeleted) { - this.isDeleted = isDeleted; + this.isDeleted = StringUtils.defaultIfEmpty(isDeleted, Constants.DEFAULT_STRING_VALUE);; } public String getCCIMSID() { @@ -181,7 +184,7 @@ public String getCCIMSID() { } public void setCCIMSID(String cCIMSID) { - CCIMSID = cCIMSID; + CCIMSID = StringUtils.defaultIfEmpty(cCIMSID, Constants.DEFAULT_DECIMAL_VALUE); } public String getSubmissionType() { @@ -189,7 +192,7 @@ public String getSubmissionType() { } public void setSubmissionType(String submissionType) { - this.submissionType = submissionType; + this.submissionType = StringUtils.defaultIfEmpty(submissionType, Constants.DEFAULT_STRING_VALUE); } public List getLtcBedYtdMaxOccupancy() { @@ -373,7 +376,7 @@ public String getSubmissionFy() { } public void setSubmissionFy(String submissionFy) { - this.submissionFy = submissionFy; + this.submissionFy = StringUtils.defaultIfEmpty(submissionFy, Constants.DEFAULT_STRING_VALUE);; } public List getLtcYtdDep() { return ltcYtdDep; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSumTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSumTotals.java index b5c7889a..8eaf95dd 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSumTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSumTotals.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -18,19 +20,19 @@ public String getConfirmationId() { return confirmationId; } public void setConfirmationId(String confirmationId) { - this.confirmationId = confirmationId; + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); } public String getTotName() { return totName; } public void setTotName(String totName) { - this.totName = totName; + this.totName = StringUtils.defaultIfEmpty(totName, Constants.DEFAULT_STRING_VALUE); } public String getSumYTD() { return sumYTD; } public void setSumYTD(String sumYTD) { - this.sumYTD = sumYTD; + this.sumYTD = StringUtils.defaultIfEmpty(sumYTD, Constants.DEFAULT_DECIMAL_VALUE); } public String getTotNotes() { return totNotes; From 8f75d5844ab924ab6a380b4daaf566e4890546d8 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 26 Apr 2023 16:16:19 -0400 Subject: [PATCH 099/183] LTC ETL process update. removing magic strings --- .../etl/forms/ltc/quarterly/json/Root.java | 176 ++++++++++- .../LtcQuarterlyYtdApiResponseProcessor.java | 286 ++++++++++-------- 2 files changed, 329 insertions(+), 133 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index deb57d28..e66b6e70 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -610,7 +610,9 @@ public class Root{ public String compB_calc25; public String compB_calc26; public String compB_calc27; - public String compB_calc3; + public String compB_calc28; + public String compB_calc29; + public String compB_calc3; public String compB_calc4; public String compB_calc5; public String compB_calc6; @@ -662,7 +664,11 @@ public class Root{ public String compB_item126; @JsonProperty("compB_item1-27") public String compB_item127; - @JsonProperty("compB_item1-3") + @JsonProperty("compB_item1-28") + public String compB_item128; + @JsonProperty("compB_item1-29") + public String compB_item129; + @JsonProperty("compB_item1-3") public String compB_item13; @JsonProperty("compB_item1-4") public String compB_item14; @@ -716,7 +722,11 @@ public class Root{ public String compB_item226; @JsonProperty("compB_item2-27") public String compB_item227; - @JsonProperty("compB_item2-3") + @JsonProperty("compB_item2-28") + public String compB_item228; + @JsonProperty("compB_item2-29") + public String compB_item229; + @JsonProperty("compB_item2-3") public String compB_item23; @JsonProperty("compB_item2-4") public String compB_item24; @@ -770,7 +780,11 @@ public class Root{ public String compB_item326; @JsonProperty("compB_item3-27") public String compB_item327; - @JsonProperty("compB_item3-3") + @JsonProperty("compB_item3-28") + public String compB_item328; + @JsonProperty("compB_item3-29") + public String compB_item329; + @JsonProperty("compB_item3-3") public String compB_item33; @JsonProperty("compB_item3-4") public String compB_item34; @@ -850,7 +864,9 @@ public class Root{ public String compH_calc25; public String compH_calc26; public String compH_calc27; - public String compH_calc3; + public String compH_calc28; + public String compH_calc29; + public String compH_calc3; public String compH_calc4; public String compH_calc5; public String compH_calc6; @@ -902,7 +918,11 @@ public class Root{ public String compH_item126; @JsonProperty("compH_item1-27") public String compH_item127; - @JsonProperty("compH_item1-3") + @JsonProperty("compH_item1-28") + public String compH_item128; + @JsonProperty("compH_item1-29") + public String compH_item129; + @JsonProperty("compH_item1-3") public String compH_item13; @JsonProperty("compH_item1-4") public String compH_item14; @@ -956,7 +976,11 @@ public class Root{ public String compH_item226; @JsonProperty("compH_item2-27") public String compH_item227; - @JsonProperty("compH_item2-3") + @JsonProperty("compH_item2-28") + public String compH_item228; + @JsonProperty("compH_item2-29") + public String compH_item229; + @JsonProperty("compH_item2-3") public String compH_item23; @JsonProperty("compH_item2-4") public String compH_item24; @@ -1010,7 +1034,11 @@ public class Root{ public String compH_item326; @JsonProperty("compH_item3-27") public String compH_item327; - @JsonProperty("compH_item3-3") + @JsonProperty("compH_item3-28") + public String compH_item328; + @JsonProperty("compH_item3-29") + public String compH_item329; + @JsonProperty("compH_item3-3") public String compH_item33; @JsonProperty("compH_item3-4") public String compH_item34; @@ -2002,9 +2030,43 @@ public class Root{ @JsonProperty("alliedNP_label_comp-6") public String alliedNP_label_comp6; public String alliedNP_label_comp_subtotal; - public String directCare_label_comp_subtotal; + public String compB_total_label; + public String compH_total_label; + public String compB_recovered_label; + public String compB_accrued_label; + public String compB_laborOther_label; + public String getCompB_total_label() { + return compB_total_label; + } + public void setCompB_total_label(String compB_total_label) { + this.compB_total_label = compB_total_label; + } + public String getCompH_total_label() { + return compH_total_label; + } + public void setCompH_total_label(String compH_total_label) { + this.compH_total_label = compH_total_label; + } + public String getCompB_recovered_label() { + return compB_recovered_label; + } + public void setCompB_recovered_label(String compB_recovered_label) { + this.compB_recovered_label = compB_recovered_label; + } + public String getCompB_accrued_label() { + return compB_accrued_label; + } + public void setCompB_accrued_label(String compB_accrued_label) { + this.compB_accrued_label = compB_accrued_label; + } + public String getCompB_laborOther_label() { + return compB_laborOther_label; + } + public void setCompB_laborOther_label(String compB_laborOther_label) { + this.compB_laborOther_label = compB_laborOther_label; + } public String getSupport_label() { return support_label; } @@ -4933,6 +4995,18 @@ public String getCompB_calc27() { public void setCompB_calc27(String compB_calc27) { this.compB_calc27 = compB_calc27; } + public String getCompB_calc28() { + return compB_calc28; + } + public void setCompB_calc28(String compB_calc28) { + this.compB_calc28 = compB_calc28; + } + public String getCompB_calc29() { + return compB_calc29; + } + public void setCompB_calc29(String compB_calc29) { + this.compB_calc29 = compB_calc29; + } public String getCompB_calc3() { return compB_calc3; } @@ -5125,6 +5199,30 @@ public String getCompB_item127() { public void setCompB_item127(String compB_item127) { this.compB_item127 = compB_item127; } + public String getCompB_item128() { + return compB_item128; + } + public void setCompB_item128(String compB_item128) { + this.compB_item128 = compB_item128; + } + public String getCompB_item129() { + return compB_item129; + } + public void setCompB_item129(String compB_item129) { + this.compB_item129 = compB_item129; + } + public String getCompB_item228() { + return compB_item228; + } + public void setCompB_item228(String compB_item228) { + this.compB_item228 = compB_item228; + } + public String getCompB_item229() { + return compB_item229; + } + public void setCompB_item229(String compB_item229) { + this.compB_item229 = compB_item229; + } public String getCompB_item13() { return compB_item13; } @@ -5449,6 +5547,18 @@ public String getCompB_item327() { public void setCompB_item327(String compB_item327) { this.compB_item327 = compB_item327; } + public String getCompB_item328() { + return compB_item328; + } + public void setCompB_item328(String compB_item328) { + this.compB_item328 = compB_item328; + } + public String getCompB_item329() { + return compB_item329; + } + public void setCompB_item329(String compB_item329) { + this.compB_item329 = compB_item329; + } public String getCompB_item33() { return compB_item33; } @@ -5797,6 +5907,18 @@ public String getCompH_calc27() { public void setCompH_calc27(String compH_calc27) { this.compH_calc27 = compH_calc27; } + public String getCompH_calc28() { + return compH_calc28; + } + public void setCompH_calc28(String compH_calc28) { + this.compH_calc28 = compH_calc28; + } + public String getCompH_calc29() { + return compH_calc29; + } + public void setCompH_calc29(String compH_calc29) { + this.compH_calc29 = compH_calc29; + } public String getCompH_calc3() { return compH_calc3; } @@ -5989,6 +6111,18 @@ public String getCompH_item127() { public void setCompH_item127(String compH_item127) { this.compH_item127 = compH_item127; } + public String getCompH_item128() { + return compH_item128; + } + public void setCompH_item128(String compH_item128) { + this.compH_item128 = compH_item128; + } + public String getCompH_item129() { + return compH_item129; + } + public void setCompH_item129(String compH_item129) { + this.compH_item129 = compH_item129; + } public String getCompH_item13() { return compH_item13; } @@ -6151,6 +6285,18 @@ public String getCompH_item227() { public void setCompH_item227(String compH_item227) { this.compH_item227 = compH_item227; } + public String getCompH_item228() { + return compH_item228; + } + public void setCompH_item228(String compH_item228) { + this.compH_item228 = compH_item228; + } + public String getCompH_item229() { + return compH_item229; + } + public void setCompH_item229(String compH_item229) { + this.compH_item229 = compH_item229; + } public String getCompH_item23() { return compH_item23; } @@ -6313,6 +6459,18 @@ public String getCompH_item327() { public void setCompH_item327(String compH_item327) { this.compH_item327 = compH_item327; } + public String getCompH_item328() { + return compH_item328; + } + public void setCompH_item328(String compH_item328) { + this.compH_item328 = compH_item328; + } + public String getCompH_item329() { + return compH_item329; + } + public void setCompH_item329(String compH_item329) { + this.compH_item329 = compH_item329; + } public String getCompH_item33() { return compH_item33; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 7504366c..0ce65da3 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -861,8 +861,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminAdministrator.setCompSalStaffYtd(root.getCompB_item15()); adminAdministrator.setCompSalContractServicesYtd(root.getCompB_item25()); adminAdministrator.setCompSalOfficeAllocYtd(root.getCompB_item35()); - adminAdministrator.setCompSalName("Administrator"); - adminAdministrator.setCompSalType("Support/Administration"); + adminAdministrator.setCompSalName(root.getAdmin_label1()); + adminAdministrator.setCompSalType(root.getAdmin_label()); adminAdministrator.setConfirmationId(root.getForm().getConfirmationId()); adminAdministrator.setCompSalTotalCostYtd(root.getCompB_calc5()); @@ -870,8 +870,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminDirOfCare.setCompSalStaffYtd(root.getCompB_item16()); adminDirOfCare.setCompSalContractServicesYtd(root.getCompB_item26()); adminDirOfCare.setCompSalOfficeAllocYtd(root.getCompB_item36()); - adminDirOfCare.setCompSalName("Director of Care"); - adminDirOfCare.setCompSalType("Support/Administration"); + adminDirOfCare.setCompSalName(root.getAdmin_label2()); + adminDirOfCare.setCompSalType(root.getAdmin_label()); adminDirOfCare.setConfirmationId(root.getForm().getConfirmationId()); adminDirOfCare.setCompSalTotalCostYtd(root.getCompB_calc6()); @@ -879,8 +879,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminDeptManagers.setCompSalStaffYtd(root.getCompB_item17()); adminDeptManagers.setCompSalContractServicesYtd(root.getCompB_item27()); adminDeptManagers.setCompSalOfficeAllocYtd(root.getCompB_item37()); - adminDeptManagers.setCompSalName("Dept Managers"); - adminDeptManagers.setCompSalType("Support/Administration"); + adminDeptManagers.setCompSalName(root.getAdmin_label3()); + adminDeptManagers.setCompSalType(root.getAdmin_label()); adminDeptManagers.setConfirmationId(root.getForm().getConfirmationId()); adminDeptManagers.setCompSalTotalCostYtd(root.getCompB_calc7()); @@ -888,8 +888,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminSupport.setCompSalStaffYtd(root.getCompB_item18()); adminSupport.setCompSalContractServicesYtd(root.getCompB_item28()); adminSupport.setCompSalOfficeAllocYtd(root.getCompB_item38()); - adminSupport.setCompSalName("Administrative Support"); - adminSupport.setCompSalType("Support/Administration"); + adminSupport.setCompSalName(root.getAdmin_label4()); + adminSupport.setCompSalType(root.getAdmin_label()); adminSupport.setConfirmationId(root.getForm().getConfirmationId()); adminSupport.setCompSalTotalCostYtd(root.getCompB_calc8()); @@ -897,8 +897,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminPastoCareWrkr.setCompSalStaffYtd(root.getCompB_item19()); adminPastoCareWrkr.setCompSalContractServicesYtd(root.getCompB_item29()); adminPastoCareWrkr.setCompSalOfficeAllocYtd(root.getCompB_item39()); - adminPastoCareWrkr.setCompSalName("Pastoral Care Worker"); - adminPastoCareWrkr.setCompSalType("Support/Administration"); + adminPastoCareWrkr.setCompSalName(root.getAdmin_label5()); + adminPastoCareWrkr.setCompSalType(root.getAdmin_label()); adminPastoCareWrkr.setConfirmationId(root.getForm().getConfirmationId()); adminPastoCareWrkr.setCompSalTotalCostYtd(root.getCompB_calc9()); @@ -906,8 +906,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminClrks.setCompSalStaffYtd(root.getCompB_item110()); adminClrks.setCompSalContractServicesYtd(root.getCompB_item210()); adminClrks.setCompSalOfficeAllocYtd(root.getCompB_item310()); - adminClrks.setCompSalName("Clerical Clerks"); - adminClrks.setCompSalType("Support/Administration"); + adminClrks.setCompSalName(root.getAdmin_label6()); + adminClrks.setCompSalType(root.getAdmin_label()); adminClrks.setConfirmationId(root.getForm().getConfirmationId()); adminClrks.setCompSalTotalCostYtd(root.getCompB_calc10()); @@ -915,8 +915,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminClncCrdinator.setCompSalStaffYtd(root.getCompB_item111()); adminClncCrdinator.setCompSalContractServicesYtd(root.getCompB_item211()); adminClncCrdinator.setCompSalOfficeAllocYtd(root.getCompB_item311()); - adminClncCrdinator.setCompSalName("Clinical Coordinator"); - adminClncCrdinator.setCompSalType("Support/Administration"); + adminClncCrdinator.setCompSalName(root.getAdmin_label7()); + adminClncCrdinator.setCompSalType(root.getAdmin_label()); adminClncCrdinator.setConfirmationId(root.getForm().getConfirmationId()); adminClncCrdinator.setCompSalTotalCostYtd(root.getCompB_calc11()); @@ -924,8 +924,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminOther.setCompSalStaffYtd(root.getCompB_item112()); adminOther.setCompSalContractServicesYtd(root.getCompB_item212()); adminOther.setCompSalOfficeAllocYtd(root.getCompB_item312()); - adminOther.setCompSalName("Other"); - adminOther.setCompSalType("Support/Administration"); + adminOther.setCompSalName(root.getAdmin_label8()); + adminOther.setCompSalType(root.getAdmin_label()); adminOther.setConfirmationId(root.getForm().getConfirmationId()); adminOther.setCompSalTotalCostYtd(root.getCompB_calc12()); @@ -934,8 +934,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingRNSal.setCompSalStaffYtd(root.getCompB_item113()); nursingRNSal.setCompSalContractServicesYtd(root.getCompB_item213()); nursingRNSal.setCompSalOfficeAllocYtd(root.getCompB_item313()); - nursingRNSal.setCompSalName("RN"); - nursingRNSal.setCompSalType("Nursing"); + nursingRNSal.setCompSalName(root.getNursing_label_comp1()); + nursingRNSal.setCompSalType(root.getNursing_label_comp()); nursingRNSal.setConfirmationId(root.getForm().getConfirmationId()); nursingRNSal.setCompSalTotalCostYtd(root.getCompB_calc13()); @@ -944,8 +944,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingLPNSal.setCompSalStaffYtd(root.getCompB_item114()); nursingLPNSal.setCompSalContractServicesYtd(root.getCompB_item214()); nursingLPNSal.setCompSalOfficeAllocYtd(root.getCompB_item314()); - nursingLPNSal.setCompSalName("LPN"); - nursingLPNSal.setCompSalType("Nursing"); + nursingLPNSal.setCompSalName(root.getNursing_label_comp2()); + nursingLPNSal.setCompSalType(root.getNursing_label_comp()); nursingLPNSal.setConfirmationId(root.getForm().getConfirmationId()); nursingLPNSal.setCompSalTotalCostYtd(root.getCompB_calc14()); @@ -953,8 +953,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingHCASal.setCompSalStaffYtd(root.getCompB_item115()); nursingHCASal.setCompSalContractServicesYtd(root.getCompB_item215()); nursingHCASal.setCompSalOfficeAllocYtd(root.getCompB_item315()); - nursingHCASal.setCompSalName("Care Aides (HCA)"); - nursingHCASal.setCompSalType("Nursing"); + nursingHCASal.setCompSalName(root.getNursing_label_comp3()); + nursingHCASal.setCompSalType(root.getNursing_label_comp()); nursingHCASal.setConfirmationId(root.getForm().getConfirmationId()); nursingHCASal.setCompSalTotalCostYtd(root.getCompB_calc15()); @@ -963,8 +963,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingOthSal.setCompSalStaffYtd(root.getCompB_item116()); nursingOthSal.setCompSalContractServicesYtd(root.getCompB_item216()); nursingOthSal.setCompSalOfficeAllocYtd(root.getCompB_item316()); - nursingOthSal.setCompSalName("Other (specify)"); - nursingOthSal.setCompSalType("Nursing"); + nursingOthSal.setCompSalName(root.getNursing_label_comp4()); + nursingOthSal.setCompSalType(root.getNursing_label_comp()); nursingOthSal.setConfirmationId(root.getForm().getConfirmationId()); nursingOthSal.setCompSalTotalCostYtd(root.getCompB_calc16()); @@ -973,8 +973,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedProfOTSal.setCompSalStaffYtd(root.getCompB_item117()); alliedProfOTSal.setCompSalContractServicesYtd(root.getCompB_item217()); alliedProfOTSal.setCompSalOfficeAllocYtd(root.getCompB_item317()); - alliedProfOTSal.setCompSalName("Occupational Therapist"); - alliedProfOTSal.setCompSalType("Allied professional"); + alliedProfOTSal.setCompSalName(root.getAlliedProf_label_comp1()); + alliedProfOTSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfOTSal.setConfirmationId(root.getForm().getConfirmationId()); alliedProfOTSal.setCompSalTotalCostYtd(root.getCompB_calc17()); @@ -982,8 +982,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedProfPTSal.setCompSalStaffYtd(root.getCompB_item118()); alliedProfPTSal.setCompSalContractServicesYtd(root.getCompB_item218()); alliedProfPTSal.setCompSalOfficeAllocYtd(root.getCompB_item318()); - alliedProfPTSal.setCompSalName("Physiotherapist"); - alliedProfPTSal.setCompSalType("Allied professional"); + alliedProfPTSal.setCompSalName(root.getAlliedProf_label_comp2()); + alliedProfPTSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfPTSal.setConfirmationId(root.getForm().getConfirmationId()); alliedProfPTSal.setCompSalTotalCostYtd(root.getCompB_calc18()); @@ -991,8 +991,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedProfDTSal.setCompSalStaffYtd(root.getCompB_item119()); alliedProfDTSal.setCompSalContractServicesYtd(root.getCompB_item219()); alliedProfDTSal.setCompSalOfficeAllocYtd(root.getCompB_item319()); - alliedProfDTSal.setCompSalName("Dietitian"); - alliedProfDTSal.setCompSalType("Allied professional"); + alliedProfDTSal.setCompSalName(root.getAlliedProf_label_comp3()); + alliedProfDTSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfDTSal.setConfirmationId(root.getForm().getConfirmationId()); alliedProfDTSal.setCompSalTotalCostYtd(root.getCompB_calc19()); @@ -1000,27 +1000,45 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedProfSWSal.setCompSalStaffYtd(root.getCompB_item120()); alliedProfSWSal.setCompSalContractServicesYtd(root.getCompB_item220()); alliedProfSWSal.setCompSalOfficeAllocYtd(root.getCompB_item320()); - alliedProfSWSal.setCompSalName("Dietitian"); - alliedProfSWSal.setCompSalType("Allied professional"); + alliedProfSWSal.setCompSalName(root.getAlliedProf_label_comp4()); + alliedProfSWSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfSWSal.setConfirmationId(root.getForm().getConfirmationId()); alliedProfSWSal.setCompSalTotalCostYtd(root.getCompB_calc20()); + LtcYtdCompSal alliedProfSLPSal = new LtcYtdCompSal(); + alliedProfSLPSal.setCompSalStaffYtd(root.getCompB_item121()); + alliedProfSLPSal.setCompSalContractServicesYtd(root.getCompB_item221()); + alliedProfSLPSal.setCompSalOfficeAllocYtd(root.getCompB_item321()); + alliedProfSLPSal.setCompSalName(root.getAlliedProf_label_comp5()); + alliedProfSLPSal.setCompSalType(root.getAlliedProf_label_comp()); + alliedProfSLPSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfSLPSal.setCompSalTotalCostYtd(root.getCompB_calc21()); + + LtcYtdCompSal alliedProfRPPSal = new LtcYtdCompSal(); + alliedProfRPPSal.setCompSalStaffYtd(root.getCompB_item128()); + alliedProfRPPSal.setCompSalContractServicesYtd(root.getCompB_item228()); + alliedProfRPPSal.setCompSalOfficeAllocYtd(root.getCompB_item328()); + alliedProfRPPSal.setCompSalName(root.getAlliedProf_label_comp6()); + alliedProfRPPSal.setCompSalType(root.getAlliedProf_label_comp()); + alliedProfRPPSal.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfRPPSal.setCompSalTotalCostYtd(root.getCompB_calc28()); + LtcYtdCompSal alliedProfOTHSal = new LtcYtdCompSal(); - alliedProfOTHSal.setCompSalStaffYtd(root.getCompB_item121()); - alliedProfOTHSal.setCompSalContractServicesYtd(root.getCompB_item221()); + alliedProfOTHSal.setCompSalStaffYtd(root.getCompB_item129()); + alliedProfOTHSal.setCompSalContractServicesYtd(root.getCompB_item229()); alliedProfOTHSal.setCompSalOfficeAllocYtd(root.getCompB_item321()); - alliedProfOTHSal.setCompSalName("Other (specify)"); - alliedProfOTHSal.setCompSalType("Allied professional"); + alliedProfOTHSal.setCompSalName(root.getAlliedProf_label_comp7()); + alliedProfOTHSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfOTHSal.setConfirmationId(root.getForm().getConfirmationId()); - alliedProfOTHSal.setCompSalTotalCostYtd(root.getCompB_calc21()); + alliedProfOTHSal.setCompSalTotalCostYtd(root.getCompB_calc29()); /* Allied Non Professional */ LtcYtdCompSal alliedNPRTSal = new LtcYtdCompSal(); alliedNPRTSal.setCompSalStaffYtd(root.getCompB_item122()); alliedNPRTSal.setCompSalContractServicesYtd(root.getCompB_item222()); alliedNPRTSal.setCompSalOfficeAllocYtd(root.getCompB_item322()); - alliedNPRTSal.setCompSalName("Recreation Therapist"); - alliedNPRTSal.setCompSalType("Allied Non-professional"); + alliedNPRTSal.setCompSalName(root.getAlliedNP_label_comp1()); + alliedNPRTSal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPRTSal.setConfirmationId(root.getForm().getConfirmationId()); alliedNPRTSal.setCompSalTotalCostYtd(root.getCompB_calc22()); @@ -1028,8 +1046,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPRASal.setCompSalStaffYtd(root.getCompB_item123()); alliedNPRASal.setCompSalContractServicesYtd(root.getCompB_item223()); alliedNPRASal.setCompSalOfficeAllocYtd(root.getCompB_item323()); - alliedNPRASal.setCompSalName("Rehab Assistant"); - alliedNPRASal.setCompSalType("Allied Non-professional"); + alliedNPRASal.setCompSalName(root.getAlliedNP_label_comp2()); + alliedNPRASal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPRASal.setConfirmationId(root.getForm().getConfirmationId()); alliedNPRASal.setCompSalTotalCostYtd(root.getCompB_calc23()); @@ -1037,8 +1055,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPAWSal.setCompSalStaffYtd(root.getCompB_item124()); alliedNPAWSal.setCompSalContractServicesYtd(root.getCompB_item224()); alliedNPAWSal.setCompSalOfficeAllocYtd(root.getCompB_item324()); - alliedNPAWSal.setCompSalName("Activity Worker"); - alliedNPAWSal.setCompSalType("Allied Non-professional"); + alliedNPAWSal.setCompSalName(root.getAlliedNP_label_comp3()); + alliedNPAWSal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPAWSal.setConfirmationId(root.getForm().getConfirmationId()); alliedNPAWSal.setCompSalTotalCostYtd(root.getCompB_calc24()); @@ -1046,8 +1064,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPMTSal.setCompSalStaffYtd(root.getCompB_item125()); alliedNPMTSal.setCompSalContractServicesYtd(root.getCompB_item225()); alliedNPMTSal.setCompSalOfficeAllocYtd(root.getCompB_item325()); - alliedNPMTSal.setCompSalName("Music Therapist"); - alliedNPMTSal.setCompSalType("Allied Non-professional"); + alliedNPMTSal.setCompSalName(root.getAlliedNP_label_comp4()); + alliedNPMTSal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPMTSal.setConfirmationId(root.getForm().getConfirmationId()); alliedNPMTSal.setCompSalTotalCostYtd(root.getCompB_calc25()); @@ -1055,8 +1073,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPATSal.setCompSalStaffYtd(root.getCompB_item126()); alliedNPATSal.setCompSalContractServicesYtd(root.getCompB_item226()); alliedNPATSal.setCompSalOfficeAllocYtd(root.getCompB_item326()); - alliedNPATSal.setCompSalName("Art Therapist"); - alliedNPATSal.setCompSalType("Allied Non-professional"); + alliedNPATSal.setCompSalName(root.getAlliedNP_label_comp5()); + alliedNPATSal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPATSal.setConfirmationId(root.getForm().getConfirmationId()); alliedNPATSal.setCompSalTotalCostYtd(root.getCompB_calc26()); @@ -1064,8 +1082,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPOTHSal.setCompSalStaffYtd(root.getCompB_item127()); alliedNPOTHSal.setCompSalContractServicesYtd(root.getCompB_item227()); alliedNPOTHSal.setCompSalOfficeAllocYtd(root.getCompB_item327()); - alliedNPOTHSal.setCompSalName("Other (specify)"); - alliedNPOTHSal.setCompSalType("Allied Non-professional"); + alliedNPOTHSal.setCompSalName(root.getAlliedNP_label_comp6()); + alliedNPOTHSal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPOTHSal.setConfirmationId(root.getForm().getConfirmationId()); alliedNPOTHSal.setCompSalTotalCostYtd(root.getCompB_calc27()); @@ -1073,12 +1091,12 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportPlantMntnce, adminAdministrator, adminDirOfCare, adminDeptManagers, adminSupport, adminPastoCareWrkr, adminClrks, adminClncCrdinator, adminOther, nursingRNSal, nursingLPNSal, nursingHCASal, nursingOthSal, alliedProfOTSal, alliedProfPTSal, alliedProfDTSal, alliedProfSWSal, - alliedProfOTHSal, alliedNPRTSal, alliedNPRASal, alliedNPAWSal, alliedNPMTSal, alliedNPATSal, - alliedNPOTHSal); + alliedProfSLPSal, alliedProfRPPSal, alliedProfOTHSal, alliedNPRTSal, alliedNPRASal, + alliedNPAWSal, alliedNPMTSal, alliedNPATSal, alliedNPOTHSal); LtcYtdCompSalSubtotals supportSalSubtotal = new LtcYtdCompSalSubtotals(); - supportSalSubtotal.setCompSalType("Support"); + supportSalSubtotal.setCompSalType(root.getSupport_label()); supportSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); supportSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum11()); supportSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum21()); @@ -1086,7 +1104,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum1()); LtcYtdCompSalSubtotals administrationSalSubtotal = new LtcYtdCompSalSubtotals(); - administrationSalSubtotal.setCompSalType("Administration"); + administrationSalSubtotal.setCompSalType(root.getAdmin_label()); administrationSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); administrationSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum12()); administrationSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum22()); @@ -1094,7 +1112,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY administrationSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum2()); LtcYtdCompSalSubtotals nursingSalSubtotal = new LtcYtdCompSalSubtotals(); - nursingSalSubtotal.setCompSalType("Nursing"); + nursingSalSubtotal.setCompSalType(root.getNursing_label_comp()); nursingSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); nursingSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum13()); nursingSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum23()); @@ -1102,7 +1120,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum3()); LtcYtdCompSalSubtotals alliedSalSubtotal = new LtcYtdCompSalSubtotals(); - alliedSalSubtotal.setCompSalType("Allied Professional"); + alliedSalSubtotal.setCompSalType(root.getAlliedProf_label_comp()); alliedSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); alliedSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum14()); alliedSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum24()); @@ -1110,7 +1128,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum4()); LtcYtdCompSalSubtotals alliedNPSalSubtotal = new LtcYtdCompSalSubtotals(); - alliedNPSalSubtotal.setCompSalType("Allied Non-professional"); + alliedNPSalSubtotal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); alliedNPSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum15()); alliedNPSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum25()); @@ -1120,7 +1138,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY Collections.addAll(ltcYtdCompSalSubttls,administrationSalSubtotal,nursingSalSubtotal,supportSalSubtotal,alliedSalSubtotal,alliedNPSalSubtotal); LtcYtdCompSalTotals totalPerPayrollSal = new LtcYtdCompSalTotals(); - totalPerPayrollSal.setCompSalType("Total Per Payroll"); + totalPerPayrollSal.setCompSalType(root.getCompB_total_label()); totalPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); totalPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_total1()); totalPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_total2()); @@ -1128,7 +1146,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY totalPerPayrollSal.setTotalCompSalTotalCostYTD(root.getCompB_total()); LtcYtdCompSalTotals recoveredPerPayrollSal = new LtcYtdCompSalTotals(); - recoveredPerPayrollSal.setCompSalType("Recovered Salaries and Wages"); + recoveredPerPayrollSal.setCompSalType(root.getCompB_recovered_label()); recoveredPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); recoveredPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_recovered1()); recoveredPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_recovered2()); @@ -1136,7 +1154,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY recoveredPerPayrollSal.setTotalCompSalTotalCostYTD(root.getCompB_recovered()); LtcYtdCompSalTotals accruedPerPayrollSal = new LtcYtdCompSalTotals(); - accruedPerPayrollSal.setCompSalType("Accrued Salaries and Wages"); + accruedPerPayrollSal.setCompSalType(root.getCompB_accrued_label()); accruedPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); accruedPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_accrued1()); accruedPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_accrued2()); @@ -1144,7 +1162,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY accruedPerPayrollSal.setTotalCompSalTotalCostYTD(root.getCompB_accrued()); LtcYtdCompSalTotals otherPerPayrollSal = new LtcYtdCompSalTotals(); - otherPerPayrollSal.setCompSalType("Other labour costs - Specify"); + otherPerPayrollSal.setCompSalType(root.getCompB_laborOther_label()); otherPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); otherPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_laborOther1()); otherPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_laborOther2()); @@ -1159,8 +1177,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportFoodServicesHrs.setCompHrsStaffYtd(root.getCompH_item11()); supportFoodServicesHrs.setCompHrsContractServicesYtd(root.getCompH_item21()); supportFoodServicesHrs.setCompHrsOfficeAllocYtd(root.getCompH_item31()); - supportFoodServicesHrs.setCompHrsName("Food Services"); - supportFoodServicesHrs.setCompHrsType("Support/Administration"); + supportFoodServicesHrs.setCompHrsName(root.getSupport_label1()); + supportFoodServicesHrs.setCompHrsType(root.getSupport_label()); supportFoodServicesHrs.setConfirmationId(root.getForm().getConfirmationId()); supportFoodServicesHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc1()); @@ -1169,8 +1187,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportLaundryServicesHrs.setCompHrsStaffYtd(root.getCompH_item12()); supportLaundryServicesHrs.setCompHrsContractServicesYtd(root.getCompH_item22()); supportLaundryServicesHrs.setCompHrsOfficeAllocYtd(root.getCompH_item32()); - supportLaundryServicesHrs.setCompHrsName("Laundry Services"); - supportLaundryServicesHrs.setCompHrsType("Support/Administration"); + supportLaundryServicesHrs.setCompHrsName(root.getSupport_label2()); + supportLaundryServicesHrs.setCompHrsType(root.getSupport_label()); supportLaundryServicesHrs.setConfirmationId(root.getForm().getConfirmationId()); supportLaundryServicesHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc2()); @@ -1179,8 +1197,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportHousekeepingHrs.setCompHrsStaffYtd(root.getCompH_item13()); supportHousekeepingHrs.setCompHrsContractServicesYtd(root.getCompH_item23()); supportHousekeepingHrs.setCompHrsOfficeAllocYtd(root.getCompH_item33()); - supportHousekeepingHrs.setCompHrsName("Housekeeping Services"); - supportHousekeepingHrs.setCompHrsType("Support/Administration"); + supportHousekeepingHrs.setCompHrsName(root.getSupport_label3()); + supportHousekeepingHrs.setCompHrsType(root.getSupport_label()); supportHousekeepingHrs.setConfirmationId(root.getForm().getConfirmationId()); supportHousekeepingHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc3()); @@ -1189,8 +1207,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportPlantMntnceHrs.setCompHrsStaffYtd(root.getCompH_item14()); supportPlantMntnceHrs.setCompHrsContractServicesYtd(root.getCompH_item24()); supportPlantMntnceHrs.setCompHrsOfficeAllocYtd(root.getCompH_item34()); - supportPlantMntnceHrs.setCompHrsName("Plant Maintenance & Op. Staffing"); - supportPlantMntnceHrs.setCompHrsType("Support/Administration"); + supportPlantMntnceHrs.setCompHrsName(root.getSupport_label4()); + supportPlantMntnceHrs.setCompHrsType(root.getSupport_label()); supportPlantMntnceHrs.setConfirmationId(root.getForm().getConfirmationId()); supportPlantMntnceHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc4()); @@ -1200,8 +1218,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminAdministratorHrs.setCompHrsStaffYtd(root.getCompH_item15()); adminAdministratorHrs.setCompHrsContractServicesYtd(root.getCompH_item25()); adminAdministratorHrs.setCompHrsOfficeAllocYtd(root.getCompH_item35()); - adminAdministratorHrs.setCompHrsName("Administrator"); - adminAdministratorHrs.setCompHrsType("Support/Administration"); + adminAdministratorHrs.setCompHrsName(root.getAdmin_label1()); + adminAdministratorHrs.setCompHrsType(root.getAdmin_label()); adminAdministratorHrs.setConfirmationId(root.getForm().getConfirmationId()); adminAdministratorHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc5()); @@ -1211,8 +1229,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminDirOfCareHrs.setCompHrsStaffYtd(root.getCompH_item16()); adminDirOfCareHrs.setCompHrsContractServicesYtd(root.getCompH_item26()); adminDirOfCareHrs.setCompHrsOfficeAllocYtd(root.getCompH_item36()); - adminDirOfCareHrs.setCompHrsName("Administrator"); - adminDirOfCareHrs.setCompHrsType("Support/Administration"); + adminDirOfCareHrs.setCompHrsName(root.getAdmin_label2()); + adminDirOfCareHrs.setCompHrsType(root.getAdmin_label()); adminDirOfCareHrs.setConfirmationId(root.getForm().getConfirmationId()); adminDirOfCareHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc6()); @@ -1221,8 +1239,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminDeptManagersHrs.setCompHrsStaffYtd(root.getCompH_item17()); adminDeptManagersHrs.setCompHrsContractServicesYtd(root.getCompH_item27()); adminDeptManagersHrs.setCompHrsOfficeAllocYtd(root.getCompH_item37()); - adminDeptManagersHrs.setCompHrsName("Dept Managers"); - adminDeptManagersHrs.setCompHrsType("Support/Administration"); + adminDeptManagersHrs.setCompHrsName(root.getAdmin_label3()); + adminDeptManagersHrs.setCompHrsType(root.getAdmin_label()); adminDeptManagersHrs.setConfirmationId(root.getForm().getConfirmationId()); adminDeptManagersHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc7()); @@ -1231,8 +1249,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminSupportHrs.setCompHrsStaffYtd(root.getCompH_item18()); adminSupportHrs.setCompHrsContractServicesYtd(root.getCompH_item28()); adminSupportHrs.setCompHrsOfficeAllocYtd(root.getCompH_item38()); - adminSupportHrs.setCompHrsName("Administrative Support"); - adminSupportHrs.setCompHrsType("Support/Administration"); + adminSupportHrs.setCompHrsName(root.getAdmin_label4()); + adminSupportHrs.setCompHrsType(root.getAdmin_label()); adminSupportHrs.setConfirmationId(root.getForm().getConfirmationId()); adminSupportHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc8()); @@ -1241,8 +1259,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminPastoCareWrkrHrs.setCompHrsStaffYtd(root.getCompH_item19()); adminPastoCareWrkrHrs.setCompHrsContractServicesYtd(root.getCompH_item29()); adminPastoCareWrkrHrs.setCompHrsOfficeAllocYtd(root.getCompH_item39()); - adminPastoCareWrkrHrs.setCompHrsName("Pastoral Care Worker"); - adminPastoCareWrkrHrs.setCompHrsType("Support/Administration"); + adminPastoCareWrkrHrs.setCompHrsName(root.getAdmin_label5()); + adminPastoCareWrkrHrs.setCompHrsType(root.getAdmin_label()); adminPastoCareWrkrHrs.setConfirmationId(root.getForm().getConfirmationId()); adminPastoCareWrkrHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc9()); @@ -1251,8 +1269,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminClrksHrs.setCompHrsStaffYtd(root.getCompH_item110()); adminClrksHrs.setCompHrsContractServicesYtd(root.getCompH_item210()); adminClrksHrs.setCompHrsOfficeAllocYtd(root.getCompH_item310()); - adminClrksHrs.setCompHrsName("Clerical Clerks"); - adminClrksHrs.setCompHrsType("Support/Administration"); + adminClrksHrs.setCompHrsName(root.getAdmin_label6()); + adminClrksHrs.setCompHrsType(root.getAdmin_label()); adminClrksHrs.setConfirmationId(root.getForm().getConfirmationId()); adminClrksHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc10()); @@ -1261,8 +1279,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminClncCrdinatorHrs.setCompHrsStaffYtd(root.getCompH_item111()); adminClncCrdinatorHrs.setCompHrsContractServicesYtd(root.getCompH_item211()); adminClncCrdinatorHrs.setCompHrsOfficeAllocYtd(root.getCompH_item311()); - adminClncCrdinatorHrs.setCompHrsName("Clinical Coordiantor"); - adminClncCrdinatorHrs.setCompHrsType("Support/Administration"); + adminClncCrdinatorHrs.setCompHrsName(root.getAdmin_label7()); + adminClncCrdinatorHrs.setCompHrsType(root.getAdmin_label()); adminClncCrdinatorHrs.setConfirmationId(root.getForm().getConfirmationId()); adminClncCrdinatorHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc11()); @@ -1271,8 +1289,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminOtherHrs.setCompHrsStaffYtd(root.getCompH_item112()); adminOtherHrs.setCompHrsContractServicesYtd(root.getCompH_item212()); adminOtherHrs.setCompHrsOfficeAllocYtd(root.getCompH_item312()); - adminOtherHrs.setCompHrsName("Other (specify)"); - adminOtherHrs.setCompHrsType("Support/Administration"); + adminOtherHrs.setCompHrsName(root.getAdmin_label8()); + adminOtherHrs.setCompHrsType(root.getAdmin_label()); adminOtherHrs.setConfirmationId(root.getForm().getConfirmationId()); adminOtherHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc12()); @@ -1282,8 +1300,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingRNHrs.setCompHrsStaffYtd(root.getCompH_item113()); nursingRNHrs.setCompHrsContractServicesYtd(root.getCompH_item213()); nursingRNHrs.setCompHrsOfficeAllocYtd(root.getCompH_item313()); - nursingRNHrs.setCompHrsName("RN"); - nursingRNHrs.setCompHrsType("Nursing"); + nursingRNHrs.setCompHrsName(root.getNursing_label_comp1()); + nursingRNHrs.setCompHrsType(root.getNursing_label_comp()); nursingRNHrs.setConfirmationId(root.getForm().getConfirmationId()); nursingRNHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc13()); @@ -1292,8 +1310,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingLPNHrs.setCompHrsStaffYtd(root.getCompH_item114()); nursingLPNHrs.setCompHrsContractServicesYtd(root.getCompH_item214()); nursingLPNHrs.setCompHrsOfficeAllocYtd(root.getCompH_item314()); - nursingLPNHrs.setCompHrsName("LPN"); - nursingLPNHrs.setCompHrsType("Nursing"); + nursingLPNHrs.setCompHrsName(root.getNursing_label_comp2()); + nursingLPNHrs.setCompHrsType(root.getNursing_label_comp()); nursingLPNHrs.setConfirmationId(root.getForm().getConfirmationId()); nursingLPNHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc14()); @@ -1302,8 +1320,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingHCAHrs.setCompHrsStaffYtd(root.getCompH_item115()); nursingHCAHrs.setCompHrsContractServicesYtd(root.getCompH_item215()); nursingHCAHrs.setCompHrsOfficeAllocYtd(root.getCompH_item315()); - nursingHCAHrs.setCompHrsName("HCA"); - nursingHCAHrs.setCompHrsType("Nursing"); + nursingHCAHrs.setCompHrsName(root.getNursing_label_comp3()); + nursingHCAHrs.setCompHrsType(root.getNursing_label_comp()); nursingHCAHrs.setConfirmationId(root.getForm().getConfirmationId()); nursingHCAHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc15()); @@ -1312,8 +1330,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingOthHrs.setCompHrsStaffYtd(root.getCompH_item116()); nursingOthHrs.setCompHrsContractServicesYtd(root.getCompH_item216()); nursingOthHrs.setCompHrsOfficeAllocYtd(root.getCompH_item316()); - nursingOthHrs.setCompHrsName("Other (specify)"); - nursingOthHrs.setCompHrsType("Nursing"); + nursingOthHrs.setCompHrsName(root.getNursing_label_comp4()); + nursingOthHrs.setCompHrsType(root.getNursing_label_comp()); nursingOthHrs.setConfirmationId(root.getForm().getConfirmationId()); nursingOthHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc16()); @@ -1322,8 +1340,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedProfOTHrs.setCompHrsStaffYtd(root.getCompH_item117()); alliedProfOTHrs.setCompHrsContractServicesYtd(root.getCompH_item217()); alliedProfOTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item317()); - alliedProfOTHrs.setCompHrsName("Occupational Therapist"); - alliedProfOTHrs.setCompHrsType("Allied Professional"); + alliedProfOTHrs.setCompHrsName(root.getAlliedProf_label_comp1()); + alliedProfOTHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfOTHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedProfOTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc17()); @@ -1332,8 +1350,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedProfPTHrs.setCompHrsStaffYtd(root.getCompH_item118()); alliedProfPTHrs.setCompHrsContractServicesYtd(root.getCompH_item218()); alliedProfPTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item318()); - alliedProfPTHrs.setCompHrsName("Physiotherapist"); - alliedProfPTHrs.setCompHrsType("Allied Professional"); + alliedProfPTHrs.setCompHrsName(root.getAlliedProf_label_comp2()); + alliedProfPTHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfPTHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedProfPTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc18()); @@ -1342,8 +1360,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedProfDTHrs.setCompHrsStaffYtd(root.getCompH_item119()); alliedProfDTHrs.setCompHrsContractServicesYtd(root.getCompH_item219()); alliedProfDTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item319()); - alliedProfDTHrs.setCompHrsName("Dietitian"); - alliedProfDTHrs.setCompHrsType("Allied Professional"); + alliedProfDTHrs.setCompHrsName(root.getAlliedProf_label_comp3()); + alliedProfDTHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfDTHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedProfDTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc19()); @@ -1352,28 +1370,48 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedProfSWHrs.setCompHrsStaffYtd(root.getCompH_item120()); alliedProfSWHrs.setCompHrsContractServicesYtd(root.getCompH_item220()); alliedProfSWHrs.setCompHrsOfficeAllocYtd(root.getCompH_item320()); - alliedProfSWHrs.setCompHrsName("Social Worker"); - alliedProfSWHrs.setCompHrsType("Allied Professional"); + alliedProfSWHrs.setCompHrsName(root.getAlliedProf_label_comp4()); + alliedProfSWHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfSWHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedProfSWHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc20()); + LtcYtdCompHrs alliedProfSLPHrs = new LtcYtdCompHrs(); + //alliedProfSWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP20()); + alliedProfSLPHrs.setCompHrsStaffYtd(root.getCompH_item121()); + alliedProfSLPHrs.setCompHrsContractServicesYtd(root.getCompH_item221()); + alliedProfSLPHrs.setCompHrsOfficeAllocYtd(root.getCompH_item321()); + alliedProfSLPHrs.setCompHrsName(root.getAlliedProf_label_comp5()); + alliedProfSLPHrs.setCompHrsType(root.getAlliedProf_label_comp()); + alliedProfSLPHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfSLPHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc21()); + + LtcYtdCompHrs alliedProfRTHrs = new LtcYtdCompHrs(); + //alliedProfSWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP20()); + alliedProfRTHrs.setCompHrsStaffYtd(root.getCompH_item128()); + alliedProfRTHrs.setCompHrsContractServicesYtd(root.getCompH_item228()); + alliedProfRTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item328()); + alliedProfRTHrs.setCompHrsName(root.getAlliedProf_label_comp6()); + alliedProfRTHrs.setCompHrsType(root.getAlliedProf_label_comp()); + alliedProfRTHrs.setConfirmationId(root.getForm().getConfirmationId()); + alliedProfRTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc28()); + LtcYtdCompHrs alliedProfOTHHrs = new LtcYtdCompHrs(); //alliedProfOTHHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP21()); - alliedProfOTHHrs.setCompHrsStaffYtd(root.getCompH_item121()); - alliedProfOTHHrs.setCompHrsContractServicesYtd(root.getCompH_item221()); - alliedProfOTHHrs.setCompHrsOfficeAllocYtd(root.getCompH_item321()); - alliedProfOTHHrs.setCompHrsName("Other (specify)"); - alliedProfOTHHrs.setCompHrsType("Allied Professional"); + alliedProfOTHHrs.setCompHrsStaffYtd(root.getCompH_item129()); + alliedProfOTHHrs.setCompHrsContractServicesYtd(root.getCompH_item229()); + alliedProfOTHHrs.setCompHrsOfficeAllocYtd(root.getCompH_item329()); + alliedProfOTHHrs.setCompHrsName(root.getAlliedProf_label_comp7()); + alliedProfOTHHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfOTHHrs.setConfirmationId(root.getForm().getConfirmationId()); - alliedProfOTHHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc21()); + alliedProfOTHHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc29()); LtcYtdCompHrs alliedNPRTHrs = new LtcYtdCompHrs(); //alliedNPRTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP22()); alliedNPRTHrs.setCompHrsStaffYtd(root.getCompH_item122()); alliedNPRTHrs.setCompHrsContractServicesYtd(root.getCompH_item222()); alliedNPRTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item322()); - alliedNPRTHrs.setCompHrsName("Recreation Therapist"); - alliedNPRTHrs.setCompHrsType("Allied Non-professional"); + alliedNPRTHrs.setCompHrsName(root.getAlliedNP_label_comp1()); + alliedNPRTHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPRTHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedNPRTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc22()); @@ -1382,8 +1420,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPRAHrs.setCompHrsStaffYtd(root.getCompH_item123()); alliedNPRAHrs.setCompHrsContractServicesYtd(root.getCompH_item223()); alliedNPRAHrs.setCompHrsOfficeAllocYtd(root.getCompH_item323()); - alliedNPRAHrs.setCompHrsName("Rehab Assistant"); - alliedNPRAHrs.setCompHrsType("Allied Non-professional"); + alliedNPRAHrs.setCompHrsName(root.getAlliedNP_label_comp2()); + alliedNPRAHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPRAHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedNPRAHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc23()); @@ -1392,8 +1430,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPAWHrs.setCompHrsStaffYtd(root.getCompH_item124()); alliedNPAWHrs.setCompHrsContractServicesYtd(root.getCompH_item224()); alliedNPAWHrs.setCompHrsOfficeAllocYtd(root.getCompH_item324()); - alliedNPAWHrs.setCompHrsName("Activity Worker"); - alliedNPAWHrs.setCompHrsType("Allied Non-professional"); + alliedNPAWHrs.setCompHrsName(root.getAlliedNP_label_comp3()); + alliedNPAWHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPAWHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedNPAWHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc24()); @@ -1402,8 +1440,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPMTHrs.setCompHrsStaffYtd(root.getCompH_item125()); alliedNPMTHrs.setCompHrsContractServicesYtd(root.getCompH_item225()); alliedNPMTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item325()); - alliedNPMTHrs.setCompHrsName("Music Therapist"); - alliedNPMTHrs.setCompHrsType("Allied Non-professional"); + alliedNPMTHrs.setCompHrsName(root.getAlliedNP_label_comp4()); + alliedNPMTHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPMTHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedNPMTHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc25()); @@ -1412,8 +1450,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPATHrs.setCompHrsStaffYtd(root.getCompH_item126()); alliedNPATHrs.setCompHrsContractServicesYtd(root.getCompH_item226()); alliedNPATHrs.setCompHrsOfficeAllocYtd(root.getCompH_item326()); - alliedNPATHrs.setCompHrsName("Art Therapist"); - alliedNPATHrs.setCompHrsType("Allied Non-professional"); + alliedNPATHrs.setCompHrsName(root.getAlliedNP_label_comp5()); + alliedNPATHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPATHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedNPATHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc26()); @@ -1422,8 +1460,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPOTHHrs.setCompHrsStaffYtd(root.getCompH_item127()); alliedNPOTHHrs.setCompHrsContractServicesYtd(root.getCompH_item227()); alliedNPOTHHrs.setCompHrsOfficeAllocYtd(root.getCompH_item327()); - alliedNPOTHHrs.setCompHrsName("Other (specify)"); - alliedNPOTHHrs.setCompHrsType("Allied Non-professional"); + alliedNPOTHHrs.setCompHrsName(root.getAlliedNP_label_comp6()); + alliedNPOTHHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPOTHHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedNPOTHHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc27()); @@ -1431,13 +1469,13 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportPlantMntnceHrs, adminAdministratorHrs, adminDirOfCareHrs, adminDeptManagersHrs, adminSupportHrs, adminPastoCareWrkrHrs, adminClrksHrs, adminClncCrdinatorHrs, adminOtherHrs, nursingRNHrs, nursingLPNHrs, nursingHCAHrs, nursingOthHrs, alliedProfOTHrs, alliedProfPTHrs, - alliedProfDTHrs, alliedProfSWHrs, alliedProfOTHHrs, alliedNPRTHrs, alliedNPRAHrs, alliedNPAWHrs, + alliedProfDTHrs, alliedProfSWHrs, alliedProfSLPHrs, alliedProfRTHrs, alliedProfOTHHrs, alliedNPRTHrs, alliedNPRAHrs, alliedNPAWHrs, alliedNPMTHrs, alliedNPATHrs, alliedNPOTHHrs); /* Subtotals */ LtcYtdCompHrsSubtotals supportHrsSubtotals = new LtcYtdCompHrsSubtotals(); supportHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); - supportHrsSubtotals.setCompHrsType("Support"); + supportHrsSubtotals.setCompHrsType(root.getSupport_label()); supportHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum11()); supportHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum21()); supportHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum31()); @@ -1445,7 +1483,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompHrsSubtotals adminHrsSubtotals = new LtcYtdCompHrsSubtotals(); adminHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); - adminHrsSubtotals.setCompHrsType("Administration"); + adminHrsSubtotals.setCompHrsType(root.getAdmin_label()); adminHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum12()); adminHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum22()); adminHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum32()); @@ -1453,7 +1491,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompHrsSubtotals nursingHrsSubtotals = new LtcYtdCompHrsSubtotals(); nursingHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); - nursingHrsSubtotals.setCompHrsType("Nursing"); + nursingHrsSubtotals.setCompHrsType(root.getNursing_label_comp()); nursingHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum13()); nursingHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum23()); nursingHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum33()); @@ -1461,7 +1499,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompHrsSubtotals alliedHrsSubtotals = new LtcYtdCompHrsSubtotals(); alliedHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); - alliedHrsSubtotals.setCompHrsType("Allied Professional"); + alliedHrsSubtotals.setCompHrsType(root.getAlliedProf_label_comp()); alliedHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum14()); alliedHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum24()); alliedHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum34()); @@ -1469,7 +1507,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompHrsSubtotals alliedNPHrsSubtotals = new LtcYtdCompHrsSubtotals(); alliedNPHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); - alliedNPHrsSubtotals.setCompHrsType("Allied Non-professional"); + alliedNPHrsSubtotals.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum15()); alliedNPHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum25()); alliedNPHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum35()); From 71db7385017f0909aab7c3070e89163548112343 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 26 Apr 2023 16:55:28 -0400 Subject: [PATCH 100/183] LTC ETL process update. removing magic strings --- .../etl/forms/ltc/quarterly/json/Root.java | 281 +++++++++--------- .../LtcQuarterlyYtdApiResponseProcessor.java | 122 ++++---- 2 files changed, 195 insertions(+), 208 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index e66b6e70..cbcb2a9a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -1922,42 +1922,6 @@ public class Root{ public String opRev_YTD_label_19; @JsonProperty("opRev_YTD_label-20") public String opRev_YTD_label_20; - @JsonProperty("opRev_YTD_label-21") - public String opRev_YTD_label_21; - @JsonProperty("opRev_YTD_label-22") - public String opRev_YTD_label_22; - @JsonProperty("opRev_YTD_label-23") - public String opRev_YTD_label_23; - @JsonProperty("opRev_YTD_label-24") - public String opRev_YTD_label_24; - @JsonProperty("opRev_YTD_label-25") - public String opRev_YTD_label_25; - @JsonProperty("opRev_YTD_label-26") - public String opRev_YTD_label_26; - @JsonProperty("opRev_YTD_label-27") - public String opRev_YTD_label_27; - @JsonProperty("opRev_YTD_label-28") - public String opRev_YTD_label_28; - @JsonProperty("opRev_YTD_label-29") - public String opRev_YTD_label_29; - @JsonProperty("opRev_YTD_label-30") - public String opRev_YTD_label_30; - @JsonProperty("opRev_YTD_label-31") - public String opRev_YTD_label_31; - @JsonProperty("opRev_YTD_label-32") - public String opRev_YTD_label_32; - @JsonProperty("opRev_YTD_label-33") - public String opRev_YTD_label_33; - @JsonProperty("opRev_YTD_label-34") - public String opRev_YTD_label_34; - @JsonProperty("opRev_YTD_label-35") - public String opRev_YTD_label_35; - @JsonProperty("opRev_YTD_label-36") - public String opRev_YTD_label_36; - @JsonProperty("opRev_YTD_label-38") - public String opRev_YTD_label_38; - @JsonProperty("opRev_YTD_label-39") - public String opRev_YTD_label_39; public String support_label; @JsonProperty("support_label-1") public String support_label1; @@ -1987,7 +1951,6 @@ public class Root{ @JsonProperty("admin_label-8") public String admin_label8; public String admin_label_subtotal; - public String nursing_label_comp; @JsonProperty("nursing_label_comp-1") public String nursing_label_comp1; @@ -1998,7 +1961,6 @@ public class Root{ @JsonProperty("nursing_label_comp-4") public String nursing_label_comp4; public String nursing_label_comp_subtotal; - public String alliedProf_label_comp; @JsonProperty("alliedProf_label_comp-1") public String alliedProf_label_comp1; @@ -2015,7 +1977,6 @@ public class Root{ @JsonProperty("alliedProf_label_comp-7") public String alliedProf_label_comp7; public String alliedProf_label_comp_subtotal; - public String alliedNP_label_comp; @JsonProperty("alliedNP_label_comp-1") public String alliedNP_label_comp1; @@ -2033,9 +1994,143 @@ public class Root{ public String directCare_label_comp_subtotal; public String compB_total_label; public String compH_total_label; + public String compH_accrued_label; public String compB_recovered_label; public String compB_accrued_label; public String compB_laborOther_label; + @JsonProperty("benefit_value_label-1") + public String benefit_value_label1; + @JsonProperty("benefit_value_label-2") + public String benefit_value_label2; + @JsonProperty("benefit_value_label-3") + public String benefit_value_label3; + @JsonProperty("benefit_value_label-4") + public String benefit_value_label4; + @JsonProperty("benefit_value_label-5") + public String benefit_value_label5; + @JsonProperty("benefit_value_label-6") + public String benefit_value_label6; + @JsonProperty("benefit_value_label-7") + public String benefit_value_label7; + @JsonProperty("benefit_value_label-8") + public String benefit_value_label8; + + public String nopRev_label; + public String nopEx_label; + @JsonProperty("nopRev_YTD_label-1") + public String nopRev_YTD_label1; + @JsonProperty("nopRev_YTD_label-2") + public String nopRev_YTD_label2; + @JsonProperty("nopEx_YTD_label-1") + public String nopEx_YTD_label1; + @JsonProperty("nopEx_YTD_label-2") + public String nopEx_YTD_label2; + public String opRev_client_label; + + public String getOpRev_otherRev_label() { + return opRev_otherRev_label; + } + public void setOpRev_otherRev_label(String opRev_otherRev_label) { + this.opRev_otherRev_label = opRev_otherRev_label; + } + public String opRev_otherRev_label; + + public String getOpRev_client_label() { + return opRev_client_label; + } + public void setOpRev_client_label(String opRev_client_label) { + this.opRev_client_label = opRev_client_label; + } + public String getNopRev_label() { + return nopRev_label; + } + public void setNopRev_label(String nopRev_label) { + this.nopRev_label = nopRev_label; + } + public String getNopEx_label() { + return nopEx_label; + } + public void setNopEx_label(String nopEx_label) { + this.nopEx_label = nopEx_label; + } + public String getNopRev_YTD_label1() { + return nopRev_YTD_label1; + } + public void setNopRev_YTD_label1(String nopRev_YTD_label1) { + this.nopRev_YTD_label1 = nopRev_YTD_label1; + } + public String getNopRev_YTD_label2() { + return nopRev_YTD_label2; + } + public void setNopRev_YTD_label2(String nopRev_YTD_label2) { + this.nopRev_YTD_label2 = nopRev_YTD_label2; + } + public String getNopEx_YTD_label1() { + return nopEx_YTD_label1; + } + public void setNopEx_YTD_label1(String nopEx_YTD_label1) { + this.nopEx_YTD_label1 = nopEx_YTD_label1; + } + public String getNopEx_YTD_label2() { + return nopEx_YTD_label2; + } + public void setNopEx_YTD_label2(String nopEx_YTD_label2) { + this.nopEx_YTD_label2 = nopEx_YTD_label2; + } + public String getBenefit_value_label1() { + return benefit_value_label1; + } + public void setBenefit_value_label1(String benefit_value_label1) { + this.benefit_value_label1 = benefit_value_label1; + } + public String getBenefit_value_label2() { + return benefit_value_label2; + } + public void setBenefit_value_label2(String benefit_value_label2) { + this.benefit_value_label2 = benefit_value_label2; + } + public String getBenefit_value_label3() { + return benefit_value_label3; + } + public void setBenefit_value_label3(String benefit_value_label3) { + this.benefit_value_label3 = benefit_value_label3; + } + public String getBenefit_value_label4() { + return benefit_value_label4; + } + public void setBenefit_value_label4(String benefit_value_label4) { + this.benefit_value_label4 = benefit_value_label4; + } + public String getBenefit_value_label5() { + return benefit_value_label5; + } + public void setBenefit_value_label5(String benefit_value_label5) { + this.benefit_value_label5 = benefit_value_label5; + } + public String getBenefit_value_label6() { + return benefit_value_label6; + } + public void setBenefit_value_label6(String benefit_value_label6) { + this.benefit_value_label6 = benefit_value_label6; + } + public String getBenefit_value_label7() { + return benefit_value_label7; + } + public void setBenefit_value_label7(String benefit_value_label7) { + this.benefit_value_label7 = benefit_value_label7; + } + public String getBenefit_value_label8() { + return benefit_value_label8; + } + public void setBenefit_value_label8(String benefit_value_label8) { + this.benefit_value_label8 = benefit_value_label8; + } + public String getCompH_accrued_label() { + return compH_accrued_label; + } + public void setCompH_accrued_label(String compH_accrued_label) { + this.compH_accrued_label = compH_accrued_label; + } public String getCompB_total_label() { return compB_total_label; @@ -2451,114 +2546,6 @@ public String getOpRev_YTD_label_20() { public void setOpRev_YTD_label_20(String opRev_YTD_label_20) { this.opRev_YTD_label_20 = opRev_YTD_label_20; } - public String getOpRev_YTD_label_21() { - return opRev_YTD_label_21; - } - public void setOpRev_YTD_label_21(String opRev_YTD_label_21) { - this.opRev_YTD_label_21 = opRev_YTD_label_21; - } - public String getOpRev_YTD_label_22() { - return opRev_YTD_label_22; - } - public void setOpRev_YTD_label_22(String opRev_YTD_label_22) { - this.opRev_YTD_label_22 = opRev_YTD_label_22; - } - public String getOpRev_YTD_label_23() { - return opRev_YTD_label_23; - } - public void setOpRev_YTD_label_23(String opRev_YTD_label_23) { - this.opRev_YTD_label_23 = opRev_YTD_label_23; - } - public String getOpRev_YTD_label_24() { - return opRev_YTD_label_24; - } - public void setOpRev_YTD_label_24(String opRev_YTD_label_24) { - this.opRev_YTD_label_24 = opRev_YTD_label_24; - } - public String getOpRev_YTD_label_25() { - return opRev_YTD_label_25; - } - public void setOpRev_YTD_label_25(String opRev_YTD_label_25) { - this.opRev_YTD_label_25 = opRev_YTD_label_25; - } - public String getOpRev_YTD_label_26() { - return opRev_YTD_label_26; - } - public void setOpRev_YTD_label_26(String opRev_YTD_label_26) { - this.opRev_YTD_label_26 = opRev_YTD_label_26; - } - public String getOpRev_YTD_label_27() { - return opRev_YTD_label_27; - } - public void setOpRev_YTD_label_27(String opRev_YTD_label_27) { - this.opRev_YTD_label_27 = opRev_YTD_label_27; - } - public String getOpRev_YTD_label_28() { - return opRev_YTD_label_28; - } - public void setOpRev_YTD_label_28(String opRev_YTD_label_28) { - this.opRev_YTD_label_28 = opRev_YTD_label_28; - } - public String getOpRev_YTD_label_29() { - return opRev_YTD_label_29; - } - public void setOpRev_YTD_label_29(String opRev_YTD_label_29) { - this.opRev_YTD_label_29 = opRev_YTD_label_29; - } - public String getOpRev_YTD_label_30() { - return opRev_YTD_label_30; - } - public void setOpRev_YTD_label_30(String opRev_YTD_label_30) { - this.opRev_YTD_label_30 = opRev_YTD_label_30; - } - public String getOpRev_YTD_label_31() { - return opRev_YTD_label_31; - } - public void setOpRev_YTD_label_31(String opRev_YTD_label_31) { - this.opRev_YTD_label_31 = opRev_YTD_label_31; - } - public String getOpRev_YTD_label_32() { - return opRev_YTD_label_32; - } - public void setOpRev_YTD_label_32(String opRev_YTD_label_32) { - this.opRev_YTD_label_32 = opRev_YTD_label_32; - } - public String getOpRev_YTD_label_33() { - return opRev_YTD_label_33; - } - public void setOpRev_YTD_label_33(String opRev_YTD_label_33) { - this.opRev_YTD_label_33 = opRev_YTD_label_33; - } - public String getOpRev_YTD_label_34() { - return opRev_YTD_label_34; - } - public void setOpRev_YTD_label_34(String opRev_YTD_label_34) { - this.opRev_YTD_label_34 = opRev_YTD_label_34; - } - public String getOpRev_YTD_label_35() { - return opRev_YTD_label_35; - } - public void setOpRev_YTD_label_35(String opRev_YTD_label_35) { - this.opRev_YTD_label_35 = opRev_YTD_label_35; - } - public String getOpRev_YTD_label_36() { - return opRev_YTD_label_36; - } - public void setOpRev_YTD_label_36(String opRev_YTD_label_36) { - this.opRev_YTD_label_36 = opRev_YTD_label_36; - } - public String getOpRev_YTD_label_38() { - return opRev_YTD_label_38; - } - public void setOpRev_YTD_label_38(String opRev_YTD_label_38) { - this.opRev_YTD_label_38 = opRev_YTD_label_38; - } - public String getOpRev_YTD_label_39() { - return opRev_YTD_label_39; - } - public void setOpRev_YTD_label_39(String opRev_YTD_label_39) { - this.opRev_YTD_label_39 = opRev_YTD_label_39; - } public String getAlliedNPContractRate_total() { return alliedNPContractRate_total; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 0ce65da3..a1f6f8cb 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1517,7 +1517,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY /* Totals */ LtcYtdCompHrsTotals totalPerPayrollHrsTotals = new LtcYtdCompHrsTotals(); - totalPerPayrollHrsTotals.setCompHrsTotalType("Total Per Payroll"); + totalPerPayrollHrsTotals.setCompHrsTotalType(root.getCompH_total_label()); totalPerPayrollHrsTotals.setTotalCompHrsStaffYTD(root.getCompH_total1()); totalPerPayrollHrsTotals.setTotalCompHrsContractServicesYTD(root.getCompH_total2()); totalPerPayrollHrsTotals.setTotalCompHrsOfficeAllocYTD(root.getCompH_total3()); @@ -1525,7 +1525,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY totalPerPayrollHrsTotals.setConfirmationID(root.getForm().getConfirmationId()); LtcYtdCompHrsTotals accuredHrsTotals = new LtcYtdCompHrsTotals(); - accuredHrsTotals.setCompHrsTotalType("Accured Hours"); + accuredHrsTotals.setCompHrsTotalType(root.getCompH_accrued_label()); accuredHrsTotals.setTotalCompHrsStaffYTD(root.getCompH_accrued2()); accuredHrsTotals.setTotalCompHrsContractServicesYTD(root.getCompH_accrued3()); accuredHrsTotals.setTotalCompHrsOfficeAllocYTD(root.getCompH_accrued3()); @@ -1682,42 +1682,42 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY /* Benefits Where is %Allocation stored */ LtcYtdCompBenefits empInsBenefit = new LtcYtdCompBenefits(); empInsBenefit.setBenefitsAmountYtd(root.getBenefit_value1()); - empInsBenefit.setBenefitsType("Employment Insurance"); + empInsBenefit.setBenefitsType(root.getBenefit_value_label1()); empInsBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits canPenPlnBenefit = new LtcYtdCompBenefits(); canPenPlnBenefit.setBenefitsAmountYtd(root.getBenefit_value2()); - canPenPlnBenefit.setBenefitsType("Canada Pension Plan"); + canPenPlnBenefit.setBenefitsType(root.getBenefit_value_label2()); canPenPlnBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits wrkrCompBoardBenefit = new LtcYtdCompBenefits(); wrkrCompBoardBenefit.setBenefitsAmountYtd(root.getBenefit_value3()); - wrkrCompBoardBenefit.setBenefitsType("Workers Compensation Board"); + wrkrCompBoardBenefit.setBenefitsType(root.getBenefit_value_label3()); wrkrCompBoardBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits empHlthTaxBenefit = new LtcYtdCompBenefits(); empHlthTaxBenefit.setBenefitsAmountYtd(root.getBenefit_value4()); - empHlthTaxBenefit.setBenefitsType("Employer Health Tax"); + empHlthTaxBenefit.setBenefitsType(root.getBenefit_value_label4()); empHlthTaxBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits penPlanBenefit = new LtcYtdCompBenefits(); penPlanBenefit.setBenefitsAmountYtd(root.getBenefit_value5()); - penPlanBenefit.setBenefitsType("Pension Plan"); + penPlanBenefit.setBenefitsType(root.getBenefit_value_label5()); penPlanBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits exHlthDntlBenefit = new LtcYtdCompBenefits(); exHlthDntlBenefit.setBenefitsAmountYtd(root.getBenefit_value6()); - exHlthDntlBenefit.setBenefitsType("Extended Health & Dental"); + exHlthDntlBenefit.setBenefitsType(root.getBenefit_value_label6()); exHlthDntlBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits grpLifeBenefit = new LtcYtdCompBenefits(); grpLifeBenefit.setBenefitsAmountYtd(root.getBenefit_value7()); - grpLifeBenefit.setBenefitsType("Group Life, AD&D, LTD"); + grpLifeBenefit.setBenefitsType(root.getBenefit_value_label7()); grpLifeBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits otherBenefit = new LtcYtdCompBenefits(); otherBenefit.setBenefitsAmountYtd(root.getBenefit_value8()); - otherBenefit.setBenefitsType("Other Benefits specify"); + otherBenefit.setBenefitsType(root.getBenefit_value_label8()); otherBenefit.setConfirmationId(root.getForm().getConfirmationId()); Collections.addAll(ltcYtdCompBenefits, empInsBenefit, canPenPlnBenefit, wrkrCompBoardBenefit, @@ -1728,22 +1728,22 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdRev revFrmHA1Adj = new LtcYtdRev(); revFrmHA1Adj.setRevYTD(root.getOpRev_YTD1()); revFrmHA1Adj.setRevNotes(root.getOpRev_note1()); - revFrmHA1Adj.setRevName("HA Operating Funding"); - revFrmHA1Adj.setRevType("Revenue from HA (1)"); + revFrmHA1Adj.setRevName(root.getOpRev_YTD_label_1()); + revFrmHA1Adj.setRevType(root.getOpRev_1_label()); revFrmHA1Adj.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev revFrmHA1DirCare = new LtcYtdRev(); revFrmHA1DirCare.setRevYTD(root.getOpRev_YTD2()); revFrmHA1DirCare.setRevNotes(root.getOpRev_note2()); - revFrmHA1DirCare.setRevName("Direct care hours"); - revFrmHA1DirCare.setRevType("Revenue from HA (1)"); + revFrmHA1DirCare.setRevName(root.getOpRev_YTD_label_2()); + revFrmHA1DirCare.setRevType(root.getOpRev_1_label()); revFrmHA1DirCare.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev revFrmHA1Others = new LtcYtdRev(); revFrmHA1Others.setRevYTD(root.getOpRev_YTD3()); revFrmHA1Others.setRevNotes(root.getOpRev_note3()); - revFrmHA1Others.setRevName("Others"); - revFrmHA1Others.setRevType("Revenue from HA (1)"); + revFrmHA1Others.setRevName(root.getOpRev_YTD_label_3()); + revFrmHA1Others.setRevType(root.getOpRev_1_label()); revFrmHA1Others.setConfirmationId(root.getForm().getConfirmationId()); // skipping subtotal for now @@ -1751,15 +1751,15 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdRev revFrmHA2OpFundMinEq = new LtcYtdRev(); revFrmHA2OpFundMinEq.setRevYTD(root.getOpRev_YTD4()); revFrmHA2OpFundMinEq.setRevNotes(root.getOpRev_note4()); - revFrmHA2OpFundMinEq.setRevName("HA Operating Funding - Minor Equipment"); - revFrmHA2OpFundMinEq.setRevType("Revenue from HA (2)"); + revFrmHA2OpFundMinEq.setRevName(root.getOpRev_YTD_label_4()); + revFrmHA2OpFundMinEq.setRevType(root.getOpRev_2_label()); revFrmHA2OpFundMinEq.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev revFrmHA2OpFundOth = new LtcYtdRev(); revFrmHA2OpFundOth.setRevYTD(root.getOpRev_YTD5()); revFrmHA2OpFundOth.setRevNotes(root.getOpRev_note5()); - revFrmHA2OpFundOth.setRevName("HA Operating Funding - Other"); - revFrmHA2OpFundOth.setRevType("Revenue from HA (2)"); + revFrmHA2OpFundOth.setRevName(root.getOpRev_YTD_label_5()); + revFrmHA2OpFundOth.setRevType(root.getOpRev_2_label()); revFrmHA2OpFundOth.setConfirmationId(root.getForm().getConfirmationId()); // skipping subtotal @@ -1767,51 +1767,51 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdRev revFrmHA3 = new LtcYtdRev(); revFrmHA3.setRevYTD(root.getOpRev_YTD6()); revFrmHA3.setRevNotes(root.getOpRev_note6()); - revFrmHA3.setRevName("HA Capital Contribution Funding"); - revFrmHA3.setRevType("Revenue from HA (3)"); + revFrmHA3.setRevName(root.getOpRev_YTD_label_6()); + revFrmHA3.setRevType(root.getOpRev_3_label()); revFrmHA3.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev revFrmHA4OccThld = new LtcYtdRev(); revFrmHA4OccThld.setRevYTD(root.getOpRev_YTD7()); revFrmHA4OccThld.setRevNotes(root.getOpRev_note7()); - revFrmHA4OccThld.setRevName("Occupancy threshold"); - revFrmHA4OccThld.setRevType("Revenue from HA (4)"); + revFrmHA4OccThld.setRevName(root.getOpRev_YTD_label_7()); + revFrmHA4OccThld.setRevType(root.getOpRev_4_label()); revFrmHA4OccThld.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev revFrmHA4CliConReconc = new LtcYtdRev(); revFrmHA4CliConReconc.setRevYTD(root.getOpRev_YTD8()); revFrmHA4CliConReconc.setRevNotes(root.getOpRev_note8()); - revFrmHA4CliConReconc.setRevName("Client Contribution Reconciliation"); - revFrmHA4CliConReconc.setRevType("Revenue from HA (4)"); + revFrmHA4CliConReconc.setRevName(root.getOpRev_YTD_label_8()); + revFrmHA4CliConReconc.setRevType(root.getOpRev_4_label()); revFrmHA4CliConReconc.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev revFrmHA4DirCare = new LtcYtdRev(); revFrmHA4DirCare.setRevYTD(root.getOpRev_YTD9()); revFrmHA4DirCare.setRevNotes(root.getOpRev_note9()); - revFrmHA4DirCare.setRevName("Direct Care Hours"); - revFrmHA4DirCare.setRevType("Revenue from HA (4)"); + revFrmHA4DirCare.setRevName(root.getOpRev_YTD_label_9()); + revFrmHA4DirCare.setRevType(root.getOpRev_4_label()); revFrmHA4DirCare.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev revFrmHA4Oth = new LtcYtdRev(); revFrmHA4Oth.setRevYTD(root.getOpRev_YTD10()); revFrmHA4Oth.setRevNotes(root.getOpRev_note10()); - revFrmHA4Oth.setRevName("Other"); - revFrmHA4Oth.setRevType("Revenue from HA (4)"); + revFrmHA4Oth.setRevName(root.getOpRev_YTD_label_10()); + revFrmHA4Oth.setRevType(root.getOpRev_4_label()); revFrmHA4Oth.setConfirmationId(root.getForm().getConfirmationId()); /* Non operating revenu */ LtcYtdRev nonOperatingRevOth = new LtcYtdRev(); nonOperatingRevOth.setRevYTD(root.getNopRev_YTD1()); nonOperatingRevOth.setRevNotes(root.getNopRev_note1()); - nonOperatingRevOth.setRevName("Other"); - nonOperatingRevOth.setRevType("Non-operating Revenue"); + nonOperatingRevOth.setRevName(root.getNopRev_YTD_label1()); + nonOperatingRevOth.setRevType(root.getNopRev_label()); nonOperatingRevOth.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev nonOperatingRevOthThirdParty = new LtcYtdRev(); nonOperatingRevOthThirdParty.setRevYTD(root.getNopRev_YTD2()); nonOperatingRevOthThirdParty.setRevNotes(root.getNopRev_note2()); - nonOperatingRevOthThirdParty.setRevName("Other - 3rd party funding "); - nonOperatingRevOthThirdParty.setRevType("Non-operating Revenue"); + nonOperatingRevOthThirdParty.setRevName(root.getNopRev_YTD_label2()); + nonOperatingRevOthThirdParty.setRevType(root.getNopRev_label()); nonOperatingRevOthThirdParty.setConfirmationId(root.getForm().getConfirmationId()); /* END */ @@ -1820,72 +1820,72 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdRev clntRvnHAClient = new LtcYtdRev(); clntRvnHAClient.setRevYTD(root.getOpRev_YTD11()); clntRvnHAClient.setRevNotes(root.getOpRev_note11()); - clntRvnHAClient.setRevName("HA Client User Fees Paid by the Client"); - clntRvnHAClient.setRevType("Client Revenue"); + clntRvnHAClient.setRevName(root.getOpRev_YTD_label_11()); + clntRvnHAClient.setRevType(root.getOpRev_client_label()); clntRvnHAClient.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev clntRvnFeePaidParties = new LtcYtdRev(); clntRvnFeePaidParties.setRevYTD(root.getOpRev_YTD12()); clntRvnFeePaidParties.setRevNotes(root.getOpRev_note12()); - clntRvnFeePaidParties.setRevName("Client user fee paid by their parties"); - clntRvnFeePaidParties.setRevType("Client Revenue"); + clntRvnFeePaidParties.setRevName(root.getOpRev_YTD_label_12()); + clntRvnFeePaidParties.setRevType(root.getOpRev_client_label()); clntRvnFeePaidParties.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev clntRvnFeePaidNonEligible = new LtcYtdRev(); clntRvnFeePaidNonEligible.setRevYTD(root.getOpRev_YTD13()); clntRvnFeePaidNonEligible.setRevNotes(root.getOpRev_note13()); - clntRvnFeePaidNonEligible.setRevName("Client user fee paid ~ for non-eligible residents"); - clntRvnFeePaidNonEligible.setRevType("Client Revenue"); + clntRvnFeePaidNonEligible.setRevName(root.getOpRev_YTD_label_13()); + clntRvnFeePaidNonEligible.setRevType(root.getOpRev_client_label()); clntRvnFeePaidNonEligible.setConfirmationId(root.getForm().getConfirmationId()); // skipping subtotal for now LtcYtdRev othRevInvstOpFund = new LtcYtdRev(); othRevInvstOpFund.setRevYTD(root.getOpRev_YTD14()); othRevInvstOpFund.setRevNotes(root.getOpRev_note14()); - othRevInvstOpFund.setRevName("Investments Revenue on operating funds"); - othRevInvstOpFund.setRevType("Other Revenue"); + othRevInvstOpFund.setRevName(root.getOpRev_YTD_label_14()); + othRevInvstOpFund.setRevType(root.getOpRev_otherRev_label()); othRevInvstOpFund.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev othRevInvstCmBcFund = new LtcYtdRev(); othRevInvstCmBcFund.setRevYTD(root.getOpRev_YTD15()); othRevInvstCmBcFund.setRevNotes(root.getOpRev_note15()); - othRevInvstCmBcFund.setRevName("CMHC/BCHMC funding"); - othRevInvstCmBcFund.setRevType("Other Revenue"); + othRevInvstCmBcFund.setRevName(root.getOpRev_YTD_label_15()); + othRevInvstCmBcFund.setRevType(root.getOpRev_otherRev_label()); othRevInvstCmBcFund.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev othRevFoodServ = new LtcYtdRev(); othRevFoodServ.setRevYTD(root.getOpRev_YTD16()); othRevFoodServ.setRevNotes(root.getOpRev_note16()); - othRevFoodServ.setRevName("food services"); - othRevFoodServ.setRevType("Other Revenue"); + othRevFoodServ.setRevName(root.getOpRev_YTD_label_16()); + othRevFoodServ.setRevType(root.getOpRev_otherRev_label()); othRevFoodServ.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev othRevLdryServ = new LtcYtdRev(); othRevLdryServ.setRevYTD(root.getOpRev_YTD17()); othRevLdryServ.setRevNotes(root.getOpRev_note17()); - othRevLdryServ.setRevName("laundry services"); - othRevLdryServ.setRevType("Other Revenue"); + othRevLdryServ.setRevName(root.getOpRev_YTD_label_17()); + othRevLdryServ.setRevType(root.getOpRev_otherRev_label()); othRevLdryServ.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev othRevCabl = new LtcYtdRev(); othRevCabl.setRevYTD(root.getOpRev_YTD18()); othRevCabl.setRevNotes(root.getOpRev_note18()); - othRevCabl.setRevName("cablevision"); - othRevCabl.setRevType("Other Revenue"); + othRevCabl.setRevName(root.getOpRev_YTD_label_18()); + othRevCabl.setRevType(root.getOpRev_otherRev_label()); othRevCabl.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev othRevOthRec = new LtcYtdRev(); othRevOthRec.setRevYTD(root.getOpRev_YTD19()); othRevOthRec.setRevNotes(root.getOpRev_note19()); - othRevOthRec.setRevName("other recoveries"); - othRevOthRec.setRevType("Other Revenue"); + othRevOthRec.setRevName(root.getOpRev_YTD_label_19()); + othRevOthRec.setRevType(root.getOpRev_otherRev_label()); othRevOthRec.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdRev othRevOthSpcfy = new LtcYtdRev(); othRevOthSpcfy.setRevYTD(root.getOpRev_YTD20()); othRevOthSpcfy.setRevNotes(root.getOpRev_note20()); - othRevOthSpcfy.setRevName("Others ~ specify"); - othRevOthSpcfy.setRevType("Other Revenue"); + othRevOthSpcfy.setRevName(root.getOpRev_YTD_label_20()); + othRevOthSpcfy.setRevType(root.getOpRev_otherRev_label()); othRevOthSpcfy.setConfirmationId(root.getForm().getConfirmationId()); Collections.addAll(ltcYtdRev, revFrmHA1Adj, revFrmHA1DirCare, revFrmHA1Others, revFrmHA2OpFundMinEq, revFrmHA2OpFundOth, revFrmHA3, revFrmHA4OccThld, revFrmHA4CliConReconc, revFrmHA4DirCare, @@ -1896,37 +1896,37 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY /* Subtotals */ LtcYtdRevSubTotals revFromHA1Subttl = new LtcYtdRevSubTotals(); revFromHA1Subttl.setConfirmationId(root.getForm().getConfirmationId()); - revFromHA1Subttl.setRevType("Revenue from HA(1)"); + revFromHA1Subttl.setRevType(root.getOpRev_1_label()); revFromHA1Subttl.setSubTotalRevYtd(root.getOpRev_sum11()); LtcYtdRevSubTotals revFromHA2Subttl = new LtcYtdRevSubTotals(); revFromHA2Subttl.setConfirmationId(root.getForm().getConfirmationId()); - revFromHA2Subttl.setRevType("Revenue from HA(2)"); + revFromHA2Subttl.setRevType(root.getOpRev_2_label()); revFromHA2Subttl.setSubTotalRevYtd(root.getOpRev_sum12()); LtcYtdRevSubTotals revFromHA4Subttl = new LtcYtdRevSubTotals(); revFromHA4Subttl.setConfirmationId(root.getForm().getConfirmationId()); - revFromHA4Subttl.setRevType("Revenue from HA(4)"); + revFromHA4Subttl.setRevType(root.getOpRev_4_label()); revFromHA4Subttl.setSubTotalRevYtd(root.getOpRev_sum13()); LtcYtdRevSubTotals clntRevSubttl = new LtcYtdRevSubTotals(); clntRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); - clntRevSubttl.setRevType("Client Revenue"); + clntRevSubttl.setRevType(root.getOpRev_client_label()); clntRevSubttl.setSubTotalRevYtd(root.getOpRev_sum14()); LtcYtdRevSubTotals othRevSubttl = new LtcYtdRevSubTotals(); othRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); - othRevSubttl.setRevType("Other Revenue"); + othRevSubttl.setRevType(root.getOpRev_otherRev_label()); othRevSubttl.setSubTotalRevYtd(root.getOpRev_sum15()); LtcYtdRevSubTotals opRevSubttl = new LtcYtdRevSubTotals(); opRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); - opRevSubttl.setRevType("Operating Revenue"); + opRevSubttl.setRevType(root.getOpRev_YTD_total_label()); opRevSubttl.setSubTotalRevYtd(root.getOpRev_YTD_total()); LtcYtdRevSubTotals nonOpRevSubttl = new LtcYtdRevSubTotals(); nonOpRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); - nonOpRevSubttl.setRevType("Non-operating revenue"); + nonOpRevSubttl.setRevType(root.getNopRev_label()); nonOpRevSubttl.setSubTotalRevYtd(root.getNopRev_sum11()); Collections.addAll(ltcYtdRevSubTtls, revFromHA1Subttl,revFromHA2Subttl,revFromHA4Subttl,clntRevSubttl,othRevSubttl,opRevSubttl, nonOpRevSubttl); From 8b67e57bf80e5a9c871ddbd37a5e790e4e5290d6 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 27 Apr 2023 14:58:17 -0400 Subject: [PATCH 101/183] LTC ETL process update. removing magic strings, and bugfix --- .../etl/forms/ltc/quarterly/json/Root.java | 351 +++++++++++++++++- .../LtcQuarterlyYtdApiResponseProcessor.java | 223 +++++------ 2 files changed, 465 insertions(+), 109 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index cbcb2a9a..063b5fb9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -1586,7 +1586,9 @@ public class Root{ public String opEx_YTD34; @JsonProperty("opEx_YTD-35") public String opEx_YTD35; - @JsonProperty("opEx_YTD-4") + @JsonProperty("opEx_YTD-36") + public String opEx_YTD36; + @JsonProperty("opEx_YTD-4") public String opEx_YTD4; @JsonProperty("opEx_YTD-5") public String opEx_YTD5; @@ -2026,7 +2028,348 @@ public class Root{ @JsonProperty("nopEx_YTD_label-2") public String nopEx_YTD_label2; public String opRev_client_label; + + public String opEx_1A_label; + public String opEx_1B_label; + public String opEx_2_label; + public String opEx_3_label; + public String opEx_4_label; + @JsonProperty("opEx_YTD_label-1") + public String opEx_YTD_label1; + @JsonProperty("opEx_YTD_label-2") + public String opEx_YTD_label2; + @JsonProperty("opEx_YTD_label-3") + public String opEx_YTD_label3; + @JsonProperty("opEx_YTD_label-4") + public String opEx_YTD_label4; + @JsonProperty("opEx_YTD_label-5") + public String opEx_YTD_label5; + @JsonProperty("opEx_YTD_label-6") + public String opEx_YTD_label6; + @JsonProperty("opEx_YTD_label-7") + public String opEx_YTD_label7; + @JsonProperty("opEx_YTD_label-8") + public String opEx_YTD_label8; + @JsonProperty("opEx_YTD_label-9") + public String opEx_YTD_label9; + @JsonProperty("opEx_YTD_label-10") + public String opEx_YTD_label10; + @JsonProperty("opEx_YTD_label-11") + public String opEx_YTD_label11; + @JsonProperty("opEx_YTD_label-12") + public String opEx_YTD_label12; + @JsonProperty("opEx_YTD_label-13") + public String opEx_YTD_label13; + @JsonProperty("opEx_YTD_label-14") + public String opEx_YTD_label14; + @JsonProperty("opEx_YTD_label-15") + public String opEx_YTD_label15; + @JsonProperty("opEx_YTD_label-16") + public String opEx_YTD_label16; + @JsonProperty("opEx_YTD_label-17") + public String opEx_YTD_label17; + @JsonProperty("opEx_YTD_label-18") + public String opEx_YTD_label18; + @JsonProperty("opEx_YTD_label-19") + public String opEx_YTD_label19; + @JsonProperty("opEx_YTD_label-20") + public String opEx_YTD_label20; + @JsonProperty("opEx_YTD_label-21") + public String opEx_YTD_label21; + @JsonProperty("opEx_YTD_label-22") + public String opEx_YTD_label22; + @JsonProperty("opEx_YTD_label-23") + public String opEx_YTD_label23; + @JsonProperty("opEx_YTD_label-24") + public String opEx_YTD_label24; + @JsonProperty("opEx_YTD_label-25") + public String opEx_YTD_label25; + @JsonProperty("opEx_YTD_label-26") + public String opEx_YTD_label26; + @JsonProperty("opEx_YTD_label-27") + public String opEx_YTD_label27; + @JsonProperty("opEx_YTD_label-28") + public String opEx_YTD_label28; + @JsonProperty("opEx_YTD_label-29") + public String opEx_YTD_label29; + @JsonProperty("opEx_YTD_label-30") + public String opEx_YTD_label30; + @JsonProperty("opEx_YTD_label-31") + public String opEx_YTD_label31; + @JsonProperty("opEx_YTD_label-32") + public String opEx_YTD_label32; + @JsonProperty("opEx_YTD_label-33") + public String opEx_YTD_label33; + @JsonProperty("opEx_YTD_label-34") + public String opEx_YTD_label34; + @JsonProperty("opEx_YTD_label-35") + public String opEx_YTD_label35; + @JsonProperty("opEx_YTD_label-36") + public String opEx_YTD_label36; + @JsonProperty("opEx_YTD_label-38") + public String opEx_YTD_label38; + @JsonProperty("opEx_YTD_label-39") + public String opEx_YTD_label39; + + public String getOpEx_1A_label() { + return opEx_1A_label; + } + public void setOpEx_1A_label(String opEx_1A_label) { + this.opEx_1A_label = opEx_1A_label; + } + public String getOpEx_1B_label() { + return opEx_1B_label; + } + public void setOpEx_1B_label(String opEx_1B_label) { + this.opEx_1B_label = opEx_1B_label; + } + public String getOpEx_2_label() { + return opEx_2_label; + } + public void setOpEx_2_label(String opEx_2_label) { + this.opEx_2_label = opEx_2_label; + } + public String getOpEx_3_label() { + return opEx_3_label; + } + public void setOpEx_3_label(String opEx_3_label) { + this.opEx_3_label = opEx_3_label; + } + public String getOpEx_4_label() { + return opEx_4_label; + } + public void setOpEx_4_label(String opEx_4_label) { + this.opEx_4_label = opEx_4_label; + } + public String getOpEx_YTD_label1() { + return opEx_YTD_label1; + } + public void setOpEx_YTD_label1(String opEx_YTD_label1) { + this.opEx_YTD_label1 = opEx_YTD_label1; + } + public String getOpEx_YTD_label2() { + return opEx_YTD_label2; + } + public void setOpEx_YTD_label2(String opEx_YTD_label2) { + this.opEx_YTD_label2 = opEx_YTD_label2; + } + public String getOpEx_YTD_label3() { + return opEx_YTD_label3; + } + public void setOpEx_YTD_label3(String opEx_YTD_label3) { + this.opEx_YTD_label3 = opEx_YTD_label3; + } + public String getOpEx_YTD_label4() { + return opEx_YTD_label4; + } + public void setOpEx_YTD_label4(String opEx_YTD_label4) { + this.opEx_YTD_label4 = opEx_YTD_label4; + } + public String getOpEx_YTD_label5() { + return opEx_YTD_label5; + } + public void setOpEx_YTD_label5(String opEx_YTD_label5) { + this.opEx_YTD_label5 = opEx_YTD_label5; + } + public String getOpEx_YTD_label6() { + return opEx_YTD_label6; + } + public void setOpEx_YTD_label6(String opEx_YTD_label6) { + this.opEx_YTD_label6 = opEx_YTD_label6; + } + public String getOpEx_YTD_label7() { + return opEx_YTD_label7; + } + public void setOpEx_YTD_label7(String opEx_YTD_label7) { + this.opEx_YTD_label7 = opEx_YTD_label7; + } + public String getOpEx_YTD_label8() { + return opEx_YTD_label8; + } + public void setOpEx_YTD_label8(String opEx_YTD_label8) { + this.opEx_YTD_label8 = opEx_YTD_label8; + } + public String getOpEx_YTD_label9() { + return opEx_YTD_label9; + } + public void setOpEx_YTD_label9(String opEx_YTD_label9) { + this.opEx_YTD_label9 = opEx_YTD_label9; + } + public String getOpEx_YTD_label10() { + return opEx_YTD_label10; + } + public void setOpEx_YTD_label10(String opEx_YTD_label10) { + this.opEx_YTD_label10 = opEx_YTD_label10; + } + public String getOpEx_YTD_label11() { + return opEx_YTD_label11; + } + public void setOpEx_YTD_label11(String opEx_YTD_label11) { + this.opEx_YTD_label11 = opEx_YTD_label11; + } + public String getOpEx_YTD_label12() { + return opEx_YTD_label12; + } + public void setOpEx_YTD_label12(String opEx_YTD_label12) { + this.opEx_YTD_label12 = opEx_YTD_label12; + } + public String getOpEx_YTD_label13() { + return opEx_YTD_label13; + } + public void setOpEx_YTD_label13(String opEx_YTD_label13) { + this.opEx_YTD_label13 = opEx_YTD_label13; + } + public String getOpEx_YTD_label14() { + return opEx_YTD_label14; + } + public void setOpEx_YTD_label14(String opEx_YTD_label14) { + this.opEx_YTD_label14 = opEx_YTD_label14; + } + public String getOpEx_YTD_label15() { + return opEx_YTD_label15; + } + public void setOpEx_YTD_label15(String opEx_YTD_label15) { + this.opEx_YTD_label15 = opEx_YTD_label15; + } + public String getOpEx_YTD_label16() { + return opEx_YTD_label16; + } + public void setOpEx_YTD_label16(String opEx_YTD_label16) { + this.opEx_YTD_label16 = opEx_YTD_label16; + } + public String getOpEx_YTD_label17() { + return opEx_YTD_label17; + } + public void setOpEx_YTD_label17(String opEx_YTD_label17) { + this.opEx_YTD_label17 = opEx_YTD_label17; + } + public String getOpEx_YTD_label18() { + return opEx_YTD_label18; + } + public void setOpEx_YTD_label18(String opEx_YTD_label18) { + this.opEx_YTD_label18 = opEx_YTD_label18; + } + public String getOpEx_YTD_label19() { + return opEx_YTD_label19; + } + public void setOpEx_YTD_label19(String opEx_YTD_label19) { + this.opEx_YTD_label19 = opEx_YTD_label19; + } + public String getOpEx_YTD_label20() { + return opEx_YTD_label20; + } + public void setOpEx_YTD_label20(String opEx_YTD_label20) { + this.opEx_YTD_label20 = opEx_YTD_label20; + } + public String getOpEx_YTD_label21() { + return opEx_YTD_label21; + } + public void setOpEx_YTD_label21(String opEx_YTD_label21) { + this.opEx_YTD_label21 = opEx_YTD_label21; + } + public String getOpEx_YTD_label22() { + return opEx_YTD_label22; + } + public void setOpEx_YTD_label22(String opEx_YTD_label22) { + this.opEx_YTD_label22 = opEx_YTD_label22; + } + public String getOpEx_YTD_label23() { + return opEx_YTD_label23; + } + public void setOpEx_YTD_label23(String opEx_YTD_label23) { + this.opEx_YTD_label23 = opEx_YTD_label23; + } + public String getOpEx_YTD_label24() { + return opEx_YTD_label24; + } + public void setOpEx_YTD_label24(String opEx_YTD_label24) { + this.opEx_YTD_label24 = opEx_YTD_label24; + } + public String getOpEx_YTD_label25() { + return opEx_YTD_label25; + } + public void setOpEx_YTD_label25(String opEx_YTD_label25) { + this.opEx_YTD_label25 = opEx_YTD_label25; + } + public String getOpEx_YTD_label26() { + return opEx_YTD_label26; + } + public void setOpEx_YTD_label26(String opEx_YTD_label26) { + this.opEx_YTD_label26 = opEx_YTD_label26; + } + public String getOpEx_YTD_label27() { + return opEx_YTD_label27; + } + public void setOpEx_YTD_label27(String opEx_YTD_label27) { + this.opEx_YTD_label27 = opEx_YTD_label27; + } + public String getOpEx_YTD_label28() { + return opEx_YTD_label28; + } + public void setOpEx_YTD_label28(String opEx_YTD_label28) { + this.opEx_YTD_label28 = opEx_YTD_label28; + } + public String getOpEx_YTD_label29() { + return opEx_YTD_label29; + } + public void setOpEx_YTD_label29(String opEx_YTD_label29) { + this.opEx_YTD_label29 = opEx_YTD_label29; + } + public String getOpEx_YTD_label30() { + return opEx_YTD_label30; + } + public void setOpEx_YTD_label30(String opEx_YTD_label30) { + this.opEx_YTD_label30 = opEx_YTD_label30; + } + public String getOpEx_YTD_label31() { + return opEx_YTD_label31; + } + public void setOpEx_YTD_label31(String opEx_YTD_label31) { + this.opEx_YTD_label31 = opEx_YTD_label31; + } + public String getOpEx_YTD_label32() { + return opEx_YTD_label32; + } + public void setOpEx_YTD_label32(String opEx_YTD_label32) { + this.opEx_YTD_label32 = opEx_YTD_label32; + } + public String getOpEx_YTD_label33() { + return opEx_YTD_label33; + } + public void setOpEx_YTD_label33(String opEx_YTD_label33) { + this.opEx_YTD_label33 = opEx_YTD_label33; + } + public String getOpEx_YTD_label34() { + return opEx_YTD_label34; + } + public void setOpEx_YTD_label34(String opEx_YTD_label34) { + this.opEx_YTD_label34 = opEx_YTD_label34; + } + public String getOpEx_YTD_label35() { + return opEx_YTD_label35; + } + public void setOpEx_YTD_label35(String opEx_YTD_label35) { + this.opEx_YTD_label35 = opEx_YTD_label35; + } + public String getOpEx_YTD_label36() { + return opEx_YTD_label36; + } + public void setOpEx_YTD_label36(String opEx_YTD_label36) { + this.opEx_YTD_label36 = opEx_YTD_label36; + } + public String getOpEx_YTD_label38() { + return opEx_YTD_label38; + } + public void setOpEx_YTD_label38(String opEx_YTD_label38) { + this.opEx_YTD_label38 = opEx_YTD_label38; + } + public String getOpEx_YTD_label39() { + return opEx_YTD_label39; + } + public void setOpEx_YTD_label39(String opEx_YTD_label39) { + this.opEx_YTD_label39 = opEx_YTD_label39; + } public String getOpRev_otherRev_label() { return opRev_otherRev_label; } @@ -8822,6 +9165,12 @@ public String getOpEx_YTD35() { public void setOpEx_YTD35(String opEx_YTD35) { this.opEx_YTD35 = opEx_YTD35; } + public String getOpEx_YTD36() { + return opEx_YTD36; + } + public void setOpEx_YTD36(String opEx_YTD36) { + this.opEx_YTD36 = opEx_YTD36; + } public String getOpEx_YTD4() { return opEx_YTD4; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index a1f6f8cb..25485061 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1934,198 +1934,198 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdExp dirCareCostExp = new LtcYtdExp(); dirCareCostExp.setExpYtd(root.getOpEx_YTD1()); dirCareCostExp.setExpNotes(root.getOpEx_note1()); - dirCareCostExp.setExpName("Direct Care"); - dirCareCostExp.setExpType("Staffing Cost (1A)"); + dirCareCostExp.setExpName(root.getOpEx_YTD_label1()); + dirCareCostExp.setExpType(root.getOpEx_1A_label()); dirCareCostExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp foodCostExp = new LtcYtdExp(); foodCostExp.setExpYtd(root.getOpEx_YTD2()); foodCostExp.setExpNotes(root.getOpEx_note2()); - foodCostExp.setExpName("Food Services"); - foodCostExp.setExpType("Staffing Cost (1A)"); + foodCostExp.setExpName(root.getOpEx_YTD_label2()); + foodCostExp.setExpType(root.getOpEx_1A_label()); foodCostExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp ldryServExp = new LtcYtdExp(); ldryServExp.setExpYtd(root.getOpEx_YTD3()); ldryServExp.setExpNotes(root.getOpEx_note3()); - ldryServExp.setExpName("Laundry Services"); - ldryServExp.setExpType("Staffing Cost (1A)"); + ldryServExp.setExpName(root.getOpEx_YTD_label3()); + ldryServExp.setExpType(root.getOpEx_1A_label()); ldryServExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp housekeepingCostExp = new LtcYtdExp(); housekeepingCostExp.setExpYtd(root.getOpEx_YTD4()); housekeepingCostExp.setExpNotes(root.getOpEx_note4()); - housekeepingCostExp.setExpName("Housekeeping Services"); - housekeepingCostExp.setExpType("Staffing Cost (1A)"); + housekeepingCostExp.setExpName(root.getOpEx_YTD_label4()); + housekeepingCostExp.setExpType(root.getOpEx_1A_label()); housekeepingCostExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp adminServCostExp = new LtcYtdExp(); adminServCostExp.setExpYtd(root.getOpEx_YTD5()); adminServCostExp.setExpNotes(root.getOpEx_note5()); - adminServCostExp.setExpName("Administration Services"); - adminServCostExp.setExpType("Staffing Cost (1A)"); + adminServCostExp.setExpName(root.getOpEx_YTD_label5()); + adminServCostExp.setExpType(root.getOpEx_1A_label()); adminServCostExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp plantMainOpStaffExp = new LtcYtdExp(); plantMainOpStaffExp.setExpYtd(root.getOpEx_YTD6()); plantMainOpStaffExp.setExpNotes(root.getOpEx_note6()); - plantMainOpStaffExp.setExpName("Plant Maintenance & Op. Staffing"); - plantMainOpStaffExp.setExpType("Staffing Cost (1A)"); + plantMainOpStaffExp.setExpName(root.getOpEx_YTD_label6()); + plantMainOpStaffExp.setExpType(root.getOpEx_1A_label()); plantMainOpStaffExp.setConfirmationId(root.getForm().getConfirmationId()); // subtotal before salary and wages - omitted LtcYtdExp salWagRecvExp = new LtcYtdExp(); salWagRecvExp.setExpYtd(root.getOpEx_YTD7()); salWagRecvExp.setExpNotes(root.getOpEx_note7()); - salWagRecvExp.setExpName("Salary & wages recovered"); - salWagRecvExp.setExpType("Staffing Cost (1A)"); + salWagRecvExp.setExpName(root.getOpEx_YTD_label7()); + salWagRecvExp.setExpType(root.getOpEx_1A_label()); salWagRecvExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp salWagAccExp = new LtcYtdExp(); salWagAccExp.setExpYtd(root.getOpEx_YTD8()); salWagAccExp.setExpNotes(root.getOpEx_note8()); - salWagAccExp.setExpName("Salaries and wages accrual"); - salWagAccExp.setExpType("Staffing Cost (1A)"); + salWagAccExp.setExpName(root.getOpEx_YTD_label8()); + salWagAccExp.setExpType(root.getOpEx_1A_label()); salWagAccExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp othLabCostExp = new LtcYtdExp(); othLabCostExp.setExpYtd(root.getOpEx_YTD9()); othLabCostExp.setExpNotes(root.getOpEx_note9()); - othLabCostExp.setExpName("Salary & wages recovered"); - othLabCostExp.setExpType("Staffing Cost (1A)"); + othLabCostExp.setExpName(root.getOpEx_YTD_label9()); + othLabCostExp.setExpType(root.getOpEx_1A_label()); othLabCostExp.setConfirmationId(root.getForm().getConfirmationId()); // subtotal LtcYtdExp bnftCostExp = new LtcYtdExp(); bnftCostExp.setExpYtd(root.getOpEx_YTD10()); - bnftCostExp.setExpNotes(root.getOpEx_YTD10()); - bnftCostExp.setExpName("Benefits"); - bnftCostExp.setExpType("Staffing Cost (1B)"); + bnftCostExp.setExpNotes(root.getOpEx_note10()); + bnftCostExp.setExpName(root.getOpEx_YTD_label10()); + bnftCostExp.setExpType(root.getOpEx_1B_label()); bnftCostExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp sickSevrnceAccExp = new LtcYtdExp(); sickSevrnceAccExp.setExpYtd(root.getOpEx_YTD11()); - sickSevrnceAccExp.setExpNotes(root.getOpEx_YTD11()); - sickSevrnceAccExp.setExpName("Sick, severance and other accrual"); - sickSevrnceAccExp.setExpType("Staffing Cost (1B)"); + sickSevrnceAccExp.setExpNotes(root.getOpEx_note11()); + sickSevrnceAccExp.setExpName(root.getOpEx_YTD_label11()); + sickSevrnceAccExp.setExpType(root.getOpEx_1B_label()); sickSevrnceAccExp.setConfirmationId(root.getForm().getConfirmationId()); // subtotal LtcYtdExp buildingRentExp = new LtcYtdExp(); buildingRentExp.setExpYtd(root.getOpEx_YTD12()); - buildingRentExp.setExpNotes(root.getOpEx_YTD12()); - buildingRentExp.setExpName("Building rent/lease cost"); - buildingRentExp.setExpType("Property Cost"); + buildingRentExp.setExpNotes(root.getOpEx_note12()); + buildingRentExp.setExpName(root.getOpEx_YTD_label12()); + buildingRentExp.setExpType(root.getOpEx_2_label()); buildingRentExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp intrstMortgageLngTrmExp = new LtcYtdExp(); intrstMortgageLngTrmExp.setExpYtd(root.getOpEx_YTD13()); - intrstMortgageLngTrmExp.setExpNotes(root.getOpEx_YTD13()); - intrstMortgageLngTrmExp.setExpName("Interest on mortgage or long-term debt"); - intrstMortgageLngTrmExp.setExpType("Property Cost"); + intrstMortgageLngTrmExp.setExpNotes(root.getOpEx_note13()); + intrstMortgageLngTrmExp.setExpName(root.getOpEx_YTD_label13()); + intrstMortgageLngTrmExp.setExpType(root.getOpEx_2_label()); intrstMortgageLngTrmExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp propertyTaxesExp = new LtcYtdExp(); propertyTaxesExp.setExpYtd(root.getOpEx_YTD14()); - propertyTaxesExp.setExpNotes(root.getOpEx_YTD14()); - propertyTaxesExp.setExpName("Property taxes"); - propertyTaxesExp.setExpType("Property Cost"); + propertyTaxesExp.setExpNotes(root.getOpEx_note14()); + propertyTaxesExp.setExpName(root.getOpEx_YTD_label14()); + propertyTaxesExp.setExpType(root.getOpEx_2_label()); propertyTaxesExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp mntnceExp = new LtcYtdExp(); mntnceExp.setExpYtd(root.getOpEx_YTD15()); - mntnceExp.setExpNotes(root.getOpEx_YTD15()); - mntnceExp.setExpName("Maintenance & Repairs - building, ground & equip."); - mntnceExp.setExpType("Property Cost"); + mntnceExp.setExpNotes(root.getOpEx_note15()); + mntnceExp.setExpName(root.getOpEx_YTD_label15()); + mntnceExp.setExpType(root.getOpEx_2_label()); mntnceExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp suppliesExp = new LtcYtdExp(); suppliesExp.setExpYtd(root.getOpEx_YTD16()); - suppliesExp.setExpNotes(root.getOpEx_YTD16()); - suppliesExp.setExpName("Supplies ~ for building, ground & equipment"); - suppliesExp.setExpType("Property Cost"); + suppliesExp.setExpNotes(root.getOpEx_note16()); + suppliesExp.setExpName(root.getOpEx_YTD_label16()); + suppliesExp.setExpType(root.getOpEx_2_label()); suppliesExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp utilitiesExp = new LtcYtdExp(); utilitiesExp.setExpYtd(root.getOpEx_YTD17()); - utilitiesExp.setExpNotes(root.getOpEx_YTD17()); - utilitiesExp.setExpName("Utilities"); - utilitiesExp.setExpType("Property Cost"); + utilitiesExp.setExpNotes(root.getOpEx_note17()); + utilitiesExp.setExpName(root.getOpEx_YTD_label17()); + utilitiesExp.setExpType(root.getOpEx_2_label()); utilitiesExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp wasteMgmntExp = new LtcYtdExp(); wasteMgmntExp.setExpYtd(root.getOpEx_YTD18()); - wasteMgmntExp.setExpNotes(root.getOpEx_YTD18()); - wasteMgmntExp.setExpName("Waste management"); - wasteMgmntExp.setExpType("Property Cost"); + wasteMgmntExp.setExpNotes(root.getOpEx_note18()); + wasteMgmntExp.setExpName(root.getOpEx_YTD_label18()); + wasteMgmntExp.setExpType(root.getOpEx_2_label()); wasteMgmntExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp resTranServExp = new LtcYtdExp(); resTranServExp.setExpYtd(root.getOpEx_YTD19()); - resTranServExp.setExpNotes(root.getOpEx_YTD19()); - resTranServExp.setExpName("Resident Transportation Services"); - resTranServExp.setExpType("Property Cost"); + resTranServExp.setExpNotes(root.getOpEx_note19()); + resTranServExp.setExpName(root.getOpEx_YTD_label19()); + resTranServExp.setExpType(root.getOpEx_2_label()); resTranServExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp othExp = new LtcYtdExp(); othExp.setExpYtd(root.getOpEx_YTD20()); - othExp.setExpNotes(root.getOpEx_YTD20()); - othExp.setExpName("Others - Operating"); - othExp.setExpType("Property Cost"); + othExp.setExpNotes(root.getOpEx_note20()); + othExp.setExpName(root.getOpEx_YTD_label20()); + othExp.setExpType(root.getOpEx_2_label()); othExp.setConfirmationId(root.getForm().getConfirmationId()); // skipping subtotal for now LtcYtdExp medSupExp = new LtcYtdExp(); medSupExp.setExpYtd(root.getOpEx_YTD21()); - medSupExp.setExpNotes(root.getOpEx_YTD21()); - medSupExp.setExpName("Medical Supplies"); - medSupExp.setExpType("Supplies"); + medSupExp.setExpNotes(root.getOpEx_note21()); + medSupExp.setExpName(root.getOpEx_YTD_label21()); + medSupExp.setExpType(root.getOpEx_3_label()); medSupExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp drgsPharmaExp = new LtcYtdExp(); drgsPharmaExp.setExpYtd(root.getOpEx_YTD22()); - drgsPharmaExp.setExpNotes(root.getOpEx_YTD22()); - drgsPharmaExp.setExpName("Drugs & Pharmaceutical"); - drgsPharmaExp.setExpType("Supplies"); + drgsPharmaExp.setExpNotes(root.getOpEx_note22()); + drgsPharmaExp.setExpName(root.getOpEx_YTD_label22()); + drgsPharmaExp.setExpType(root.getOpEx_3_label()); drgsPharmaExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp rawFoodCostExp = new LtcYtdExp(); rawFoodCostExp.setExpYtd(root.getOpEx_YTD23()); - rawFoodCostExp.setExpNotes(root.getOpEx_YTD23()); - rawFoodCostExp.setExpName("Raw Food Cost (inc. dietary supplement costs)"); - rawFoodCostExp.setExpType("Supplies"); + rawFoodCostExp.setExpNotes(root.getOpEx_note23()); + rawFoodCostExp.setExpName(root.getOpEx_YTD_label23()); + rawFoodCostExp.setExpType(root.getOpEx_3_label()); rawFoodCostExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp dietSupExp = new LtcYtdExp(); dietSupExp.setExpYtd(root.getOpEx_YTD24()); - dietSupExp.setExpNotes(root.getOpEx_YTD24()); - dietSupExp.setExpName("Dietary supplies"); - dietSupExp.setExpType("Supplies"); + dietSupExp.setExpNotes(root.getOpEx_note24()); + dietSupExp.setExpName(root.getOpEx_YTD_label24()); + dietSupExp.setExpType(root.getOpEx_3_label()); dietSupExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp ldrySupExp = new LtcYtdExp(); ldrySupExp.setExpYtd(root.getOpEx_YTD25()); - ldrySupExp.setExpNotes(root.getOpEx_YTD25()); - ldrySupExp.setExpName("Laundry supplies"); - ldrySupExp.setExpType("Supplies"); + ldrySupExp.setExpNotes(root.getOpEx_note25()); + ldrySupExp.setExpName(root.getOpEx_YTD_label25()); + ldrySupExp.setExpType(root.getOpEx_3_label()); ldrySupExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp houseSupExp = new LtcYtdExp(); houseSupExp.setExpYtd(root.getOpEx_YTD26()); - houseSupExp.setExpNotes(root.getOpEx_YTD26()); - houseSupExp.setExpName("Housekeeping supplies"); - houseSupExp.setExpType("Supplies"); + houseSupExp.setExpNotes(root.getOpEx_note26()); + houseSupExp.setExpName(root.getOpEx_YTD_label26()); + houseSupExp.setExpType(root.getOpEx_3_label()); houseSupExp.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp othSupExp = new LtcYtdExp(); othSupExp.setExpYtd(root.getOpEx_YTD27()); - othSupExp.setExpNotes(root.getOpEx_YTD27()); - othSupExp.setExpName("Others - Specify"); - othSupExp.setExpType("Supplies"); + othSupExp.setExpNotes(root.getOpEx_note27()); + othSupExp.setExpName(root.getOpEx_YTD_label27()); + othSupExp.setExpType(root.getOpEx_3_label()); othSupExp.setConfirmationId(root.getForm().getConfirmationId()); Collections.addAll(ltcYtdExp, dirCareCostExp, foodCostExp, ldryServExp, housekeepingCostExp, @@ -2138,37 +2138,37 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY /* Subtotals */ LtcYtdExpSubTotals staffCost1ASubtotal = new LtcYtdExpSubTotals(); staffCost1ASubtotal.setConfirmationId(root.getForm().getConfirmationId()); - staffCost1ASubtotal.setExpType("Staffing Type (1A)"); + staffCost1ASubtotal.setExpType(root.getOpEx_1A_label()); staffCost1ASubtotal.setSubTotalRevYtd(root.getOpEx_sum11()); LtcYtdExpSubTotals staffCost1BSubtotal = new LtcYtdExpSubTotals(); staffCost1BSubtotal.setConfirmationId(root.getForm().getConfirmationId()); - staffCost1BSubtotal.setExpType("Staffing Type (1B)"); + staffCost1BSubtotal.setExpType(root.getOpEx_1B_label()); staffCost1BSubtotal.setSubTotalRevYtd(root.getOpEx_sum12()); LtcYtdExpSubTotals propertyCostSubtotal = new LtcYtdExpSubTotals(); propertyCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); - propertyCostSubtotal.setExpType("Property Cost (2)"); + propertyCostSubtotal.setExpType(root.getOpEx_2_label()); propertyCostSubtotal.setSubTotalRevYtd(root.getOpEx_sum13()); LtcYtdExpSubTotals suppliesSubtotal = new LtcYtdExpSubTotals(); suppliesSubtotal.setConfirmationId(root.getForm().getConfirmationId()); - suppliesSubtotal.setExpType("Supplies"); + suppliesSubtotal.setExpType(root.getOpEx_3_label()); suppliesSubtotal.setSubTotalRevYtd(root.getOpEx_sum14()); LtcYtdExpSubTotals adminCostSubtotal = new LtcYtdExpSubTotals(); adminCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); - adminCostSubtotal.setExpType("Administration Cost - non-wages (4)"); + adminCostSubtotal.setExpType(root.getOpEx_4_label()); adminCostSubtotal.setSubTotalRevYtd(root.getOpEx_sum15()); LtcYtdExpSubTotals operatingCostSubtotal = new LtcYtdExpSubTotals(); operatingCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); - operatingCostSubtotal.setExpType("Operating Expenses"); - operatingCostSubtotal.setSubTotalRevYtd(root.getOpEx_sum16()); + operatingCostSubtotal.setExpType(root.getOpEx_data_total_label()); + operatingCostSubtotal.setSubTotalRevYtd(root.getOpEx_data_total()); LtcYtdExpSubTotals nonOperationalExpSubtotal = new LtcYtdExpSubTotals(); nonOperationalExpSubtotal.setConfirmationId(root.getForm().getConfirmationId()); - nonOperationalExpSubtotal.setExpType("Non-operating expenses"); + nonOperationalExpSubtotal.setExpType(root.getNopEx_label()); nonOperationalExpSubtotal.setSubTotalRevYtd(root.getNopEx_sum11()); Collections.addAll(ltcYtdExpSubttls,staffCost1ASubtotal,staffCost1BSubtotal,propertyCostSubtotal,suppliesSubtotal,adminCostSubtotal,operatingCostSubtotal, @@ -2179,13 +2179,13 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY /*LtcYtdDep */ LtcYtdDep buildingDep = new LtcYtdDep(); buildingDep.setConfirmationId(root.getForm().getConfirmationId()); - buildingDep.setDepName("Building"); + buildingDep.setDepName(root.getOpEx_YTD_label38()); buildingDep.setDepYtd(root.getOpEx_item138()); buildingDep.setDepNotes(root.getOpEx_note38()); LtcYtdDep furnitureEquipmentDep = new LtcYtdDep(); furnitureEquipmentDep.setConfirmationId(root.getForm().getConfirmationId()); - furnitureEquipmentDep.setDepName("Furniture & equipment"); + furnitureEquipmentDep.setDepName(root.getOpEx_YTD_label39()); furnitureEquipmentDep.setDepYtd(root.getOpEx_item139()); furnitureEquipmentDep.setDepNotes(root.getOpEx_note39()); @@ -2205,60 +2205,67 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdExp offExpAdCost = new LtcYtdExp(); offExpAdCost.setExpYtd(root.getOpEx_YTD28()); - offExpAdCost.setExpNotes(root.getOpEx_YTD28()); - offExpAdCost.setExpName("Office Expense"); - offExpAdCost.setExpType("Administration Cost - non-wages"); + offExpAdCost.setExpNotes(root.getOpEx_note28()); + offExpAdCost.setExpName(root.getOpEx_YTD_label28()); + offExpAdCost.setExpType(root.getOpEx_4_label()); offExpAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp mgmntAdCost = new LtcYtdExp(); mgmntAdCost.setExpYtd(root.getOpEx_YTD29()); - mgmntAdCost.setExpNotes(root.getOpEx_YTD29()); - mgmntAdCost.setExpName("Management Fees"); - mgmntAdCost.setExpType("Administration Cost - non-wages"); + mgmntAdCost.setExpNotes(root.getOpEx_note29()); + mgmntAdCost.setExpName(root.getOpEx_YTD_label29()); + mgmntAdCost.setExpType(root.getOpEx_4_label()); mgmntAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp hoAllocpAdCost = new LtcYtdExp(); hoAllocpAdCost.setExpYtd(root.getOpEx_YTD30()); - hoAllocpAdCost.setExpNotes(root.getOpEx_YTD30()); - hoAllocpAdCost.setExpName("Head Office Allocation (non-compensation)"); - hoAllocpAdCost.setExpType("Administration Cost - non-wages"); + hoAllocpAdCost.setExpNotes(root.getOpEx_note30()); + hoAllocpAdCost.setExpName(root.getOpEx_YTD_label30()); + hoAllocpAdCost.setExpType(root.getOpEx_4_label()); hoAllocpAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp accAdCost = new LtcYtdExp(); accAdCost.setExpYtd(root.getOpEx_YTD31()); - accAdCost.setExpNotes(root.getOpEx_YTD31()); - accAdCost.setExpName("Accreditation Costs"); - accAdCost.setExpType("Administration Cost - non-wages"); + accAdCost.setExpNotes(root.getOpEx_note31()); + accAdCost.setExpName(root.getOpEx_YTD_label31()); + accAdCost.setExpType(root.getOpEx_4_label()); accAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp apaAdCost = new LtcYtdExp(); apaAdCost.setExpYtd(root.getOpEx_YTD32()); - apaAdCost.setExpNotes(root.getOpEx_YTD32()); - apaAdCost.setExpName("Association dues, professional fees, audit fees"); - apaAdCost.setExpType("Administration Cost - non-wages"); + apaAdCost.setExpNotes(root.getOpEx_note32()); + apaAdCost.setExpName(root.getOpEx_YTD_label32()); + apaAdCost.setExpType(root.getOpEx_4_label()); apaAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp insuranceAdCost = new LtcYtdExp(); insuranceAdCost.setExpYtd(root.getOpEx_YTD33()); - insuranceAdCost.setExpNotes(root.getOpEx_YTD33()); - insuranceAdCost.setExpName("Insurances (for property & liability)"); - insuranceAdCost.setExpType("Administration Cost - non-wages"); + insuranceAdCost.setExpNotes(root.getOpEx_note33()); + insuranceAdCost.setExpName(root.getOpEx_YTD_label33()); + insuranceAdCost.setExpType(root.getOpEx_4_label()); insuranceAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp othSupAdCost = new LtcYtdExp(); othSupAdCost.setExpYtd(root.getOpEx_YTD34()); - othSupAdCost.setExpNotes(root.getOpEx_YTD34()); - othSupAdCost.setExpName("Other - Administration and supplies"); - othSupAdCost.setExpType("Administration Cost - non-wages"); + othSupAdCost.setExpNotes(root.getOpEx_note34()); + othSupAdCost.setExpName(root.getOpEx_YTD_label34()); + othSupAdCost.setExpType(root.getOpEx_4_label()); othSupAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp othAdCost = new LtcYtdExp(); othAdCost.setExpYtd(root.getOpEx_YTD35()); - othAdCost.setExpNotes(root.getOpEx_YTD35()); - othAdCost.setExpName("Other - Specify"); - othAdCost.setExpType("Administration Cost - non-wages"); + othAdCost.setExpNotes(root.getOpEx_note35()); + othAdCost.setExpName(root.getOpEx_YTD_label35()); + othAdCost.setExpType(root.getOpEx_4_label()); othAdCost.setConfirmationId(root.getForm().getConfirmationId()); + LtcYtdExp othAdCostOther = new LtcYtdExp(); + othAdCostOther.setExpYtd(root.getOpEx_YTD36()); + othAdCostOther.setExpNotes(root.getOpEx_note36()); + othAdCostOther.setExpName(root.getOpEx_YTD_label36()); + othAdCostOther.setExpType(root.getOpEx_4_label()); + othAdCostOther.setConfirmationId(root.getForm().getConfirmationId()); + /* Non operating expense */ LtcYtdExp dirCareNonOpExpMortgage = new LtcYtdExp(); @@ -2282,8 +2289,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY sickSevrnceAccExp, buildingRentExp, intrstMortgageLngTrmExp, propertyTaxesExp, mntnceExp, suppliesExp, utilitiesExp, wasteMgmntExp, resTranServExp, othExp, medSupExp, rawFoodCostExp, drgsPharmaExp, dietSupExp, ldrySupExp, houseSupExp, othSupExp, offExpAdCost, mgmntAdCost, - hoAllocpAdCost, accAdCost, apaAdCost, insuranceAdCost, othSupAdCost, othAdCost, dirCareNonOpExpMortgage, - dirCareNonOpExpOther); + hoAllocpAdCost, accAdCost, apaAdCost, insuranceAdCost, othSupAdCost, othAdCost, othAdCostOther, + dirCareNonOpExpMortgage, dirCareNonOpExpOther); // subtotal // total operating expenses From 30a67a5f62c4f8dc74d4ae974e33607833214358 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 27 Apr 2023 16:21:20 -0400 Subject: [PATCH 102/183] readded Add Pos logic --- .../etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java index bf88d525..eb54cf3e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java @@ -62,14 +62,11 @@ public void setAddPosAnotherName(String addPosAnotherName) { this.addPosAnotherName = addPosAnotherName; } - //TODO Verify that we have to right logic with Wagner public void determineAddPosContractedOutYtd() { if(this.getAddPosLegalNameContractServiceYtd() != "" && this.getAddPosLegalNameContractServiceYtd() != null){ - //this.setAddPosContractedOutYtd("Y"); - this.setAddPosContractedOutYtd(""); + this.setAddPosContractedOutYtd("N"); } - //this.setAddPosContractedOutYtd("N"); - this.setAddPosContractedOutYtd(""); + this.setAddPosContractedOutYtd("Y"); } @Override From 6a5ae28bd976ee9f494bfd0a9e94aa6bd556c015 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 27 Apr 2023 16:45:14 -0400 Subject: [PATCH 103/183] bugfix, correct mapping for occupancyRate --- .../LtcQuarterlyYtdApiResponseProcessor.java | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 25485061..4a1c509b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2271,15 +2271,15 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdExp dirCareNonOpExpMortgage = new LtcYtdExp(); dirCareNonOpExpMortgage.setExpYtd(root.getNopEx_YTD1()); dirCareNonOpExpMortgage.setExpNotes(root.getNopEx_note1()); - dirCareNonOpExpMortgage.setExpName("Mortgage Principle Repayment"); - dirCareNonOpExpMortgage.setExpType("Non-operating Expense"); + dirCareNonOpExpMortgage.setExpName(root.getNopEx_YTD_label1()); + dirCareNonOpExpMortgage.setExpType(root.getNopEx_label()); dirCareNonOpExpMortgage.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp dirCareNonOpExpOther = new LtcYtdExp(); dirCareNonOpExpOther.setExpYtd(root.getNopEx_YTD2()); dirCareNonOpExpOther.setExpNotes(root.getNopEx_note2()); - dirCareNonOpExpOther.setExpName("Other"); - dirCareNonOpExpOther.setExpType("Non-operating Expense"); + dirCareNonOpExpOther.setExpName(root.getNopEx_YTD_label2()); + dirCareNonOpExpOther.setExpType(root.getNopEx_label()); dirCareNonOpExpOther.setConfirmationId(root.getForm().getConfirmationId()); /* END */ @@ -2481,9 +2481,9 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcBedYtdOccupancyRate occOutRateQ1 = new LtcBedYtdOccupancyRate(); occOutRateQ1.setConfirmationID(root.getForm().getConfirmationId()); occOutRateQ1.setOccRateBedTypes("Out of Scope Publicly Funded Beds"); - occOutRateQ1.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); - occOutRateQ1.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); - occOutRateQ1.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); + occOutRateQ1.setPlanMaxOccDays(root.getyTDPlannedOutScopeQ1()); + occOutRateQ1.setYtdMaxOccDays(root.getyTDMaxOutScopeQ1()); + occOutRateQ1.setYtdOccDays(root.getyTDOccupiedOutScopeQ1()); occOutRateQ1.setPercentOcc(root.getOccupiedPercentageOutScopeQ1()); occOutRateQ1.setOccRateQuarter("Q1"); //occInRateQ1.setOccRateNotes(root.getOpEx_note13()); @@ -2491,12 +2491,12 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcBedYtdOccupancyRate occRateQ1 = new LtcBedYtdOccupancyRate(); occRateQ1.setConfirmationID(root.getForm().getConfirmationId()); occRateQ1.setOccRateBedTypes("Private Beds"); - occRateQ1.setPlanMaxOccDays(root.getyTDPlannedInScopeQ1()); - occRateQ1.setYtdMaxOccDays(root.getyTDMaxInScopeQ1()); - occRateQ1.setYtdOccDays(root.getyTDOccupiedInScopeQ1()); + occRateQ1.setPlanMaxOccDays(root.getyTDPlannedPrivateQ1()); + occRateQ1.setYtdMaxOccDays(root.getyTDMaxPrivateQ1()); + occRateQ1.setYtdOccDays(root.getyTDOccupiedPrivateQ1()); occRateQ1.setPercentOcc(root.getOccupiedPercentagePrivateQ1()); occRateQ1.setOccRateQuarter("Q1"); - // occInRateQ1.setOccRateNotes(root.getNoteInScopeQ1()); + //occInRateQ1.setOccRateNotes(root.getNoteInScopeQ1()); LtcBedYtdOccupancyRateTotals q1RateTotals = new LtcBedYtdOccupancyRateTotals(); q1RateTotals.setConfirmationID(root.getForm().getConfirmationId()); @@ -2545,7 +2545,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY augYtdOccDays.setOccDaysYTDInScopePublic(root.getInScopeMonth8()); augYtdOccDays.setOccDaysYTOutScopePublic(root.getOutScopeMonth8()); augYtdOccDays.setOccDaysYTDPrivate(root.getPrivateMonth8()); - augYtdOccDays.setOccMonth("May"); + augYtdOccDays.setOccMonth("August"); augYtdOccDays.setOccQuarter("Q2"); augYtdOccDays.setOccDaysYtdTotalDays(root.getTotalMonth8()); @@ -2584,17 +2584,17 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcBedYtdOccupancyRate occOutRateQ2 = new LtcBedYtdOccupancyRate(); occOutRateQ2.setConfirmationID(root.getForm().getConfirmationId()); occOutRateQ2.setOccRateBedTypes("Out of Scope Publicly Funded Beds"); - occOutRateQ2.setPlanMaxOccDays(root.getyTDPlannedInScopeQ2()); - occOutRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ2()); - occOutRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ2()); + occOutRateQ2.setPlanMaxOccDays(root.getyTDPlannedOutScopeQ2()); + occOutRateQ2.setYtdMaxOccDays(root.getyTDMaxOutScopeQ2()); + occOutRateQ2.setYtdOccDays(root.getyTDOccupiedOutScopeQ2()); occOutRateQ2.setPercentOcc(root.getOccupiedPercentageOutScopeQ2()); occOutRateQ2.setOccRateQuarter("Q2"); LtcBedYtdOccupancyRate occRateQ2 = new LtcBedYtdOccupancyRate(); occRateQ2.setConfirmationID(root.getForm().getConfirmationId()); occRateQ2.setOccRateBedTypes("Private Beds"); - occRateQ2.setPlanMaxOccDays(root.getyTDPlannedInScopeQ2()); - occRateQ2.setYtdMaxOccDays(root.getyTDMaxInScopeQ2()); + occRateQ2.setPlanMaxOccDays(root.getyTDPlannedPrivateQ2()); + occRateQ2.setYtdMaxOccDays(root.getyTDMaxPrivateQ2()); occRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ2()); occRateQ2.setPercentOcc(root.getOccupiedPercentagePrivateQ2()); occRateQ2.setOccRateQuarter("Q2"); @@ -2681,17 +2681,17 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcBedYtdOccupancyRate occOutRateQ3 = new LtcBedYtdOccupancyRate(); occOutRateQ3.setConfirmationID(root.getForm().getConfirmationId()); occOutRateQ3.setOccRateBedTypes("Out of Scope Publicly Funded Beds"); - occOutRateQ3.setPlanMaxOccDays(root.getyTDPlannedInScopeQ3()); - occOutRateQ3.setYtdMaxOccDays(root.getyTDMaxInScopeQ3()); - occOutRateQ3.setYtdOccDays(root.getyTDOccupiedInScopeQ3()); + occOutRateQ3.setPlanMaxOccDays(root.getyTDPlannedOutScopeQ3()); + occOutRateQ3.setYtdMaxOccDays(root.getyTDMaxOutScopeQ3()); + occOutRateQ3.setYtdOccDays(root.getyTDOccupiedOutScopeQ3()); occOutRateQ3.setPercentOcc(root.getOccupiedPercentageOutScopeQ3()); LtcBedYtdOccupancyRate occRateQ3 = new LtcBedYtdOccupancyRate(); occRateQ3.setConfirmationID(root.getForm().getConfirmationId()); occRateQ3.setOccRateBedTypes("Private Beds"); - occRateQ3.setPlanMaxOccDays(root.getyTDPlannedInScopeQ3()); - occRateQ3.setYtdMaxOccDays(root.getyTDMaxInScopeQ3()); - occRateQ3.setYtdOccDays(root.getyTDOccupiedInScopeQ3()); + occRateQ3.setPlanMaxOccDays(root.getyTDPlannedPrivateQ3()); + occRateQ3.setYtdMaxOccDays(root.getyTDMaxPrivateQ3()); + occRateQ3.setYtdOccDays(root.getyTDOccupiedPrivateQ3()); occRateQ3.setPercentOcc(root.getOccupiedPercentagePrivateQ3()); LtcBedYtdOccupancyRateTotals q3RateTotals = new LtcBedYtdOccupancyRateTotals(); @@ -2778,17 +2778,17 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcBedYtdOccupancyRate occOutRateQ4 = new LtcBedYtdOccupancyRate(); occOutRateQ4.setConfirmationID(root.getForm().getConfirmationId()); occOutRateQ4.setOccRateBedTypes("Out of Scope Publicly Funded Beds"); - occOutRateQ4.setPlanMaxOccDays(root.getyTDPlannedInScopeQ4()); - occOutRateQ4.setYtdMaxOccDays(root.getyTDMaxInScopeQ4()); - occOutRateQ4.setYtdOccDays(root.getyTDOccupiedInScopeQ4()); + occOutRateQ4.setPlanMaxOccDays(root.getyTDPlannedOutScopeQ4()); + occOutRateQ4.setYtdMaxOccDays(root.getyTDMaxOutScopeQ4()); + occOutRateQ4.setYtdOccDays(root.getyTDOccupiedOutScopeQ4()); occOutRateQ4.setPercentOcc(root.getOccupiedPercentageOutScopeQ4()); LtcBedYtdOccupancyRate occRateQ4 = new LtcBedYtdOccupancyRate(); occRateQ4.setConfirmationID(root.getForm().getConfirmationId()); occRateQ4.setOccRateBedTypes("Private Beds"); - occRateQ4.setPlanMaxOccDays(root.getyTDPlannedInScopeQ4()); - occRateQ4.setYtdMaxOccDays(root.getyTDMaxInScopeQ4()); - occRateQ4.setYtdOccDays(root.getyTDOccupiedInScopeQ4()); + occRateQ4.setPlanMaxOccDays(root.getyTDPlannedPrivateQ4()); + occRateQ4.setYtdMaxOccDays(root.getyTDMaxPrivateQ4()); + occRateQ4.setYtdOccDays(root.getyTDOccupiedPrivateQ4()); occRateQ4.setPercentOcc(root.getOccupiedPercentagePrivateQ4()); LtcBedYtdOccupancyRateTotals q4RateTotals = new LtcBedYtdOccupancyRateTotals(); From 1003403bf11b0cf8eb100bf4c62e810ade656ceb Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 27 Apr 2023 16:57:24 -0400 Subject: [PATCH 104/183] modified date format --- src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index 1fe3b9ab..fb5e1a60 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -168,7 +168,7 @@ public static List writeToCSVFile(Map>> map, fileProperties.setEncDirForThisExchange(Constants.ENC_FILE_PATH.get(directoryKey)); ICsvListWriter listWriter = null; List filesGenerated = new ArrayList(); - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyMMddHHmmss"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); String dateTime = LocalDateTime.now().format(formatter); for (Map.Entry>> entry : map.entrySet()) { From da3fe7c2e961b90f247cc8aabfe4b17506388d35 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 28 Apr 2023 12:41:51 -0400 Subject: [PATCH 105/183] removed mock password. --- src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index fb5e1a60..fd6adc74 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -270,7 +270,7 @@ public static String buildPublicKeyPath(String propertyName){ private static PGPPrivateKey findSecretKey(long keyID) throws Exception, PGPException { String privateKeyInPath = "src/main/resources/secret-Test.txt"; - String password = "789456123"; + String password = "tbd"; char[] passCode = password.toCharArray(); InputStream privateKeyIn = new BufferedInputStream(new FileInputStream(new File(privateKeyInPath))); PGPSecretKeyRingCollection pgpSecretKeyRingCollection = new PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(privateKeyIn) From 58fa0fccdd741cf2bc410fba1ea4d1a092bdbef1 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 28 Apr 2023 15:14:47 -0400 Subject: [PATCH 106/183] moved password definition to properties file. Modifying mock password to be "tbd" --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 3 +++ src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java | 4 ++-- src/main/resources/application-dev.properties | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 0c9801b3..4d2d5d4e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -86,6 +86,9 @@ public class Constants { public static final String DATA_DIRECTORY = FileUtil.buildDirectoryPath(PROPERTIES_DATA_DIR); public static final String ENCRYPTED_DATA_DIRECTORY = FileUtil.buildDirectoryPath(PROPERTIES_ENC_DATA_DIR); + public static final String ENCRYPTION_SECRET_PATH = "encryption-secret-path"; + public static final String ENCRYPTION_SECRET_PWD = "encryption-secret-pwd"; + public final static String PROPERTIES_LTC_FACILITY_DIR = "ltc-facility-dir"; public final static String LTC_FACILITY_DIR = FileUtil.getDirectoryName(PROPERTIES_LTC_FACILITY_DIR); public static final String LTC_FACILITY_UNENCRYPTED_FP = FileUtil.buildDestinationPath(PROPERTIES_LTC_FACILITY_DIR, false); diff --git a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java index fd6adc74..a79e233a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java +++ b/src/main/java/ca/bc/gov/chefs/etl/util/FileUtil.java @@ -269,8 +269,8 @@ public static String buildPublicKeyPath(String propertyName){ * TODO This part is for testing purposes only, remove when done */ private static PGPPrivateKey findSecretKey(long keyID) throws Exception, PGPException { - String privateKeyInPath = "src/main/resources/secret-Test.txt"; - String password = "tbd"; + String privateKeyInPath = PropertiesUtil.getValue(Constants.ENCRYPTION_SECRET_PATH); + String password = PropertiesUtil.getValue(Constants.ENCRYPTION_SECRET_PWD); char[] passCode = password.toCharArray(); InputStream privateKeyIn = new BufferedInputStream(new FileInputStream(new File(privateKeyInPath))); PGPSecretKeyRingCollection pgpSecretKeyRingCollection = new PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(privateKeyIn) diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index a2b099b6..cc1eb13e 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -15,6 +15,8 @@ ltc-facility-dir=ltc-facility ltc-quarterly-dir=ltc-quarterly public-key-file-name=public-UAT.txt +encryption-secret-path=src/main/resources/ +encryption-secret-password=tbd chefs.http.uri=https://submit.digital.gov.bc.ca/app/api/v1/forms/%s/export?format=json&bridgeEndpoint=true&version=%s&type=submissions&minDate=%s&maxDate=%s From fddc3beb092c05ccf237d65e5e1eb3f4faf53419 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 28 Apr 2023 16:15:05 -0400 Subject: [PATCH 107/183] adde missing notes to bedMaxOccupancy --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 4a1c509b..7cc8b004 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2307,7 +2307,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY numOfBeds.setEndDate(maxOcp.getEndDate0()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); - // notes missing + numOfBeds.setNotes(maxOcp.getInventoryNotes()); if (maxOcp.getBedType()!=null && maxOcp.getBedType().equals(Constants.IN_SCOPE)) { numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); } else if (maxOcp.getBedType()!=null && maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { From b110989b25935923d1880a98c18329e604998793 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 28 Apr 2023 17:02:24 -0400 Subject: [PATCH 108/183] etl process fix for LtcBedYtdMaxOccupancy --- .../forms/ltc/quarterly/json/BedGrid0.java | 22 ++++++ .../forms/ltc/quarterly/json/BedGrid1.java | 22 ++++++ .../forms/ltc/quarterly/json/BedGrid2.java | 22 ++++++ .../forms/ltc/quarterly/json/BedGrid3.java | 22 ++++++ .../forms/ltc/quarterly/json/BedGrid4.java | 22 ++++++ .../LtcQuarterlyYtdApiResponseProcessor.java | 74 ++++++------------- 6 files changed, 132 insertions(+), 52 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid0.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid0.java index 9e6207ac..aae728eb 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid0.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid0.java @@ -1,6 +1,9 @@ package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class BedGrid0{ @@ -38,6 +41,25 @@ public class BedGrid0{ public String subTypeOut; public String subTypePrivate; public String totalrow; + public String subTypeLabel; + public String subTypeValue; + @JsonProperty("subType") + protected void unPackSubtype(Map subType) { + this.subTypeLabel = subType.get("label"); + this.subTypeValue = subType.get("value"); + } + public String getSubTypeLabel() { + return subTypeLabel; + } + public void setSubTypeLabel(String subTypeLabel) { + this.subTypeLabel = subTypeLabel; + } + public String getSubTypeValue() { + return subTypeValue; + } + public void setSubTypeValue(String subTypeValue) { + this.subTypeValue = subTypeValue; + } public String getBedType() { return bedType; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid1.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid1.java index 0f83fdb9..92c519d6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid1.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid1.java @@ -1,6 +1,9 @@ package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class BedGrid1{ @@ -34,6 +37,25 @@ public class BedGrid1{ public String subTypePrivate; public String totalrow; public String subTypeOut1; + public String subTypeLabel; + public String subTypeValue; + @JsonProperty("subType1") + protected void unPackSubtype(Map subType) { + this.subTypeLabel = subType.get("label"); + this.subTypeValue = subType.get("value"); + } + public String getSubTypeLabel() { + return subTypeLabel; + } + public void setSubTypeLabel(String subTypeLabel) { + this.subTypeLabel = subTypeLabel; + } + public String getSubTypeValue() { + return subTypeValue; + } + public void setSubTypeValue(String subTypeValue) { + this.subTypeValue = subTypeValue; + } public String getBedType() { return bedType; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid2.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid2.java index 8d296d35..ba082e67 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid2.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid2.java @@ -1,6 +1,9 @@ package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class BedGrid2{ @@ -32,6 +35,25 @@ public class BedGrid2{ public String subTypeOut; public String subTypePrivate; public String totalrow; + public String subTypeLabel; + public String subTypeValue; + @JsonProperty("subType2") + protected void unPackSubtype(Map subType) { + this.subTypeLabel = subType.get("label"); + this.subTypeValue = subType.get("value"); + } + public String getSubTypeLabel() { + return subTypeLabel; + } + public void setSubTypeLabel(String subTypeLabel) { + this.subTypeLabel = subTypeLabel; + } + public String getSubTypeValue() { + return subTypeValue; + } + public void setSubTypeValue(String subTypeValue) { + this.subTypeValue = subTypeValue; + } public String getBedType() { return bedType; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid3.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid3.java index 4316b14d..86b60e38 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid3.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid3.java @@ -1,6 +1,9 @@ package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class BedGrid3{ @@ -32,6 +35,25 @@ public class BedGrid3{ public String subTypeOut; public String subTypePrivate; public String totalrow; + public String subTypeLabel; + public String subTypeValue; + @JsonProperty("subType3") + protected void unPackSubtype(Map subType) { + this.subTypeLabel = subType.get("label"); + this.subTypeValue = subType.get("value"); + } + public String getSubTypeLabel() { + return subTypeLabel; + } + public void setSubTypeLabel(String subTypeLabel) { + this.subTypeLabel = subTypeLabel; + } + public String getSubTypeValue() { + return subTypeValue; + } + public void setSubTypeValue(String subTypeValue) { + this.subTypeValue = subTypeValue; + } public String getBedType() { return bedType; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid4.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid4.java index 82d1abfe..256817b0 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid4.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/BedGrid4.java @@ -1,6 +1,9 @@ package ca.bc.gov.chefs.etl.forms.ltc.quarterly.json; +import java.util.Map; + import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class BedGrid4{ @@ -32,6 +35,25 @@ public class BedGrid4{ public String subTypeOut; public String subTypePrivate; public String totalrow; + public String subTypeLabel; + public String subTypeValue; + @JsonProperty("subType4") + protected void unPackSubtype(Map subType) { + this.subTypeLabel = subType.get("label"); + this.subTypeValue = subType.get("value"); + } + public String getSubTypeLabel() { + return subTypeLabel; + } + public void setSubTypeLabel(String subTypeLabel) { + this.subTypeLabel = subTypeLabel; + } + public String getSubTypeValue() { + return subTypeValue; + } + public void setSubTypeValue(String subTypeValue) { + this.subTypeValue = subTypeValue; + } public String getBedType() { return bedType; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 7cc8b004..fae94f9c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2308,13 +2308,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); numOfBeds.setNotes(maxOcp.getInventoryNotes()); - if (maxOcp.getBedType()!=null && maxOcp.getBedType().equals(Constants.IN_SCOPE)) { - numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); - } else if (maxOcp.getBedType()!=null && maxOcp.getBedType().equals(Constants.OUT_OF_SCOPE)) { - numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); - } else { - numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); - } + numOfBeds.setBedSubype(maxOcp.getSubTypeLabel()); ltcBedYtdMaxOccupancies.add(numOfBeds); @@ -2410,21 +2404,15 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY // bed grid for (BedGrid1 maxOcp : root.getBedGrid1()) { LtcBedYtdMaxOccupancy numOfBeds = new LtcBedYtdMaxOccupancy(); - numOfBeds.setBedFundingType(maxOcp.getBedType()); + numOfBeds.setBedFundingType(maxOcp.getBedType1()); numOfBeds.setConfirmationId(root.getForm().getConfirmationId()); numOfBeds.setStartDate(maxOcp.getStartDate1()); numOfBeds.setEndDate(maxOcp.getEndDate1()); - numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); - numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds1()); + numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays1()); numOfBeds.setQuarterInventory(root.getQuarter()); - // notes missing - if (maxOcp.getBedType1()!=null && maxOcp.getBedType1().equals(Constants.IN_SCOPE)) { - numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); - } else if (maxOcp.getBedType1()!=null && maxOcp.getBedType1().equals(Constants.OUT_OF_SCOPE)) { - numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); - } else { - numOfBeds.setBedSubype(maxOcp.getSubTypePrivate() == null ? "" : maxOcp.getSubTypePrivate()); - } + numOfBeds.setNotes(maxOcp.getQuarterNote1()); + numOfBeds.setBedSubype(maxOcp.getSubTypeLabel()); ltcBedYtdMaxOccupancies.add(numOfBeds); } @@ -2513,21 +2501,15 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY case "q2": for (BedGrid2 maxOcp : root.getBedGrid2()) { LtcBedYtdMaxOccupancy numOfBeds = new LtcBedYtdMaxOccupancy(); - numOfBeds.setBedFundingType(maxOcp.getBedType()); + numOfBeds.setBedFundingType(maxOcp.getBedType2()); numOfBeds.setConfirmationId(root.getForm().getConfirmationId()); numOfBeds.setStartDate(maxOcp.getStartDate2()); numOfBeds.setEndDate(maxOcp.getEndDate2()); - numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); - numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); - numOfBeds.setQuarterInventory("Q2"); - // notes missing - if (maxOcp.getBedType2()!=null && maxOcp.getBedType2().equals(Constants.IN_SCOPE)) { - numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); - } else if (maxOcp.getBedType2()!=null && maxOcp.getBedType2().equals(Constants.OUT_OF_SCOPE)) { - numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); - } else { - numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); - } + numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds2()); + numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays2()); + numOfBeds.setQuarterInventory(root.getQuarter()); + numOfBeds.setNotes(maxOcp.getNotes2()); + numOfBeds.setBedSubype(maxOcp.getSubTypeLabel()); ltcBedYtdMaxOccupancies.add(numOfBeds); } // Q2 July, August, September @@ -2615,21 +2597,15 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY case "q3": for (BedGrid3 maxOcp : root.getBedGrid3()) { LtcBedYtdMaxOccupancy numOfBeds = new LtcBedYtdMaxOccupancy(); - numOfBeds.setBedFundingType(maxOcp.getBedType()); + numOfBeds.setBedFundingType(maxOcp.getBedType3()); numOfBeds.setConfirmationId(root.getForm().getConfirmationId()); numOfBeds.setStartDate(maxOcp.getStartDate3()); numOfBeds.setEndDate(maxOcp.getEndDate3()); - numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); - numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds3()); + numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays3()); numOfBeds.setQuarterInventory(root.getQuarter()); - // notes missing - if (maxOcp.getBedType3()!=null && maxOcp.getBedType3().equals(Constants.IN_SCOPE)) { - numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); - } else if (maxOcp.getBedType3()!=null && maxOcp.getBedType3().equals(Constants.OUT_OF_SCOPE)) { - numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); - } else { - numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); - } + numOfBeds.setNotes(maxOcp.getNotes3()); + numOfBeds.setBedSubype(maxOcp.getSubTypeLabel()); ltcBedYtdMaxOccupancies.add(numOfBeds); } @@ -2708,21 +2684,15 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY case "q4": for (BedGrid4 maxOcp : root.getBedGrid4()) { LtcBedYtdMaxOccupancy numOfBeds = new LtcBedYtdMaxOccupancy(); - numOfBeds.setBedFundingType(maxOcp.getBedType()); + numOfBeds.setBedFundingType(maxOcp.getBedType4()); numOfBeds.setConfirmationId(root.getForm().getConfirmationId()); numOfBeds.setStartDate(maxOcp.getStartDate4()); numOfBeds.setEndDate(maxOcp.getEndDate4()); - numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds()); - numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays()); + numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds4()); + numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays4()); numOfBeds.setQuarterInventory(root.getQuarter()); - // notes missing - if (maxOcp.getBedType4()!=null && maxOcp.getBedType4().equals(Constants.IN_SCOPE)) { - numOfBeds.setBedSubype(maxOcp.getSubTypeIn()); - } else if (maxOcp.getBedType4()!=null && maxOcp.getBedType4().equals(Constants.OUT_OF_SCOPE)) { - numOfBeds.setBedSubype(maxOcp.getSubTypeOut()); - } else { - numOfBeds.setBedSubype(maxOcp.getSubTypePrivate()); - } + numOfBeds.setNotes(maxOcp.getNotes4()); + numOfBeds.setBedSubype(maxOcp.getSubTypeLabel()); ltcBedYtdMaxOccupancies.add(numOfBeds); } LtcBedYtdOccupiedDaysTotals q4OccDaysSubttls = new LtcBedYtdOccupiedDaysTotals(); From a7e308bc970cfd1a1bd714a5d8bb48a5fbe27e70 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 13:27:32 -0400 Subject: [PATCH 109/183] bugfix --- .../java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 063b5fb9..f7df909e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -1598,7 +1598,7 @@ public class Root{ public String opEx_YTD7; @JsonProperty("opEx_YTD-8") public String opEx_YTD8; - @JsonProperty("opEx_sum-9") + @JsonProperty("opEx_YTD-9") public String opEx_YTD9; public String opRev_note1; public String opRev_note10; From 91371ddefd4650282e5123ab746f0a33f3c534d0 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 13:54:29 -0400 Subject: [PATCH 110/183] better format --- .../java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index f7df909e..49a3009c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -2110,7 +2110,6 @@ public class Root{ public String opEx_YTD_label38; @JsonProperty("opEx_YTD_label-39") public String opEx_YTD_label39; - public String getOpEx_1A_label() { return opEx_1A_label; From 39e56f7c909095e0cc266c37e5cd4a1368cffbe6 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 13:54:41 -0400 Subject: [PATCH 111/183] label bug fix --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index fae94f9c..8c662654 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2207,7 +2207,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY offExpAdCost.setExpYtd(root.getOpEx_YTD28()); offExpAdCost.setExpNotes(root.getOpEx_note28()); offExpAdCost.setExpName(root.getOpEx_YTD_label28()); - offExpAdCost.setExpType(root.getOpEx_4_label()); + offExpAdCost.setExpType(root.getOpEx_3_label()); offExpAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp mgmntAdCost = new LtcYtdExp(); From 5736869baf298fb022d47fa061b47963de121345 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 14:04:04 -0400 Subject: [PATCH 112/183] renamming to the actual data entry --- .../LtcQuarterlyYtdApiResponseProcessor.java | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 8c662654..f993aeea 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2121,18 +2121,18 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY houseSupExp.setExpType(root.getOpEx_3_label()); houseSupExp.setConfirmationId(root.getForm().getConfirmationId()); - LtcYtdExp othSupExp = new LtcYtdExp(); - othSupExp.setExpYtd(root.getOpEx_YTD27()); - othSupExp.setExpNotes(root.getOpEx_note27()); - othSupExp.setExpName(root.getOpEx_YTD_label27()); - othSupExp.setExpType(root.getOpEx_3_label()); - othSupExp.setConfirmationId(root.getForm().getConfirmationId()); + LtcYtdExp incontinenceSupExp = new LtcYtdExp(); + incontinenceSupExp.setExpYtd(root.getOpEx_YTD27()); + incontinenceSupExp.setExpNotes(root.getOpEx_note27()); + incontinenceSupExp.setExpName(root.getOpEx_YTD_label27()); + incontinenceSupExp.setExpType(root.getOpEx_3_label()); + incontinenceSupExp.setConfirmationId(root.getForm().getConfirmationId()); Collections.addAll(ltcYtdExp, dirCareCostExp, foodCostExp, ldryServExp, housekeepingCostExp, adminServCostExp, plantMainOpStaffExp, salWagRecvExp, salWagAccExp, othLabCostExp, bnftCostExp, sickSevrnceAccExp, buildingRentExp, intrstMortgageLngTrmExp, propertyTaxesExp, mntnceExp, suppliesExp, utilitiesExp, wasteMgmntExp, resTranServExp, othExp, medSupExp, rawFoodCostExp, - drgsPharmaExp, dietSupExp, ldrySupExp, houseSupExp, othSupExp); + drgsPharmaExp, dietSupExp, ldrySupExp, houseSupExp, incontinenceSupExp); // /* Subtotals */ @@ -2203,69 +2203,69 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY /* END */ - LtcYtdExp offExpAdCost = new LtcYtdExp(); - offExpAdCost.setExpYtd(root.getOpEx_YTD28()); - offExpAdCost.setExpNotes(root.getOpEx_note28()); - offExpAdCost.setExpName(root.getOpEx_YTD_label28()); - offExpAdCost.setExpType(root.getOpEx_3_label()); - offExpAdCost.setConfirmationId(root.getForm().getConfirmationId()); + LtcYtdExp OthSupExp = new LtcYtdExp(); + OthSupExp.setExpYtd(root.getOpEx_YTD28()); + OthSupExp.setExpNotes(root.getOpEx_note28()); + OthSupExp.setExpName(root.getOpEx_YTD_label28()); + OthSupExp.setExpType(root.getOpEx_3_label()); + OthSupExp.setConfirmationId(root.getForm().getConfirmationId()); + + LtcYtdExp officeExpAdCost = new LtcYtdExp(); + officeExpAdCost.setExpYtd(root.getOpEx_YTD29()); + officeExpAdCost.setExpNotes(root.getOpEx_note29()); + officeExpAdCost.setExpName(root.getOpEx_YTD_label29()); + officeExpAdCost.setExpType(root.getOpEx_4_label()); + officeExpAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp mgmntAdCost = new LtcYtdExp(); - mgmntAdCost.setExpYtd(root.getOpEx_YTD29()); - mgmntAdCost.setExpNotes(root.getOpEx_note29()); - mgmntAdCost.setExpName(root.getOpEx_YTD_label29()); + mgmntAdCost.setExpYtd(root.getOpEx_YTD30()); + mgmntAdCost.setExpNotes(root.getOpEx_note30()); + mgmntAdCost.setExpName(root.getOpEx_YTD_label30()); mgmntAdCost.setExpType(root.getOpEx_4_label()); mgmntAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp hoAllocpAdCost = new LtcYtdExp(); - hoAllocpAdCost.setExpYtd(root.getOpEx_YTD30()); - hoAllocpAdCost.setExpNotes(root.getOpEx_note30()); - hoAllocpAdCost.setExpName(root.getOpEx_YTD_label30()); + hoAllocpAdCost.setExpYtd(root.getOpEx_YTD31()); + hoAllocpAdCost.setExpNotes(root.getOpEx_note31()); + hoAllocpAdCost.setExpName(root.getOpEx_YTD_label31()); hoAllocpAdCost.setExpType(root.getOpEx_4_label()); hoAllocpAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp accAdCost = new LtcYtdExp(); - accAdCost.setExpYtd(root.getOpEx_YTD31()); - accAdCost.setExpNotes(root.getOpEx_note31()); - accAdCost.setExpName(root.getOpEx_YTD_label31()); + accAdCost.setExpYtd(root.getOpEx_YTD32()); + accAdCost.setExpNotes(root.getOpEx_note32()); + accAdCost.setExpName(root.getOpEx_YTD_label32()); accAdCost.setExpType(root.getOpEx_4_label()); accAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp apaAdCost = new LtcYtdExp(); - apaAdCost.setExpYtd(root.getOpEx_YTD32()); - apaAdCost.setExpNotes(root.getOpEx_note32()); - apaAdCost.setExpName(root.getOpEx_YTD_label32()); + apaAdCost.setExpYtd(root.getOpEx_YTD33()); + apaAdCost.setExpNotes(root.getOpEx_note33()); + apaAdCost.setExpName(root.getOpEx_YTD_label33()); apaAdCost.setExpType(root.getOpEx_4_label()); apaAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp insuranceAdCost = new LtcYtdExp(); - insuranceAdCost.setExpYtd(root.getOpEx_YTD33()); - insuranceAdCost.setExpNotes(root.getOpEx_note33()); - insuranceAdCost.setExpName(root.getOpEx_YTD_label33()); + insuranceAdCost.setExpYtd(root.getOpEx_YTD34()); + insuranceAdCost.setExpNotes(root.getOpEx_note34()); + insuranceAdCost.setExpName(root.getOpEx_YTD_label34()); insuranceAdCost.setExpType(root.getOpEx_4_label()); insuranceAdCost.setConfirmationId(root.getForm().getConfirmationId()); - LtcYtdExp othSupAdCost = new LtcYtdExp(); - othSupAdCost.setExpYtd(root.getOpEx_YTD34()); - othSupAdCost.setExpNotes(root.getOpEx_note34()); - othSupAdCost.setExpName(root.getOpEx_YTD_label34()); - othSupAdCost.setExpType(root.getOpEx_4_label()); - othSupAdCost.setConfirmationId(root.getForm().getConfirmationId()); + LtcYtdExp adminSupAdCost = new LtcYtdExp(); + adminSupAdCost.setExpYtd(root.getOpEx_YTD35()); + adminSupAdCost.setExpNotes(root.getOpEx_note35()); + adminSupAdCost.setExpName(root.getOpEx_YTD_label35()); + adminSupAdCost.setExpType(root.getOpEx_4_label()); + adminSupAdCost.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdExp othAdCost = new LtcYtdExp(); - othAdCost.setExpYtd(root.getOpEx_YTD35()); - othAdCost.setExpNotes(root.getOpEx_note35()); - othAdCost.setExpName(root.getOpEx_YTD_label35()); + othAdCost.setExpYtd(root.getOpEx_YTD36()); + othAdCost.setExpNotes(root.getOpEx_note36()); + othAdCost.setExpName(root.getOpEx_YTD_label36()); othAdCost.setExpType(root.getOpEx_4_label()); othAdCost.setConfirmationId(root.getForm().getConfirmationId()); - LtcYtdExp othAdCostOther = new LtcYtdExp(); - othAdCostOther.setExpYtd(root.getOpEx_YTD36()); - othAdCostOther.setExpNotes(root.getOpEx_note36()); - othAdCostOther.setExpName(root.getOpEx_YTD_label36()); - othAdCostOther.setExpType(root.getOpEx_4_label()); - othAdCostOther.setConfirmationId(root.getForm().getConfirmationId()); - /* Non operating expense */ LtcYtdExp dirCareNonOpExpMortgage = new LtcYtdExp(); @@ -2288,8 +2288,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminServCostExp, plantMainOpStaffExp, salWagRecvExp, salWagAccExp, othLabCostExp, bnftCostExp, sickSevrnceAccExp, buildingRentExp, intrstMortgageLngTrmExp, propertyTaxesExp, mntnceExp, suppliesExp, utilitiesExp, wasteMgmntExp, resTranServExp, othExp, medSupExp, rawFoodCostExp, - drgsPharmaExp, dietSupExp, ldrySupExp, houseSupExp, othSupExp, offExpAdCost, mgmntAdCost, - hoAllocpAdCost, accAdCost, apaAdCost, insuranceAdCost, othSupAdCost, othAdCost, othAdCostOther, + drgsPharmaExp, dietSupExp, ldrySupExp, houseSupExp, incontinenceSupExp, OthSupExp, officeExpAdCost, + mgmntAdCost, hoAllocpAdCost, accAdCost, apaAdCost, insuranceAdCost, adminSupAdCost, othAdCost, dirCareNonOpExpMortgage, dirCareNonOpExpOther); // subtotal From 2b04ae8439e5a75904a7ca79c5192d23156abae4 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 14:28:27 -0400 Subject: [PATCH 113/183] mapping bugfix --- .../java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 49a3009c..f9b91c90 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -806,7 +806,7 @@ public class Root{ public String compB_recovered1; public String compB_recovered2; public String compB_recovered3; - @JsonProperty("compB_sum11") + @JsonProperty("compB_sum1-1") public String compB_sum11; @JsonProperty("compB_sum1-2") public String compB_sum12; From fda06aa06c25aec21d8cd023d47b35dc7b5d1687 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 14:37:19 -0400 Subject: [PATCH 114/183] bugfix --- .../etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java index ff9aee3c..94830f14 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java @@ -30,7 +30,7 @@ public String getCompSalType() { } public void setCompSalType(String compSalType) { - this.compSalType = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); + this.compSalType = StringUtils.defaultIfEmpty(compSalType, Constants.DEFAULT_STRING_VALUE); } public String getTotalCompSalStaffYTD() { From 9a78da5eba0d50cd917e75f76cf4d05245cc274f Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 14:48:38 -0400 Subject: [PATCH 115/183] mapping bugfix --- .../java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index f9b91c90..4174bd58 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -906,7 +906,7 @@ public class Root{ public String compH_item120; @JsonProperty("compH_item1-21") public String compH_item121; - @JsonProperty("compH_item1-1-22") + @JsonProperty("compH_item1-22") public String compH_item122; @JsonProperty("compH_item1-23") public String compH_item123; From a9a2f236c8e968bbc4e569c397b5d37eb61b22b1 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 15:27:39 -0400 Subject: [PATCH 116/183] mapping bugfix --- .../java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 4174bd58..9039757f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -1104,7 +1104,7 @@ public class Root{ public String compH_sum24; @JsonProperty("compH_sum2-5") public String compH_sum25; - @JsonProperty("compH_sum13-1") + @JsonProperty("compH_sum3-1") public String compH_sum31; @JsonProperty("compH_sum3-2") public String compH_sum32; From ac9fade1585d63b3fde46fdd49a8c9139fca26c8 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 15:32:23 -0400 Subject: [PATCH 117/183] yet another mapping bugfix --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index f993aeea..8a8f80e0 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1528,7 +1528,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY accuredHrsTotals.setCompHrsTotalType(root.getCompH_accrued_label()); accuredHrsTotals.setTotalCompHrsStaffYTD(root.getCompH_accrued2()); accuredHrsTotals.setTotalCompHrsContractServicesYTD(root.getCompH_accrued3()); - accuredHrsTotals.setTotalCompHrsOfficeAllocYTD(root.getCompH_accrued3()); + accuredHrsTotals.setTotalCompHrsOfficeAllocYTD(root.getCompH_accrued4()); accuredHrsTotals.setTotalCompTotalWorkedHrsYTD(root.getCompH_accrued()); accuredHrsTotals.setConfirmationID(root.getForm().getConfirmationId()); From 7f264a8712d8298d30baa1e1309cc1d4aaeedb1c Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 15:45:13 -0400 Subject: [PATCH 118/183] missed mapping bugfix --- .../etl/forms/ltc/quarterly/json/Root.java | 32 +++++++++++++++++-- .../LtcQuarterlyYtdApiResponseProcessor.java | 12 +++---- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 9039757f..91bf8d1c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -409,7 +409,9 @@ public class Root{ public String alliedProfPercentage3; public String alliedProfPercentage4; public String alliedProfPercentage5; - public String alliedProfProdC_calc1; + public String alliedProfPercentage6; + public String alliedProfPercentage7; + public String alliedProfProdC_calc1; public String alliedProfProdC_calc2; public String alliedProfProdC_calc3; public String alliedProfProdC_calc4; @@ -543,7 +545,9 @@ public class Root{ public String alliedProfProvider3; public String alliedProfProvider4; public String alliedProfProvider5; - public String alliedProfStaffRate_total; + public String alliedProfProvider6; + public String alliedProfProvider7; + public String alliedProfStaffRate_total; public String alliedProfStaffRate1; public String alliedProfStaffRate2; public String alliedProfStaffRate3; @@ -4472,6 +4476,18 @@ public String getAlliedProfPercentage5() { public void setAlliedProfPercentage5(String alliedProfPercentage5) { this.alliedProfPercentage5 = alliedProfPercentage5; } + public String getAlliedProfPercentage6() { + return alliedProfPercentage6; + } + public void setAlliedProfPercentage6(String alliedProfPercentage6) { + this.alliedProfPercentage6 = alliedProfPercentage6; + } + public String getAlliedProfPercentage7() { + return alliedProfPercentage7; + } + public void setAlliedProfPercentage7(String alliedProfPercentage7) { + this.alliedProfPercentage7 = alliedProfPercentage7; + } public String getAlliedProfProdC_calc1() { return alliedProfProdC_calc1; } @@ -4934,6 +4950,18 @@ public String getAlliedProfProvider5() { public void setAlliedProfProvider5(String alliedProfProvider5) { this.alliedProfProvider5 = alliedProfProvider5; } + public String getAlliedProfProvider6() { + return alliedProfProvider6; + } + public void setAlliedProfProvider6(String alliedProfProvider6) { + this.alliedProfProvider6 = alliedProfProvider6; + } + public String getAlliedProfProvider7() { + return alliedProfProvider7; + } + public void setAlliedProfProvider7(String alliedProfProvider7) { + this.alliedProfProvider7 = alliedProfProvider7; + } public String getAlliedProfStaffRate_total() { return alliedProfStaffRate_total; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 8a8f80e0..91ec9b54 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1604,24 +1604,24 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedProfSLPAddPos.setConfirmationId(root.getForm().getConfirmationId()); alliedProfSLPAddPos.setAddPosType(root.getAlliedProf_label_CSP()); alliedProfSLPAddPos.setAddPosName(root.getAlliedProf_label_CSP5()); - alliedProfSLPAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider4()); - alliedProfSLPAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage4()); + alliedProfSLPAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider5()); + alliedProfSLPAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage5()); alliedProfSLPAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfRTAddPos = new LtcYtdCompAddPos(); alliedProfRTAddPos.setConfirmationId(root.getForm().getConfirmationId()); alliedProfRTAddPos.setAddPosType(root.getAlliedProf_label_CSP()); alliedProfRTAddPos.setAddPosName(root.getAlliedProf_label_CSP6()); - alliedProfRTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider4()); - alliedProfRTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage4()); + alliedProfRTAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider6()); + alliedProfRTAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage6()); alliedProfRTAddPos.determineAddPosContractedOutYtd(); LtcYtdCompAddPos alliedProfOTHAddPos = new LtcYtdCompAddPos(); alliedProfOTHAddPos.setConfirmationId(root.getForm().getConfirmationId()); alliedProfOTHAddPos.setAddPosType(root.getAlliedProf_label_CSP()); alliedProfOTHAddPos.setAddPosName(Constants.POS_TYPE_OTHER); - alliedProfOTHAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider5()); - alliedProfOTHAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage5()); + alliedProfOTHAddPos.setAddPosLegalNameContractServiceYtd(root.getAlliedProfProvider7()); + alliedProfOTHAddPos.setAddPosPercentServiceContractOutYtd(root.getAlliedProfPercentage7()); alliedProfOTHAddPos.setAddPosAnotherName(root.getAlliedProf_label_CSP7()); alliedProfOTHAddPos.determineAddPosContractedOutYtd(); From 3e4932103e9ca2165721803f7df8efdb23bec6ff Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 15:54:29 -0400 Subject: [PATCH 119/183] added missing mapping --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 91ec9b54..915d5767 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1683,41 +1683,49 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompBenefits empInsBenefit = new LtcYtdCompBenefits(); empInsBenefit.setBenefitsAmountYtd(root.getBenefit_value1()); empInsBenefit.setBenefitsType(root.getBenefit_value_label1()); + empInsBenefit.setBenefitsPercentageAlloc(root.getBenefit_percentage1()); empInsBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits canPenPlnBenefit = new LtcYtdCompBenefits(); canPenPlnBenefit.setBenefitsAmountYtd(root.getBenefit_value2()); canPenPlnBenefit.setBenefitsType(root.getBenefit_value_label2()); + canPenPlnBenefit.setBenefitsPercentageAlloc(root.getBenefit_percentage2()); canPenPlnBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits wrkrCompBoardBenefit = new LtcYtdCompBenefits(); wrkrCompBoardBenefit.setBenefitsAmountYtd(root.getBenefit_value3()); wrkrCompBoardBenefit.setBenefitsType(root.getBenefit_value_label3()); + wrkrCompBoardBenefit.setBenefitsPercentageAlloc(root.getBenefit_percentage3()); wrkrCompBoardBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits empHlthTaxBenefit = new LtcYtdCompBenefits(); empHlthTaxBenefit.setBenefitsAmountYtd(root.getBenefit_value4()); empHlthTaxBenefit.setBenefitsType(root.getBenefit_value_label4()); + empHlthTaxBenefit.setBenefitsPercentageAlloc(root.getBenefit_percentage4()); empHlthTaxBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits penPlanBenefit = new LtcYtdCompBenefits(); penPlanBenefit.setBenefitsAmountYtd(root.getBenefit_value5()); penPlanBenefit.setBenefitsType(root.getBenefit_value_label5()); + penPlanBenefit.setBenefitsPercentageAlloc(root.getBenefit_percentage5()); penPlanBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits exHlthDntlBenefit = new LtcYtdCompBenefits(); exHlthDntlBenefit.setBenefitsAmountYtd(root.getBenefit_value6()); exHlthDntlBenefit.setBenefitsType(root.getBenefit_value_label6()); + exHlthDntlBenefit.setBenefitsPercentageAlloc(root.getBenefit_percentage6()); exHlthDntlBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits grpLifeBenefit = new LtcYtdCompBenefits(); grpLifeBenefit.setBenefitsAmountYtd(root.getBenefit_value7()); grpLifeBenefit.setBenefitsType(root.getBenefit_value_label7()); + grpLifeBenefit.setBenefitsPercentageAlloc(root.getBenefit_percentage7()); grpLifeBenefit.setConfirmationId(root.getForm().getConfirmationId()); LtcYtdCompBenefits otherBenefit = new LtcYtdCompBenefits(); otherBenefit.setBenefitsAmountYtd(root.getBenefit_value8()); otherBenefit.setBenefitsType(root.getBenefit_value_label8()); + otherBenefit.setBenefitsPercentageAlloc(root.getBenefit_percentage8()); otherBenefit.setConfirmationId(root.getForm().getConfirmationId()); Collections.addAll(ltcYtdCompBenefits, empInsBenefit, canPenPlnBenefit, wrkrCompBoardBenefit, From c1fb680baf6e4d6e029d814ed8c3c66c6e0db8c8 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 15:56:34 -0400 Subject: [PATCH 120/183] corrected logic for posContractedOutYtd --- .../etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java index eb54cf3e..bce679d4 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java @@ -63,10 +63,10 @@ public void setAddPosAnotherName(String addPosAnotherName) { } public void determineAddPosContractedOutYtd() { - if(this.getAddPosLegalNameContractServiceYtd() != "" && this.getAddPosLegalNameContractServiceYtd() != null){ - this.setAddPosContractedOutYtd("N"); + if(this.addPosLegalNameContractServiceYtd != "" && this.addPosLegalNameContractServiceYtd != null){ + this.setAddPosContractedOutYtd("Y"); } - this.setAddPosContractedOutYtd("Y"); + this.setAddPosContractedOutYtd("N"); } @Override From 24fc7b657b6ae82f5b8d9f446952a57ba17f317b Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 16:25:17 -0400 Subject: [PATCH 121/183] cleanup and adding missing values --- .../etl/forms/ltc/quarterly/json/Root.java | 137 ++---------------- 1 file changed, 16 insertions(+), 121 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 91bf8d1c..e6a784f4 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -239,12 +239,6 @@ public class Root{ public String alliedNPProdH_sum11; @JsonProperty("alliedNPProdH_sum2-1") public String alliedNPProdH_sum21; - public String alliedNPProdH_THP1; - public String alliedNPProdH_THP2; - public String alliedNPProdH_THP3; - public String alliedNPProdH_THP4; - public String alliedNPProdH_THP5; - public String alliedNPProdH_THP6; public String alliedNPProdH_THPsum1; public String alliedNPProdHCS_subsum1; public String alliedNPProdHCS1; @@ -403,7 +397,9 @@ public class Root{ public String alliedProfNProdH_THP3; public String alliedProfNProdH_THP4; public String alliedProfNProdH_THP5; - public String alliedProfNProdH_THPsum1; + public String alliedProfNProdH_THP6; + public String alliedProfNProdH_THP7; + public String alliedProfNProdH_THPsum1; public String alliedProfPercentage1; public String alliedProfPercentage2; public String alliedProfPercentage3; @@ -524,13 +520,6 @@ public class Root{ public String alliedProfProdH_sum11; @JsonProperty("alliedProfProdH_sum2-1") public String alliedProfProdH_sum21; - public String alliedProfProdH_THP1; - public String alliedProfProdH_THP2; - public String alliedProfProdH_THP3; - public String alliedProfProdH_THP4; - public String alliedProfProdH_THP5; - public String alliedProfProdH_THP6; - public String alliedProfProdH_THP7; public String alliedProfProdH_THPsum1; public String alliedProfProdHCS_subsum1; public String alliedProfProdHCS1; @@ -1255,7 +1244,7 @@ public class Root{ public String nursingNProdH_item23; @JsonProperty("nursingNProdH_item2-4") public String nursingNProdH_item24; - @JsonProperty("nursingNProdH_item4-1") + @JsonProperty("nursingNProdH_item3-1") public String nursingNProdH_item31; @JsonProperty("nursingNProdH_item3-2") public String nursingNProdH_item32; @@ -1422,10 +1411,6 @@ public class Root{ public String alliedNP_label_CSP5; @JsonProperty("alliedNP_label_CSP-6") public String alliedNP_label_CSP6; - public String nursingProdH_THP1; - public String nursingProdH_THP2; - public String nursingProdH_THP3; - public String nursingProdH_THP4; public String nursingProdH_THPsum1; public String nursingProdHCS_subsum1; public String nursingProdHCS1; @@ -3852,42 +3837,6 @@ public String getAlliedNPProdH_sum21() { public void setAlliedNPProdH_sum21(String alliedNPProdH_sum21) { this.alliedNPProdH_sum21 = alliedNPProdH_sum21; } - public String getAlliedNPProdH_THP1() { - return alliedNPProdH_THP1; - } - public void setAlliedNPProdH_THP1(String alliedNPProdH_THP1) { - this.alliedNPProdH_THP1 = alliedNPProdH_THP1; - } - public String getAlliedNPProdH_THP2() { - return alliedNPProdH_THP2; - } - public void setAlliedNPProdH_THP2(String alliedNPProdH_THP2) { - this.alliedNPProdH_THP2 = alliedNPProdH_THP2; - } - public String getAlliedNPProdH_THP3() { - return alliedNPProdH_THP3; - } - public void setAlliedNPProdH_THP3(String alliedNPProdH_THP3) { - this.alliedNPProdH_THP3 = alliedNPProdH_THP3; - } - public String getAlliedNPProdH_THP4() { - return alliedNPProdH_THP4; - } - public void setAlliedNPProdH_THP4(String alliedNPProdH_THP4) { - this.alliedNPProdH_THP4 = alliedNPProdH_THP4; - } - public String getAlliedNPProdH_THP5() { - return alliedNPProdH_THP5; - } - public void setAlliedNPProdH_THP5(String alliedNPProdH_THP5) { - this.alliedNPProdH_THP5 = alliedNPProdH_THP5; - } - public String getAlliedNPProdH_THP6() { - return alliedNPProdH_THP6; - } - public void setAlliedNPProdH_THP6(String alliedNPProdH_THP6) { - this.alliedNPProdH_THP6 = alliedNPProdH_THP6; - } public String getAlliedNPProdH_THPsum1() { return alliedNPProdH_THPsum1; } @@ -4440,6 +4389,18 @@ public String getAlliedProfNProdH_THP5() { public void setAlliedProfNProdH_THP5(String alliedProfNProdH_THP5) { this.alliedProfNProdH_THP5 = alliedProfNProdH_THP5; } + public String getAlliedProfNProdH_THP6() { + return alliedProfNProdH_THP6; + } + public void setAlliedProfNProdH_THP6(String alliedProfNProdH_THP6) { + this.alliedProfNProdH_THP6 = alliedProfNProdH_THP6; + } + public String getAlliedProfNProdH_THP7() { + return alliedProfNProdH_THP7; + } + public void setAlliedProfNProdH_THP7(String alliedProfNProdH_THP7) { + this.alliedProfNProdH_THP7 = alliedProfNProdH_THP7; + } public String getAlliedProfNProdH_THPsum1() { return alliedProfNProdH_THPsum1; } @@ -4848,36 +4809,6 @@ public String getAlliedProfProdH_sum21() { public void setAlliedProfProdH_sum21(String alliedProfProdH_sum21) { this.alliedProfProdH_sum21 = alliedProfProdH_sum21; } - public String getAlliedProfProdH_THP1() { - return alliedProfProdH_THP1; - } - public void setAlliedProfProdH_THP1(String alliedProfProdH_THP1) { - this.alliedProfProdH_THP1 = alliedProfProdH_THP1; - } - public String getAlliedProfProdH_THP2() { - return alliedProfProdH_THP2; - } - public void setAlliedProfProdH_THP2(String alliedProfProdH_THP2) { - this.alliedProfProdH_THP2 = alliedProfProdH_THP2; - } - public String getAlliedProfProdH_THP3() { - return alliedProfProdH_THP3; - } - public void setAlliedProfProdH_THP3(String alliedProfProdH_THP3) { - this.alliedProfProdH_THP3 = alliedProfProdH_THP3; - } - public String getAlliedProfProdH_THP4() { - return alliedProfProdH_THP4; - } - public void setAlliedProfProdH_THP4(String alliedProfProdH_THP4) { - this.alliedProfProdH_THP4 = alliedProfProdH_THP4; - } - public String getAlliedProfProdH_THP5() { - return alliedProfProdH_THP5; - } - public void setAlliedProfProdH_THP5(String alliedProfProdH_THP5) { - this.alliedProfProdH_THP5 = alliedProfProdH_THP5; - } public String getAlliedProfProdH_THPsum1() { return alliedProfProdH_THPsum1; } @@ -8430,30 +8361,6 @@ public String getAlliedNP_label_CSP6() { public void setAlliedNP_label_CSP6(String alliedNP_label_CSP6) { this.alliedNP_label_CSP6 = alliedNP_label_CSP6; } - public String getNursingProdH_THP1() { - return nursingProdH_THP1; - } - public void setNursingProdH_THP1(String nursingProdH_THP1) { - this.nursingProdH_THP1 = nursingProdH_THP1; - } - public String getNursingProdH_THP2() { - return nursingProdH_THP2; - } - public void setNursingProdH_THP2(String nursingProdH_THP2) { - this.nursingProdH_THP2 = nursingProdH_THP2; - } - public String getNursingProdH_THP3() { - return nursingProdH_THP3; - } - public void setNursingProdH_THP3(String nursingProdH_THP3) { - this.nursingProdH_THP3 = nursingProdH_THP3; - } - public String getNursingProdH_THP4() { - return nursingProdH_THP4; - } - public void setNursingProdH_THP4(String nursingProdH_THP4) { - this.nursingProdH_THP4 = nursingProdH_THP4; - } public String getNursingProdH_THPsum1() { return nursingProdH_THPsum1; } @@ -10560,18 +10467,6 @@ public String getAlliedProfProdH_sub7() { public void setAlliedProfProdH_sub7(String alliedProfProdH_sub7) { this.alliedProfProdH_sub7 = alliedProfProdH_sub7; } - public String getAlliedProfProdH_THP6() { - return alliedProfProdH_THP6; - } - public void setAlliedProfProdH_THP6(String alliedProfProdH_THP6) { - this.alliedProfProdH_THP6 = alliedProfProdH_THP6; - } - public String getAlliedProfProdH_THP7() { - return alliedProfProdH_THP7; - } - public void setAlliedProfProdH_THP7(String alliedProfProdH_THP7) { - this.alliedProfProdH_THP7 = alliedProfProdH_THP7; - } public String getAlliedProfNProdH_calc6() { return alliedProfNProdH_calc6; } From b74405c8ee8d3b4eb437dfe87287b2c6811103b4 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 1 May 2023 16:25:32 -0400 Subject: [PATCH 122/183] remapping, bugfix --- .../LtcQuarterlyYtdApiResponseProcessor.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 915d5767..4ea3a821 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -130,7 +130,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingRNProdH.setDirCareName(root.getNursing_label1()); nursingRNProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc1()); nursingRNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub1()); - nursingRNProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP1()); + nursingRNProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP1()); nursingRNProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc1()); LtcYtdDirectCareHrs nursingLPNProdH = new LtcYtdDirectCareHrs(); @@ -145,7 +145,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingLPNProdH.setDirCareName(root.getNursing_label2()); nursingLPNProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc2()); nursingLPNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub2()); - nursingLPNProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP2()); + nursingLPNProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP2()); nursingLPNProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc2()); @@ -161,7 +161,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingHCAProdH.setDirCareName(root.getNursing_label3()); nursingHCAProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc3()); nursingHCAProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub3()); - nursingHCAProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP3()); + nursingHCAProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP3()); nursingHCAProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc3()); LtcYtdDirectCareHrs nursingOthProdH = new LtcYtdDirectCareHrs(); @@ -176,7 +176,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingOthProdH.setDirCareName(Constants.DC_HRS_OTHER); nursingOthProdH.setDirCareProdHrsSubtotalYtd(root.getNursingProdH_calc4()); nursingOthProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub4()); - nursingOthProdH.setDirCareTotalHrsPaidYtd(root.getNursingProdH_THP4()); + nursingOthProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP4()); nursingOthProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc4()); nursingOthProdH.setDirCareOtherValue(root.getNursing_label4()); @@ -195,7 +195,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedOTProfH.setDirCareName(root.getAlliedProf_label1()); alliedOTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc1()); alliedOTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub1()); - alliedOTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP1()); + alliedOTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfNProdH_THP1()); alliedOTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc1()); @@ -211,7 +211,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedPTProfH.setDirCareName(root.getAlliedProf_label2()); alliedPTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc2()); alliedPTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub2()); - alliedPTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP2()); + alliedPTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfNProdH_THP2()); alliedPTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc2()); LtcYtdDirectCareHrs alliedDTProfH = new LtcYtdDirectCareHrs(); @@ -226,7 +226,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedDTProfH.setDirCareName(root.getAlliedProf_label3()); alliedDTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc3()); alliedDTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub3()); - alliedDTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP3()); + alliedDTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfNProdH_THP3()); alliedDTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc3()); @@ -242,7 +242,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedSWProfH.setDirCareName(root.getAlliedProf_label4()); alliedSWProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc4()); alliedSWProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub4()); - alliedSWProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP4()); + alliedSWProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfNProdH_THP4()); alliedSWProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc4()); LtcYtdDirectCareHrs alliedSLPProfH = new LtcYtdDirectCareHrs(); @@ -257,7 +257,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedSLPProfH.setDirCareName(root.getAlliedProf_label5()); alliedSLPProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc5()); alliedSLPProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub5()); - alliedSLPProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP5()); + alliedSLPProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfNProdH_THP5()); alliedSLPProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc5()); LtcYtdDirectCareHrs alliedRTProfH = new LtcYtdDirectCareHrs(); @@ -272,7 +272,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedRTProfH.setDirCareName(root.getAlliedProf_label6()); alliedRTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc6()); alliedRTProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub6()); - alliedRTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP6()); + alliedRTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfNProdH_THP6()); alliedRTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc6()); LtcYtdDirectCareHrs alliedOTHProfH = new LtcYtdDirectCareHrs(); @@ -287,7 +287,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedOTHProfH.setDirCareName(Constants.DC_HRS_OTHER); alliedOTHProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedProfProdH_calc7()); alliedOTHProfH.setDirCareProdHrsTotalYtd(root.getAlliedProfProdH_sub7()); - alliedOTHProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfProdH_THP7()); + alliedOTHProfH.setDirCareTotalHrsPaidYtd(root.getAlliedProfNProdH_THP7()); alliedOTHProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedProfNProdH_calc7()); alliedOTHProfH.setDirCareOtherValue(root.getAlliedProf_label7()); @@ -304,7 +304,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPRTProfH.setDirCareName(root.getAlliedNP_label1()); alliedNPRTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc1()); alliedNPRTProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub1()); - alliedNPRTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP1()); + alliedNPRTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPNProdH_THP1()); alliedNPRTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc1()); @@ -320,7 +320,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPRAProfH.setDirCareName(root.getAlliedNP_label2()); alliedNPRAProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc2()); alliedNPRAProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub2()); - alliedNPRAProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP2()); + alliedNPRAProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPNProdH_THP2()); alliedNPRAProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc2()); @@ -336,7 +336,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPAWProfH.setDirCareName(root.getAlliedNP_label3()); alliedNPAWProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc3()); alliedNPAWProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub3()); - alliedNPAWProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP3()); + alliedNPAWProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPNProdH_THP3()); alliedNPAWProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc3()); @@ -352,7 +352,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPMTProfH.setDirCareName(root.getAlliedNP_label4()); alliedNPMTProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc4()); alliedNPMTProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub4()); - alliedNPMTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP4()); + alliedNPMTProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPNProdH_THP4()); alliedNPMTProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc4()); @@ -368,7 +368,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPATProfH.setDirCareName(root.getAlliedNP_label5()); alliedNPATProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc5()); alliedNPATProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub5()); - alliedNPATProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP5()); + alliedNPATProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPNProdH_THP5()); alliedNPATProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc5()); LtcYtdDirectCareHrs alliedNPOTHProfH = new LtcYtdDirectCareHrs(); @@ -383,7 +383,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPOTHProfH.setDirCareName(Constants.DC_HRS_OTHER); alliedNPOTHProfH.setDirCareProdHrsSubtotalYtd(root.getAlliedNPProdH_calc6()); alliedNPOTHProfH.setDirCareProdHrsTotalYtd(root.getAlliedNPProdH_sub6()); - alliedNPOTHProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPProdH_THP6()); + alliedNPOTHProfH.setDirCareTotalHrsPaidYtd(root.getAlliedNPNProdH_THP6()); alliedNPOTHProfH.setDirCareNonProdHrsTotalYtd(root.getAlliedNPNProdH_calc6()); alliedNPOTHProfH.setDirCareOtherValue(root.getAlliedNP_label6()); From 8cb3e7978704161fbcfa1f3ca3d8494c572ac1e0 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 14:52:14 -0400 Subject: [PATCH 123/183] mapping bugfix --- .../ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java | 2 +- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index e6a784f4..6dbd6537 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -516,7 +516,7 @@ public class Root{ public String alliedProfProdH_sub6; public String alliedProfProdH_sub7; public String alliedProfProdH_subsum1; - @JsonProperty("alliedProfProdH_sum11") + @JsonProperty("alliedProfProdH_sum1-1") public String alliedProfProdH_sum11; @JsonProperty("alliedProfProdH_sum2-1") public String alliedProfProdH_sum21; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 4ea3a821..3911a6b1 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -402,7 +402,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsSubtotalYTD(root.getNursingProdH_calcsum1()); nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsContServYTD(root.getNursingProdHCS_subsum1()); nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsTotalYTD(root.getNursingProdH_subsum1()); - nursingDirCareHrsSubTotal.setSubTotalDirCareTotalHrsPaidYTD(root.getNursingProdH_THPsum1()); + nursingDirCareHrsSubTotal.setSubTotalDirCareTotalHrsPaidYTD(root.getNursingNProdH_THPsum1()); nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsVacYTD(root.getNursingNProdH_sum11()); nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsSickYTD(root.getNursingNProdH_sum21()); nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsOtherServYTD(root.getNursingNProdH_sum31()); @@ -418,7 +418,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsSubtotalYTD(root.getAlliedProfProdH_calcsum1()); alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsContServYTD(root.getAlliedProfProdHCS_subsum1()); alliedDirCareHrsSubTotal.setSubTotalDirCareProdHrsTotalYTD(root.getAlliedProfProdH_subsum1()); - alliedDirCareHrsSubTotal.setSubTotalDirCareTotalHrsPaidYTD(root.getAlliedProfProdH_THPsum1()); + alliedDirCareHrsSubTotal.setSubTotalDirCareTotalHrsPaidYTD(root.getAlliedProfNProdH_THPsum1()); alliedDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsVacYTD(root.getAlliedProfNProdH_sum11()); alliedDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsSickYTD(root.getAlliedNProdH_sum21()); alliedDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsOtherServYTD(root.getAlliedProfNProdH_sum31()); @@ -432,7 +432,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPDirCareHrsSubTotal.setSubTotalDirCareProdHrsSubtotalYTD(root.getAlliedNPProdH_calcsum1()); alliedNPDirCareHrsSubTotal.setSubTotalDirCareProdHrsContServYTD(root.getAlliedNPProdHCS_subsum1()); alliedNPDirCareHrsSubTotal.setSubTotalDirCareProdHrsTotalYTD(root.getAlliedNPProdH_subsum1()); - alliedNPDirCareHrsSubTotal.setSubTotalDirCareTotalHrsPaidYTD(root.getAlliedNPProdH_THPsum1()); + alliedNPDirCareHrsSubTotal.setSubTotalDirCareTotalHrsPaidYTD(root.getAlliedNPNProdH_THPsum1()); alliedNPDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsVacYTD(root.getAlliedNPNProdH_sum11()); alliedNPDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsSickYTD(root.getAlliedNPNProdH_sum21()); alliedNPDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsOtherServYTD(root.getAlliedNPNProdH_sum31()); From f07f7d3e7361ecf3bd96fcdf43cb59ac2d7d5a0c Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 14:52:31 -0400 Subject: [PATCH 124/183] bugfix, added missing element --- .../forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java index 856a59f5..d809ad7e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java @@ -143,6 +143,7 @@ public List getCsvElements() { elements.add(this.getSubTotalDirCareProdHrsTotalYTD()); elements.add(this.getSubTotalDirCareNonProdHrsVacYTD()); elements.add(this.getSubTotalDirCareNonProdHrsSickYTD()); + elements.add(this.getSubTotalDirCareNonProdHrsOtherServYTD()); elements.add(this.getSubTotalDirCareNonProdHrsTotalYTD()); elements.add(this.getSubTotalDirCareTotalHrsPaidYTD()); return elements; From f412412f16f44bc46ac6e638ea9ef422e40ec51b Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 18:18:24 -0400 Subject: [PATCH 125/183] bugfix, added missing column --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 4d2d5d4e..1df93dba 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -239,7 +239,7 @@ public class Constants { }); HEADERS.put(LTC_YTD_DIRECT_CARE_COST, - new String[] { "CONFIRMATION_ID", "DIR_CARE_COST_TYPE", "DIR_CARE_COST_NAME", + new String[] { "CONFIRMATION_ID", "DIR_CARE_COST_TYPE", "DIR_CARE_COST_NAME","DIR_CARE_OTHER_VALUE", "DIR_CARE_COST_PROD_HRS_REG_YTD", "DIR_CARE_COST_PROD_HRS_OT_YTD", "DIR_CARE_CST_PROD_HRS_CONTRACTED_YTD", "DIR_CARE_COST_PROD_HRS_SUBTOTAL_YTD", "DIR_CARE_COST_PROD_HRS_TOTAL_YTD", "DIR_CARE_COST_NON_PROD_HRS_VAC_YTD", From f88cac0834dfb8e864348816f7cbf7c298ffb8cb Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 18:43:47 -0400 Subject: [PATCH 126/183] removed dead code, added issing mapping --- .../etl/forms/ltc/quarterly/json/Root.java | 135 ++---------------- 1 file changed, 15 insertions(+), 120 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 6dbd6537..fb53f777 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -182,12 +182,6 @@ public class Root{ public String alliedNPProdC_sum11; @JsonProperty("alliedNPProdC_sum2-1") public String alliedNPProdC_sum21; - public String alliedNPProdC_THP1; - public String alliedNPProdC_THP2; - public String alliedNPProdC_THP3; - public String alliedNPProdC_THP4; - public String alliedNPProdC_THP5; - public String alliedNPProdC_THP6; public String alliedNPProdC_THPsum1; public String alliedNPProdCCS_subsum1; public String alliedNPProdCCS1; @@ -278,7 +272,9 @@ public class Root{ public String alliedProfCost3; public String alliedProfCost4; public String alliedProfCost5; - public String alliedProfNProdC_calc1; + public String alliedProfCost6; + public String alliedProfCost7; + public String alliedProfNProdC_calc1; public String alliedProfNProdC_calc2; public String alliedProfNProdC_calc3; public String alliedProfNProdC_calc4; @@ -456,13 +452,6 @@ public class Root{ public String alliedProfProdC_sum11; @JsonProperty("alliedProfProdC_sum2-1") public String alliedProfProdC_sum21; - public String alliedProfProdC_THP1; - public String alliedProfProdC_THP2; - public String alliedProfProdC_THP3; - public String alliedProfProdC_THP4; - public String alliedProfProdC_THP5; - public String alliedProfProdC_THP6; - public String alliedProfProdC_THP7; public String alliedProfProdC_THPsum1; public String alliedProfProdCCS_subsum1; public String alliedProfProdCCS1; @@ -1297,10 +1286,6 @@ public class Root{ public String nursingProdC_sum11; @JsonProperty("nursingProdC_sum2-1") public String nursingProdC_sum21; - public String nursingProdC_THP1; - public String nursingProdC_THP2; - public String nursingProdC_THP3; - public String nursingProdC_THP4; public String nursingProdC_THPsum1; public String nursingProdCCS_subsum1; public String nursingProdCCS1; @@ -3585,42 +3570,6 @@ public String getAlliedNPProdC_sum21() { public void setAlliedNPProdC_sum21(String alliedNPProdC_sum21) { this.alliedNPProdC_sum21 = alliedNPProdC_sum21; } - public String getAlliedNPProdC_THP1() { - return alliedNPProdC_THP1; - } - public void setAlliedNPProdC_THP1(String alliedNPProdC_THP1) { - this.alliedNPProdC_THP1 = alliedNPProdC_THP1; - } - public String getAlliedNPProdC_THP2() { - return alliedNPProdC_THP2; - } - public void setAlliedNPProdC_THP2(String alliedNPProdC_THP2) { - this.alliedNPProdC_THP2 = alliedNPProdC_THP2; - } - public String getAlliedNPProdC_THP3() { - return alliedNPProdC_THP3; - } - public void setAlliedNPProdC_THP3(String alliedNPProdC_THP3) { - this.alliedNPProdC_THP3 = alliedNPProdC_THP3; - } - public String getAlliedNPProdC_THP4() { - return alliedNPProdC_THP4; - } - public void setAlliedNPProdC_THP4(String alliedNPProdC_THP4) { - this.alliedNPProdC_THP4 = alliedNPProdC_THP4; - } - public String getAlliedNPProdC_THP5() { - return alliedNPProdC_THP5; - } - public void setAlliedNPProdC_THP5(String alliedNPProdC_THP5) { - this.alliedNPProdC_THP5 = alliedNPProdC_THP5; - } - public String getAlliedNPProdC_THP6() { - return alliedNPProdC_THP6; - } - public void setAlliedNPProdC_THP6(String alliedNPProdC_THP6) { - this.alliedNPProdC_THP6 = alliedNPProdC_THP6; - } public String getAlliedNPProdC_THPsum1() { return alliedNPProdC_THPsum1; } @@ -4047,6 +3996,18 @@ public String getAlliedProfCost5() { public void setAlliedProfCost5(String alliedProfCost5) { this.alliedProfCost5 = alliedProfCost5; } + public String getAlliedProfCost6() { + return alliedProfCost6; + } + public void setAlliedProfCost6(String alliedProfCost6) { + this.alliedProfCost6 = alliedProfCost6; + } + public String getAlliedProfCost7() { + return alliedProfCost7; + } + public void setAlliedProfCost7(String alliedProfCost7) { + this.alliedProfCost7 = alliedProfCost7; + } public String getAlliedProfNProdC_calc1() { return alliedProfNProdC_calc1; } @@ -4593,36 +4554,6 @@ public String getAlliedProfProdC_sum21() { public void setAlliedProfProdC_sum21(String alliedProfProdC_sum21) { this.alliedProfProdC_sum21 = alliedProfProdC_sum21; } - public String getAlliedProfProdC_THP1() { - return alliedProfProdC_THP1; - } - public void setAlliedProfProdC_THP1(String alliedProfProdC_THP1) { - this.alliedProfProdC_THP1 = alliedProfProdC_THP1; - } - public String getAlliedProfProdC_THP2() { - return alliedProfProdC_THP2; - } - public void setAlliedProfProdC_THP2(String alliedProfProdC_THP2) { - this.alliedProfProdC_THP2 = alliedProfProdC_THP2; - } - public String getAlliedProfProdC_THP3() { - return alliedProfProdC_THP3; - } - public void setAlliedProfProdC_THP3(String alliedProfProdC_THP3) { - this.alliedProfProdC_THP3 = alliedProfProdC_THP3; - } - public String getAlliedProfProdC_THP4() { - return alliedProfProdC_THP4; - } - public void setAlliedProfProdC_THP4(String alliedProfProdC_THP4) { - this.alliedProfProdC_THP4 = alliedProfProdC_THP4; - } - public String getAlliedProfProdC_THP5() { - return alliedProfProdC_THP5; - } - public void setAlliedProfProdC_THP5(String alliedProfProdC_THP5) { - this.alliedProfProdC_THP5 = alliedProfProdC_THP5; - } public String getAlliedProfProdC_THPsum1() { return alliedProfProdC_THPsum1; } @@ -7941,30 +7872,6 @@ public String getNursingProdC_sum21() { public void setNursingProdC_sum21(String nursingProdC_sum21) { this.nursingProdC_sum21 = nursingProdC_sum21; } - public String getNursingProdC_THP1() { - return nursingProdC_THP1; - } - public void setNursingProdC_THP1(String nursingProdC_THP1) { - this.nursingProdC_THP1 = nursingProdC_THP1; - } - public String getNursingProdC_THP2() { - return nursingProdC_THP2; - } - public void setNursingProdC_THP2(String nursingProdC_THP2) { - this.nursingProdC_THP2 = nursingProdC_THP2; - } - public String getNursingProdC_THP3() { - return nursingProdC_THP3; - } - public void setNursingProdC_THP3(String nursingProdC_THP3) { - this.nursingProdC_THP3 = nursingProdC_THP3; - } - public String getNursingProdC_THP4() { - return nursingProdC_THP4; - } - public void setNursingProdC_THP4(String nursingProdC_THP4) { - this.nursingProdC_THP4 = nursingProdC_THP4; - } public String getNursingProdC_THPsum1() { return nursingProdC_THPsum1; } @@ -10575,18 +10482,6 @@ public String getAlliedProfProdC_sub7() { public void setAlliedProfProdC_sub7(String alliedProfProdC_sub7) { this.alliedProfProdC_sub7 = alliedProfProdC_sub7; } - public String getAlliedProfProdC_THP6() { - return alliedProfProdC_THP6; - } - public void setAlliedProfProdC_THP6(String alliedProfProdC_THP6) { - this.alliedProfProdC_THP6 = alliedProfProdC_THP6; - } - public String getAlliedProfProdC_THP7() { - return alliedProfProdC_THP7; - } - public void setAlliedProfProdC_THP7(String alliedProfProdC_THP7) { - this.alliedProfProdC_THP7 = alliedProfProdC_THP7; - } public String getAlliedProfNProdC_calc6() { return alliedProfNProdC_calc6; } From 7cacf07f0a17f6a423c21f1c9a427f628d75f267 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 18:43:58 -0400 Subject: [PATCH 127/183] fixed mapping --- .../LtcQuarterlyYtdApiResponseProcessor.java | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 3911a6b1..9cb814bc 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -456,7 +456,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingRNProdC.setDirCareCostName(root.getNursing_label1()); nursingRNProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc1()); nursingRNProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub1()); - nursingRNProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP1()); + nursingRNProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingCost1()); nursingRNProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc1()); nursingRNProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate1()); nursingRNProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate1()); @@ -474,7 +474,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingLPNProdC.setDirCareCostName(root.getNursing_label2()); nursingLPNProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc2()); nursingLPNProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub2()); - nursingLPNProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP2()); + nursingLPNProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingCost2()); nursingLPNProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc2()); nursingLPNProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate2()); nursingLPNProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate2()); @@ -493,7 +493,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingHCAProdC.setDirCareCostName(root.getNursing_label3()); nursingHCAProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc3()); nursingHCAProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub3()); - nursingHCAProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP3()); + nursingHCAProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingCost3()); nursingHCAProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc3()); nursingHCAProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate3()); nursingHCAProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate3()); @@ -511,7 +511,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingOthProdC.setDirCareCostName(Constants.DC_HRS_OTHER); nursingOthProdC.setDirCareCostProdHrsSubtotalYtd(root.getNursingProdC_calc4()); nursingOthProdC.setDirCareCostProdHrsTotalYtd(root.getNursingProdC_sub4()); - nursingOthProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingProdC_THP4()); + nursingOthProdC.setDirCareCostTotalHrsPaidYtd(root.getNursingCost4()); nursingOthProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc4()); nursingOthProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate4()); nursingOthProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate4()); @@ -533,7 +533,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedOTProfC.setDirCareCostName(root.getAlliedProf_label1()); alliedOTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc1()); alliedOTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub1()); - alliedOTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP1()); + alliedOTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfCost1()); alliedOTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc1()); alliedOTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate1()); alliedOTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate1()); @@ -551,7 +551,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedPTProfC.setDirCareCostName(root.getAlliedProf_label2()); alliedPTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc2()); alliedPTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub2()); - alliedPTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP2()); + alliedPTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfCost2()); alliedPTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc2()); alliedPTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate2()); alliedPTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate2()); @@ -570,7 +570,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedDTProfC.setDirCareCostName(root.getAlliedProf_label3()); alliedDTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc3()); alliedDTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub3()); - alliedDTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP3()); + alliedDTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfCost3()); alliedDTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc3()); alliedDTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate3()); alliedDTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate3()); @@ -589,7 +589,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedSWProfC.setDirCareCostName(root.getAlliedProf_label4()); alliedSWProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc4()); alliedSWProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub4()); - alliedSWProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP4()); + alliedSWProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfCost4()); alliedSWProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc4()); alliedSWProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate4()); alliedSWProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate4()); @@ -606,7 +606,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedSLPProfC.setDirCareCostName(root.getAlliedProf_label5()); alliedSLPProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc5()); alliedSLPProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub5()); - alliedSLPProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP5()); + alliedSLPProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfCost5()); alliedSLPProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc5()); alliedSLPProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate5()); alliedSLPProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate5()); @@ -623,7 +623,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedRTProfC.setDirCareCostName(root.getAlliedProf_label6()); alliedRTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc6()); alliedRTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub6()); - alliedRTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP6()); + alliedRTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfCost6()); alliedRTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc6()); alliedRTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate6()); alliedRTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate6()); @@ -640,7 +640,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedOTHProfC.setDirCareCostName(Constants.DC_HRS_OTHER); alliedOTHProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedProfProdC_calc7()); alliedOTHProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedProfProdC_sub7()); - alliedOTHProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfProdC_THP7()); + alliedOTHProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedProfCost7()); alliedOTHProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedProfNProdC_calc7()); alliedOTHProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedProfStaffRate7()); alliedOTHProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedProfContractRate7()); @@ -660,7 +660,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPRTProfC.setDirCareCostName(root.getAlliedNP_label1()); alliedNPRTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc1()); alliedNPRTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub1()); - alliedNPRTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP1()); + alliedNPRTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPCost1()); alliedNPRTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc1()); alliedNPRTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate1()); alliedNPRTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate1()); @@ -678,7 +678,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPRAProfC.setDirCareCostName(root.getAlliedNP_label2()); alliedNPRAProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc2()); alliedNPRAProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub2()); - alliedNPRAProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP2()); + alliedNPRAProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPCost2()); alliedNPRAProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc2()); alliedNPRAProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate2()); alliedNPRAProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate2()); @@ -697,7 +697,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPAWProfC.setDirCareCostName(root.getAlliedNP_label3()); alliedNPAWProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc3()); alliedNPAWProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub3()); - alliedNPAWProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP3()); + alliedNPAWProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPCost3()); alliedNPAWProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc3()); alliedNPAWProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate3()); alliedNPAWProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate3()); @@ -716,7 +716,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPMTProfC.setDirCareCostName(root.getAlliedNP_label4()); alliedNPMTProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc4()); alliedNPMTProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub4()); - alliedNPMTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP4()); + alliedNPMTProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPCost4()); alliedNPMTProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc4()); alliedNPMTProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate4()); alliedNPMTProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate4()); @@ -735,7 +735,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPATProfC.setDirCareCostName(root.getAlliedNP_label5()); alliedNPATProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc5()); alliedNPATProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub5()); - alliedNPATProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP5()); + alliedNPATProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPCost5()); alliedNPATProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc5()); alliedNPATProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate5()); alliedNPATProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate5()); @@ -754,7 +754,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPOTHProfC.setDirCareCostName(Constants.DC_HRS_OTHER); alliedNPOTHProfC.setDirCareCostProdHrsSubtotalYtd(root.getAlliedNPProdC_calc6()); alliedNPOTHProfC.setDirCareCostProdHrsTotalYtd(root.getAlliedNPProdC_sub6()); - alliedNPOTHProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPProdC_THP6()); + alliedNPOTHProfC.setDirCareCostTotalHrsPaidYtd(root.getAlliedNPCost6()); alliedNPOTHProfC.setDirCareCostNonProdHrsTotalYtd(root.getAlliedNPNProdC_calc6()); alliedNPOTHProfC.setDirCareCostHourlyRateStaffYtd(root.getAlliedNPStaffRate6()); alliedNPOTHProfC.setDirCareCostHourlyRateContractedYtd(root.getAlliedNPContractRate6()); From 76cb33c2d6a4b68494e742371b550f51f2218c15 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 18:59:15 -0400 Subject: [PATCH 128/183] mapping bugfix --- .../LtcQuarterlyYtdApiResponseProcessor.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 9cb814bc..cd65d19f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -771,10 +771,10 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingCareCostSubtotals.setDirCareType(root.getNursing_label()); nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsRegularYTD(root.getNursingProdC_sum11()); nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsOTYTD(root.getNursingProdC_sum21()); - nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getNursingProdC_calc1()); + nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getNursingProdC_calcsum1()); nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsContServYTD(root.getNursingProdCCS_subsum1()); nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsTotalYTD(root.getNursingProdC_subsum1()); - nursingCareCostSubtotals.setSubTotalDirCareCostTotalHrsPaidYTD(root.getNursingProdC_sum11()); + nursingCareCostSubtotals.setSubTotalDirCareCostTotalHrsPaidYTD(root.getNursingCost_total()); nursingCareCostSubtotals.setSubTotalDirCareCostNonProdHrsVacYTD(root.getNursingNProdC_sum11()); nursingCareCostSubtotals.setSubTotalDirCareCostNonProdHrsSickYTD(root.getNursingNProdC_sum21()); nursingCareCostSubtotals.setSubTotalDirCareCostNonProdHrsOtherServYTD(root.getNursingNProdC_sum31()); @@ -787,10 +787,10 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedCareCostSubtotals.setDirCareType(root.getAlliedProf_label()); alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsRegularYTD(root.getAlliedProfProdC_sum11()); alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsOTYTD(root.getAlliedProfProdC_sum21()); - alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getAlliedProfProdC_calc1()); + alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getAlliedProfProdC_calcsum1()); alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsContServYTD(root.getAlliedProfProdCCS_subsum1()); alliedCareCostSubtotals.setSubTotalDirCareCostProdHrsTotalYTD(root.getAlliedProfProdC_subsum1()); - alliedCareCostSubtotals.setSubTotalDirCareCostTotalHrsPaidYTD(root.getAlliedProfProdC_sum11()); + alliedCareCostSubtotals.setSubTotalDirCareCostTotalHrsPaidYTD(root.getAlliedProfCost_total()); alliedCareCostSubtotals.setSubTotalDirCareCostNonProdHrsVacYTD(root.getAlliedProfNProdC_sum11()); alliedCareCostSubtotals.setSubTotalDirCareCostNonProdHrsSickYTD(root.getAlliedNProdC_sum21()); alliedCareCostSubtotals.setSubTotalDirCareCostNonProdHrsOtherServYTD(root.getAlliedProfNProdC_sum31()); @@ -803,10 +803,10 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNProfCareCostSubtotals.setDirCareType(root.getAlliedNP_label()); alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsRegularYTD(root.getAlliedNPProdC_sum11()); alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsOTYTD(root.getAlliedNPProdC_sum21()); - alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getAlliedNPProdC_calc1()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsSubtotalYTD(root.getAlliedNPProdC_calcsum1()); alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsContServYTD(root.getAlliedNPProdCCS_subsum1()); alliedNProfCareCostSubtotals.setSubTotalDirCareCostProdHrsTotalYTD(root.getAlliedNPProdC_subsum1()); - alliedNProfCareCostSubtotals.setSubTotalDirCareCostTotalHrsPaidYTD(root.getAlliedNPProdC_sum11()); + alliedNProfCareCostSubtotals.setSubTotalDirCareCostTotalHrsPaidYTD(root.getAlliedNPCost_total()); alliedNProfCareCostSubtotals.setSubTotalDirCareCostNonProdHrsVacYTD(root.getAlliedNPNProdC_sum11()); alliedNProfCareCostSubtotals.setSubTotalDirCareCostNonProdHrsSickYTD(root.getAlliedNPNProdC_sum21()); alliedNProfCareCostSubtotals.setSubTotalDirCareCostNonProdHrsOtherServYTD(root.getAlliedNPNProdC_sum31()); From c38b23fdd26f967f137ac5619886d5120ad9e25d Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 19:09:54 -0400 Subject: [PATCH 129/183] modified labels --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index cd65d19f..f154fe94 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2386,7 +2386,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcBedYtdMaxOccupancyTotals ytdPrivateMaxBedOccupancy = new LtcBedYtdMaxOccupancyTotals(); ytdPrivateMaxBedOccupancy.setConfirmationID(root.getForm().getConfirmationId()); ytdPrivateMaxBedOccupancy.setOccupancyType("YTD Maximum Bed Occupancy"); - ytdPrivateMaxBedOccupancy.setBedFundingType("In-Scope Max. Beds Days"); + ytdPrivateMaxBedOccupancy.setBedFundingType("Private Max Beds Days"); ytdPrivateMaxBedOccupancy.setTotalBedQuarter1(root.getyTDMaxPrivateQ1()); ytdPrivateMaxBedOccupancy.setTotalBedQuarter2(root.getyTDMaxPrivateQ2()); ytdPrivateMaxBedOccupancy.setTotalBedQuarter3(root.getyTDMaxPrivateQ3()); @@ -2396,7 +2396,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcBedYtdMaxOccupancyTotals ytdTotalMaxBedOccupancy = new LtcBedYtdMaxOccupancyTotals(); ytdTotalMaxBedOccupancy.setConfirmationID(root.getForm().getConfirmationId()); ytdTotalMaxBedOccupancy.setOccupancyType("YTD Maximum Bed Occupancy"); - ytdTotalMaxBedOccupancy.setBedFundingType("In-Scope Max. Beds Days"); + ytdTotalMaxBedOccupancy.setBedFundingType("Total Max Bed Days"); ytdTotalMaxBedOccupancy.setTotalBedQuarter1(root.getyTDMaxTotalQ1()); ytdTotalMaxBedOccupancy.setTotalBedQuarter2(root.getyTDMaxTotalQ2()); ytdTotalMaxBedOccupancy.setTotalBedQuarter3(root.getyTDMaxTotalQ3()); From fa53fa3718e69ae50ce62915f2410a8dcd149f17 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 19:10:17 -0400 Subject: [PATCH 130/183] added missing column --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 1df93dba..2cc4412c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -272,6 +272,7 @@ public class Constants { HEADERS.put(LTC_BED_YTD_MAX_OCCUPANCY_TOTALS, new String[] { "CONFIRMATION_ID", "BED_OCCUPANCY_TYPE", + "BED_FUNDING_TYPE", "TOTAL_BED_QUARTER_1", "TOTAL_BED_QUARTER_2", "TOTAL_BED_QUARTER_3", From 56139fe15954a90189ca064af60219f3c1d1fdd0 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 19:37:47 -0400 Subject: [PATCH 131/183] mapping bugfix --- .../LtcQuarterlyYtdApiResponseProcessor.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index f154fe94..11dad2ab 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2367,40 +2367,40 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY ytdInScopeMaxBedOccupancy.setConfirmationID(root.getForm().getConfirmationId()); ytdInScopeMaxBedOccupancy.setOccupancyType("YTD Maximum Bed Occupancy"); ytdInScopeMaxBedOccupancy.setBedFundingType("In-Scope Max. Beds Days"); - ytdInScopeMaxBedOccupancy.setTotalBedQuarter1(root.getyTDMaxInScopeQ1()); - ytdInScopeMaxBedOccupancy.setTotalBedQuarter2(root.getyTDMaxInScopeQ2()); - ytdInScopeMaxBedOccupancy.setTotalBedQuarter3(root.getyTDMaxInScopeQ3()); - ytdInScopeMaxBedOccupancy.setTotalBedQuarter4(root.getyTDMaxInScopeQ4()); + ytdInScopeMaxBedOccupancy.setTotalBedQuarter1(root.getInScopeBedTotal1()); + ytdInScopeMaxBedOccupancy.setTotalBedQuarter2(root.getInScopeBedTotal2()); + ytdInScopeMaxBedOccupancy.setTotalBedQuarter3(root.getInScopeBedTotal3()); + ytdInScopeMaxBedOccupancy.setTotalBedQuarter4(root.getInScopeBedTotal4()); ytdInScopeMaxBedOccupancy.setTotalBedDays(root.getInScopeBedTotalYTD()); LtcBedYtdMaxOccupancyTotals ytdOutOfScopeMaxBedOccupancy = new LtcBedYtdMaxOccupancyTotals(); ytdOutOfScopeMaxBedOccupancy.setConfirmationID(root.getForm().getConfirmationId()); ytdOutOfScopeMaxBedOccupancy.setOccupancyType("YTD Maximum Bed Occupancy"); ytdOutOfScopeMaxBedOccupancy.setBedFundingType("Out of Scope Max Beds Days"); - ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter1(root.getyTDMaxOutScopeQ1()); - ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter2(root.getyTDMaxOutScopeQ2()); - ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter3(root.getyTDMaxOutScopeQ3()); - ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter4(root.getyTDMaxOutScopeQ4()); + ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter1(root.getOutScopeBedTotal1()); + ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter2(root.getOutScopeBedTotal2()); + ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter3(root.getOutScopeBedTotal3()); + ytdOutOfScopeMaxBedOccupancy.setTotalBedQuarter4(root.getOutScopeBedTotal4()); ytdOutOfScopeMaxBedOccupancy.setTotalBedDays(root.getOutScopeBedTotalYTD()); LtcBedYtdMaxOccupancyTotals ytdPrivateMaxBedOccupancy = new LtcBedYtdMaxOccupancyTotals(); ytdPrivateMaxBedOccupancy.setConfirmationID(root.getForm().getConfirmationId()); ytdPrivateMaxBedOccupancy.setOccupancyType("YTD Maximum Bed Occupancy"); ytdPrivateMaxBedOccupancy.setBedFundingType("Private Max Beds Days"); - ytdPrivateMaxBedOccupancy.setTotalBedQuarter1(root.getyTDMaxPrivateQ1()); - ytdPrivateMaxBedOccupancy.setTotalBedQuarter2(root.getyTDMaxPrivateQ2()); - ytdPrivateMaxBedOccupancy.setTotalBedQuarter3(root.getyTDMaxPrivateQ3()); - ytdPrivateMaxBedOccupancy.setTotalBedQuarter4(root.getyTDMaxPrivateQ4()); + ytdPrivateMaxBedOccupancy.setTotalBedQuarter1(root.getPrivateBedTotal1()); + ytdPrivateMaxBedOccupancy.setTotalBedQuarter2(root.getPrivateBedTotal2()); + ytdPrivateMaxBedOccupancy.setTotalBedQuarter3(root.getPrivateBedTotal3()); + ytdPrivateMaxBedOccupancy.setTotalBedQuarter4(root.getPrivateBedTotal4()); ytdPrivateMaxBedOccupancy.setTotalBedDays(root.getPrivateBedTotalYTD()); LtcBedYtdMaxOccupancyTotals ytdTotalMaxBedOccupancy = new LtcBedYtdMaxOccupancyTotals(); ytdTotalMaxBedOccupancy.setConfirmationID(root.getForm().getConfirmationId()); ytdTotalMaxBedOccupancy.setOccupancyType("YTD Maximum Bed Occupancy"); ytdTotalMaxBedOccupancy.setBedFundingType("Total Max Bed Days"); - ytdTotalMaxBedOccupancy.setTotalBedQuarter1(root.getyTDMaxTotalQ1()); - ytdTotalMaxBedOccupancy.setTotalBedQuarter2(root.getyTDMaxTotalQ2()); - ytdTotalMaxBedOccupancy.setTotalBedQuarter3(root.getyTDMaxTotalQ3()); - ytdTotalMaxBedOccupancy.setTotalBedQuarter4(root.getyTDMaxTotalQ4()); + ytdTotalMaxBedOccupancy.setTotalBedQuarter1(root.getTotalBed1()); + ytdTotalMaxBedOccupancy.setTotalBedQuarter2(root.getTotalBed2()); + ytdTotalMaxBedOccupancy.setTotalBedQuarter3(root.getTotalBed3()); + ytdTotalMaxBedOccupancy.setTotalBedQuarter4(root.getTotalBed4()); ytdTotalMaxBedOccupancy.setTotalBedDays(root.getTotalBedYTD()); Collections.addAll(ltcBedYtdMaxOccTtls,plannedInScopeOccupancy,plannedOutOfScopeOccupancy,plannedPrivateOccupancy,plannedTotalMaxBedOccupancy,ytdTotalMaxBedOccupancy,ytdInScopeMaxBedOccupancy,ytdOutOfScopeMaxBedOccupancy,ytdPrivateMaxBedOccupancy); From f29c1876d85aaa1537e18b81f1d079f876ad825c Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 19:44:47 -0400 Subject: [PATCH 132/183] wrong element placing bugfix --- .../forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java index 0b41b825..69964277 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java @@ -67,11 +67,11 @@ public String getFormType() { public List getCsvElements() { List elements = new ArrayList(); elements.add(this.getConfirmationID()); + elements.add(this.getOccQuarter()); elements.add(this.getOccDaysYTDInScopePublic()); elements.add(this.getOccDaysYTDOutScopePublic()); elements.add(this.getOccDaysYTDPrivate()); elements.add(this.getOccDaysYTDTotalDays()); - elements.add(this.getOccQuarter()); return elements; } @Override From 26a150168bc65c2aebdfe285a44c12f42532415a Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 20:02:15 -0400 Subject: [PATCH 133/183] bugfix, added missing else statement --- .../etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java index bce679d4..024cb1b2 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompAddPos.java @@ -63,10 +63,11 @@ public void setAddPosAnotherName(String addPosAnotherName) { } public void determineAddPosContractedOutYtd() { - if(this.addPosLegalNameContractServiceYtd != "" && this.addPosLegalNameContractServiceYtd != null){ + if(this.addPosLegalNameContractServiceYtd != null && !this.addPosLegalNameContractServiceYtd.trim().isEmpty()){ this.setAddPosContractedOutYtd("Y"); + } else { + this.setAddPosContractedOutYtd("N"); } - this.setAddPosContractedOutYtd("N"); } @Override From 5329afa5b530d9ae82f82976592e39a949496ed0 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 2 May 2023 20:15:03 -0400 Subject: [PATCH 134/183] adding notes to occupencyRate, keeping it as commented lines if needed --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 11dad2ab..77414cca 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2482,7 +2482,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY occOutRateQ1.setYtdOccDays(root.getyTDOccupiedOutScopeQ1()); occOutRateQ1.setPercentOcc(root.getOccupiedPercentageOutScopeQ1()); occOutRateQ1.setOccRateQuarter("Q1"); - //occInRateQ1.setOccRateNotes(root.getOpEx_note13()); + //occOutRateQ1.setOccRateNotes(root.getNoteInScopeQ1()); LtcBedYtdOccupancyRate occRateQ1 = new LtcBedYtdOccupancyRate(); occRateQ1.setConfirmationID(root.getForm().getConfirmationId()); @@ -2492,7 +2492,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY occRateQ1.setYtdOccDays(root.getyTDOccupiedPrivateQ1()); occRateQ1.setPercentOcc(root.getOccupiedPercentagePrivateQ1()); occRateQ1.setOccRateQuarter("Q1"); - //occInRateQ1.setOccRateNotes(root.getNoteInScopeQ1()); + //occRateQ1.setOccRateNotes(root.getNoteInScopeQ1()); LtcBedYtdOccupancyRateTotals q1RateTotals = new LtcBedYtdOccupancyRateTotals(); q1RateTotals.setConfirmationID(root.getForm().getConfirmationId()); @@ -2579,6 +2579,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY occOutRateQ2.setYtdOccDays(root.getyTDOccupiedOutScopeQ2()); occOutRateQ2.setPercentOcc(root.getOccupiedPercentageOutScopeQ2()); occOutRateQ2.setOccRateQuarter("Q2"); + //occOutRateQ2.setOccRateNotes(root.getNoteInScopeQ2()); LtcBedYtdOccupancyRate occRateQ2 = new LtcBedYtdOccupancyRate(); occRateQ2.setConfirmationID(root.getForm().getConfirmationId()); @@ -2588,6 +2589,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY occRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ2()); occRateQ2.setPercentOcc(root.getOccupiedPercentagePrivateQ2()); occRateQ2.setOccRateQuarter("Q2"); + //occRateQ2.setOccRateNotes(root.getNoteInScopeQ2()); LtcBedYtdOccupancyRateTotals q2RateTotals = new LtcBedYtdOccupancyRateTotals(); q2RateTotals.setConfirmationID(root.getForm().getConfirmationId()); @@ -2669,6 +2671,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY occOutRateQ3.setYtdMaxOccDays(root.getyTDMaxOutScopeQ3()); occOutRateQ3.setYtdOccDays(root.getyTDOccupiedOutScopeQ3()); occOutRateQ3.setPercentOcc(root.getOccupiedPercentageOutScopeQ3()); + //occOutRateQ3.setOccRateNotes(root.getNoteInScopeQ3()); LtcBedYtdOccupancyRate occRateQ3 = new LtcBedYtdOccupancyRate(); occRateQ3.setConfirmationID(root.getForm().getConfirmationId()); @@ -2677,6 +2680,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY occRateQ3.setYtdMaxOccDays(root.getyTDMaxPrivateQ3()); occRateQ3.setYtdOccDays(root.getyTDOccupiedPrivateQ3()); occRateQ3.setPercentOcc(root.getOccupiedPercentagePrivateQ3()); + //occRateQ3.setOccRateNotes(root.getNoteInScopeQ3()); LtcBedYtdOccupancyRateTotals q3RateTotals = new LtcBedYtdOccupancyRateTotals(); q3RateTotals.setConfirmationID(root.getForm().getConfirmationId()); @@ -2760,6 +2764,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY occOutRateQ4.setYtdMaxOccDays(root.getyTDMaxOutScopeQ4()); occOutRateQ4.setYtdOccDays(root.getyTDOccupiedOutScopeQ4()); occOutRateQ4.setPercentOcc(root.getOccupiedPercentageOutScopeQ4()); + // occOutRateQ4.setOccRateNotes(root.getNoteInScopeQ4()); LtcBedYtdOccupancyRate occRateQ4 = new LtcBedYtdOccupancyRate(); occRateQ4.setConfirmationID(root.getForm().getConfirmationId()); @@ -2768,6 +2773,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY occRateQ4.setYtdMaxOccDays(root.getyTDMaxPrivateQ4()); occRateQ4.setYtdOccDays(root.getyTDOccupiedPrivateQ4()); occRateQ4.setPercentOcc(root.getOccupiedPercentagePrivateQ4()); + // occRateQ4.setOccRateNotes(root.getNoteInScopeQ4()); LtcBedYtdOccupancyRateTotals q4RateTotals = new LtcBedYtdOccupancyRateTotals(); q4RateTotals.setConfirmationID(root.getForm().getConfirmationId()); From 1f696df71acba4688853a6d8046edc79b7f38f38 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 3 May 2023 15:24:56 -0400 Subject: [PATCH 135/183] default values to all required fields if empty --- .../forms/ltc/facility/model/Approver.java | 14 +++-- .../facility/model/FacilityInformation.java | 57 ++++++++++--------- .../forms/ltc/facility/model/Preparer.java | 14 +++-- 3 files changed, 45 insertions(+), 40 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java index add5b4cf..d7863fad 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Approver.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -17,37 +19,37 @@ public String getConfirmationID() { return confirmationID; } public void setConfirmationID(String confirmationID) { - this.confirmationID = confirmationID; + this.confirmationID = StringUtils.defaultIfEmpty(confirmationID, Constants.DEFAULT_STRING_VALUE); } public String getApproverNum() { return approverNum; } public void setApproverNum(String approverNum) { - this.approverNum = approverNum; + this.approverNum = StringUtils.defaultIfEmpty(approverNum, Constants.DEFAULT_STRING_VALUE); } public String getApproverContactName() { return approverContactName; } public void setApproverContactName(String approverContactName) { - this.approverContactName = approverContactName; + this.approverContactName = StringUtils.defaultIfEmpty(approverContactName, Constants.DEFAULT_STRING_VALUE); } public String getApproverContactPosition() { return approverContactPosition; } public void setApproverContactPosition(String approverContactPosition) { - this.approverContactPosition = approverContactPosition; + this.approverContactPosition = StringUtils.defaultIfEmpty(approverContactPosition, Constants.DEFAULT_STRING_VALUE); } public String getApproverContactPhone() { return approverContactPhone; } public void setApproverContactPhone(String approverContactPhone) { - this.approverContactPhone = approverContactPhone; + this.approverContactPhone = StringUtils.defaultIfEmpty(approverContactPhone, Constants.DEFAULT_STRING_VALUE); } public String getApproverContactEmail() { return approverContactEmail; } public void setApproverContactEmail(String approverContactEmail) { - this.approverContactEmail = approverContactEmail; + this.approverContactEmail = StringUtils.defaultIfEmpty(approverContactEmail, Constants.DEFAULT_STRING_VALUE); } @Override public String getFileName() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java index 45876449..91ef35bd 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; import ca.bc.gov.chefs.etl.util.CSVUtil; @@ -51,43 +53,43 @@ public String getConfirmationID() { return ConfirmationID; } public void setConfirmationID(String confirmationID) { - ConfirmationID = confirmationID; + ConfirmationID = StringUtils.defaultIfEmpty(confirmationID, Constants.DEFAULT_STRING_VALUE); } public String getIsDeleted() { return IsDeleted; } public void setIsDeleted(String isDeleted) { - IsDeleted = isDeleted; + IsDeleted = StringUtils.defaultIfEmpty(isDeleted, Constants.DEFAULT_STRING_VALUE); } public String getSubmissionDate() { return CSVUtil.getFormattedDate(SubmissionDate); } public void setSubmissionDate(String submissionDate) { - SubmissionDate = submissionDate; + SubmissionDate = StringUtils.defaultIfEmpty(submissionDate, Constants.DEFAULT_STRING_VALUE); } public String getSubmittedby() { return Submittedby; } public void setSubmittedby(String submittedby) { - Submittedby = submittedby; + Submittedby = StringUtils.defaultIfEmpty(submittedby, Constants.DEFAULT_STRING_VALUE); } public String getFacilityName() { return FacilityName; } public void setFacilityName(String facilityName) { - FacilityName = facilityName; + FacilityName = StringUtils.defaultIfEmpty(facilityName, Constants.DEFAULT_STRING_VALUE); } public String getFacilityAddress() { return FacilityAddress; } public void setFacilityAddress(String facilityAddress) { - FacilityAddress = facilityAddress; + FacilityAddress = StringUtils.defaultIfEmpty(facilityAddress, Constants.DEFAULT_STRING_VALUE); } public String getFacilityCity() { return FacilityCity; } public void setFacilityCity(String facilityCity) { - FacilityCity = facilityCity; + FacilityCity = StringUtils.defaultIfEmpty(facilityCity, Constants.DEFAULT_STRING_VALUE); } public String getFacilityPostalCode() { return FacilityPostalCode; @@ -111,37 +113,37 @@ public String getCCIMSID() { return CCIMSID; } public void setCCIMSID(String cCIMSID) { - CCIMSID = cCIMSID; + CCIMSID = StringUtils.defaultIfEmpty(cCIMSID, Constants.DEFAULT_STRING_VALUE); } public String getProgramtype() { return Programtype; } public void setProgramtype(String programtype) { - Programtype = programtype; + Programtype = StringUtils.defaultIfEmpty(programtype, Constants.DEFAULT_STRING_VALUE); } public String getOwnershiptype() { return Ownershiptype; } public void setOwnershiptype(String ownershiptype) { - Ownershiptype = ownershiptype; + Ownershiptype = StringUtils.defaultIfEmpty(ownershiptype, Constants.DEFAULT_STRING_VALUE); } public String getLegislationtype() { return Legislationtype; } public void setLegislationtype(String legislationtype) { - Legislationtype = legislationtype; + Legislationtype = StringUtils.defaultIfEmpty(legislationtype, Constants.DEFAULT_STRING_VALUE); } public String getAccreditationBody() { return AccreditationBody; } public void setAccreditationBody(String accreditationBody) { - AccreditationBody = accreditationBody; + AccreditationBody = StringUtils.defaultIfEmpty(accreditationBody, Constants.DEFAULT_STRING_VALUE); } public String getAccreditationDate() { return CSVUtil.getFormattedDate(AccreditationDate); } public void setAccreditationDate(String accreditationDate) { - AccreditationDate = accreditationDate; + AccreditationDate = StringUtils.defaultIfEmpty(accreditationDate, Constants.DEFAULT_STRING_VALUE); } public String getAccreditationExpiryDate() { return CSVUtil.getFormattedDate(AccreditationExpiryDate); @@ -153,37 +155,37 @@ public String getHealthAuthority() { return HealthAuthority; } public void setHealthAuthority(String healthAuthority) { - HealthAuthority = healthAuthority; + HealthAuthority = StringUtils.defaultIfEmpty(healthAuthority, Constants.DEFAULT_STRING_VALUE); } public String getOwnerName() { return OwnerName; } public void setOwnerName(String ownerName) { - OwnerName = ownerName; + OwnerName = StringUtils.defaultIfEmpty(ownerName, Constants.DEFAULT_STRING_VALUE); } public String getOwnerAddress() { return OwnerAddress; } public void setOwnerAddress(String ownerAddress) { - OwnerAddress = ownerAddress; + OwnerAddress = StringUtils.defaultIfEmpty(ownerAddress, Constants.DEFAULT_STRING_VALUE); } public String getOwnerCity() { return OwnerCity; } public void setOwnerCity(String ownerCity) { - OwnerCity = ownerCity; + OwnerCity = StringUtils.defaultIfEmpty(ownerCity, Constants.DEFAULT_STRING_VALUE); } public String getOwnerpostalcode() { return Ownerpostalcode; } public void setOwnerpostalcode(String ownerpostalcode) { - Ownerpostalcode = ownerpostalcode; + Ownerpostalcode = StringUtils.defaultIfEmpty(ownerpostalcode, Constants.DEFAULT_STRING_VALUE); } public String getOwnercontactName() { return OwnercontactName; } public void setOwnercontactName(String ownercontactName) { - OwnercontactName = ownercontactName; + OwnercontactName = StringUtils.defaultIfEmpty(ownercontactName, Constants.DEFAULT_STRING_VALUE); } public String getOwnercontactphone() { return Ownercontactphone; @@ -195,37 +197,37 @@ public String getOwnercontactposition() { return Ownercontactposition; } public void setOwnercontactposition(String ownercontactposition) { - Ownercontactposition = ownercontactposition; + Ownercontactposition = StringUtils.defaultIfEmpty(ownercontactposition, Constants.DEFAULT_STRING_VALUE); } public String getOwnercontactemail() { return Ownercontactemail; } public void setOwnercontactemail(String ownercontactemail) { - Ownercontactemail = ownercontactemail; + Ownercontactemail = StringUtils.defaultIfEmpty(ownercontactemail, Constants.DEFAULT_STRING_VALUE); } public String getOperatorName() { return OperatorName; } public void setOperatorName(String operatorName) { - OperatorName = operatorName; + OperatorName = StringUtils.defaultIfEmpty(operatorName, Constants.DEFAULT_STRING_VALUE); } public String getOperatorAddress() { return OperatorAddress; } public void setOperatorAddress(String operatorAddress) { - OperatorAddress = operatorAddress; + OperatorAddress = StringUtils.defaultIfEmpty(operatorAddress, Constants.DEFAULT_STRING_VALUE); } public String getOperatorCity() { return OperatorCity; } public void setOperatorCity(String operatorCity) { - OperatorCity = operatorCity; + OperatorCity = StringUtils.defaultIfEmpty(operatorCity, Constants.DEFAULT_STRING_VALUE); } public String getOperatorpostalcode() { return Operatorpostalcode; } public void setOperatorpostalcode(String operatorpostalcode) { - Operatorpostalcode = operatorpostalcode; + Operatorpostalcode = StringUtils.defaultIfEmpty(operatorpostalcode, Constants.DEFAULT_STRING_VALUE); } public String getOperatorcontactName() { return OperatorcontactName; @@ -237,13 +239,13 @@ public String getOperatorcontactphone() { return Operatorcontactphone; } public void setOperatorcontactphone(String operatorcontactphone) { - Operatorcontactphone = operatorcontactphone; + Operatorcontactphone = StringUtils.defaultIfEmpty(operatorcontactphone, Constants.DEFAULT_STRING_VALUE); } public String getOperatorcontactposition() { return Operatorcontactposition; } public void setOperatorcontactposition(String operatorcontactposition) { - Operatorcontactposition = operatorcontactposition; + Operatorcontactposition = StringUtils.defaultIfEmpty(operatorcontactposition, Constants.DEFAULT_STRING_VALUE); } public String getOperatorcontactemail() { return Operatorcontactemail; @@ -251,7 +253,6 @@ public String getOperatorcontactemail() { public void setOperatorcontactemail(String operatorcontactemail) { Operatorcontactemail = operatorcontactemail; } - public List getApprovers() { return approvers; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java index 2576d90e..f2a37c41 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/Preparer.java @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.lang3.StringUtils; + import ca.bc.gov.chefs.etl.constant.Constants; import ca.bc.gov.chefs.etl.core.model.IModel; @@ -18,37 +20,37 @@ public String getConfirmationID() { return confirmationID; } public void setConfirmationID(String confirmationID) { - this.confirmationID = confirmationID; + this.confirmationID = StringUtils.defaultIfEmpty(confirmationID, Constants.DEFAULT_STRING_VALUE); } public String getPreparerNum() { return preparerNum; } public void setPreparerNum(String preparerNum) { - this.preparerNum = preparerNum; + this.preparerNum = StringUtils.defaultIfEmpty(preparerNum, Constants.DEFAULT_STRING_VALUE); } public String getPreparerContactName() { return preparerContactName; } public void setPreparerContactName(String preparerContactName) { - this.preparerContactName = preparerContactName; + this.preparerContactName = StringUtils.defaultIfEmpty(preparerContactName, Constants.DEFAULT_STRING_VALUE); } public String getPreparerContactPosition() { return preparerContactPosition; } public void setPreparerContactPosition(String preparerContactPosition) { - this.preparerContactPosition = preparerContactPosition; + this.preparerContactPosition = StringUtils.defaultIfEmpty(preparerContactPosition, Constants.DEFAULT_STRING_VALUE); } public String getPreparerContactPhone() { return preparerContactPhone; } public void setPreparerContactPhone(String preparerContactPhone) { - this.preparerContactPhone = preparerContactPhone; + this.preparerContactPhone = StringUtils.defaultIfEmpty(preparerContactPhone, Constants.DEFAULT_STRING_VALUE); } public String getPreparerContactEmail() { return preparerContactEmail; } public void setPreparerContactEmail(String preparerContactEmail) { - this.preparerContactEmail = preparerContactEmail; + this.preparerContactEmail = StringUtils.defaultIfEmpty(preparerContactEmail, Constants.DEFAULT_STRING_VALUE); } @Override public String getFileName() { From c6c1268604fdcfe6ede2a676b0b8f26ba34ff53a Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 8 May 2023 13:18:31 -0400 Subject: [PATCH 136/183] keeping a single Object to represent addresses --- .../forms/ltc/facility/json/Bcaddress.java | 2 - .../forms/ltc/facility/json/Bcaddress1.java | 30 --------- .../ltc/facility/json/OperatorAddress.java | 65 ------------------- 3 files changed, 97 deletions(-) delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress1.java delete mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress.java index c2e1eb1e..0abd8fb9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress.java @@ -25,7 +25,5 @@ public Properties getProperties() { public void setProperties(Properties properties) { this.properties = properties; } - - } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress1.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress1.java deleted file mode 100644 index 505c2e4e..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Bcaddress1.java +++ /dev/null @@ -1,30 +0,0 @@ -package ca.bc.gov.chefs.etl.forms.ltc.facility.json; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown=true) -public class Bcaddress1{ - public String type; - public Geometry geometry; - public Properties properties; - public String getType() { - return type; - } - public void setType(String type) { - this.type = type; - } - public Geometry getGeometry() { - return geometry; - } - public void setGeometry(Geometry geometry) { - this.geometry = geometry; - } - public Properties getProperties() { - return properties; - } - public void setProperties(Properties properties) { - this.properties = properties; - } - - -} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java deleted file mode 100644 index ac6eb30b..00000000 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/OperatorAddress.java +++ /dev/null @@ -1,65 +0,0 @@ -package ca.bc.gov.chefs.etl.forms.ltc.facility.json; - -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -import ca.bc.gov.chefs.etl.core.model.IModel; - -@JsonIgnoreProperties(ignoreUnknown=true) -public class OperatorAddress implements IModel{ - - public String type; - public Geometry geometry; - public Properties properties; - - - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public Geometry getGeometry() { - return geometry; - } - - public void setGeometry(Geometry geometry) { - this.geometry = geometry; - } - - public Properties getProperties() { - return properties; - } - - public void setProperties(Properties properties) { - this.properties = properties; - } - - @Override - public String getFileName() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getFormType() { - // TODO Auto-generated method stub - return null; - } - - @Override - public List getCsvElements() { - // TODO Auto-generated method stub - return null; - } - - @Override - public List getObjects() { - // TODO Auto-generated method stub - return null; - } -} From 4435aff851cbb86d39b95367d0049800ce7f5c5f Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 8 May 2023 13:19:07 -0400 Subject: [PATCH 137/183] complete change to the received payload, root updated accordingly --- .../etl/forms/ltc/facility/json/Root.java | 730 +++++++++--------- 1 file changed, 377 insertions(+), 353 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java index dee5cb2d..3334766b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java @@ -1,510 +1,521 @@ package ca.bc.gov.chefs.etl.forms.ltc.facility.json; + import java.util.List; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import ca.bc.gov.chefs.etl.core.model.IModel; -@JsonIgnoreProperties(ignoreUnknown=true) +@JsonIgnoreProperties(ignoreUnknown = true) public class Root { - + public Form form; - public String city1; - public String city3; - public String city5; - public String name2; - public String name3; - public String name4; - public String name5; - public String name6; - public String name7; - public String name8; - public String name9; - public String email2; - public String name10; - public String name11; - public String opName; - public Bcaddress bcaddress; - public String ownerName; - public String position3; - public String position4; - public String position6; - public String position7; - public String position8; - public String position9; - public String textField; - public Bcaddress1 bcaddress1; - public String position10; - public String position11; - public String position12; - public String position13; - public String contactName; - public String phoneNumber; - public String postalCode1; - public String postalCode3; - public String selectList1; - public String contactEmail; - public String contactName3; - public String phoneNumber3; - public String phoneNumber4; - public String phoneNumber5; - public String phoneNumber6; - public String phoneNumber7; - public String phoneNumber8; - public String phoneNumber9; - public String programType1; - public String simpleemail2; - public String simpleemail4; - public String simpleemail5; - public String simpleemail6; - public String simpleemail7; - public String simpleemail8; - public String simpleemail9; - public String contactEmail2; - public String facilityName2; - public String phoneNumber10; - public String phoneNumber11; - public String phoneNumber12; - public String simpleemail10; - public String simpleemail11; - public String ownershipType1; - public String contactPosition; - public String facilityWebsite; - public OperatorAddress operatorAddress; - public String contactPosition2; - public String healthAuthority1; - public String simpletextfield1; - public String accreditationBody; - public String accreditationDate1; - public String simplephonenumber3; - public String contactPhoneNumber2; - public String accreditationExpiryDate1; - public boolean isTheOwnerTheSameAsTheOperator1; + public String admin; + public String ccimsid; + public String lateEntry; + public String ownerCity; + public String ownerName; + public String phoneNumber; + public String facilityCity; + public String facilityName; + public String facilityType; + public String operatorCity; + public String operatorName; + public String approverName1; + public String approverName2; + public String approverName3; + public String approverName4; + public String approverName5; + public String approverEmail1; + public String approverEmail2; + public String approverEmail3; + public String approverEmail4; + public String approverEmail5; + public String submitterName1; + public String submitterName2; + public String submitterName3; + public String submitterName4; + public String submitterName5; + public String facilityAddress; + public String facilityWebsite; + public String healthAuthority; + public String ownerPostalCode; + public String submitterEmail1; + public String submitterEmail2; + public String submitterEmail3; + public String submitterEmail4; + public String submitterEmail5; + public String ownerContactName; + public String approverPosition1; + public String approverPosition2; + public String approverPosition3; + public String approverPosition4; + public String approverPosition5; + public String ownerContactEmail; + public String facilityPostalCode; + public String operatorPostalCode; + public String submitterPosition1; + public String submitterPosition2; + public String submitterPosition3; + public String submitterPosition4; + public String submitterPosition5; + public String operatorContactName; + public String operatorPhoneNumber; + public String approverPhoneNumber1; + public String approverPhoneNumber2; + public String approverPhoneNumber3; + public String approverPhoneNumber4; + public String approverPhoneNumber5; + public String operatorContactEmail; + public String ownerContactPosition; + public String facilityOwnershipType; + public String submitterPhoneNumber1; + public String submitterPhoneNumber2; + public String submitterPhoneNumber3; + public String submitterPhoneNumber4; + public String submitterPhoneNumber5; + public String facilityLegislationType; + public String operatorContactPosition; + public String ownerContactPhoneNumber; + public String facilityAccreditationBody; + public String facilityAccreditationDate; + public String localHealthAuthorityLhaName; + public String facilityAccreditationExpiryDate; + public boolean isTheOwnerTheSameAsTheOperator1; + public Bcaddress ownerAddress; + public Bcaddress operatorAddress; + public Form getForm() { return form; } public void setForm(Form form) { this.form = form; } - public String getCity1() { - return city1; + public String getAdmin() { + return admin; } - public void setCity1(String city1) { - this.city1 = city1; + public void setAdmin(String admin) { + this.admin = admin; } - public String getCity3() { - return city3; + public String getCcimsid() { + return ccimsid; } - public void setCity3(String city3) { - this.city3 = city3; + public void setCcimsid(String ccimsid) { + this.ccimsid = ccimsid; } - public String getCity5() { - return city5; + public String getLateEntry() { + return lateEntry; } - public void setCity5(String city5) { - this.city5 = city5; + public void setLateEntry(String lateEntry) { + this.lateEntry = lateEntry; } - public String getName2() { - return name2; + public String getOwnerCity() { + return ownerCity; } - public void setName2(String name2) { - this.name2 = name2; + public void setOwnerCity(String ownerCity) { + this.ownerCity = ownerCity; } - public String getName3() { - return name3; + public String getOwnerName() { + return ownerName; } - public void setName3(String name3) { - this.name3 = name3; + public void setOwnerName(String ownerName) { + this.ownerName = ownerName; } - public String getName4() { - return name4; + public String getPhoneNumber() { + return phoneNumber; } - public void setName4(String name4) { - this.name4 = name4; + public void setPhoneNumber(String phoneNumber) { + this.phoneNumber = phoneNumber; } - public String getName5() { - return name5; + public String getFacilityCity() { + return facilityCity; } - public void setName5(String name5) { - this.name5 = name5; + public void setFacilityCity(String facilityCity) { + this.facilityCity = facilityCity; } - public String getName6() { - return name6; + public String getFacilityName() { + return facilityName; } - public void setName6(String name6) { - this.name6 = name6; + public void setFacilityName(String facilityName) { + this.facilityName = facilityName; } - public String getName7() { - return name7; + public String getFacilityType() { + return facilityType; } - public void setName7(String name7) { - this.name7 = name7; + public void setFacilityType(String facilityType) { + this.facilityType = facilityType; } - public String getName8() { - return name8; + public String getOperatorCity() { + return operatorCity; } - public void setName8(String name8) { - this.name8 = name8; + public void setOperatorCity(String operatorCity) { + this.operatorCity = operatorCity; } - public String getName9() { - return name9; + public String getOperatorName() { + return operatorName; } - public void setName9(String name9) { - this.name9 = name9; + public void setOperatorName(String operatorName) { + this.operatorName = operatorName; } - public String getEmail2() { - return email2; + public String getApproverName1() { + return approverName1; } - public void setEmail2(String email2) { - this.email2 = email2; + public void setApproverName1(String approverName1) { + this.approverName1 = approverName1; } - public String getName10() { - return name10; + public String getApproverName2() { + return approverName2; } - public void setName10(String name10) { - this.name10 = name10; + public void setApproverName2(String approverName2) { + this.approverName2 = approverName2; } - public String getName11() { - return name11; + public String getApproverName3() { + return approverName3; } - public void setName11(String name11) { - this.name11 = name11; + public void setApproverName3(String approverName3) { + this.approverName3 = approverName3; } - public String getOpName() { - return opName; + public String getApproverName4() { + return approverName4; } - public void setOpName(String opName) { - this.opName = opName; + public void setApproverName4(String approverName4) { + this.approverName4 = approverName4; } - public Bcaddress getBcaddress() { - return bcaddress; + public String getApproverName5() { + return approverName5; } - public void setBcaddress(Bcaddress bcaddress) { - this.bcaddress = bcaddress; + public void setApproverName5(String approverName5) { + this.approverName5 = approverName5; } - public String getOwnerName() { - return ownerName; + public String getApproverEmail1() { + return approverEmail1; } - public void setOwnerName(String ownerName) { - this.ownerName = ownerName; + public void setApproverEmail1(String approverEmail1) { + this.approverEmail1 = approverEmail1; } - public String getPosition3() { - return position3; + public String getApproverEmail2() { + return approverEmail2; } - public void setPosition3(String position3) { - this.position3 = position3; + public void setApproverEmail2(String approverEmail2) { + this.approverEmail2 = approverEmail2; } - public String getPosition4() { - return position4; + public String getApproverEmail3() { + return approverEmail3; } - public void setPosition4(String position4) { - this.position4 = position4; + public void setApproverEmail3(String approverEmail3) { + this.approverEmail3 = approverEmail3; } - public String getPosition6() { - return position6; + public String getApproverEmail4() { + return approverEmail4; } - public void setPosition6(String position6) { - this.position6 = position6; + public void setApproverEmail4(String approverEmail4) { + this.approverEmail4 = approverEmail4; } - public String getPosition7() { - return position7; + public String getApproverEmail5() { + return approverEmail5; } - public void setPosition7(String position7) { - this.position7 = position7; + public void setApproverEmail5(String approverEmail5) { + this.approverEmail5 = approverEmail5; } - public String getPosition8() { - return position8; + public String getSubmitterName1() { + return submitterName1; } - public void setPosition8(String position8) { - this.position8 = position8; + public void setSubmitterName1(String submitterName1) { + this.submitterName1 = submitterName1; } - public String getPosition9() { - return position9; + public String getSubmitterName2() { + return submitterName2; } - public void setPosition9(String position9) { - this.position9 = position9; + public void setSubmitterName2(String submitterName2) { + this.submitterName2 = submitterName2; } - public String getTextField() { - return textField; + public String getSubmitterName3() { + return submitterName3; } - public void setTextField(String textField) { - this.textField = textField; + public void setSubmitterName3(String submitterName3) { + this.submitterName3 = submitterName3; } - public Bcaddress1 getBcaddress1() { - return bcaddress1; + public String getSubmitterName4() { + return submitterName4; } - public void setBcaddress1(Bcaddress1 bcaddress1) { - this.bcaddress1 = bcaddress1; + public void setSubmitterName4(String submitterName4) { + this.submitterName4 = submitterName4; } - public String getPosition10() { - return position10; + public String getSubmitterName5() { + return submitterName5; } - public void setPosition10(String position10) { - this.position10 = position10; + public void setSubmitterName5(String submitterName5) { + this.submitterName5 = submitterName5; } - public String getPosition11() { - return position11; + public String getFacilityAddress() { + return facilityAddress; + } + public void setFacilityAddress(String facilityAddress) { + this.facilityAddress = facilityAddress; + } + public String getFacilityWebsite() { + return facilityWebsite; } - public void setPosition11(String position11) { - this.position11 = position11; + public void setFacilityWebsite(String facilityWebsite) { + this.facilityWebsite = facilityWebsite; } - public String getPosition12() { - return position12; + public String getHealthAuthority() { + return healthAuthority; } - public void setPosition12(String position12) { - this.position12 = position12; + public void setHealthAuthority(String healthAuthority) { + this.healthAuthority = healthAuthority; } - public String getPosition13() { - return position13; + public String getOwnerPostalCode() { + return ownerPostalCode; } - public void setPosition13(String position13) { - this.position13 = position13; + public void setOwnerPostalCode(String ownerPostalCode) { + this.ownerPostalCode = ownerPostalCode; } - public String getContactName() { - return contactName; + public String getSubmitterEmail1() { + return submitterEmail1; } - public void setContactName(String contactName) { - this.contactName = contactName; + public void setSubmitterEmail1(String submitterEmail1) { + this.submitterEmail1 = submitterEmail1; } - public String getPhoneNumber() { - return phoneNumber; + public String getSubmitterEmail2() { + return submitterEmail2; } - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; + public void setSubmitterEmail2(String submitterEmail2) { + this.submitterEmail2 = submitterEmail2; } - public String getPostalCode1() { - return postalCode1; + public String getSubmitterEmail3() { + return submitterEmail3; } - public void setPostalCode1(String postalCode1) { - this.postalCode1 = postalCode1; + public void setSubmitterEmail3(String submitterEmail3) { + this.submitterEmail3 = submitterEmail3; } - public String getPostalCode3() { - return postalCode3; + public String getSubmitterEmail4() { + return submitterEmail4; } - public void setPostalCode3(String postalCode3) { - this.postalCode3 = postalCode3; + public void setSubmitterEmail4(String submitterEmail4) { + this.submitterEmail4 = submitterEmail4; } - public String getSelectList1() { - return selectList1; + public String getSubmitterEmail5() { + return submitterEmail5; } - public void setSelectList1(String selectList1) { - this.selectList1 = selectList1; + public void setSubmitterEmail5(String submitterEmail5) { + this.submitterEmail5 = submitterEmail5; } - public String getContactEmail() { - return contactEmail; + public String getOwnerContactName() { + return ownerContactName; } - public void setContactEmail(String contactEmail) { - this.contactEmail = contactEmail; + public void setOwnerContactName(String ownerContactName) { + this.ownerContactName = ownerContactName; } - public String getContactName3() { - return contactName3; + public String getApproverPosition1() { + return approverPosition1; } - public void setContactName3(String contactName3) { - this.contactName3 = contactName3; + public void setApproverPosition1(String approverPosition1) { + this.approverPosition1 = approverPosition1; } - public String getPhoneNumber3() { - return phoneNumber3; + public String getApproverPosition2() { + return approverPosition2; } - public void setPhoneNumber3(String phoneNumber3) { - this.phoneNumber3 = phoneNumber3; + public void setApproverPosition2(String approverPosition2) { + this.approverPosition2 = approverPosition2; } - public String getPhoneNumber4() { - return phoneNumber4; + public String getApproverPosition3() { + return approverPosition3; } - public void setPhoneNumber4(String phoneNumber4) { - this.phoneNumber4 = phoneNumber4; + public void setApproverPosition3(String approverPosition3) { + this.approverPosition3 = approverPosition3; } - public String getPhoneNumber5() { - return phoneNumber5; + public String getApproverPosition4() { + return approverPosition4; } - public void setPhoneNumber5(String phoneNumber5) { - this.phoneNumber5 = phoneNumber5; + public void setApproverPosition4(String approverPosition4) { + this.approverPosition4 = approverPosition4; } - public String getPhoneNumber6() { - return phoneNumber6; + public String getApproverPosition5() { + return approverPosition5; } - public void setPhoneNumber6(String phoneNumber6) { - this.phoneNumber6 = phoneNumber6; + public void setApproverPosition5(String approverPosition5) { + this.approverPosition5 = approverPosition5; } - public String getPhoneNumber7() { - return phoneNumber7; + public String getOwnerContactEmail() { + return ownerContactEmail; } - public void setPhoneNumber7(String phoneNumber7) { - this.phoneNumber7 = phoneNumber7; + public void setOwnerContactEmail(String ownerContactEmail) { + this.ownerContactEmail = ownerContactEmail; } - public String getPhoneNumber8() { - return phoneNumber8; + public String getFacilityPostalCode() { + return facilityPostalCode; } - public void setPhoneNumber8(String phoneNumber8) { - this.phoneNumber8 = phoneNumber8; + public void setFacilityPostalCode(String facilityPostalCode) { + this.facilityPostalCode = facilityPostalCode; } - public String getPhoneNumber9() { - return phoneNumber9; + public String getOperatorPostalCode() { + return operatorPostalCode; } - public void setPhoneNumber9(String phoneNumber9) { - this.phoneNumber9 = phoneNumber9; + public void setOperatorPostalCode(String operatorPostalCode) { + this.operatorPostalCode = operatorPostalCode; } - public String getProgramType1() { - return programType1; + public String getSubmitterPosition1() { + return submitterPosition1; } - public void setProgramType1(String programType1) { - this.programType1 = programType1; + public void setSubmitterPosition1(String submitterPosition1) { + this.submitterPosition1 = submitterPosition1; } - public String getSimpleemail2() { - return simpleemail2; + public String getSubmitterPosition2() { + return submitterPosition2; } - public void setSimpleemail2(String simpleemail2) { - this.simpleemail2 = simpleemail2; + public void setSubmitterPosition2(String submitterPosition2) { + this.submitterPosition2 = submitterPosition2; } - public String getSimpleemail4() { - return simpleemail4; + public String getSubmitterPosition3() { + return submitterPosition3; } - public void setSimpleemail4(String simpleemail4) { - this.simpleemail4 = simpleemail4; + public void setSubmitterPosition3(String submitterPosition3) { + this.submitterPosition3 = submitterPosition3; } - public String getSimpleemail5() { - return simpleemail5; + public String getSubmitterPosition4() { + return submitterPosition4; } - public void setSimpleemail5(String simpleemail5) { - this.simpleemail5 = simpleemail5; + public void setSubmitterPosition4(String submitterPosition4) { + this.submitterPosition4 = submitterPosition4; } - public String getSimpleemail6() { - return simpleemail6; + public String getSubmitterPosition5() { + return submitterPosition5; } - public void setSimpleemail6(String simpleemail6) { - this.simpleemail6 = simpleemail6; + public void setSubmitterPosition5(String submitterPosition5) { + this.submitterPosition5 = submitterPosition5; } - public String getSimpleemail7() { - return simpleemail7; + public String getOperatorContactName() { + return operatorContactName; } - public void setSimpleemail7(String simpleemail7) { - this.simpleemail7 = simpleemail7; + public void setOperatorContactName(String operatorContactName) { + this.operatorContactName = operatorContactName; } - public String getSimpleemail8() { - return simpleemail8; + public String getOperatorPhoneNumber() { + return operatorPhoneNumber; } - public void setSimpleemail8(String simpleemail8) { - this.simpleemail8 = simpleemail8; + public void setOperatorPhoneNumber(String operatorPhoneNumber) { + this.operatorPhoneNumber = operatorPhoneNumber; } - public String getSimpleemail9() { - return simpleemail9; + public String getApproverPhoneNumber1() { + return approverPhoneNumber1; } - public void setSimpleemail9(String simpleemail9) { - this.simpleemail9 = simpleemail9; + public void setApproverPhoneNumber1(String approverPhoneNumber1) { + this.approverPhoneNumber1 = approverPhoneNumber1; } - public String getContactEmail2() { - return contactEmail2; + public String getApproverPhoneNumber2() { + return approverPhoneNumber2; } - public void setContactEmail2(String contactEmail2) { - this.contactEmail2 = contactEmail2; + public void setApproverPhoneNumber2(String approverPhoneNumber2) { + this.approverPhoneNumber2 = approverPhoneNumber2; } - public String getFacilityName2() { - return facilityName2; + public String getApproverPhoneNumber3() { + return approverPhoneNumber3; } - public void setFacilityName2(String facilityName2) { - this.facilityName2 = facilityName2; + public void setApproverPhoneNumber3(String approverPhoneNumber3) { + this.approverPhoneNumber3 = approverPhoneNumber3; } - public String getPhoneNumber10() { - return phoneNumber10; + public String getApproverPhoneNumber4() { + return approverPhoneNumber4; } - public void setPhoneNumber10(String phoneNumber10) { - this.phoneNumber10 = phoneNumber10; + public void setApproverPhoneNumber4(String approverPhoneNumber4) { + this.approverPhoneNumber4 = approverPhoneNumber4; } - public String getPhoneNumber11() { - return phoneNumber11; + public String getApproverPhoneNumber5() { + return approverPhoneNumber5; } - public void setPhoneNumber11(String phoneNumber11) { - this.phoneNumber11 = phoneNumber11; + public void setApproverPhoneNumber5(String approverPhoneNumber5) { + this.approverPhoneNumber5 = approverPhoneNumber5; } - public String getPhoneNumber12() { - return phoneNumber12; + public String getOperatorContactEmail() { + return operatorContactEmail; } - public void setPhoneNumber12(String phoneNumber12) { - this.phoneNumber12 = phoneNumber12; + public void setOperatorContactEmail(String operatorContactEmail) { + this.operatorContactEmail = operatorContactEmail; } - public String getSimpleemail10() { - return simpleemail10; + public String getOwnerContactPosition() { + return ownerContactPosition; } - public void setSimpleemail10(String simpleemail10) { - this.simpleemail10 = simpleemail10; + public void setOwnerContactPosition(String ownerContactPosition) { + this.ownerContactPosition = ownerContactPosition; } - public String getSimpleemail11() { - return simpleemail11; + public String getFacilityOwnershipType() { + return facilityOwnershipType; } - public void setSimpleemail11(String simpleemail11) { - this.simpleemail11 = simpleemail11; + public void setFacilityOwnershipType(String facilityOwnershipType) { + this.facilityOwnershipType = facilityOwnershipType; } - public String getOwnershipType1() { - return ownershipType1; + public String getSubmitterPhoneNumber1() { + return submitterPhoneNumber1; } - public void setOwnershipType1(String ownershipType1) { - this.ownershipType1 = ownershipType1; + public void setSubmitterPhoneNumber1(String submitterPhoneNumber1) { + this.submitterPhoneNumber1 = submitterPhoneNumber1; } - public String getContactPosition() { - return contactPosition; + public String getSubmitterPhoneNumber2() { + return submitterPhoneNumber2; } - public void setContactPosition(String contactPosition) { - this.contactPosition = contactPosition; + public void setSubmitterPhoneNumber2(String submitterPhoneNumber2) { + this.submitterPhoneNumber2 = submitterPhoneNumber2; } - public String getFacilityWebsite() { - return facilityWebsite; + public String getSubmitterPhoneNumber3() { + return submitterPhoneNumber3; } - public void setFacilityWebsite(String facilityWebsite) { - this.facilityWebsite = facilityWebsite; + public void setSubmitterPhoneNumber3(String submitterPhoneNumber3) { + this.submitterPhoneNumber3 = submitterPhoneNumber3; } - public OperatorAddress getOperatorAddress() { - return operatorAddress; + public String getSubmitterPhoneNumber4() { + return submitterPhoneNumber4; } - public void setOperatorAddress(OperatorAddress operatorAddress) { - this.operatorAddress = operatorAddress; + public void setSubmitterPhoneNumber4(String submitterPhoneNumber4) { + this.submitterPhoneNumber4 = submitterPhoneNumber4; } - public String getContactPosition2() { - return contactPosition2; + public String getSubmitterPhoneNumber5() { + return submitterPhoneNumber5; } - public void setContactPosition2(String contactPosition2) { - this.contactPosition2 = contactPosition2; + public void setSubmitterPhoneNumber5(String submitterPhoneNumber5) { + this.submitterPhoneNumber5 = submitterPhoneNumber5; } - public String getHealthAuthority1() { - return healthAuthority1; + public String getFacilityLegislationType() { + return facilityLegislationType; } - public void setHealthAuthority1(String healthAuthority1) { - this.healthAuthority1 = healthAuthority1; + public void setFacilityLegislationType(String facilityLegislationType) { + this.facilityLegislationType = facilityLegislationType; } - public String getSimpletextfield1() { - return simpletextfield1; + public String getOperatorContactPosition() { + return operatorContactPosition; } - public void setSimpletextfield1(String simpletextfield1) { - this.simpletextfield1 = simpletextfield1; + public void setOperatorContactPosition(String operatorContactPosition) { + this.operatorContactPosition = operatorContactPosition; } - public String getAccreditationBody() { - return accreditationBody; + public String getOwnerContactPhoneNumber() { + return ownerContactPhoneNumber; } - public void setAccreditationBody(String accreditationBody) { - this.accreditationBody = accreditationBody; + public void setOwnerContactPhoneNumber(String ownerContactPhoneNumber) { + this.ownerContactPhoneNumber = ownerContactPhoneNumber; } - public String getAccreditationDate1() { - return accreditationDate1; + public String getFacilityAccreditationBody() { + return facilityAccreditationBody; } - public void setAccreditationDate1(String accreditationDate1) { - this.accreditationDate1 = accreditationDate1; + public void setFacilityAccreditationBody(String facilityAccreditationBody) { + this.facilityAccreditationBody = facilityAccreditationBody; } - public String getSimplephonenumber3() { - return simplephonenumber3; + public String getFacilityAccreditationDate() { + return facilityAccreditationDate; } - public void setSimplephonenumber3(String simplephonenumber3) { - this.simplephonenumber3 = simplephonenumber3; + public void setFacilityAccreditationDate(String facilityAccreditationDate) { + this.facilityAccreditationDate = facilityAccreditationDate; } - public String getContactPhoneNumber2() { - return contactPhoneNumber2; + public String getLocalHealthAuthorityLhaName() { + return localHealthAuthorityLhaName; } - public void setContactPhoneNumber2(String contactPhoneNumber2) { - this.contactPhoneNumber2 = contactPhoneNumber2; + public void setLocalHealthAuthorityLhaName(String localHealthAuthorityLhaName) { + this.localHealthAuthorityLhaName = localHealthAuthorityLhaName; } - public String getAccreditationExpiryDate1() { - return accreditationExpiryDate1; + public String getFacilityAccreditationExpiryDate() { + return facilityAccreditationExpiryDate; } - public void setAccreditationExpiryDate1(String accreditationExpiryDate1) { - this.accreditationExpiryDate1 = accreditationExpiryDate1; + public void setFacilityAccreditationExpiryDate(String facilityAccreditationExpiryDate) { + this.facilityAccreditationExpiryDate = facilityAccreditationExpiryDate; } public boolean isTheOwnerTheSameAsTheOperator1() { return isTheOwnerTheSameAsTheOperator1; @@ -512,4 +523,17 @@ public boolean isTheOwnerTheSameAsTheOperator1() { public void setTheOwnerTheSameAsTheOperator1(boolean isTheOwnerTheSameAsTheOperator1) { this.isTheOwnerTheSameAsTheOperator1 = isTheOwnerTheSameAsTheOperator1; } + public Bcaddress getOwnerAddress() { + return ownerAddress; + } + public void setOwnerAddress(Bcaddress ownerAddress) { + this.ownerAddress = ownerAddress; + } + public Bcaddress getOperatorAddress() { + return operatorAddress; + } + public void setOperatorAddress(Bcaddress operatorAddress) { + this.operatorAddress = operatorAddress; + } + } From 8a87bff977c4c137c26351cad84721d1aa0a8213 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 8 May 2023 13:19:50 -0400 Subject: [PATCH 138/183] full ETL process update for LTC facility --- .../FacilityInfoFormApiResponseProcessor.java | 139 +++++++++--------- 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java index 8540e904..229b2d78 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/processor/FacilityInfoFormApiResponseProcessor.java @@ -38,9 +38,10 @@ public void process(Exchange exchange) throws Exception { Map>> map = CSVUtil.provider(iModels); List filesGenerated = FileUtil.writeToCSVFile(map,Constants.LTC_FACILITY_DIR); - SuccessResponse successResponse = new SuccessResponse(); - successResponse.setFiles(filesGenerated); - exchange.getIn().setBody(mapper.writeValueAsString(successResponse)); + // TODO remove successReponse or uncomment + // SuccessResponse successResponse = new SuccessResponse(); + // successResponse.setFiles(filesGenerated); + // exchange.getIn().setBody(mapper.writeValueAsString(successResponse)); } private List parseFacilityInfo(List facilities) { @@ -48,43 +49,43 @@ private List parseFacilityInfo(List facilities) { List facilityInfoParsed = new ArrayList<>(); for(Root facility : facilities) { FacilityInformation facilityInfo = new FacilityInformation(); - facilityInfo.setAccreditationBody(facility.getAccreditationBody()); - facilityInfo.setAccreditationDate(facility.getAccreditationDate1()); - facilityInfo.setAccreditationExpiryDate(facility.getAccreditationExpiryDate1()); - facilityInfo.setCCIMSID(facility.getSimpletextfield1()); + facilityInfo.setAccreditationBody(facility.getFacilityAccreditationBody()); + facilityInfo.setAccreditationDate(facility.getFacilityAccreditationDate()); + facilityInfo.setAccreditationExpiryDate(facility.getFacilityAccreditationExpiryDate()); + facilityInfo.setCCIMSID(facility.getCcimsid()); facilityInfo.setConfirmationID(facility.getForm().getConfirmationId()); - facilityInfo.setFacilityAddress(facility.getBcaddress().getProperties().getFullAddress()); - facilityInfo.setFacilityCity(facility.getCity1()); - facilityInfo.setFacilityName(facility.getFacilityName2()); - facilityInfo.setFacilityPostalCode(facility.getTextField()); + facilityInfo.setFacilityAddress(facility.getFacilityAddress()); + facilityInfo.setFacilityCity(facility.getFacilityCity()); + facilityInfo.setFacilityName(facility.getFacilityName()); + facilityInfo.setFacilityPostalCode(facility.getFacilityPostalCode()); facilityInfo.setFacilityTelephone(facility.getPhoneNumber()); facilityInfo.setFacilityWebsite(facility.getFacilityWebsite()); - facilityInfo.setHealthAuthority(facility.getHealthAuthority1()); + facilityInfo.setHealthAuthority(facility.getHealthAuthority()); facilityInfo.setIsDeleted("false"); // TODO FIXME - facilityInfo.setLegislationtype(facility.getSelectList1()); - facilityInfo.setOwnerAddress(facility.getBcaddress1().getProperties().getFullAddress()); - facilityInfo.setOwnerCity(facility.getCity3()); - facilityInfo.setOwnercontactemail(facility.getContactEmail()); - facilityInfo.setOwnercontactName(facility.getContactName()); - facilityInfo.setOwnercontactposition(facility.getContactPosition()); + facilityInfo.setLegislationtype(facility.getFacilityLegislationType()); + facilityInfo.setOwnerAddress(facility.getOwnerAddress().getProperties().getFullAddress()); + facilityInfo.setOwnerCity(facility.getOwnerCity()); + facilityInfo.setOwnercontactemail(facility.getOwnerContactEmail()); + facilityInfo.setOwnercontactName(facility.getOwnerContactName()); + facilityInfo.setOwnercontactposition(facility.getOwnerContactPosition()); facilityInfo.setOwnerName(facility.getOwnerName()); - facilityInfo.setOwnercontactphone(facility.getPhoneNumber3()); - facilityInfo.setOwnerpostalcode(facility.getPostalCode1()); - facilityInfo.setOwnershiptype(facility.getOwnershipType1()); - facilityInfo.setProgramtype(facility.getProgramType1()); + facilityInfo.setOwnercontactphone(facility.getOwnerContactPhoneNumber()); + facilityInfo.setOwnerpostalcode(facility.getOwnerPostalCode()); + facilityInfo.setOwnershiptype(facility.getFacilityOwnershipType()); + facilityInfo.setProgramtype(facility.getFacilityType()); facilityInfo.setSubmissionDate(facility.getForm().getCreatedAt()); facilityInfo.setSubmittedby(facility.getForm().getEmail()); if(!facility.isTheOwnerTheSameAsTheOperator1()) { facilityInfo.setOperatorAddress(facility.getOperatorAddress().getProperties().getFullAddress()); - facilityInfo.setOperatorCity(facility.getCity5()); - facilityInfo.setOperatorcontactemail(facility.getContactEmail2()); - facilityInfo.setOperatorcontactName(facility.getContactName3()); - facilityInfo.setOperatorcontactphone(facility.getContactPhoneNumber2()); - facilityInfo.setOperatorcontactposition(facility.getContactPosition2()); - facilityInfo.setOperatorName(facility.getOpName()); - facilityInfo.setOperatorpostalcode(facility.getPostalCode3()); + facilityInfo.setOperatorCity(facility.getOperatorCity()); + facilityInfo.setOperatorcontactemail(facility.getOperatorContactEmail()); + facilityInfo.setOperatorcontactName(facility.getOperatorContactName()); + facilityInfo.setOperatorcontactphone(facility.getOperatorPhoneNumber()); + facilityInfo.setOperatorcontactposition(facility.getOperatorContactPosition()); + facilityInfo.setOperatorName(facility.getOperatorName()); + facilityInfo.setOperatorpostalcode(facility.getOperatorPostalCode()); }else { facilityInfo.setOperatorAddress(facilityInfo.getOwnerAddress()); facilityInfo.setOperatorCity(facilityInfo.getOwnerCity()); @@ -101,10 +102,10 @@ private List parseFacilityInfo(List facilities) { List preparers = new ArrayList(); Preparer preparer1 = new Preparer(); preparer1.setConfirmationID(facility.getForm().getConfirmationId()); - preparer1.setPreparerContactEmail(facility.getSimpleemail2()); - preparer1.setPreparerContactName(facility.getName2()); - preparer1.setPreparerContactPhone(facility.getPhoneNumber4()); - preparer1.setPreparerContactPosition(facility.getPosition3()); + preparer1.setPreparerContactEmail(facility.getSubmitterEmail1()); + preparer1.setPreparerContactName(facility.getSubmitterName1()); + preparer1.setPreparerContactPhone(facility.getSubmitterPhoneNumber1()); + preparer1.setPreparerContactPosition(facility.getSubmitterPosition1()); preparer1.setPreparerNum("1"); if(preparer1.getPreparerContactEmail().isBlank() || preparer1.getPreparerContactName().isBlank() || preparer1.getPreparerContactPhone().isBlank() || preparer1.getPreparerContactPosition().isBlank() || preparer1.getPreparerContactName().isBlank()) { @@ -115,10 +116,10 @@ private List parseFacilityInfo(List facilities) { Preparer preparer2 = new Preparer(); preparer2.setConfirmationID(facility.getForm().getConfirmationId()); - preparer2.setPreparerContactEmail(facility.getSimpleemail4()); - preparer2.setPreparerContactName(facility.getName4()); - preparer2.setPreparerContactPhone(facility.getPhoneNumber5()); - preparer2.setPreparerContactPosition(facility.getPosition6()); + preparer2.setPreparerContactEmail(facility.getSubmitterEmail2()); + preparer2.setPreparerContactName(facility.getSubmitterName2()); + preparer2.setPreparerContactPhone(facility.getSubmitterPhoneNumber2()); + preparer2.setPreparerContactPosition(facility.getSubmitterPosition2()); preparer2.setPreparerNum("2"); if(preparer2.getPreparerContactEmail().isBlank() || preparer2.getPreparerContactName().isBlank() || preparer2.getPreparerContactPhone().isBlank() || preparer2.getPreparerContactPosition().isBlank() || preparer2.getPreparerContactName().isBlank()) { @@ -130,10 +131,10 @@ private List parseFacilityInfo(List facilities) { Preparer preparer3 = new Preparer(); preparer3.setConfirmationID(facility.getForm().getConfirmationId()); - preparer3.setPreparerContactEmail(facility.getSimpleemail5()); - preparer3.setPreparerContactName(facility.getName5()); - preparer3.setPreparerContactPhone(facility.getPhoneNumber6()); - preparer3.setPreparerContactPosition(facility.getPosition7()); + preparer3.setPreparerContactEmail(facility.getSubmitterEmail3()); + preparer3.setPreparerContactName(facility.getSubmitterName3()); + preparer3.setPreparerContactPhone(facility.getSubmitterPhoneNumber3()); + preparer3.setPreparerContactPosition(facility.getSubmitterPosition3()); preparer3.setPreparerNum("3"); if(preparer3.getPreparerContactEmail().isBlank() || preparer3.getPreparerContactName().isBlank() || preparer3.getPreparerContactPhone().isBlank() || preparer3.getPreparerContactPosition().isBlank() || preparer3.getPreparerContactName().isBlank()) { @@ -145,10 +146,10 @@ private List parseFacilityInfo(List facilities) { Preparer preparer4 = new Preparer(); preparer4.setConfirmationID(facility.getForm().getConfirmationId()); - preparer4.setPreparerContactEmail(facility.getSimpleemail8()); - preparer4.setPreparerContactName(facility.getName8()); - preparer4.setPreparerContactPhone(facility.getPhoneNumber9()); - preparer4.setPreparerContactPosition(facility.getPosition10()); + preparer4.setPreparerContactEmail(facility.getSubmitterEmail4()); + preparer4.setPreparerContactName(facility.getSubmitterName4()); + preparer4.setPreparerContactPhone(facility.getSubmitterPhoneNumber4()); + preparer4.setPreparerContactPosition(facility.getSubmitterPosition4()); preparer4.setPreparerNum("4"); if(preparer4.getPreparerContactEmail().isBlank() || preparer4.getPreparerContactName().isBlank() || preparer4.getPreparerContactPhone().isBlank() || preparer4.getPreparerContactPosition().isBlank() || preparer4.getPreparerContactName().isBlank()) { @@ -160,10 +161,10 @@ private List parseFacilityInfo(List facilities) { Preparer preparer5 = new Preparer(); preparer5.setConfirmationID(facility.getForm().getConfirmationId()); - preparer5.setPreparerContactEmail(facility.getSimpleemail9()); - preparer5.setPreparerContactName(facility.getName9()); - preparer5.setPreparerContactPhone(facility.getPhoneNumber10()); - preparer5.setPreparerContactPosition(facility.getPosition11()); + preparer5.setPreparerContactEmail(facility.getSubmitterEmail5()); + preparer5.setPreparerContactName(facility.getSubmitterName5()); + preparer5.setPreparerContactPhone(facility.getSubmitterPhoneNumber5()); + preparer5.setPreparerContactPosition(facility.getSubmitterPosition5()); preparer5.setPreparerNum("5"); if(preparer5.getPreparerContactEmail().isBlank() || preparer5.getPreparerContactName().isBlank() || preparer5.getPreparerContactPhone().isBlank() || preparer5.getPreparerContactPosition().isBlank() || preparer5.getPreparerContactName().isBlank()) { @@ -174,10 +175,10 @@ private List parseFacilityInfo(List facilities) { List approvers = new ArrayList(); Approver approver1 = new Approver(); - approver1.setApproverContactEmail(facility.getEmail2()); - approver1.setApproverContactName(facility.getName3()); - approver1.setApproverContactPhone(facility.getSimplephonenumber3()); - approver1.setApproverContactPosition(facility.getPosition4()); + approver1.setApproverContactEmail(facility.getApproverEmail1()); + approver1.setApproverContactName(facility.getApproverName1()); + approver1.setApproverContactPhone(facility.getApproverPhoneNumber1()); + approver1.setApproverContactPosition(facility.getApproverPosition1()); approver1.setApproverNum("1"); approver1.setConfirmationID(facility.getForm().getConfirmationId()); @@ -188,10 +189,10 @@ private List parseFacilityInfo(List facilities) { } Approver approver2 = new Approver(); - approver2.setApproverContactEmail(facility.getEmail2()); - approver2.setApproverContactName(facility.getName6()); - approver2.setApproverContactPhone(facility.getPhoneNumber7()); - approver2.setApproverContactPosition(facility.getPosition8()); + approver2.setApproverContactEmail(facility.getApproverEmail2()); + approver2.setApproverContactName(facility.getApproverName2()); + approver2.setApproverContactPhone(facility.getApproverPhoneNumber2()); + approver2.setApproverContactPosition(facility.getApproverPosition2()); approver2.setApproverNum("2"); approver2.setConfirmationID(facility.getForm().getConfirmationId()); @@ -203,10 +204,10 @@ private List parseFacilityInfo(List facilities) { Approver approver3 = new Approver(); - approver3.setApproverContactEmail(facility.getSimpleemail6()); - approver3.setApproverContactName(facility.getName3()); - approver3.setApproverContactPhone(facility.getSimplephonenumber3()); - approver3.setApproverContactPosition(facility.getPosition4()); + approver3.setApproverContactEmail(facility.getApproverEmail3()); + approver3.setApproverContactName(facility.getApproverName3()); + approver3.setApproverContactPhone(facility.getApproverPhoneNumber3()); + approver3.setApproverContactPosition(facility.getApproverPosition3()); approver3.setApproverNum("3"); approver3.setConfirmationID(facility.getForm().getConfirmationId()); @@ -218,10 +219,10 @@ private List parseFacilityInfo(List facilities) { Approver approver4 = new Approver(); - approver4.setApproverContactEmail(facility.getSimpleemail10()); - approver4.setApproverContactName(facility.getName10()); - approver4.setApproverContactPhone(facility.getPhoneNumber11()); - approver4.setApproverContactPosition(facility.getPosition12()); + approver4.setApproverContactEmail(facility.getApproverEmail4()); + approver4.setApproverContactName(facility.getApproverName4()); + approver4.setApproverContactPhone(facility.getApproverPhoneNumber4()); + approver4.setApproverContactPosition(facility.getApproverPosition4()); approver4.setApproverNum("4"); approver4.setConfirmationID(facility.getForm().getConfirmationId()); @@ -233,10 +234,10 @@ private List parseFacilityInfo(List facilities) { Approver approver5 = new Approver(); - approver5.setApproverContactEmail(facility.getSimpleemail7()); - approver5.setApproverContactName(facility.getName7()); - approver5.setApproverContactPhone(facility.getPhoneNumber8()); - approver5.setApproverContactPosition(facility.getPosition9()); + approver5.setApproverContactEmail(facility.getApproverEmail5()); + approver5.setApproverContactName(facility.getApproverName5()); + approver5.setApproverContactPhone(facility.getApproverPhoneNumber5()); + approver5.setApproverContactPosition(facility.getApproverPosition5()); approver5.setApproverNum("5"); approver5.setConfirmationID(facility.getForm().getConfirmationId()); From 559a46cdd30fe682abe972d9b0db483de602775f Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 8 May 2023 14:18:16 -0400 Subject: [PATCH 139/183] removed unused value, causing trouble when auto populated feature was used on the form --- .../ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java index 3334766b..461b3dcb 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/json/Root.java @@ -79,7 +79,6 @@ public class Root { public String ownerContactPhoneNumber; public String facilityAccreditationBody; public String facilityAccreditationDate; - public String localHealthAuthorityLhaName; public String facilityAccreditationExpiryDate; public boolean isTheOwnerTheSameAsTheOperator1; public Bcaddress ownerAddress; @@ -505,12 +504,6 @@ public String getFacilityAccreditationDate() { public void setFacilityAccreditationDate(String facilityAccreditationDate) { this.facilityAccreditationDate = facilityAccreditationDate; } - public String getLocalHealthAuthorityLhaName() { - return localHealthAuthorityLhaName; - } - public void setLocalHealthAuthorityLhaName(String localHealthAuthorityLhaName) { - this.localHealthAuthorityLhaName = localHealthAuthorityLhaName; - } public String getFacilityAccreditationExpiryDate() { return facilityAccreditationExpiryDate; } From 572d9b97790c13bb42d1649b349f9331658f6ed6 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 8 May 2023 14:55:40 -0400 Subject: [PATCH 140/183] typo fix --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 2cc4412c..778f73f6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -149,7 +149,7 @@ public class Constants { "Facility_Postal_Code", "Facility_Telephone", "Facility_Website", "CCIMS_ID", "Program_type", "Ownership_type", "Legislation_type", "Accreditation_Body", "Accreditation_Date", "Accreditation_Expiry_Date", "Health_Authority", "Owner_Name", "Owner_Address", "Owner_City", - "Owner_postal_code", "Owner_contact_name","Owner_contact_phone","Owner_contact_position", "Owner_contact_email", "Operator_Name", + "Owner_postal_code", "Owner_contact_Name","Owner_contact_phone","Owner_contact_position", "Owner_contact_email", "Operator_Name", "Operator_Address", "Operator_City", "Operator_postal_code", "Operator_contact_Name", "Operator_contact_phone", "Operator_contact_position", "Operator_contact_email", }); From 39032b7a97648ea5d7140cc78fcb7720ed75de43 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 8 May 2023 16:42:37 -0400 Subject: [PATCH 141/183] complete remapping of received fields --- .../etl/forms/ltc/quarterly/json/Root.java | 1050 +++++++++-------- 1 file changed, 586 insertions(+), 464 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index fb53f777..44fb46be 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -572,10 +572,17 @@ public class Root{ public String compB_accrued1; public String compB_accrued2; public String compB_accrued3; - public String compB_calc1; - public String compB_calc10; - public String compB_calc11; - public String compB_calc12; + public String supportC_calc1; + @JsonProperty("adminC_item3-6") + public String adminC_item36; + @JsonProperty("adminC_item3-7") + public String adminC_item37; + @JsonProperty("adminC_item3-8") + public String adminC_item38; + @JsonProperty("adminC_item3-9") + public String adminC_item39; + @JsonProperty("adminC_item3-10") + public String adminC_item310; public String compB_calc13; public String compB_calc14; public String compB_calc15; @@ -583,7 +590,7 @@ public class Root{ public String compB_calc17; public String compB_calc18; public String compB_calc19; - public String compB_calc2; + public String supportC_calc2; public String compB_calc20; public String compB_calc21; public String compB_calc22; @@ -594,26 +601,35 @@ public class Root{ public String compB_calc27; public String compB_calc28; public String compB_calc29; - public String compB_calc3; - public String compB_calc4; - public String compB_calc5; - public String compB_calc6; - public String compB_calc7; - public String compB_calc8; - public String compB_calc9; - public String compB_calcsum1; - public String compB_calcsum2; + public String supportC_calc3; + public String supportC_calc4; + @JsonProperty("adminC_item3-1") + public String adminC_item31; + @JsonProperty("adminC_item3-2") + public String adminC_item32; + @JsonProperty("adminC_item3-3") + public String adminC_item33; + @JsonProperty("adminC_item3-4") + public String adminC_item34; + @JsonProperty("adminC_item3-5") + public String adminC_item35; + public String supportC_calcsum; + public String adminC_calcsum; public String compB_calcsum3; public String compB_calcsum4; public String compB_calcsum5; - @JsonProperty("compB_item1-1") - public String compB_item11; - @JsonProperty("compB_item1-10") - public String compB_item110; - @JsonProperty("compB_item1-11") - public String compB_item111; - @JsonProperty("compB_item1-12") - public String compB_item112; + @JsonProperty("supportC_item1-1") + public String supportC_item11; + @JsonProperty("adminC_item1-6") + public String adminC_item16; + @JsonProperty("adminC_item1-7") + public String adminC_item17; + @JsonProperty("adminC_item1-8") + public String adminC_item18; + @JsonProperty("adminC_item1-9") + public String adminC_item19; + @JsonProperty("adminC_item1-10") + public String adminC_item110; @JsonProperty("compB_item1-13") public String compB_item113; @JsonProperty("compB_item1-14") @@ -628,8 +644,8 @@ public class Root{ public String compB_item118; @JsonProperty("compB_item1-19") public String compB_item119; - @JsonProperty("compB_item1-2") - public String compB_item12; + @JsonProperty("supportC_item1-2") + public String supportC_item12; @JsonProperty("compB_item1-20") public String compB_item120; @JsonProperty("compB_item1-21") @@ -650,28 +666,32 @@ public class Root{ public String compB_item128; @JsonProperty("compB_item1-29") public String compB_item129; - @JsonProperty("compB_item1-3") - public String compB_item13; - @JsonProperty("compB_item1-4") - public String compB_item14; - @JsonProperty("compB_item1-5") - public String compB_item15; - @JsonProperty("compB_item1-6") - public String compB_item16; - @JsonProperty("compB_item1-7") - public String compB_item17; - @JsonProperty("compB_item1-8") - public String compB_item18; - @JsonProperty("compB_item1-9") - public String compB_item19; + @JsonProperty("supportC_item1-3") + public String supportC_item13; + @JsonProperty("supportC_item1-4") + public String supportC_item14; + @JsonProperty("adminC_item1-1") + public String adminC_item11; + @JsonProperty("adminC_item1-2") + public String adminC_item12; + @JsonProperty("adminC_item1-3") + public String adminC_item13; + @JsonProperty("adminC_item1-4") + public String adminC_item14; + @JsonProperty("adminC_item1-5") + public String adminC_item15; @JsonProperty("compB_item2-1") public String compB_item21; - @JsonProperty("compB_item2-10") - public String compB_item210; - @JsonProperty("compB_item2-11") - public String compB_item211; - @JsonProperty("compB_item2-12") - public String compB_item212; + @JsonProperty("adminC_item2-6") + public String adminC_item26; + @JsonProperty("adminC_item2-7") + public String adminC_item27; + @JsonProperty("adminC_item2-8") + public String adminC_item28; + @JsonProperty("adminC_item2-9") + public String adminC_item29; + @JsonProperty("adminC_item2-10") + public String adminC_item210; @JsonProperty("compB_item2-13") public String compB_item213; @JsonProperty("compB_item2-14") @@ -712,16 +732,16 @@ public class Root{ public String compB_item23; @JsonProperty("compB_item2-4") public String compB_item24; - @JsonProperty("compB_item2-5") - public String compB_item25; - @JsonProperty("compB_item2-6") - public String compB_item26; - @JsonProperty("compB_item2-7") - public String compB_item27; - @JsonProperty("compB_item2-8") - public String compB_item28; - @JsonProperty("compB_item2-9") - public String compB_item29; + @JsonProperty("adminC_item2-1") + public String adminC_item21; + @JsonProperty("adminC_item2-2") + public String adminC_item22; + @JsonProperty("adminC_item2-3") + public String adminC_item23; + @JsonProperty("adminC_item2-4") + public String adminC_item24; + @JsonProperty("adminC_item2-5") + public String adminC_item25; @JsonProperty("compB_item3-1") public String compB_item31; @JsonProperty("compB_item3-10") @@ -788,24 +808,22 @@ public class Root{ public String compB_recovered1; public String compB_recovered2; public String compB_recovered3; - @JsonProperty("compB_sum1-1") - public String compB_sum11; - @JsonProperty("compB_sum1-2") - public String compB_sum12; + public String supportC_sum1; + public String adminC_sum1; @JsonProperty("compB_sum1-3") public String compB_sum13; @JsonProperty("compB_sum1-4") public String compB_sum14; @JsonProperty("compB_sum1-5") public String compB_sum15; - @JsonProperty("compB_sum2-1") - public String compB_sum21; - @JsonProperty("compB_sum2-2") - public String compB_sum22; - @JsonProperty("compB_sum2-3") - public String compB_sum23; - @JsonProperty("compB_sum2-4") - public String compB_sum24; + @JsonProperty("supportC_item2-1") + public String supportC_item21; + @JsonProperty("supportC_item2-2") + public String supportC_item22; + @JsonProperty("supportC_item2-3") + public String supportC_item23; + @JsonProperty("supportC_item2-4") + public String supportC_item24; @JsonProperty("compB_sum2-5") public String compB_sum25; @JsonProperty("compB_sum3-1") @@ -826,10 +844,17 @@ public class Root{ public String compH_accrued2; public String compH_accrued3; public String compH_accrued4; - public String compH_calc1; - public String compH_calc10; - public String compH_calc11; - public String compH_calc12; + public String supportH_calc1; + @JsonProperty("adminH_item3-6") + public String adminH_item36; + @JsonProperty("adminH_item3-7") + public String adminH_item37; + @JsonProperty("adminH_item3-8") + public String adminH_item38; + @JsonProperty("adminH_item3-9") + public String adminH_item39; + @JsonProperty("adminH_item3-10") + public String adminH_item310; public String compH_calc13; public String compH_calc14; public String compH_calc15; @@ -837,7 +862,7 @@ public class Root{ public String compH_calc17; public String compH_calc18; public String compH_calc19; - public String compH_calc2; + public String supportH_calc2; public String compH_calc20; public String compH_calc21; public String compH_calc22; @@ -848,26 +873,35 @@ public class Root{ public String compH_calc27; public String compH_calc28; public String compH_calc29; - public String compH_calc3; - public String compH_calc4; - public String compH_calc5; - public String compH_calc6; - public String compH_calc7; - public String compH_calc8; - public String compH_calc9; - public String compH_calcsum1; - public String compH_calcsum2; + public String supportH_calc3; + public String supportH_calc4; + @JsonProperty("adminH_item3-1") + public String adminH_item31; + @JsonProperty("adminH_item3-2") + public String adminH_item32; + @JsonProperty("adminH_item3-3") + public String adminH_item33; + @JsonProperty("adminH_item3-4") + public String adminH_item34; + @JsonProperty("adminH_item3-5") + public String adminH_item35; + public String supportH_calcsum; + public String adminH_calcsum; public String compH_calcsum3; public String compH_calcsum4; public String compH_calcsum5; - @JsonProperty("compH_item1-1") - public String compH_item11; - @JsonProperty("compH_item1-10") - public String compH_item110; - @JsonProperty("compH_item1-11") - public String compH_item111; - @JsonProperty("compH_item1-12") - public String compH_item112; + @JsonProperty("supportH_item1-1") + public String supportH_item11; + @JsonProperty("adminH_item1-6") + public String adminH_item16; + @JsonProperty("adminH_item1-7") + public String adminH_item17; + @JsonProperty("adminH_item1-8") + public String adminH_item18; + @JsonProperty("adminH_item1-9") + public String adminH_item19; + @JsonProperty("adminH_item1-10") + public String adminH_item110; @JsonProperty("compH_item1-13") public String compH_item113; @JsonProperty("compH_item1-14") @@ -882,8 +916,8 @@ public class Root{ public String compH_item118; @JsonProperty("compH_item1-19") public String compH_item119; - @JsonProperty("compH_item1-2") - public String compH_item12; + @JsonProperty("supportH_item1-2") + public String supportH_item12; @JsonProperty("compH_item1-20") public String compH_item120; @JsonProperty("compH_item1-21") @@ -904,28 +938,32 @@ public class Root{ public String compH_item128; @JsonProperty("compH_item1-29") public String compH_item129; - @JsonProperty("compH_item1-3") - public String compH_item13; - @JsonProperty("compH_item1-4") - public String compH_item14; - @JsonProperty("compH_item1-5") - public String compH_item15; - @JsonProperty("compH_item1-6") - public String compH_item16; - @JsonProperty("compH_item1-7") - public String compH_item17; - @JsonProperty("compH_item1-8") - public String compH_item18; - @JsonProperty("compH_item1-9") - public String compH_item19; - @JsonProperty("compH_item2-1") - public String compH_item21; - @JsonProperty("compH_item2-10") - public String compH_item210; - @JsonProperty("compH_item2-11") - public String compH_item211; - @JsonProperty("compH_item2-12") - public String compH_item212; + @JsonProperty("supportH_item1-3") + public String supportH_item13; + @JsonProperty("supportH_item1-4") + public String supportH_item14; + @JsonProperty("adminH_item1-1") + public String adminH_item11; + @JsonProperty("adminH_item1-2") + public String adminH_item12; + @JsonProperty("adminH_item1-3") + public String adminH_item13; + @JsonProperty("adminH_item1-4") + public String adminH_item14; + @JsonProperty("adminH_item1-5") + public String adminH_item15; + @JsonProperty("supportH_item2-1") + public String supportH_item21; + @JsonProperty("adminH_item2-6") + public String adminH_item26; + @JsonProperty("adminH_item2-7") + public String adminH_item27; + @JsonProperty("adminH_item2-8") + public String adminH_item28; + @JsonProperty("adminH_item2-9") + public String adminH_item29; + @JsonProperty("adminH_item2-10") + public String adminH_item210; @JsonProperty("compH_item2-13") public String compH_item213; @JsonProperty("compH_item2-14") @@ -940,8 +978,8 @@ public class Root{ public String compH_item218; @JsonProperty("compH_item2-19") public String compH_item219; - @JsonProperty("compH_item2-2") - public String compH_item22; + @JsonProperty("supportH_item2-2") + public String supportH_item22; @JsonProperty("compH_item2-20") public String compH_item220; @JsonProperty("compH_item2-21") @@ -962,20 +1000,20 @@ public class Root{ public String compH_item228; @JsonProperty("compH_item2-29") public String compH_item229; - @JsonProperty("compH_item2-3") - public String compH_item23; - @JsonProperty("compH_item2-4") - public String compH_item24; - @JsonProperty("compH_item2-5") - public String compH_item25; - @JsonProperty("compH_item2-6") - public String compH_item26; - @JsonProperty("compH_item2-7") - public String compH_item27; - @JsonProperty("compH_item2-8") - public String compH_item28; - @JsonProperty("compH_item2-9") - public String compH_item29; + @JsonProperty("supportH_item2-3") + public String supportH_item23; + @JsonProperty("supportH_item2-4") + public String supportH_item24; + @JsonProperty("adminH_item2-1") + public String adminH_item21; + @JsonProperty("adminH_item2-2") + public String adminH_item22; + @JsonProperty("adminH_item2-3") + public String adminH_item23; + @JsonProperty("adminH_item2-4") + public String adminH_item24; + @JsonProperty("adminH_item2-5") + public String adminH_item25; @JsonProperty("compH_item3-1") public String compH_item31; @JsonProperty("compH_item3-10") @@ -1066,20 +1104,16 @@ public class Root{ public String compH_PHPsum3; public String compH_PHPsum4; public String compH_PHPsum5; - @JsonProperty("compH_sum1-1") - public String compH_sum11; - @JsonProperty("compH_sum1-2") - public String compH_sum12; + public String supportH_sum1; + public String adminH_sum1; @JsonProperty("compH_sum1-3") public String compH_sum13; @JsonProperty("compH_sum1-4") public String compH_sum14; @JsonProperty("compH_sum1-5") public String compH_sum15; - @JsonProperty("compH_sum2-1") - public String compH_sum21; - @JsonProperty("compH_sum2-2") - public String compH_sum22; + public String supportH_sum2; + public String adminH_sum2; @JsonProperty("compH_sum2-3") public String compH_sum23; @JsonProperty("compH_sum2-4") @@ -1926,6 +1960,10 @@ public class Root{ public String admin_label7; @JsonProperty("admin_label-8") public String admin_label8; + @JsonProperty("admin_label-9") + public String admin_label9; + @JsonProperty("admin_label-10") + public String admin_label10; public String admin_label_subtotal; public String nursing_label_comp; @JsonProperty("nursing_label_comp-1") @@ -2568,6 +2606,18 @@ public String getAdmin_label8() { public void setAdmin_label8(String admin_label8) { this.admin_label8 = admin_label8; } + public String getAdmin_label9() { + return admin_label9; + } + public void setAdmin_label9(String admin_label9) { + this.admin_label9 = admin_label9; + } + public String getAdmin_label10() { + return admin_label10; + } + public void setAdmin_label10(String admin_label10) { + this.admin_label10 = admin_label10; + } public String getAdmin_label_subtotal() { return admin_label_subtotal; } @@ -5094,29 +5144,41 @@ public String getCompB_accrued3() { public void setCompB_accrued3(String compB_accrued3) { this.compB_accrued3 = compB_accrued3; } - public String getCompB_calc1() { - return compB_calc1; + public String getSupportC_calc1() { + return supportC_calc1; + } + public void setSupportC_calc1(String compB_calc1) { + this.supportC_calc1 = compB_calc1; + } + public String getAdminC_item36() { + return adminC_item36; + } + public void setAdminC_item36(String compB_calc10) { + this.adminC_item36 = compB_calc10; } - public void setCompB_calc1(String compB_calc1) { - this.compB_calc1 = compB_calc1; + public String getAdminC_item37() { + return adminC_item37; } - public String getCompB_calc10() { - return compB_calc10; + public void setAdminC_item37(String compB_calc11) { + this.adminC_item37 = compB_calc11; } - public void setCompB_calc10(String compB_calc10) { - this.compB_calc10 = compB_calc10; + public String getAdminC_item38() { + return adminC_item38; } - public String getCompB_calc11() { - return compB_calc11; + public void setAdminC_item38(String adminC_item38) { + this.adminC_item38 = adminC_item38; } - public void setCompB_calc11(String compB_calc11) { - this.compB_calc11 = compB_calc11; + public String getAdminC_item39() { + return adminC_item39; } - public String getCompB_calc12() { - return compB_calc12; + public void setAdminC_item39(String adminC_item39) { + this.adminC_item39 = adminC_item39; } - public void setCompB_calc12(String compB_calc12) { - this.compB_calc12 = compB_calc12; + public String getAdminC_item310() { + return adminC_item310; + } + public void setAdminC_item310(String compB_calc12) { + this.adminC_item310 = compB_calc12; } public String getCompB_calc13() { return compB_calc13; @@ -5160,11 +5222,11 @@ public String getCompB_calc19() { public void setCompB_calc19(String compB_calc19) { this.compB_calc19 = compB_calc19; } - public String getCompB_calc2() { - return compB_calc2; + public String getSupportC_calc2() { + return supportC_calc2; } - public void setCompB_calc2(String compB_calc2) { - this.compB_calc2 = compB_calc2; + public void setSupportC_calc2(String compB_calc2) { + this.supportC_calc2 = compB_calc2; } public String getCompB_calc20() { return compB_calc20; @@ -5226,59 +5288,59 @@ public String getCompB_calc29() { public void setCompB_calc29(String compB_calc29) { this.compB_calc29 = compB_calc29; } - public String getCompB_calc3() { - return compB_calc3; + public String getSupportC_calc3() { + return supportC_calc3; } - public void setCompB_calc3(String compB_calc3) { - this.compB_calc3 = compB_calc3; + public void setSupportC_calc3(String compB_calc3) { + this.supportC_calc3 = compB_calc3; } - public String getCompB_calc4() { - return compB_calc4; + public String getSupportC_calc4() { + return supportC_calc4; } - public void setCompB_calc4(String compB_calc4) { - this.compB_calc4 = compB_calc4; + public void setSupportC_calc4(String compB_calc4) { + this.supportC_calc4 = compB_calc4; } - public String getCompB_calc5() { - return compB_calc5; + public String getAdminC_item31() { + return adminC_item31; } - public void setCompB_calc5(String compB_calc5) { - this.compB_calc5 = compB_calc5; + public void setAdminC_item31(String compB_calc5) { + this.adminC_item31 = compB_calc5; } - public String getCompB_calc6() { - return compB_calc6; + public String getAdminC_item32() { + return adminC_item32; } - public void setCompB_calc6(String compB_calc6) { - this.compB_calc6 = compB_calc6; + public void setAdminC_item32(String compB_calc6) { + this.adminC_item32 = compB_calc6; } - public String getCompB_calc7() { - return compB_calc7; + public String getAdminC_item33() { + return adminC_item33; } - public void setCompB_calc7(String compB_calc7) { - this.compB_calc7 = compB_calc7; + public void setAdminC_item33(String compB_calc7) { + this.adminC_item33 = compB_calc7; } - public String getCompB_calc8() { - return compB_calc8; + public String getAdminC_item34() { + return adminC_item34; } - public void setCompB_calc8(String compB_calc8) { - this.compB_calc8 = compB_calc8; + public void setAdminC_item34(String compB_calc8) { + this.adminC_item34 = compB_calc8; } - public String getCompB_calc9() { - return compB_calc9; + public String getAdminC_item35() { + return adminC_item35; } - public void setCompB_calc9(String compB_calc9) { - this.compB_calc9 = compB_calc9; + public void setAdminC_item35(String compB_calc9) { + this.adminC_item35 = compB_calc9; } - public String getCompB_calcsum1() { - return compB_calcsum1; + public String getSupportC_calcsum() { + return supportC_calcsum; } - public void setCompB_calcsum1(String compB_calcsum1) { - this.compB_calcsum1 = compB_calcsum1; + public void setSupportC_calcsum(String compB_calcsum1) { + this.supportC_calcsum = compB_calcsum1; } - public String getCompB_calcsum2() { - return compB_calcsum2; + public String getAdminC_calcsum() { + return adminC_calcsum; } - public void setCompB_calcsum2(String compB_calcsum2) { - this.compB_calcsum2 = compB_calcsum2; + public void setAdminC_calcsum(String compB_calcsum2) { + this.adminC_calcsum = compB_calcsum2; } public String getCompB_calcsum3() { return compB_calcsum3; @@ -5298,29 +5360,41 @@ public String getCompB_calcsum5() { public void setCompB_calcsum5(String compB_calcsum5) { this.compB_calcsum5 = compB_calcsum5; } - public String getCompB_item11() { - return compB_item11; + public String getSupportC_item11() { + return supportC_item11; + } + public void setSupportC_item11(String compB_item11) { + this.supportC_item11 = compB_item11; + } + public String getAdminC_item16() { + return adminC_item16; + } + public void setAdminC_item16(String compB_item110) { + this.adminC_item16 = compB_item110; } - public void setCompB_item11(String compB_item11) { - this.compB_item11 = compB_item11; + public String getAdminC_item17() { + return adminC_item17; } - public String getCompB_item110() { - return compB_item110; + public void setAdminC_item17(String compB_item111) { + this.adminC_item17 = compB_item111; } - public void setCompB_item110(String compB_item110) { - this.compB_item110 = compB_item110; + public String getAdminC_item18() { + return adminC_item18; } - public String getCompB_item111() { - return compB_item111; + public void setAdminC_item18(String adminC_item18) { + this.adminC_item18 = adminC_item18; } - public void setCompB_item111(String compB_item111) { - this.compB_item111 = compB_item111; + public String getAdminC_item19() { + return adminC_item19; } - public String getCompB_item112() { - return compB_item112; + public void setAdminC_item19(String adminC_item19) { + this.adminC_item19 = adminC_item19; } - public void setCompB_item112(String compB_item112) { - this.compB_item112 = compB_item112; + public String getAdminC_item110() { + return adminC_item110; + } + public void setAdminC_item110(String compB_item112) { + this.adminC_item110 = compB_item112; } public String getCompB_item113() { return compB_item113; @@ -5364,11 +5438,11 @@ public String getCompB_item119() { public void setCompB_item119(String compB_item119) { this.compB_item119 = compB_item119; } - public String getCompB_item12() { - return compB_item12; + public String getSupportC_item12() { + return supportC_item12; } - public void setCompB_item12(String compB_item12) { - this.compB_item12 = compB_item12; + public void setSupportC_item12(String compB_item12) { + this.supportC_item12 = compB_item12; } public String getCompB_item120() { return compB_item120; @@ -5442,47 +5516,47 @@ public String getCompB_item229() { public void setCompB_item229(String compB_item229) { this.compB_item229 = compB_item229; } - public String getCompB_item13() { - return compB_item13; + public String getSupportC_item13() { + return supportC_item13; } - public void setCompB_item13(String compB_item13) { - this.compB_item13 = compB_item13; + public void setSupportC_item13(String compB_item13) { + this.supportC_item13 = compB_item13; } - public String getCompB_item14() { - return compB_item14; + public String getSupportC_item14() { + return supportC_item14; } - public void setCompB_item14(String compB_item14) { - this.compB_item14 = compB_item14; + public void setSupportC_item14(String compB_item14) { + this.supportC_item14 = compB_item14; } - public String getCompB_item15() { - return compB_item15; + public String getAdminC_item11() { + return adminC_item11; } - public void setCompB_item15(String compB_item15) { - this.compB_item15 = compB_item15; + public void setAdminC_item11(String compB_item15) { + this.adminC_item11 = compB_item15; } - public String getCompB_item16() { - return compB_item16; + public String getAdminC_item12() { + return adminC_item12; } - public void setCompB_item16(String compB_item16) { - this.compB_item16 = compB_item16; + public void setAdminC_item12(String compB_item16) { + this.adminC_item12 = compB_item16; } - public String getCompB_item17() { - return compB_item17; + public String getAdminC_item13() { + return adminC_item13; } - public void setCompB_item17(String compB_item17) { - this.compB_item17 = compB_item17; + public void setAdminC_item13(String compB_item17) { + this.adminC_item13 = compB_item17; } - public String getCompB_item18() { - return compB_item18; + public String getAdminC_item14() { + return adminC_item14; } - public void setCompB_item18(String compB_item18) { - this.compB_item18 = compB_item18; + public void setAdminC_item14(String compB_item18) { + this.adminC_item14 = compB_item18; } - public String getCompB_item19() { - return compB_item19; + public String getAdminC_item15() { + return adminC_item15; } - public void setCompB_item19(String compB_item19) { - this.compB_item19 = compB_item19; + public void setAdminC_item15(String compB_item19) { + this.adminC_item15 = compB_item19; } public String getCompB_item21() { return compB_item21; @@ -5490,23 +5564,35 @@ public String getCompB_item21() { public void setCompB_item21(String compB_item21) { this.compB_item21 = compB_item21; } - public String getCompB_item210() { - return compB_item210; + public String getAdminC_item26() { + return adminC_item26; + } + public void setAdminC_item26(String compB_item210) { + this.adminC_item26 = compB_item210; + } + public String getAdminC_item27() { + return adminC_item27; } - public void setCompB_item210(String compB_item210) { - this.compB_item210 = compB_item210; + public void setAdminC_item27(String compB_item211) { + this.adminC_item27 = compB_item211; } - public String getCompB_item211() { - return compB_item211; + public String getAdminC_item28() { + return adminC_item28; } - public void setCompB_item211(String compB_item211) { - this.compB_item211 = compB_item211; + public void setAdminC_item28(String adminC_item28) { + this.adminC_item28 = adminC_item28; } - public String getCompB_item212() { - return compB_item212; + public String getAdminC_item29() { + return adminC_item29; } - public void setCompB_item212(String compB_item212) { - this.compB_item212 = compB_item212; + public void setAdminC_item29(String adminC_item29) { + this.adminC_item29 = adminC_item29; + } + public String getAdminC_item210() { + return adminC_item210; + } + public void setAdminC_item210(String compB_item212) { + this.adminC_item210 = compB_item212; } public String getCompB_item213() { return compB_item213; @@ -5616,35 +5702,35 @@ public String getCompB_item24() { public void setCompB_item24(String compB_item24) { this.compB_item24 = compB_item24; } - public String getCompB_item25() { - return compB_item25; + public String getAdminC_item21() { + return adminC_item21; } - public void setCompB_item25(String compB_item25) { - this.compB_item25 = compB_item25; + public void setAdminC_item21(String compB_item25) { + this.adminC_item21 = compB_item25; } - public String getCompB_item26() { - return compB_item26; + public String getAdminC_item22() { + return adminC_item22; } - public void setCompB_item26(String compB_item26) { - this.compB_item26 = compB_item26; + public void setAdminC_item22(String compB_item26) { + this.adminC_item22 = compB_item26; } - public String getCompB_item27() { - return compB_item27; + public String getAdminC_item23() { + return adminC_item23; } - public void setCompB_item27(String compB_item27) { - this.compB_item27 = compB_item27; + public void setAdminC_item23(String compB_item27) { + this.adminC_item23 = compB_item27; } - public String getCompB_item28() { - return compB_item28; + public String getAdminC_item24() { + return adminC_item24; } - public void setCompB_item28(String compB_item28) { - this.compB_item28 = compB_item28; + public void setAdminC_item24(String compB_item28) { + this.adminC_item24 = compB_item28; } - public String getCompB_item29() { - return compB_item29; + public String getAdminC_item25() { + return adminC_item25; } - public void setCompB_item29(String compB_item29) { - this.compB_item29 = compB_item29; + public void setAdminC_item25(String compB_item29) { + this.adminC_item25 = compB_item29; } public String getCompB_item31() { return compB_item31; @@ -5868,17 +5954,17 @@ public String getCompB_recovered3() { public void setCompB_recovered3(String compB_recovered3) { this.compB_recovered3 = compB_recovered3; } - public String getCompB_sum11() { - return compB_sum11; + public String getSupportC_sum1() { + return supportC_sum1; } - public void setCompB_sum11(String compB_sum11) { - this.compB_sum11 = compB_sum11; + public void setSupportC_sum1(String compB_sum11) { + this.supportC_sum1 = compB_sum11; } - public String getCompB_sum12() { - return compB_sum12; + public String getAdminC_sum1() { + return adminC_sum1; } - public void setCompB_sum12(String compB_sum12) { - this.compB_sum12 = compB_sum12; + public void setAdminC_sum1(String compB_sum12) { + this.adminC_sum1 = compB_sum12; } public String getCompB_sum13() { return compB_sum13; @@ -5898,29 +5984,29 @@ public String getCompB_sum15() { public void setCompB_sum15(String compB_sum15) { this.compB_sum15 = compB_sum15; } - public String getCompB_sum21() { - return compB_sum21; + public String getSupportC_item21() { + return supportC_item21; } - public void setCompB_sum21(String compB_sum21) { - this.compB_sum21 = compB_sum21; + public void setSupportC_item21(String compB_sum21) { + this.supportC_item21 = compB_sum21; } - public String getCompB_sum22() { - return compB_sum22; + public String getSupportC_item22() { + return supportC_item22; } - public void setCompB_sum22(String compB_sum22) { - this.compB_sum22 = compB_sum22; + public void setSupportC_item22(String compB_sum22) { + this.supportC_item22 = compB_sum22; } - public String getCompB_sum23() { - return compB_sum23; + public String getSupportC_item23() { + return supportC_item23; } - public void setCompB_sum23(String compB_sum23) { - this.compB_sum23 = compB_sum23; + public void setSupportC_item23(String compB_sum23) { + this.supportC_item23 = compB_sum23; } - public String getCompB_sum24() { - return compB_sum24; + public String getSupportC_item24() { + return supportC_item24; } - public void setCompB_sum24(String compB_sum24) { - this.compB_sum24 = compB_sum24; + public void setSupportC_item24(String compB_sum24) { + this.supportC_item24 = compB_sum24; } public String getCompB_sum25() { return compB_sum25; @@ -6006,29 +6092,41 @@ public String getCompH_accrued4() { public void setCompH_accrued4(String compH_accrued4) { this.compH_accrued4 = compH_accrued4; } - public String getCompH_calc1() { - return compH_calc1; + public String getSupportH_calc1() { + return supportH_calc1; + } + public void setSupportH_calc1(String compH_calc1) { + this.supportH_calc1 = compH_calc1; + } + public String getAdminH_item36() { + return adminH_item36; } - public void setCompH_calc1(String compH_calc1) { - this.compH_calc1 = compH_calc1; + public void setAdminH_item36(String compH_calc10) { + this.adminH_item36 = compH_calc10; } - public String getCompH_calc10() { - return compH_calc10; + public String getAdminH_item37() { + return adminH_item37; } - public void setCompH_calc10(String compH_calc10) { - this.compH_calc10 = compH_calc10; + public void setAdminH_item37(String compH_calc11) { + this.adminH_item37 = compH_calc11; } - public String getCompH_calc11() { - return compH_calc11; + public String getAdminH_item38() { + return adminH_item38; } - public void setCompH_calc11(String compH_calc11) { - this.compH_calc11 = compH_calc11; + public void setAdminH_item38(String adminH_item38) { + this.adminH_item38 = adminH_item38; } - public String getCompH_calc12() { - return compH_calc12; + public String getAdminH_item39() { + return adminH_item39; } - public void setCompH_calc12(String compH_calc12) { - this.compH_calc12 = compH_calc12; + public void setAdminH_item39(String adminH_item39) { + this.adminH_item39 = adminH_item39; + } + public String getAdminH_item310() { + return adminH_item310; + } + public void setAdminH_item310(String compH_calc12) { + this.adminH_item310 = compH_calc12; } public String getCompH_calc13() { return compH_calc13; @@ -6072,11 +6170,11 @@ public String getCompH_calc19() { public void setCompH_calc19(String compH_calc19) { this.compH_calc19 = compH_calc19; } - public String getCompH_calc2() { - return compH_calc2; + public String getSupportH_calc2() { + return supportH_calc2; } - public void setCompH_calc2(String compH_calc2) { - this.compH_calc2 = compH_calc2; + public void setSupportH_calc2(String compH_calc2) { + this.supportH_calc2 = compH_calc2; } public String getCompH_calc20() { return compH_calc20; @@ -6138,59 +6236,59 @@ public String getCompH_calc29() { public void setCompH_calc29(String compH_calc29) { this.compH_calc29 = compH_calc29; } - public String getCompH_calc3() { - return compH_calc3; + public String getSupportH_calc3() { + return supportH_calc3; } - public void setCompH_calc3(String compH_calc3) { - this.compH_calc3 = compH_calc3; + public void setSupportH_calc3(String compH_calc3) { + this.supportH_calc3 = compH_calc3; } - public String getCompH_calc4() { - return compH_calc4; + public String getSupportH_calc4() { + return supportH_calc4; } - public void setCompH_calc4(String compH_calc4) { - this.compH_calc4 = compH_calc4; + public void setSupportH_calc4(String compH_calc4) { + this.supportH_calc4 = compH_calc4; } - public String getCompH_calc5() { - return compH_calc5; + public String getAdminH_item31() { + return adminH_item31; } - public void setCompH_calc5(String compH_calc5) { - this.compH_calc5 = compH_calc5; + public void setAdminH_item31(String compH_calc5) { + this.adminH_item31 = compH_calc5; } - public String getCompH_calc6() { - return compH_calc6; + public String getAdminH_item32() { + return adminH_item32; } - public void setCompH_calc6(String compH_calc6) { - this.compH_calc6 = compH_calc6; + public void setAdminH_item32(String compH_calc6) { + this.adminH_item32 = compH_calc6; } - public String getCompH_calc7() { - return compH_calc7; + public String getAdminH_item33() { + return adminH_item33; } - public void setCompH_calc7(String compH_calc7) { - this.compH_calc7 = compH_calc7; + public void setAdminH_item33(String compH_calc7) { + this.adminH_item33 = compH_calc7; } - public String getCompH_calc8() { - return compH_calc8; + public String getAdminH_item34() { + return adminH_item34; } - public void setCompH_calc8(String compH_calc8) { - this.compH_calc8 = compH_calc8; + public void setAdminH_item34(String compH_calc8) { + this.adminH_item34 = compH_calc8; } - public String getCompH_calc9() { - return compH_calc9; + public String getAdminH_item35() { + return adminH_item35; } - public void setCompH_calc9(String compH_calc9) { - this.compH_calc9 = compH_calc9; + public void setAdminH_item35(String compH_calc9) { + this.adminH_item35 = compH_calc9; } - public String getCompH_calcsum1() { - return compH_calcsum1; + public String getSupportH_calcsum() { + return supportH_calcsum; } - public void setCompH_calcsum1(String compH_calcsum1) { - this.compH_calcsum1 = compH_calcsum1; + public void setSupportH_calcsum(String compH_calcsum1) { + this.supportH_calcsum = compH_calcsum1; } - public String getCompH_calcsum2() { - return compH_calcsum2; + public String getAdminH_calcsum() { + return adminH_calcsum; } - public void setCompH_calcsum2(String compH_calcsum2) { - this.compH_calcsum2 = compH_calcsum2; + public void setAdminH_calcsum(String compH_calcsum2) { + this.adminH_calcsum = compH_calcsum2; } public String getCompH_calcsum3() { return compH_calcsum3; @@ -6210,29 +6308,41 @@ public String getCompH_calcsum5() { public void setCompH_calcsum5(String compH_calcsum5) { this.compH_calcsum5 = compH_calcsum5; } - public String getCompH_item11() { - return compH_item11; + public String getSupportH_item11() { + return supportH_item11; + } + public void setSupportH_item11(String compH_item11) { + this.supportH_item11 = compH_item11; } - public void setCompH_item11(String compH_item11) { - this.compH_item11 = compH_item11; + public String getAdminH_item16() { + return adminH_item16; } - public String getCompH_item110() { - return compH_item110; + public void setAdminH_item16(String compH_item110) { + this.adminH_item16 = compH_item110; } - public void setCompH_item110(String compH_item110) { - this.compH_item110 = compH_item110; + public String getAdminH_item17() { + return adminH_item17; } - public String getCompH_item111() { - return compH_item111; + public void setAdminH_item17(String compH_item111) { + this.adminH_item17 = compH_item111; } - public void setCompH_item111(String compH_item111) { - this.compH_item111 = compH_item111; + public String getAdminH_item18() { + return adminH_item18; } - public String getCompH_item112() { - return compH_item112; + public void setAdminH_item18(String adminH_item18) { + this.adminH_item18 = adminH_item18; } - public void setCompH_item112(String compH_item112) { - this.compH_item112 = compH_item112; + public String getAdminH_item19() { + return adminH_item19; + } + public void setAdminH_item19(String adminH_item19) { + this.adminH_item19 = adminH_item19; + } + public String getAdminH_item110() { + return adminH_item110; + } + public void setAdminH_item110(String compH_item112) { + this.adminH_item110 = compH_item112; } public String getCompH_item113() { return compH_item113; @@ -6276,11 +6386,11 @@ public String getCompH_item119() { public void setCompH_item119(String compH_item119) { this.compH_item119 = compH_item119; } - public String getCompH_item12() { - return compH_item12; + public String getSupportH_item12() { + return supportH_item12; } - public void setCompH_item12(String compH_item12) { - this.compH_item12 = compH_item12; + public void setSupportH_item12(String compH_item12) { + this.supportH_item12 = compH_item12; } public String getCompH_item120() { return compH_item120; @@ -6342,71 +6452,83 @@ public String getCompH_item129() { public void setCompH_item129(String compH_item129) { this.compH_item129 = compH_item129; } - public String getCompH_item13() { - return compH_item13; + public String getSupportH_item13() { + return supportH_item13; + } + public void setSupportH_item13(String compH_item13) { + this.supportH_item13 = compH_item13; + } + public String getSupportH_item14() { + return supportH_item14; + } + public void setSupportH_item14(String compH_item14) { + this.supportH_item14 = compH_item14; + } + public String getAdminH_item11() { + return adminH_item11; } - public void setCompH_item13(String compH_item13) { - this.compH_item13 = compH_item13; + public void setAdminH_item11(String compH_item15) { + this.adminH_item11 = compH_item15; } - public String getCompH_item14() { - return compH_item14; + public String getAdminH_item12() { + return adminH_item12; } - public void setCompH_item14(String compH_item14) { - this.compH_item14 = compH_item14; + public void setAdminH_item12(String compH_item16) { + this.adminH_item12 = compH_item16; } - public String getCompH_item15() { - return compH_item15; + public String getAdminH_item13() { + return adminH_item13; } - public void setCompH_item15(String compH_item15) { - this.compH_item15 = compH_item15; + public void setAdminH_item13(String compH_item17) { + this.adminH_item13 = compH_item17; } - public String getCompH_item16() { - return compH_item16; + public String getAdminH_item14() { + return adminH_item14; } - public void setCompH_item16(String compH_item16) { - this.compH_item16 = compH_item16; + public void setAdminH_item14(String compH_item18) { + this.adminH_item14 = compH_item18; } - public String getCompH_item17() { - return compH_item17; + public String getAdminH_item15() { + return adminH_item15; } - public void setCompH_item17(String compH_item17) { - this.compH_item17 = compH_item17; + public void setAdminH_item15(String compH_item19) { + this.adminH_item15 = compH_item19; } - public String getCompH_item18() { - return compH_item18; + public String getSupportH_item21() { + return supportH_item21; } - public void setCompH_item18(String compH_item18) { - this.compH_item18 = compH_item18; + public void setSupportH_item21(String compH_item21) { + this.supportH_item21 = compH_item21; } - public String getCompH_item19() { - return compH_item19; + public String getAdminH_item26() { + return adminH_item26; } - public void setCompH_item19(String compH_item19) { - this.compH_item19 = compH_item19; + public void setAdminH_item26(String compH_item210) { + this.adminH_item26 = compH_item210; } - public String getCompH_item21() { - return compH_item21; + public String getAdminH_item27() { + return adminH_item27; } - public void setCompH_item21(String compH_item21) { - this.compH_item21 = compH_item21; + public void setAdminH_item27(String compH_item211) { + this.adminH_item27 = compH_item211; } - public String getCompH_item210() { - return compH_item210; + public String getAdminH_item28() { + return adminH_item28; } - public void setCompH_item210(String compH_item210) { - this.compH_item210 = compH_item210; + public void setAdminH_item28(String adminH_item28) { + this.adminH_item28 = adminH_item28; } - public String getCompH_item211() { - return compH_item211; + public String getAdminH_item29() { + return adminH_item29; } - public void setCompH_item211(String compH_item211) { - this.compH_item211 = compH_item211; + public void setAdminH_item29(String adminH_item29) { + this.adminH_item29 = adminH_item29; } - public String getCompH_item212() { - return compH_item212; + public String getAdminH_item210() { + return adminH_item210; } - public void setCompH_item212(String compH_item212) { - this.compH_item212 = compH_item212; + public void setAdminH_item210(String compH_item212) { + this.adminH_item210 = compH_item212; } public String getCompH_item213() { return compH_item213; @@ -6450,11 +6572,11 @@ public String getCompH_item219() { public void setCompH_item219(String compH_item219) { this.compH_item219 = compH_item219; } - public String getCompH_item22() { - return compH_item22; + public String getSupportH_item22() { + return supportH_item22; } - public void setCompH_item22(String compH_item22) { - this.compH_item22 = compH_item22; + public void setSupportH_item22(String compH_item22) { + this.supportH_item22 = compH_item22; } public String getCompH_item220() { return compH_item220; @@ -6516,47 +6638,47 @@ public String getCompH_item229() { public void setCompH_item229(String compH_item229) { this.compH_item229 = compH_item229; } - public String getCompH_item23() { - return compH_item23; + public String getSupportH_item23() { + return supportH_item23; } - public void setCompH_item23(String compH_item23) { - this.compH_item23 = compH_item23; + public void setSupportH_item23(String compH_item23) { + this.supportH_item23 = compH_item23; } - public String getCompH_item24() { - return compH_item24; + public String getSupportH_item24() { + return supportH_item24; } - public void setCompH_item24(String compH_item24) { - this.compH_item24 = compH_item24; + public void setSupportH_item24(String compH_item24) { + this.supportH_item24 = compH_item24; } - public String getCompH_item25() { - return compH_item25; + public String getAdminH_item21() { + return adminH_item21; } - public void setCompH_item25(String compH_item25) { - this.compH_item25 = compH_item25; + public void setAdminH_item21(String compH_item25) { + this.adminH_item21 = compH_item25; } - public String getCompH_item26() { - return compH_item26; + public String getAdminH_item22() { + return adminH_item22; } - public void setCompH_item26(String compH_item26) { - this.compH_item26 = compH_item26; + public void setAdminH_item22(String compH_item26) { + this.adminH_item22 = compH_item26; } - public String getCompH_item27() { - return compH_item27; + public String getAdminH_item23() { + return adminH_item23; } - public void setCompH_item27(String compH_item27) { - this.compH_item27 = compH_item27; + public void setAdminH_item23(String compH_item27) { + this.adminH_item23 = compH_item27; } - public String getCompH_item28() { - return compH_item28; + public String getAdminH_item24() { + return adminH_item24; } - public void setCompH_item28(String compH_item28) { - this.compH_item28 = compH_item28; + public void setAdminH_item24(String compH_item28) { + this.adminH_item24 = compH_item28; } - public String getCompH_item29() { - return compH_item29; + public String getAdminH_item25() { + return adminH_item25; } - public void setCompH_item29(String compH_item29) { - this.compH_item29 = compH_item29; + public void setAdminH_item25(String compH_item29) { + this.adminH_item25 = compH_item29; } public String getCompH_item31() { return compH_item31; @@ -6924,17 +7046,17 @@ public String getCompH_PHPsum5() { public void setCompH_PHPsum5(String compH_PHPsum5) { this.compH_PHPsum5 = compH_PHPsum5; } - public String getCompH_sum11() { - return compH_sum11; + public String getSupportH_sum1() { + return supportH_sum1; } - public void setCompH_sum11(String compH_sum11) { - this.compH_sum11 = compH_sum11; + public void setSupportH_sum1(String compH_sum11) { + this.supportH_sum1 = compH_sum11; } - public String getCompH_sum12() { - return compH_sum12; + public String getAdminH_sum1() { + return adminH_sum1; } - public void setCompH_sum12(String compH_sum12) { - this.compH_sum12 = compH_sum12; + public void setAdminH_sum1(String compH_sum12) { + this.adminH_sum1 = compH_sum12; } public String getCompH_sum13() { return compH_sum13; @@ -6954,17 +7076,17 @@ public String getCompH_sum15() { public void setCompH_sum15(String compH_sum15) { this.compH_sum15 = compH_sum15; } - public String getCompH_sum21() { - return compH_sum21; + public String getSupportH_sum2() { + return supportH_sum2; } - public void setCompH_sum21(String compH_sum21) { - this.compH_sum21 = compH_sum21; + public void setSupportH_sum2(String compH_sum21) { + this.supportH_sum2 = compH_sum21; } - public String getCompH_sum22() { - return compH_sum22; + public String getAdminH_sum2() { + return adminH_sum2; } - public void setCompH_sum22(String compH_sum22) { - this.compH_sum22 = compH_sum22; + public void setAdminH_sum2(String compH_sum22) { + this.adminH_sum2 = compH_sum22; } public String getCompH_sum23() { return compH_sum23; From 28107abec766032a113dc2c5757ed42c479a8a0f Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 8 May 2023 16:43:38 -0400 Subject: [PATCH 142/183] using new received mapping, added newly added rows from form --- .../LtcQuarterlyYtdApiResponseProcessor.java | 244 ++++++++++-------- 1 file changed, 140 insertions(+), 104 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 77414cca..93c98deb 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -821,113 +821,131 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY * Contracted Services. */ LtcYtdCompSal supportFoodServices = new LtcYtdCompSal(); - supportFoodServices.setCompSalStaffYtd(root.getCompB_item11()); + supportFoodServices.setCompSalStaffYtd(root.getSupportC_item11()); supportFoodServices.setCompSalContractServicesYtd(root.getCompB_item21()); supportFoodServices.setCompSalOfficeAllocYtd(root.getCompB_item31()); supportFoodServices.setCompSalName(root.getSupport_label1()); supportFoodServices.setCompSalType(root.getSupport_label()); supportFoodServices.setConfirmationId(root.getForm().getConfirmationId()); - supportFoodServices.setCompSalTotalCostYtd(root.getCompB_calc1()); + supportFoodServices.setCompSalTotalCostYtd(root.getSupportC_calc1()); LtcYtdCompSal supportLaundryServices = new LtcYtdCompSal(); - supportLaundryServices.setCompSalStaffYtd(root.getCompB_item12()); + supportLaundryServices.setCompSalStaffYtd(root.getSupportC_item12()); supportLaundryServices.setCompSalContractServicesYtd(root.getCompB_item22()); supportLaundryServices.setCompSalOfficeAllocYtd(root.getCompB_item32()); supportLaundryServices.setCompSalName(root.getSupport_label2()); supportLaundryServices.setCompSalType(root.getSupport_label()); supportLaundryServices.setConfirmationId(root.getForm().getConfirmationId()); - supportLaundryServices.setCompSalTotalCostYtd(root.getCompB_calc2()); + supportLaundryServices.setCompSalTotalCostYtd(root.getSupportC_calc2()); LtcYtdCompSal supportHousekeeping = new LtcYtdCompSal(); - supportHousekeeping.setCompSalStaffYtd(root.getCompB_item13()); + supportHousekeeping.setCompSalStaffYtd(root.getSupportC_item13()); supportHousekeeping.setCompSalContractServicesYtd(root.getCompB_item23()); supportHousekeeping.setCompSalOfficeAllocYtd(root.getCompB_item33()); supportHousekeeping.setCompSalName(root.getSupport_label3()); supportHousekeeping.setCompSalType(root.getSupport_label()); supportHousekeeping.setConfirmationId(root.getForm().getConfirmationId()); - supportHousekeeping.setCompSalTotalCostYtd(root.getCompB_calc3()); + supportHousekeeping.setCompSalTotalCostYtd(root.getSupportC_calc3()); LtcYtdCompSal supportPlantMntnce = new LtcYtdCompSal(); - supportPlantMntnce.setCompSalStaffYtd(root.getCompB_item14()); + supportPlantMntnce.setCompSalStaffYtd(root.getSupportC_item14()); supportPlantMntnce.setCompSalContractServicesYtd(root.getCompB_item24()); supportPlantMntnce.setCompSalOfficeAllocYtd(root.getCompB_item34()); supportPlantMntnce.setCompSalName(root.getSupport_label4()); supportPlantMntnce.setCompSalType(root.getSupport_label()); supportPlantMntnce.setConfirmationId(root.getForm().getConfirmationId()); - supportPlantMntnce.setCompSalTotalCostYtd(root.getCompB_calc4()); + supportPlantMntnce.setCompSalTotalCostYtd(root.getSupportC_calc4()); // Administration LtcYtdCompSal adminAdministrator = new LtcYtdCompSal(); - adminAdministrator.setCompSalStaffYtd(root.getCompB_item15()); - adminAdministrator.setCompSalContractServicesYtd(root.getCompB_item25()); - adminAdministrator.setCompSalOfficeAllocYtd(root.getCompB_item35()); + adminAdministrator.setCompSalStaffYtd(root.getAdminC_item11()); + adminAdministrator.setCompSalContractServicesYtd(root.getAdminC_item21()); + adminAdministrator.setCompSalOfficeAllocYtd(""); adminAdministrator.setCompSalName(root.getAdmin_label1()); adminAdministrator.setCompSalType(root.getAdmin_label()); adminAdministrator.setConfirmationId(root.getForm().getConfirmationId()); - adminAdministrator.setCompSalTotalCostYtd(root.getCompB_calc5()); + adminAdministrator.setCompSalTotalCostYtd(root.getAdminC_item31()); LtcYtdCompSal adminDirOfCare = new LtcYtdCompSal(); - adminDirOfCare.setCompSalStaffYtd(root.getCompB_item16()); - adminDirOfCare.setCompSalContractServicesYtd(root.getCompB_item26()); - adminDirOfCare.setCompSalOfficeAllocYtd(root.getCompB_item36()); + adminDirOfCare.setCompSalStaffYtd(root.getAdminC_item12()); + adminDirOfCare.setCompSalContractServicesYtd(root.getAdminC_item22()); + adminDirOfCare.setCompSalOfficeAllocYtd(""); adminDirOfCare.setCompSalName(root.getAdmin_label2()); adminDirOfCare.setCompSalType(root.getAdmin_label()); adminDirOfCare.setConfirmationId(root.getForm().getConfirmationId()); - adminDirOfCare.setCompSalTotalCostYtd(root.getCompB_calc6()); + adminDirOfCare.setCompSalTotalCostYtd(root.getAdminC_item32()); LtcYtdCompSal adminDeptManagers = new LtcYtdCompSal(); - adminDeptManagers.setCompSalStaffYtd(root.getCompB_item17()); - adminDeptManagers.setCompSalContractServicesYtd(root.getCompB_item27()); - adminDeptManagers.setCompSalOfficeAllocYtd(root.getCompB_item37()); + adminDeptManagers.setCompSalStaffYtd(root.getAdminC_item13()); + adminDeptManagers.setCompSalContractServicesYtd(root.getAdminC_item23()); + adminDeptManagers.setCompSalOfficeAllocYtd(""); adminDeptManagers.setCompSalName(root.getAdmin_label3()); adminDeptManagers.setCompSalType(root.getAdmin_label()); adminDeptManagers.setConfirmationId(root.getForm().getConfirmationId()); - adminDeptManagers.setCompSalTotalCostYtd(root.getCompB_calc7()); + adminDeptManagers.setCompSalTotalCostYtd(root.getAdminC_item33()); LtcYtdCompSal adminSupport = new LtcYtdCompSal(); - adminSupport.setCompSalStaffYtd(root.getCompB_item18()); - adminSupport.setCompSalContractServicesYtd(root.getCompB_item28()); - adminSupport.setCompSalOfficeAllocYtd(root.getCompB_item38()); + adminSupport.setCompSalStaffYtd(root.getAdminC_item14()); + adminSupport.setCompSalContractServicesYtd(root.getAdminC_item24()); + adminSupport.setCompSalOfficeAllocYtd(""); adminSupport.setCompSalName(root.getAdmin_label4()); adminSupport.setCompSalType(root.getAdmin_label()); adminSupport.setConfirmationId(root.getForm().getConfirmationId()); - adminSupport.setCompSalTotalCostYtd(root.getCompB_calc8()); + adminSupport.setCompSalTotalCostYtd(root.getAdminC_item34()); LtcYtdCompSal adminPastoCareWrkr = new LtcYtdCompSal(); - adminPastoCareWrkr.setCompSalStaffYtd(root.getCompB_item19()); - adminPastoCareWrkr.setCompSalContractServicesYtd(root.getCompB_item29()); - adminPastoCareWrkr.setCompSalOfficeAllocYtd(root.getCompB_item39()); + adminPastoCareWrkr.setCompSalStaffYtd(root.getAdminC_item15()); + adminPastoCareWrkr.setCompSalContractServicesYtd(root.getAdminC_item25()); + adminPastoCareWrkr.setCompSalOfficeAllocYtd(""); adminPastoCareWrkr.setCompSalName(root.getAdmin_label5()); adminPastoCareWrkr.setCompSalType(root.getAdmin_label()); adminPastoCareWrkr.setConfirmationId(root.getForm().getConfirmationId()); - adminPastoCareWrkr.setCompSalTotalCostYtd(root.getCompB_calc9()); + adminPastoCareWrkr.setCompSalTotalCostYtd(root.getAdminC_item35()); LtcYtdCompSal adminClrks = new LtcYtdCompSal(); - adminClrks.setCompSalStaffYtd(root.getCompB_item110()); - adminClrks.setCompSalContractServicesYtd(root.getCompB_item210()); - adminClrks.setCompSalOfficeAllocYtd(root.getCompB_item310()); + adminClrks.setCompSalStaffYtd(root.getAdminC_item16()); + adminClrks.setCompSalContractServicesYtd(root.getAdminC_item26()); + adminClrks.setCompSalOfficeAllocYtd(""); adminClrks.setCompSalName(root.getAdmin_label6()); adminClrks.setCompSalType(root.getAdmin_label()); adminClrks.setConfirmationId(root.getForm().getConfirmationId()); - adminClrks.setCompSalTotalCostYtd(root.getCompB_calc10()); + adminClrks.setCompSalTotalCostYtd(root.getAdminC_item36()); LtcYtdCompSal adminClncCrdinator = new LtcYtdCompSal(); - adminClncCrdinator.setCompSalStaffYtd(root.getCompB_item111()); - adminClncCrdinator.setCompSalContractServicesYtd(root.getCompB_item211()); - adminClncCrdinator.setCompSalOfficeAllocYtd(root.getCompB_item311()); + adminClncCrdinator.setCompSalStaffYtd(root.getAdminC_item17()); + adminClncCrdinator.setCompSalContractServicesYtd(root.getAdminC_item27()); + adminClncCrdinator.setCompSalOfficeAllocYtd(""); adminClncCrdinator.setCompSalName(root.getAdmin_label7()); adminClncCrdinator.setCompSalType(root.getAdmin_label()); adminClncCrdinator.setConfirmationId(root.getForm().getConfirmationId()); - adminClncCrdinator.setCompSalTotalCostYtd(root.getCompB_calc11()); + adminClncCrdinator.setCompSalTotalCostYtd(root.getAdminC_item37()); + + LtcYtdCompSal adminScreenGreeters = new LtcYtdCompSal(); + adminScreenGreeters.setCompSalStaffYtd(root.getAdminC_item18()); + adminScreenGreeters.setCompSalContractServicesYtd(root.getAdminC_item28()); + adminScreenGreeters.setCompSalOfficeAllocYtd(""); + adminScreenGreeters.setCompSalName(root.getAdmin_label8()); + adminScreenGreeters.setCompSalType(root.getAdmin_label()); + adminScreenGreeters.setConfirmationId(root.getForm().getConfirmationId()); + adminScreenGreeters.setCompSalTotalCostYtd(root.getAdminC_item38()); + + LtcYtdCompSal adminHCSP = new LtcYtdCompSal(); + adminHCSP.setCompSalStaffYtd(root.getAdminC_item19()); + adminHCSP.setCompSalContractServicesYtd(root.getAdminC_item29()); + adminHCSP.setCompSalOfficeAllocYtd(""); + adminHCSP.setCompSalName(root.getAdmin_label9()); + adminHCSP.setCompSalType(root.getAdmin_label()); + adminHCSP.setConfirmationId(root.getForm().getConfirmationId()); + adminHCSP.setCompSalTotalCostYtd(root.getAdminC_item39()); LtcYtdCompSal adminOther = new LtcYtdCompSal(); - adminOther.setCompSalStaffYtd(root.getCompB_item112()); - adminOther.setCompSalContractServicesYtd(root.getCompB_item212()); - adminOther.setCompSalOfficeAllocYtd(root.getCompB_item312()); - adminOther.setCompSalName(root.getAdmin_label8()); + adminOther.setCompSalStaffYtd(root.getAdminC_item110()); + adminOther.setCompSalContractServicesYtd(root.getAdminC_item210()); + adminOther.setCompSalOfficeAllocYtd(""); + adminOther.setCompSalName(root.getAdmin_label10()); adminOther.setCompSalType(root.getAdmin_label()); adminOther.setConfirmationId(root.getForm().getConfirmationId()); - adminOther.setCompSalTotalCostYtd(root.getCompB_calc12()); + adminOther.setCompSalTotalCostYtd(root.getAdminC_item310()); /* Direct Care Nursing */ LtcYtdCompSal nursingRNSal = new LtcYtdCompSal(); @@ -1089,8 +1107,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY Collections.addAll(ltcYtdCompSal, supportFoodServices, supportLaundryServices, supportHousekeeping, supportPlantMntnce, adminAdministrator, adminDirOfCare, adminDeptManagers, adminSupport, - adminPastoCareWrkr, adminClrks, adminClncCrdinator, adminOther, nursingRNSal, nursingLPNSal, - nursingHCASal, nursingOthSal, alliedProfOTSal, alliedProfPTSal, alliedProfDTSal, alliedProfSWSal, + adminPastoCareWrkr, adminClrks, adminClncCrdinator, adminScreenGreeters, adminHCSP, adminOther, nursingRNSal, + nursingLPNSal, nursingHCASal, nursingOthSal, alliedProfOTSal, alliedProfPTSal, alliedProfDTSal, alliedProfSWSal, alliedProfSLPSal, alliedProfRPPSal, alliedProfOTHSal, alliedNPRTSal, alliedNPRASal, alliedNPAWSal, alliedNPMTSal, alliedNPATSal, alliedNPOTHSal); @@ -1098,24 +1116,24 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSalSubtotals supportSalSubtotal = new LtcYtdCompSalSubtotals(); supportSalSubtotal.setCompSalType(root.getSupport_label()); supportSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); - supportSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum11()); - supportSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum21()); + supportSalSubtotal.setSubTotalCompSalStaffYTD(root.getSupportC_sum1()); + supportSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getSupportC_item21()); supportSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum31()); - supportSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum1()); + supportSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getSupportC_calcsum()); LtcYtdCompSalSubtotals administrationSalSubtotal = new LtcYtdCompSalSubtotals(); administrationSalSubtotal.setCompSalType(root.getAdmin_label()); administrationSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); - administrationSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum12()); - administrationSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum22()); + administrationSalSubtotal.setSubTotalCompSalStaffYTD(root.getAdminC_sum1()); + administrationSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getSupportC_item22()); administrationSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum32()); - administrationSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum2()); + administrationSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getAdminC_calcsum()); LtcYtdCompSalSubtotals nursingSalSubtotal = new LtcYtdCompSalSubtotals(); nursingSalSubtotal.setCompSalType(root.getNursing_label_comp()); nursingSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); nursingSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum13()); - nursingSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum23()); + nursingSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getSupportC_item23()); nursingSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum33()); nursingSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum3()); @@ -1123,7 +1141,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedSalSubtotal.setCompSalType(root.getAlliedProf_label_comp()); alliedSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); alliedSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum14()); - alliedSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum24()); + alliedSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getSupportC_item24()); alliedSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum34()); alliedSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum4()); @@ -1174,125 +1192,143 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY /* Hours for Staff and Contracted Services */ LtcYtdCompHrs supportFoodServicesHrs = new LtcYtdCompHrs(); //supportFoodServicesHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP1()); - supportFoodServicesHrs.setCompHrsStaffYtd(root.getCompH_item11()); - supportFoodServicesHrs.setCompHrsContractServicesYtd(root.getCompH_item21()); + supportFoodServicesHrs.setCompHrsStaffYtd(root.getSupportH_item11()); + supportFoodServicesHrs.setCompHrsContractServicesYtd(root.getSupportH_item21()); supportFoodServicesHrs.setCompHrsOfficeAllocYtd(root.getCompH_item31()); supportFoodServicesHrs.setCompHrsName(root.getSupport_label1()); supportFoodServicesHrs.setCompHrsType(root.getSupport_label()); supportFoodServicesHrs.setConfirmationId(root.getForm().getConfirmationId()); - supportFoodServicesHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc1()); + supportFoodServicesHrs.setCompTotalWorkedHrsYtd(root.getSupportH_calc1()); LtcYtdCompHrs supportLaundryServicesHrs = new LtcYtdCompHrs(); //supportLaundryServicesHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP2()); - supportLaundryServicesHrs.setCompHrsStaffYtd(root.getCompH_item12()); - supportLaundryServicesHrs.setCompHrsContractServicesYtd(root.getCompH_item22()); + supportLaundryServicesHrs.setCompHrsStaffYtd(root.getSupportH_item12()); + supportLaundryServicesHrs.setCompHrsContractServicesYtd(root.getSupportH_item22()); supportLaundryServicesHrs.setCompHrsOfficeAllocYtd(root.getCompH_item32()); supportLaundryServicesHrs.setCompHrsName(root.getSupport_label2()); supportLaundryServicesHrs.setCompHrsType(root.getSupport_label()); supportLaundryServicesHrs.setConfirmationId(root.getForm().getConfirmationId()); - supportLaundryServicesHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc2()); + supportLaundryServicesHrs.setCompTotalWorkedHrsYtd(root.getSupportH_calc2()); LtcYtdCompHrs supportHousekeepingHrs = new LtcYtdCompHrs(); //supportHousekeepingHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP3()); - supportHousekeepingHrs.setCompHrsStaffYtd(root.getCompH_item13()); - supportHousekeepingHrs.setCompHrsContractServicesYtd(root.getCompH_item23()); + supportHousekeepingHrs.setCompHrsStaffYtd(root.getSupportH_item13()); + supportHousekeepingHrs.setCompHrsContractServicesYtd(root.getSupportH_item23()); supportHousekeepingHrs.setCompHrsOfficeAllocYtd(root.getCompH_item33()); supportHousekeepingHrs.setCompHrsName(root.getSupport_label3()); supportHousekeepingHrs.setCompHrsType(root.getSupport_label()); supportHousekeepingHrs.setConfirmationId(root.getForm().getConfirmationId()); - supportHousekeepingHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc3()); + supportHousekeepingHrs.setCompTotalWorkedHrsYtd(root.getSupportH_calc3()); LtcYtdCompHrs supportPlantMntnceHrs = new LtcYtdCompHrs(); // supportPlantMntnceHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP4()); - supportPlantMntnceHrs.setCompHrsStaffYtd(root.getCompH_item14()); - supportPlantMntnceHrs.setCompHrsContractServicesYtd(root.getCompH_item24()); + supportPlantMntnceHrs.setCompHrsStaffYtd(root.getSupportH_item14()); + supportPlantMntnceHrs.setCompHrsContractServicesYtd(root.getSupportH_item24()); supportPlantMntnceHrs.setCompHrsOfficeAllocYtd(root.getCompH_item34()); supportPlantMntnceHrs.setCompHrsName(root.getSupport_label4()); supportPlantMntnceHrs.setCompHrsType(root.getSupport_label()); supportPlantMntnceHrs.setConfirmationId(root.getForm().getConfirmationId()); - supportPlantMntnceHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc4()); + supportPlantMntnceHrs.setCompTotalWorkedHrsYtd(root.getSupportH_calc4()); // sum remaining LtcYtdCompHrs adminAdministratorHrs = new LtcYtdCompHrs(); // adminAdministratorHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP5()); - adminAdministratorHrs.setCompHrsStaffYtd(root.getCompH_item15()); - adminAdministratorHrs.setCompHrsContractServicesYtd(root.getCompH_item25()); - adminAdministratorHrs.setCompHrsOfficeAllocYtd(root.getCompH_item35()); + adminAdministratorHrs.setCompHrsStaffYtd(root.getAdminH_item11()); + adminAdministratorHrs.setCompHrsContractServicesYtd(root.getAdminH_item21()); + adminAdministratorHrs.setCompHrsOfficeAllocYtd(""); adminAdministratorHrs.setCompHrsName(root.getAdmin_label1()); adminAdministratorHrs.setCompHrsType(root.getAdmin_label()); adminAdministratorHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminAdministratorHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc5()); + adminAdministratorHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item31()); LtcYtdCompHrs adminDirOfCareHrs = new LtcYtdCompHrs(); //adminDirOfCareHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP6()); - adminDirOfCareHrs.setCompHrsStaffYtd(root.getCompH_item16()); - adminDirOfCareHrs.setCompHrsContractServicesYtd(root.getCompH_item26()); - adminDirOfCareHrs.setCompHrsOfficeAllocYtd(root.getCompH_item36()); + adminDirOfCareHrs.setCompHrsStaffYtd(root.getAdminH_item12()); + adminDirOfCareHrs.setCompHrsContractServicesYtd(root.getAdminH_item22()); + adminDirOfCareHrs.setCompHrsOfficeAllocYtd(""); adminDirOfCareHrs.setCompHrsName(root.getAdmin_label2()); adminDirOfCareHrs.setCompHrsType(root.getAdmin_label()); adminDirOfCareHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminDirOfCareHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc6()); + adminDirOfCareHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item32()); LtcYtdCompHrs adminDeptManagersHrs = new LtcYtdCompHrs(); // adminDeptManagersHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP7()); - adminDeptManagersHrs.setCompHrsStaffYtd(root.getCompH_item17()); - adminDeptManagersHrs.setCompHrsContractServicesYtd(root.getCompH_item27()); - adminDeptManagersHrs.setCompHrsOfficeAllocYtd(root.getCompH_item37()); + adminDeptManagersHrs.setCompHrsStaffYtd(root.getAdminH_item13()); + adminDeptManagersHrs.setCompHrsContractServicesYtd(root.getAdminH_item23()); + adminDeptManagersHrs.setCompHrsOfficeAllocYtd(""); adminDeptManagersHrs.setCompHrsName(root.getAdmin_label3()); adminDeptManagersHrs.setCompHrsType(root.getAdmin_label()); adminDeptManagersHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminDeptManagersHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc7()); + adminDeptManagersHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item33()); LtcYtdCompHrs adminSupportHrs = new LtcYtdCompHrs(); //adminSupportHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP8()); - adminSupportHrs.setCompHrsStaffYtd(root.getCompH_item18()); - adminSupportHrs.setCompHrsContractServicesYtd(root.getCompH_item28()); - adminSupportHrs.setCompHrsOfficeAllocYtd(root.getCompH_item38()); + adminSupportHrs.setCompHrsStaffYtd(root.getAdminH_item14()); + adminSupportHrs.setCompHrsContractServicesYtd(root.getAdminH_item24()); + adminSupportHrs.setCompHrsOfficeAllocYtd(""); adminSupportHrs.setCompHrsName(root.getAdmin_label4()); adminSupportHrs.setCompHrsType(root.getAdmin_label()); adminSupportHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminSupportHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc8()); + adminSupportHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item34()); LtcYtdCompHrs adminPastoCareWrkrHrs = new LtcYtdCompHrs(); // adminPastoCareWrkrHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP9()); - adminPastoCareWrkrHrs.setCompHrsStaffYtd(root.getCompH_item19()); - adminPastoCareWrkrHrs.setCompHrsContractServicesYtd(root.getCompH_item29()); - adminPastoCareWrkrHrs.setCompHrsOfficeAllocYtd(root.getCompH_item39()); + adminPastoCareWrkrHrs.setCompHrsStaffYtd(root.getAdminH_item15()); + adminPastoCareWrkrHrs.setCompHrsContractServicesYtd(root.getAdminH_item25()); + adminPastoCareWrkrHrs.setCompHrsOfficeAllocYtd(""); adminPastoCareWrkrHrs.setCompHrsName(root.getAdmin_label5()); adminPastoCareWrkrHrs.setCompHrsType(root.getAdmin_label()); adminPastoCareWrkrHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminPastoCareWrkrHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc9()); + adminPastoCareWrkrHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item35()); LtcYtdCompHrs adminClrksHrs = new LtcYtdCompHrs(); //adminClrksHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP10()); - adminClrksHrs.setCompHrsStaffYtd(root.getCompH_item110()); - adminClrksHrs.setCompHrsContractServicesYtd(root.getCompH_item210()); - adminClrksHrs.setCompHrsOfficeAllocYtd(root.getCompH_item310()); + adminClrksHrs.setCompHrsStaffYtd(root.getAdminH_item16()); + adminClrksHrs.setCompHrsContractServicesYtd(root.getAdminH_item26()); + adminClrksHrs.setCompHrsOfficeAllocYtd(""); adminClrksHrs.setCompHrsName(root.getAdmin_label6()); adminClrksHrs.setCompHrsType(root.getAdmin_label()); adminClrksHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminClrksHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc10()); + adminClrksHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item36()); LtcYtdCompHrs adminClncCrdinatorHrs = new LtcYtdCompHrs(); // adminClncCrdinatorHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP11()); - adminClncCrdinatorHrs.setCompHrsStaffYtd(root.getCompH_item111()); - adminClncCrdinatorHrs.setCompHrsContractServicesYtd(root.getCompH_item211()); - adminClncCrdinatorHrs.setCompHrsOfficeAllocYtd(root.getCompH_item311()); + adminClncCrdinatorHrs.setCompHrsStaffYtd(root.getAdminH_item17()); + adminClncCrdinatorHrs.setCompHrsContractServicesYtd(root.getAdminH_item27()); + adminClncCrdinatorHrs.setCompHrsOfficeAllocYtd(""); adminClncCrdinatorHrs.setCompHrsName(root.getAdmin_label7()); adminClncCrdinatorHrs.setCompHrsType(root.getAdmin_label()); adminClncCrdinatorHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminClncCrdinatorHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc11()); + adminClncCrdinatorHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item37()); + + LtcYtdCompHrs adminScreenersGreeters = new LtcYtdCompHrs(); + adminScreenersGreeters.setCompHrsStaffYtd(root.getAdminH_item18()); + adminScreenersGreeters.setCompHrsContractServicesYtd(root.getAdminH_item28()); + adminScreenersGreeters.setCompHrsOfficeAllocYtd(""); + adminScreenersGreeters.setCompHrsName(root.getAdmin_label8()); + adminScreenersGreeters.setCompHrsType(root.getAdmin_label()); + adminScreenersGreeters.setConfirmationId(root.getForm().getConfirmationId()); + adminScreenersGreeters.setCompTotalWorkedHrsYtd(root.getAdminH_item38()); + + LtcYtdCompHrs adminHCSW = new LtcYtdCompHrs(); + adminHCSW.setCompHrsStaffYtd(root.getAdminH_item19()); + adminHCSW.setCompHrsContractServicesYtd(root.getAdminH_item29()); + adminHCSW.setCompHrsOfficeAllocYtd(""); + adminHCSW.setCompHrsName(root.getAdmin_label9()); + adminHCSW.setCompHrsType(root.getAdmin_label()); + adminHCSW.setConfirmationId(root.getForm().getConfirmationId()); + adminHCSW.setCompTotalWorkedHrsYtd(root.getAdminH_item39()); LtcYtdCompHrs adminOtherHrs = new LtcYtdCompHrs(); // adminOtherHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP12()); - adminOtherHrs.setCompHrsStaffYtd(root.getCompH_item112()); - adminOtherHrs.setCompHrsContractServicesYtd(root.getCompH_item212()); - adminOtherHrs.setCompHrsOfficeAllocYtd(root.getCompH_item312()); - adminOtherHrs.setCompHrsName(root.getAdmin_label8()); + adminOtherHrs.setCompHrsStaffYtd(root.getAdminH_item110()); + adminOtherHrs.setCompHrsContractServicesYtd(root.getAdminH_item210()); + adminOtherHrs.setCompHrsOfficeAllocYtd(""); + adminOtherHrs.setCompHrsName(root.getAdmin_label10()); adminOtherHrs.setCompHrsType(root.getAdmin_label()); adminOtherHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminOtherHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc12()); + adminOtherHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item310()); /* Nursing, Allied, Non Allied Hours */ LtcYtdCompHrs nursingRNHrs = new LtcYtdCompHrs(); @@ -1467,8 +1503,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY Collections.addAll(ltcYtdCompHrs, supportFoodServicesHrs, supportLaundryServicesHrs, supportHousekeepingHrs, supportPlantMntnceHrs, adminAdministratorHrs, adminDirOfCareHrs, adminDeptManagersHrs, - adminSupportHrs, adminPastoCareWrkrHrs, adminClrksHrs, adminClncCrdinatorHrs, adminOtherHrs, - nursingRNHrs, nursingLPNHrs, nursingHCAHrs, nursingOthHrs, alliedProfOTHrs, alliedProfPTHrs, + adminSupportHrs, adminPastoCareWrkrHrs, adminClrksHrs, adminClncCrdinatorHrs, adminScreenersGreeters, adminHCSW, + adminOtherHrs, nursingRNHrs, nursingLPNHrs, nursingHCAHrs, nursingOthHrs, alliedProfOTHrs, alliedProfPTHrs, alliedProfDTHrs, alliedProfSWHrs, alliedProfSLPHrs, alliedProfRTHrs, alliedProfOTHHrs, alliedNPRTHrs, alliedNPRAHrs, alliedNPAWHrs, alliedNPMTHrs, alliedNPATHrs, alliedNPOTHHrs); @@ -1476,18 +1512,18 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompHrsSubtotals supportHrsSubtotals = new LtcYtdCompHrsSubtotals(); supportHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); supportHrsSubtotals.setCompHrsType(root.getSupport_label()); - supportHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum11()); - supportHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum21()); + supportHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getSupportH_sum1()); + supportHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getSupportH_sum2()); supportHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum31()); - supportHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getCompH_calcsum1()); + supportHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getSupportH_calcsum()); LtcYtdCompHrsSubtotals adminHrsSubtotals = new LtcYtdCompHrsSubtotals(); adminHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); adminHrsSubtotals.setCompHrsType(root.getAdmin_label()); - adminHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum12()); - adminHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum22()); + adminHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getAdminH_sum1()); + adminHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getAdminH_sum2()); adminHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum32()); - adminHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getCompH_calcsum2()); + adminHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getAdminH_calcsum()); LtcYtdCompHrsSubtotals nursingHrsSubtotals = new LtcYtdCompHrsSubtotals(); nursingHrsSubtotals.setConfirmationID(root.getForm().getConfirmationId()); From b737b27ff4afc41f5e6ebfae11bbbaaf1cb1726f Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 8 May 2023 17:08:03 -0400 Subject: [PATCH 143/183] bugfix for subtotals --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 93c98deb..2894e624 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1117,7 +1117,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportSalSubtotal.setCompSalType(root.getSupport_label()); supportSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); supportSalSubtotal.setSubTotalCompSalStaffYTD(root.getSupportC_sum1()); - supportSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getSupportC_item21()); + supportSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getSupportC_sum2()); supportSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum31()); supportSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getSupportC_calcsum()); @@ -1125,7 +1125,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY administrationSalSubtotal.setCompSalType(root.getAdmin_label()); administrationSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); administrationSalSubtotal.setSubTotalCompSalStaffYTD(root.getAdminC_sum1()); - administrationSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getSupportC_item22()); + administrationSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getAdminC_sum2()); administrationSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum32()); administrationSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getAdminC_calcsum()); @@ -1133,7 +1133,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingSalSubtotal.setCompSalType(root.getNursing_label_comp()); nursingSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); nursingSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum13()); - nursingSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getSupportC_item23()); + nursingSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum23()); nursingSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum33()); nursingSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum3()); @@ -1141,7 +1141,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedSalSubtotal.setCompSalType(root.getAlliedProf_label_comp()); alliedSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); alliedSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum14()); - alliedSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getSupportC_item24()); + alliedSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum24()); alliedSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum34()); alliedSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum4()); From f2d3d41dd0789201c72081ff2e81c3939a8908d4 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 8 May 2023 17:08:20 -0400 Subject: [PATCH 144/183] adding missing mapping --- .../etl/forms/ltc/quarterly/json/Root.java | 36 +++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 44fb46be..c007909e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -809,8 +809,10 @@ public class Root{ public String compB_recovered2; public String compB_recovered3; public String supportC_sum1; - public String adminC_sum1; - @JsonProperty("compB_sum1-3") + public String supportC_sum2; + public String adminC_sum1; + public String adminC_sum2; + @JsonProperty("compB_sum1-3") public String compB_sum13; @JsonProperty("compB_sum1-4") public String compB_sum14; @@ -824,7 +826,11 @@ public class Root{ public String supportC_item23; @JsonProperty("supportC_item2-4") public String supportC_item24; - @JsonProperty("compB_sum2-5") + @JsonProperty("compB_sum2-3") + public String compB_sum23; + @JsonProperty("compB_sum2-4") + public String compB_sum24; + @JsonProperty("compB_sum2-5") public String compB_sum25; @JsonProperty("compB_sum3-1") public String compB_sum31; @@ -5960,12 +5966,24 @@ public String getSupportC_sum1() { public void setSupportC_sum1(String compB_sum11) { this.supportC_sum1 = compB_sum11; } + public String getSupportC_sum2() { + return supportC_sum2; + } + public void setSupportC_sum2(String supportC_sum2) { + this.supportC_sum2 = supportC_sum2; + } public String getAdminC_sum1() { return adminC_sum1; } public void setAdminC_sum1(String compB_sum12) { this.adminC_sum1 = compB_sum12; } + public String getAdminC_sum2() { + return adminC_sum2; + } + public void setAdminC_sum2(String adminC_sum2) { + this.adminC_sum2 = adminC_sum2; + } public String getCompB_sum13() { return compB_sum13; } @@ -6008,6 +6026,18 @@ public String getSupportC_item24() { public void setSupportC_item24(String compB_sum24) { this.supportC_item24 = compB_sum24; } + public String getCompB_sum23() { + return compB_sum23; + } + public void setCompB_sum23(String compB_sum23) { + this.compB_sum23 = compB_sum23; + } + public String getCompB_sum24() { + return compB_sum24; + } + public void setCompB_sum24(String compB_sum24) { + this.compB_sum24 = compB_sum24; + } public String getCompB_sum25() { return compB_sum25; } From 333bd4d5e91c7a87e0930df9666a571c453a93d2 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 13:55:35 -0400 Subject: [PATCH 145/183] bugfix, we no longer format to date if string is blank or empty --- .../forms/ltc/facility/model/FacilityInformation.java | 9 +++++---- .../forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java | 4 ++-- .../etl/forms/ltc/quarterly/model/LtcYtdSubmission.java | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java index 91ef35bd..fb2e1e1e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/facility/model/FacilityInformation.java @@ -62,7 +62,7 @@ public void setIsDeleted(String isDeleted) { IsDeleted = StringUtils.defaultIfEmpty(isDeleted, Constants.DEFAULT_STRING_VALUE); } public String getSubmissionDate() { - return CSVUtil.getFormattedDate(SubmissionDate); + return SubmissionDate.isBlank() || SubmissionDate.isEmpty() ? Constants.DEFAULT_STRING_VALUE : CSVUtil.getFormattedDate(SubmissionDate); } public void setSubmissionDate(String submissionDate) { SubmissionDate = StringUtils.defaultIfEmpty(submissionDate, Constants.DEFAULT_STRING_VALUE); @@ -140,16 +140,17 @@ public void setAccreditationBody(String accreditationBody) { AccreditationBody = StringUtils.defaultIfEmpty(accreditationBody, Constants.DEFAULT_STRING_VALUE); } public String getAccreditationDate() { - return CSVUtil.getFormattedDate(AccreditationDate); + return AccreditationDate.isBlank() || AccreditationDate.isEmpty() ? Constants.DEFAULT_STRING_VALUE : CSVUtil.getFormattedDate(AccreditationDate); } public void setAccreditationDate(String accreditationDate) { AccreditationDate = StringUtils.defaultIfEmpty(accreditationDate, Constants.DEFAULT_STRING_VALUE); } public String getAccreditationExpiryDate() { - return CSVUtil.getFormattedDate(AccreditationExpiryDate); + return AccreditationExpiryDate.isBlank() || AccreditationExpiryDate.isEmpty() ? + Constants.DEFAULT_STRING_VALUE : CSVUtil.getFormattedDate(AccreditationExpiryDate); } public void setAccreditationExpiryDate(String accreditationExpiryDate) { - AccreditationExpiryDate = accreditationExpiryDate; + AccreditationExpiryDate = StringUtils.defaultIfEmpty(accreditationExpiryDate, Constants.DEFAULT_STRING_VALUE); } public String getHealthAuthority() { return HealthAuthority; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java index 35eca4d9..3cbfd954 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java @@ -46,13 +46,13 @@ public void setBedSubype(String bedSubype) { this.bedSubype = bedSubype; } public String getStartDate() { - return CSVUtil.getFormattedDate(startDate); + return startDate.isBlank() || startDate.isEmpty() ? Constants.DEFAULT_STRING_VALUE : CSVUtil.getFormattedDate(startDate); } public void setStartDate(String startDate) { this.startDate = StringUtils.defaultIfEmpty(startDate, Constants.DEFAULT_STRING_VALUE); } public String getEndDate() { - return CSVUtil.getFormattedDate(endDate); + return endDate.isBlank() || endDate.isEmpty() ? Constants.DEFAULT_STRING_VALUE : CSVUtil.getFormattedDate(endDate); } public void setEndDate(String endDate) { this.endDate = StringUtils.defaultIfEmpty(endDate, Constants.DEFAULT_STRING_VALUE); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java index e5aead9d..3852efa2 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java @@ -124,7 +124,7 @@ public void setConfirmationId(String confirmationId) { } public String getSubmissionDate() { - return CSVUtil.getFormattedDate(submissionDate); + return submissionDate.isBlank() || submissionDate.isEmpty() ? Constants.DEFAULT_STRING_VALUE : CSVUtil.getFormattedDate(submissionDate); } public void setSubmissionDate(String submissionDate) { From d39f6dccd87f99ee816a019b787bfa731d1275fb Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 15:53:28 -0400 Subject: [PATCH 146/183] bugfix, removed duplicated fields --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 77414cca..3c1fd141 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2136,12 +2136,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY incontinenceSupExp.setExpType(root.getOpEx_3_label()); incontinenceSupExp.setConfirmationId(root.getForm().getConfirmationId()); - Collections.addAll(ltcYtdExp, dirCareCostExp, foodCostExp, ldryServExp, housekeepingCostExp, - adminServCostExp, plantMainOpStaffExp, salWagRecvExp, salWagAccExp, othLabCostExp, bnftCostExp, - sickSevrnceAccExp, buildingRentExp, intrstMortgageLngTrmExp, propertyTaxesExp, mntnceExp, - suppliesExp, utilitiesExp, wasteMgmntExp, resTranServExp, othExp, medSupExp, rawFoodCostExp, - drgsPharmaExp, dietSupExp, ldrySupExp, houseSupExp, incontinenceSupExp); - // /* Subtotals */ LtcYtdExpSubTotals staffCost1ASubtotal = new LtcYtdExpSubTotals(); From d0bc39adcfacab9747deb1b53b9a64353e090d69 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 16:29:49 -0400 Subject: [PATCH 147/183] bugfix, corrected mapping --- .../etl/forms/ltc/quarterly/json/Root.java | 132 ++++++++---------- 1 file changed, 61 insertions(+), 71 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index c007909e..19e7a909 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -573,17 +573,17 @@ public class Root{ public String compB_accrued2; public String compB_accrued3; public String supportC_calc1; - @JsonProperty("adminC_item3-6") - public String adminC_item36; - @JsonProperty("adminC_item3-7") - public String adminC_item37; - @JsonProperty("adminC_item3-8") - public String adminC_item38; - @JsonProperty("adminC_item3-9") - public String adminC_item39; - @JsonProperty("adminC_item3-10") - public String adminC_item310; - public String compB_calc13; + public String adminC_calc1; + public String adminC_calc2; + public String adminC_calc3; + public String adminC_calc4; + public String adminC_calc5; + public String adminC_calc6; + public String adminC_calc7; + public String adminC_calc8; + public String adminC_calc9; + public String adminC_calc10; + public String compB_calc13; public String compB_calc14; public String compB_calc15; public String compB_calc16; @@ -603,16 +603,6 @@ public class Root{ public String compB_calc29; public String supportC_calc3; public String supportC_calc4; - @JsonProperty("adminC_item3-1") - public String adminC_item31; - @JsonProperty("adminC_item3-2") - public String adminC_item32; - @JsonProperty("adminC_item3-3") - public String adminC_item33; - @JsonProperty("adminC_item3-4") - public String adminC_item34; - @JsonProperty("adminC_item3-5") - public String adminC_item35; public String supportC_calcsum; public String adminC_calcsum; public String compB_calcsum3; @@ -5156,35 +5146,65 @@ public String getSupportC_calc1() { public void setSupportC_calc1(String compB_calc1) { this.supportC_calc1 = compB_calc1; } - public String getAdminC_item36() { - return adminC_item36; + public String getAdminC_calc1() { + return adminC_calc1; } - public void setAdminC_item36(String compB_calc10) { - this.adminC_item36 = compB_calc10; + public void setAdminC_calc1(String adminC_calc1) { + this.adminC_calc1 = adminC_calc1; } - public String getAdminC_item37() { - return adminC_item37; + public String getAdminC_calc2() { + return adminC_calc2; } - public void setAdminC_item37(String compB_calc11) { - this.adminC_item37 = compB_calc11; + public void setAdminC_calc2(String adminC_calc2) { + this.adminC_calc2 = adminC_calc2; } - public String getAdminC_item38() { - return adminC_item38; + public String getAdminC_calc3() { + return adminC_calc3; } - public void setAdminC_item38(String adminC_item38) { - this.adminC_item38 = adminC_item38; + public void setAdminC_calc3(String adminC_calc3) { + this.adminC_calc3 = adminC_calc3; } - public String getAdminC_item39() { - return adminC_item39; + public String getAdminC_calc4() { + return adminC_calc4; } - public void setAdminC_item39(String adminC_item39) { - this.adminC_item39 = adminC_item39; + public void setAdminC_calc4(String adminC_calc4) { + this.adminC_calc4 = adminC_calc4; } - public String getAdminC_item310() { - return adminC_item310; + public String getAdminC_calc5() { + return adminC_calc5; } - public void setAdminC_item310(String compB_calc12) { - this.adminC_item310 = compB_calc12; + public void setAdminC_calc5(String adminC_calc5) { + this.adminC_calc5 = adminC_calc5; + } + public String getAdminC_calc6() { + return adminC_calc6; + } + public void setAdminC_calc6(String adminC_calc6) { + this.adminC_calc6 = adminC_calc6; + } + public String getAdminC_calc7() { + return adminC_calc7; + } + public void setAdminC_calc7(String adminC_calc7) { + this.adminC_calc7 = adminC_calc7; + } + public String getAdminC_calc8() { + return adminC_calc8; + } + public void setAdminC_calc8(String adminC_calc8) { + this.adminC_calc8 = adminC_calc8; + } + public String getAdminC_calc9() { + return adminC_calc9; + } + public void setAdminC_calc9(String adminC_calc9) { + this.adminC_calc9 = adminC_calc9; + } + public String getAdminC_calc10() { + return adminC_calc10; + } + public void setAdminC_calc10(String adminC_calc10) { + this.adminC_calc10 = adminC_calc10; } public String getCompB_calc13() { return compB_calc13; @@ -5306,36 +5326,6 @@ public String getSupportC_calc4() { public void setSupportC_calc4(String compB_calc4) { this.supportC_calc4 = compB_calc4; } - public String getAdminC_item31() { - return adminC_item31; - } - public void setAdminC_item31(String compB_calc5) { - this.adminC_item31 = compB_calc5; - } - public String getAdminC_item32() { - return adminC_item32; - } - public void setAdminC_item32(String compB_calc6) { - this.adminC_item32 = compB_calc6; - } - public String getAdminC_item33() { - return adminC_item33; - } - public void setAdminC_item33(String compB_calc7) { - this.adminC_item33 = compB_calc7; - } - public String getAdminC_item34() { - return adminC_item34; - } - public void setAdminC_item34(String compB_calc8) { - this.adminC_item34 = compB_calc8; - } - public String getAdminC_item35() { - return adminC_item35; - } - public void setAdminC_item35(String compB_calc9) { - this.adminC_item35 = compB_calc9; - } public String getSupportC_calcsum() { return supportC_calcsum; } From b177ff8932652ba6d5ca29ec5c174e7deb08506c Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 16:30:26 -0400 Subject: [PATCH 148/183] removed unecessary column, and mapping bugfix --- .../bc/gov/chefs/etl/constant/Constants.java | 2 +- .../ltc/quarterly/model/LtcYtdCompSal.java | 8 --- .../LtcQuarterlyYtdApiResponseProcessor.java | 59 +++++-------------- 3 files changed, 15 insertions(+), 54 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 778f73f6..ac532da3 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -189,7 +189,7 @@ public class Constants { HEADERS.put(LTC_YTD_COMP_SAL, new String[] { "CONFIRMATION_ID", "COMP_SAL_TYPE", "COMP_SAL_NAME", "COMP_SAL_STAFF_YTD", - "COMP_SAL_CONTRACT_SERVICES_YTD", "COMP_SAL_OFFICE_ALLOC_YTD", "COMP_SAL_TOTAL_COST_YTD" }); + "COMP_SAL_CONTRACT_SERVICES_YTD", "COMP_SAL_TOTAL_COST_YTD" }); HEADERS.put(LTC_YTD_COMP_SAL_SUBTOTALS, new String[] { "Confirmation_ID", "Comp_Sal_Type", "Sub_Total_Comp_Sal_Staff_YTD", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java index fbf53f73..cbecb0b6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java @@ -15,7 +15,6 @@ public class LtcYtdCompSal implements IModel{ private String compSalName; private String compSalStaffYtd; private String compSalContractServicesYtd; - private String compSalOfficeAllocYtd; private String compSalTotalCostYtd; public String getCompSalTotalCostYtd() { return compSalTotalCostYtd; @@ -53,12 +52,6 @@ public String getCompSalContractServicesYtd() { public void setCompSalContractServicesYtd(String compSalContractServicesYtd) { this.compSalContractServicesYtd = StringUtils.defaultIfEmpty(compSalContractServicesYtd, Constants.DEFAULT_DECIMAL_VALUE); } - public String getCompSalOfficeAllocYtd() { - return compSalOfficeAllocYtd; - } - public void setCompSalOfficeAllocYtd(String compSalOfficeAllocYtd) { - this.compSalOfficeAllocYtd = StringUtils.defaultIfEmpty(compSalOfficeAllocYtd, Constants.DEFAULT_DECIMAL_VALUE); - } @Override public String getFileName() { // TODO Auto-generated method stub @@ -76,7 +69,6 @@ public List getCsvElements() { elements.add(this.getCompSalName()); elements.add(this.getCompSalStaffYtd()); elements.add(this.getCompSalContractServicesYtd()); - elements.add(this.getCompSalOfficeAllocYtd()); elements.add(this.getCompSalTotalCostYtd()); return elements; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index c67275c2..a2047f5a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -822,8 +822,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY */ LtcYtdCompSal supportFoodServices = new LtcYtdCompSal(); supportFoodServices.setCompSalStaffYtd(root.getSupportC_item11()); - supportFoodServices.setCompSalContractServicesYtd(root.getCompB_item21()); - supportFoodServices.setCompSalOfficeAllocYtd(root.getCompB_item31()); + supportFoodServices.setCompSalContractServicesYtd(root.getSupportC_item21()); supportFoodServices.setCompSalName(root.getSupport_label1()); supportFoodServices.setCompSalType(root.getSupport_label()); supportFoodServices.setConfirmationId(root.getForm().getConfirmationId()); @@ -831,8 +830,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal supportLaundryServices = new LtcYtdCompSal(); supportLaundryServices.setCompSalStaffYtd(root.getSupportC_item12()); - supportLaundryServices.setCompSalContractServicesYtd(root.getCompB_item22()); - supportLaundryServices.setCompSalOfficeAllocYtd(root.getCompB_item32()); + supportLaundryServices.setCompSalContractServicesYtd(root.getSupportC_item22()); supportLaundryServices.setCompSalName(root.getSupport_label2()); supportLaundryServices.setCompSalType(root.getSupport_label()); supportLaundryServices.setConfirmationId(root.getForm().getConfirmationId()); @@ -840,8 +838,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal supportHousekeeping = new LtcYtdCompSal(); supportHousekeeping.setCompSalStaffYtd(root.getSupportC_item13()); - supportHousekeeping.setCompSalContractServicesYtd(root.getCompB_item23()); - supportHousekeeping.setCompSalOfficeAllocYtd(root.getCompB_item33()); + supportHousekeeping.setCompSalContractServicesYtd(root.getSupportC_item23()); supportHousekeeping.setCompSalName(root.getSupport_label3()); supportHousekeeping.setCompSalType(root.getSupport_label()); supportHousekeeping.setConfirmationId(root.getForm().getConfirmationId()); @@ -849,8 +846,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal supportPlantMntnce = new LtcYtdCompSal(); supportPlantMntnce.setCompSalStaffYtd(root.getSupportC_item14()); - supportPlantMntnce.setCompSalContractServicesYtd(root.getCompB_item24()); - supportPlantMntnce.setCompSalOfficeAllocYtd(root.getCompB_item34()); + supportPlantMntnce.setCompSalContractServicesYtd(root.getSupportC_item24()); supportPlantMntnce.setCompSalName(root.getSupport_label4()); supportPlantMntnce.setCompSalType(root.getSupport_label()); supportPlantMntnce.setConfirmationId(root.getForm().getConfirmationId()); @@ -860,98 +856,87 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal adminAdministrator = new LtcYtdCompSal(); adminAdministrator.setCompSalStaffYtd(root.getAdminC_item11()); adminAdministrator.setCompSalContractServicesYtd(root.getAdminC_item21()); - adminAdministrator.setCompSalOfficeAllocYtd(""); adminAdministrator.setCompSalName(root.getAdmin_label1()); adminAdministrator.setCompSalType(root.getAdmin_label()); adminAdministrator.setConfirmationId(root.getForm().getConfirmationId()); - adminAdministrator.setCompSalTotalCostYtd(root.getAdminC_item31()); + adminAdministrator.setCompSalTotalCostYtd(root.getAdminC_calc1()); LtcYtdCompSal adminDirOfCare = new LtcYtdCompSal(); adminDirOfCare.setCompSalStaffYtd(root.getAdminC_item12()); adminDirOfCare.setCompSalContractServicesYtd(root.getAdminC_item22()); - adminDirOfCare.setCompSalOfficeAllocYtd(""); adminDirOfCare.setCompSalName(root.getAdmin_label2()); adminDirOfCare.setCompSalType(root.getAdmin_label()); adminDirOfCare.setConfirmationId(root.getForm().getConfirmationId()); - adminDirOfCare.setCompSalTotalCostYtd(root.getAdminC_item32()); + adminDirOfCare.setCompSalTotalCostYtd(root.getAdminC_calc2()); LtcYtdCompSal adminDeptManagers = new LtcYtdCompSal(); adminDeptManagers.setCompSalStaffYtd(root.getAdminC_item13()); adminDeptManagers.setCompSalContractServicesYtd(root.getAdminC_item23()); - adminDeptManagers.setCompSalOfficeAllocYtd(""); adminDeptManagers.setCompSalName(root.getAdmin_label3()); adminDeptManagers.setCompSalType(root.getAdmin_label()); adminDeptManagers.setConfirmationId(root.getForm().getConfirmationId()); - adminDeptManagers.setCompSalTotalCostYtd(root.getAdminC_item33()); + adminDeptManagers.setCompSalTotalCostYtd(root.getAdminC_calc3()); LtcYtdCompSal adminSupport = new LtcYtdCompSal(); adminSupport.setCompSalStaffYtd(root.getAdminC_item14()); adminSupport.setCompSalContractServicesYtd(root.getAdminC_item24()); - adminSupport.setCompSalOfficeAllocYtd(""); adminSupport.setCompSalName(root.getAdmin_label4()); adminSupport.setCompSalType(root.getAdmin_label()); adminSupport.setConfirmationId(root.getForm().getConfirmationId()); - adminSupport.setCompSalTotalCostYtd(root.getAdminC_item34()); + adminSupport.setCompSalTotalCostYtd(root.getAdminC_calc4()); LtcYtdCompSal adminPastoCareWrkr = new LtcYtdCompSal(); adminPastoCareWrkr.setCompSalStaffYtd(root.getAdminC_item15()); adminPastoCareWrkr.setCompSalContractServicesYtd(root.getAdminC_item25()); - adminPastoCareWrkr.setCompSalOfficeAllocYtd(""); adminPastoCareWrkr.setCompSalName(root.getAdmin_label5()); adminPastoCareWrkr.setCompSalType(root.getAdmin_label()); adminPastoCareWrkr.setConfirmationId(root.getForm().getConfirmationId()); - adminPastoCareWrkr.setCompSalTotalCostYtd(root.getAdminC_item35()); + adminPastoCareWrkr.setCompSalTotalCostYtd(root.getAdminC_calc5()); LtcYtdCompSal adminClrks = new LtcYtdCompSal(); adminClrks.setCompSalStaffYtd(root.getAdminC_item16()); adminClrks.setCompSalContractServicesYtd(root.getAdminC_item26()); - adminClrks.setCompSalOfficeAllocYtd(""); adminClrks.setCompSalName(root.getAdmin_label6()); adminClrks.setCompSalType(root.getAdmin_label()); adminClrks.setConfirmationId(root.getForm().getConfirmationId()); - adminClrks.setCompSalTotalCostYtd(root.getAdminC_item36()); + adminClrks.setCompSalTotalCostYtd(root.getAdminC_calc6()); LtcYtdCompSal adminClncCrdinator = new LtcYtdCompSal(); adminClncCrdinator.setCompSalStaffYtd(root.getAdminC_item17()); adminClncCrdinator.setCompSalContractServicesYtd(root.getAdminC_item27()); - adminClncCrdinator.setCompSalOfficeAllocYtd(""); adminClncCrdinator.setCompSalName(root.getAdmin_label7()); adminClncCrdinator.setCompSalType(root.getAdmin_label()); adminClncCrdinator.setConfirmationId(root.getForm().getConfirmationId()); - adminClncCrdinator.setCompSalTotalCostYtd(root.getAdminC_item37()); + adminClncCrdinator.setCompSalTotalCostYtd(root.getAdminC_calc7()); LtcYtdCompSal adminScreenGreeters = new LtcYtdCompSal(); adminScreenGreeters.setCompSalStaffYtd(root.getAdminC_item18()); adminScreenGreeters.setCompSalContractServicesYtd(root.getAdminC_item28()); - adminScreenGreeters.setCompSalOfficeAllocYtd(""); adminScreenGreeters.setCompSalName(root.getAdmin_label8()); adminScreenGreeters.setCompSalType(root.getAdmin_label()); adminScreenGreeters.setConfirmationId(root.getForm().getConfirmationId()); - adminScreenGreeters.setCompSalTotalCostYtd(root.getAdminC_item38()); + adminScreenGreeters.setCompSalTotalCostYtd(root.getAdminC_calc8()); LtcYtdCompSal adminHCSP = new LtcYtdCompSal(); adminHCSP.setCompSalStaffYtd(root.getAdminC_item19()); adminHCSP.setCompSalContractServicesYtd(root.getAdminC_item29()); - adminHCSP.setCompSalOfficeAllocYtd(""); adminHCSP.setCompSalName(root.getAdmin_label9()); adminHCSP.setCompSalType(root.getAdmin_label()); adminHCSP.setConfirmationId(root.getForm().getConfirmationId()); - adminHCSP.setCompSalTotalCostYtd(root.getAdminC_item39()); + adminHCSP.setCompSalTotalCostYtd(root.getAdminC_calc9()); LtcYtdCompSal adminOther = new LtcYtdCompSal(); adminOther.setCompSalStaffYtd(root.getAdminC_item110()); adminOther.setCompSalContractServicesYtd(root.getAdminC_item210()); - adminOther.setCompSalOfficeAllocYtd(""); adminOther.setCompSalName(root.getAdmin_label10()); adminOther.setCompSalType(root.getAdmin_label()); adminOther.setConfirmationId(root.getForm().getConfirmationId()); - adminOther.setCompSalTotalCostYtd(root.getAdminC_item310()); + adminOther.setCompSalTotalCostYtd(root.getAdminC_calc10()); /* Direct Care Nursing */ LtcYtdCompSal nursingRNSal = new LtcYtdCompSal(); nursingRNSal.setCompSalStaffYtd(root.getCompB_item113()); nursingRNSal.setCompSalContractServicesYtd(root.getCompB_item213()); - nursingRNSal.setCompSalOfficeAllocYtd(root.getCompB_item313()); nursingRNSal.setCompSalName(root.getNursing_label_comp1()); nursingRNSal.setCompSalType(root.getNursing_label_comp()); nursingRNSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -961,7 +946,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal nursingLPNSal = new LtcYtdCompSal(); nursingLPNSal.setCompSalStaffYtd(root.getCompB_item114()); nursingLPNSal.setCompSalContractServicesYtd(root.getCompB_item214()); - nursingLPNSal.setCompSalOfficeAllocYtd(root.getCompB_item314()); nursingLPNSal.setCompSalName(root.getNursing_label_comp2()); nursingLPNSal.setCompSalType(root.getNursing_label_comp()); nursingLPNSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -970,7 +954,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal nursingHCASal = new LtcYtdCompSal(); nursingHCASal.setCompSalStaffYtd(root.getCompB_item115()); nursingHCASal.setCompSalContractServicesYtd(root.getCompB_item215()); - nursingHCASal.setCompSalOfficeAllocYtd(root.getCompB_item315()); nursingHCASal.setCompSalName(root.getNursing_label_comp3()); nursingHCASal.setCompSalType(root.getNursing_label_comp()); nursingHCASal.setConfirmationId(root.getForm().getConfirmationId()); @@ -980,7 +963,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal nursingOthSal = new LtcYtdCompSal(); nursingOthSal.setCompSalStaffYtd(root.getCompB_item116()); nursingOthSal.setCompSalContractServicesYtd(root.getCompB_item216()); - nursingOthSal.setCompSalOfficeAllocYtd(root.getCompB_item316()); nursingOthSal.setCompSalName(root.getNursing_label_comp4()); nursingOthSal.setCompSalType(root.getNursing_label_comp()); nursingOthSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -990,7 +972,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedProfOTSal = new LtcYtdCompSal(); alliedProfOTSal.setCompSalStaffYtd(root.getCompB_item117()); alliedProfOTSal.setCompSalContractServicesYtd(root.getCompB_item217()); - alliedProfOTSal.setCompSalOfficeAllocYtd(root.getCompB_item317()); alliedProfOTSal.setCompSalName(root.getAlliedProf_label_comp1()); alliedProfOTSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfOTSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -999,7 +980,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedProfPTSal = new LtcYtdCompSal(); alliedProfPTSal.setCompSalStaffYtd(root.getCompB_item118()); alliedProfPTSal.setCompSalContractServicesYtd(root.getCompB_item218()); - alliedProfPTSal.setCompSalOfficeAllocYtd(root.getCompB_item318()); alliedProfPTSal.setCompSalName(root.getAlliedProf_label_comp2()); alliedProfPTSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfPTSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -1008,7 +988,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedProfDTSal = new LtcYtdCompSal(); alliedProfDTSal.setCompSalStaffYtd(root.getCompB_item119()); alliedProfDTSal.setCompSalContractServicesYtd(root.getCompB_item219()); - alliedProfDTSal.setCompSalOfficeAllocYtd(root.getCompB_item319()); alliedProfDTSal.setCompSalName(root.getAlliedProf_label_comp3()); alliedProfDTSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfDTSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -1017,7 +996,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedProfSWSal = new LtcYtdCompSal(); alliedProfSWSal.setCompSalStaffYtd(root.getCompB_item120()); alliedProfSWSal.setCompSalContractServicesYtd(root.getCompB_item220()); - alliedProfSWSal.setCompSalOfficeAllocYtd(root.getCompB_item320()); alliedProfSWSal.setCompSalName(root.getAlliedProf_label_comp4()); alliedProfSWSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfSWSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -1026,7 +1004,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedProfSLPSal = new LtcYtdCompSal(); alliedProfSLPSal.setCompSalStaffYtd(root.getCompB_item121()); alliedProfSLPSal.setCompSalContractServicesYtd(root.getCompB_item221()); - alliedProfSLPSal.setCompSalOfficeAllocYtd(root.getCompB_item321()); alliedProfSLPSal.setCompSalName(root.getAlliedProf_label_comp5()); alliedProfSLPSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfSLPSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -1035,7 +1012,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedProfRPPSal = new LtcYtdCompSal(); alliedProfRPPSal.setCompSalStaffYtd(root.getCompB_item128()); alliedProfRPPSal.setCompSalContractServicesYtd(root.getCompB_item228()); - alliedProfRPPSal.setCompSalOfficeAllocYtd(root.getCompB_item328()); alliedProfRPPSal.setCompSalName(root.getAlliedProf_label_comp6()); alliedProfRPPSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfRPPSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -1044,7 +1020,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedProfOTHSal = new LtcYtdCompSal(); alliedProfOTHSal.setCompSalStaffYtd(root.getCompB_item129()); alliedProfOTHSal.setCompSalContractServicesYtd(root.getCompB_item229()); - alliedProfOTHSal.setCompSalOfficeAllocYtd(root.getCompB_item321()); alliedProfOTHSal.setCompSalName(root.getAlliedProf_label_comp7()); alliedProfOTHSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfOTHSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -1054,7 +1029,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedNPRTSal = new LtcYtdCompSal(); alliedNPRTSal.setCompSalStaffYtd(root.getCompB_item122()); alliedNPRTSal.setCompSalContractServicesYtd(root.getCompB_item222()); - alliedNPRTSal.setCompSalOfficeAllocYtd(root.getCompB_item322()); alliedNPRTSal.setCompSalName(root.getAlliedNP_label_comp1()); alliedNPRTSal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPRTSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -1063,7 +1037,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedNPRASal = new LtcYtdCompSal(); alliedNPRASal.setCompSalStaffYtd(root.getCompB_item123()); alliedNPRASal.setCompSalContractServicesYtd(root.getCompB_item223()); - alliedNPRASal.setCompSalOfficeAllocYtd(root.getCompB_item323()); alliedNPRASal.setCompSalName(root.getAlliedNP_label_comp2()); alliedNPRASal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPRASal.setConfirmationId(root.getForm().getConfirmationId()); @@ -1072,7 +1045,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedNPAWSal = new LtcYtdCompSal(); alliedNPAWSal.setCompSalStaffYtd(root.getCompB_item124()); alliedNPAWSal.setCompSalContractServicesYtd(root.getCompB_item224()); - alliedNPAWSal.setCompSalOfficeAllocYtd(root.getCompB_item324()); alliedNPAWSal.setCompSalName(root.getAlliedNP_label_comp3()); alliedNPAWSal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPAWSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -1081,7 +1053,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedNPMTSal = new LtcYtdCompSal(); alliedNPMTSal.setCompSalStaffYtd(root.getCompB_item125()); alliedNPMTSal.setCompSalContractServicesYtd(root.getCompB_item225()); - alliedNPMTSal.setCompSalOfficeAllocYtd(root.getCompB_item325()); alliedNPMTSal.setCompSalName(root.getAlliedNP_label_comp4()); alliedNPMTSal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPMTSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -1090,7 +1061,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedNPATSal = new LtcYtdCompSal(); alliedNPATSal.setCompSalStaffYtd(root.getCompB_item126()); alliedNPATSal.setCompSalContractServicesYtd(root.getCompB_item226()); - alliedNPATSal.setCompSalOfficeAllocYtd(root.getCompB_item326()); alliedNPATSal.setCompSalName(root.getAlliedNP_label_comp5()); alliedNPATSal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPATSal.setConfirmationId(root.getForm().getConfirmationId()); @@ -1099,7 +1069,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedNPOTHSal = new LtcYtdCompSal(); alliedNPOTHSal.setCompSalStaffYtd(root.getCompB_item127()); alliedNPOTHSal.setCompSalContractServicesYtd(root.getCompB_item227()); - alliedNPOTHSal.setCompSalOfficeAllocYtd(root.getCompB_item327()); alliedNPOTHSal.setCompSalName(root.getAlliedNP_label_comp6()); alliedNPOTHSal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPOTHSal.setConfirmationId(root.getForm().getConfirmationId()); From f80777b8927bf1b8b4900e480afccefe12c81d82 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 17:11:57 -0400 Subject: [PATCH 149/183] removed unused columu "Office Alloc" --- .../java/ca/bc/gov/chefs/etl/constant/Constants.java | 9 ++++----- .../ltc/quarterly/model/LtcYtdCompSalSubtotals.java | 10 ---------- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 5 ----- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index ac532da3..57a00b0c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -40,8 +40,8 @@ public class Constants { public static final String LTC_FACILITY_PREPARER = "LTC_FACILITY_PREPARER"; /* LTC Quarterly YTD */ - public final static String LTC_YTD_USERNAME = "ltc.ytd.username"; - public final static String LTC_YTD_PASSWORD = "ltc.ytd.password"; + public final static String LTC_YTD_USERNAME = "ltc.ytd.test.username"; + public final static String LTC_YTD_PASSWORD = "ltc.ytd.test.password"; public final static String IN_SCOPE = "inScope"; public final static String OUT_OF_SCOPE = "outOfScope"; public final static String PRIVATE_BED = "privateBed"; @@ -193,13 +193,12 @@ public class Constants { HEADERS.put(LTC_YTD_COMP_SAL_SUBTOTALS, new String[] { "Confirmation_ID", "Comp_Sal_Type", "Sub_Total_Comp_Sal_Staff_YTD", - "Sub_Total_Comp_Sal_Contract_Services_YTD", "Sub_Total_Comp_Sal_Office_Alloc_YTD", - "Sub_Total_Comp_Sal_Total_Cost_YTD", }); + "Sub_Total_Comp_Sal_Contract_Services_YTD", "Sub_Total_Comp_Sal_Total_Cost_YTD" }); HEADERS.put(LTC_YTD_COMP_SAL_TOTALS, new String[] { "Confirmation_ID", "Comp_Sal_Total_Type", "Total_Comp_Sal_Staff_YTD", "Total_Comp_Sal_Contract_Services_YTD", "Total_Comp_Sal_Office_Alloc_YTD", - "Total_Comp_Sal_Total_Cost_YTD", }); + "Total_Comp_Sal_Total_Cost_YTD" }); HEADERS.put(LTC_YTD_COMP_HRS, new String[] { "CONFIRMATION_ID", "COMP_HRS_TYPE", "COMP_HRS_NAME", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalSubtotals.java index 51cb66ed..8cd639c9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalSubtotals.java @@ -14,7 +14,6 @@ public class LtcYtdCompSalSubtotals implements IModel { private String compSalType; private String subTotalCompSalStaffYTD; private String subTotalCompSalContractServicesYTD; - private String subTotalCompSalOfficeAllocYTD; private String subTotalCompSalTotalCostYTD; public String getConfirmationId() { @@ -49,14 +48,6 @@ public void setSubTotalCompSalContractServicesYTD(String subTotalCompSalContract this.subTotalCompSalContractServicesYTD = subTotalCompSalContractServicesYTD; } - public String getSubTotalCompSalOfficeAllocYTD() { - return StringUtils.isBlank(subTotalCompSalOfficeAllocYTD) ? "0" : subTotalCompSalOfficeAllocYTD; - } - - public void setSubTotalCompSalOfficeAllocYTD(String subTotalCompSalOfficeAllocYTD) { - this.subTotalCompSalOfficeAllocYTD = subTotalCompSalOfficeAllocYTD; - } - public String getSubTotalCompSalTotalCostYTD() { return StringUtils.isBlank(subTotalCompSalTotalCostYTD) ? "0" : subTotalCompSalTotalCostYTD; } @@ -83,7 +74,6 @@ public List getCsvElements() { elements.add(this.getCompSalType()); elements.add(this.getSubTotalCompSalStaffYTD()); elements.add(this.getSubTotalCompSalContractServicesYTD()); - elements.add(this.getSubTotalCompSalOfficeAllocYTD()); elements.add(this.getSubTotalCompSalTotalCostYTD()); return elements; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index a2047f5a..382162a9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1087,7 +1087,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); supportSalSubtotal.setSubTotalCompSalStaffYTD(root.getSupportC_sum1()); supportSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getSupportC_sum2()); - supportSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum31()); supportSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getSupportC_calcsum()); LtcYtdCompSalSubtotals administrationSalSubtotal = new LtcYtdCompSalSubtotals(); @@ -1095,7 +1094,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY administrationSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); administrationSalSubtotal.setSubTotalCompSalStaffYTD(root.getAdminC_sum1()); administrationSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getAdminC_sum2()); - administrationSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum32()); administrationSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getAdminC_calcsum()); LtcYtdCompSalSubtotals nursingSalSubtotal = new LtcYtdCompSalSubtotals(); @@ -1103,7 +1101,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); nursingSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum13()); nursingSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum23()); - nursingSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum33()); nursingSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum3()); LtcYtdCompSalSubtotals alliedSalSubtotal = new LtcYtdCompSalSubtotals(); @@ -1111,7 +1108,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); alliedSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum14()); alliedSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum24()); - alliedSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum34()); alliedSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum4()); LtcYtdCompSalSubtotals alliedNPSalSubtotal = new LtcYtdCompSalSubtotals(); @@ -1119,7 +1115,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPSalSubtotal.setConfirmationId(root.getForm().getConfirmationId()); alliedNPSalSubtotal.setSubTotalCompSalStaffYTD(root.getCompB_sum15()); alliedNPSalSubtotal.setSubTotalCompSalContractServicesYTD(root.getCompB_sum25()); - alliedNPSalSubtotal.setSubTotalCompSalOfficeAllocYTD(root.getCompB_sum35()); alliedNPSalSubtotal.setSubTotalCompSalTotalCostYTD(root.getCompB_calcsum5()); Collections.addAll(ltcYtdCompSalSubttls,administrationSalSubtotal,nursingSalSubtotal,supportSalSubtotal,alliedSalSubtotal,alliedNPSalSubtotal); From 1dd568515f41eb5a662c8d689fdfbc5d917d7d8f Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 17:22:22 -0400 Subject: [PATCH 150/183] removed column no longer used --- .../java/ca/bc/gov/chefs/etl/constant/Constants.java | 3 +-- .../forms/ltc/quarterly/model/LtcYtdCompSalTotals.java | 10 ---------- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 4 ---- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 57a00b0c..41f16701 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -197,8 +197,7 @@ public class Constants { HEADERS.put(LTC_YTD_COMP_SAL_TOTALS, new String[] { "Confirmation_ID", "Comp_Sal_Total_Type", "Total_Comp_Sal_Staff_YTD", - "Total_Comp_Sal_Contract_Services_YTD", "Total_Comp_Sal_Office_Alloc_YTD", - "Total_Comp_Sal_Total_Cost_YTD" }); + "Total_Comp_Sal_Contract_Services_YTD", "Total_Comp_Sal_Total_Cost_YTD" }); HEADERS.put(LTC_YTD_COMP_HRS, new String[] { "CONFIRMATION_ID", "COMP_HRS_TYPE", "COMP_HRS_NAME", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java index 94830f14..7453023a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSalTotals.java @@ -14,7 +14,6 @@ public class LtcYtdCompSalTotals implements IModel { private String compSalType; private String totalCompSalStaffYTD; private String totalCompSalContractServicesYTD; - private String totalCompSalOfficeAllocYTD; private String totalCompSalTotalCostYTD; public String getConfirmationId() { @@ -49,14 +48,6 @@ public void setTotalCompSalContractServicesYTD(String totalCompSalContractServic this.totalCompSalContractServicesYTD = totalCompSalContractServicesYTD; } - public String getTotalCompSalOfficeAllocYTD() { - return StringUtils.isBlank(totalCompSalOfficeAllocYTD) ? "0" : totalCompSalOfficeAllocYTD; - } - - public void setTotalCompSalOfficeAllocYTD(String totalCompSalOfficeAllocYTD) { - this.totalCompSalOfficeAllocYTD = totalCompSalOfficeAllocYTD; - } - public String getTotalCompSalTotalCostYTD() { return StringUtils.isBlank(totalCompSalTotalCostYTD) ? "0" : totalCompSalTotalCostYTD; } @@ -83,7 +74,6 @@ public List getCsvElements() { elements.add(this.getCompSalType()); elements.add(this.getTotalCompSalStaffYTD()); elements.add(this.getTotalCompSalContractServicesYTD()); - elements.add(this.getTotalCompSalOfficeAllocYTD()); elements.add(this.getTotalCompSalTotalCostYTD()); return elements; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 382162a9..254a1c32 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1124,7 +1124,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY totalPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); totalPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_total1()); totalPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_total2()); - totalPerPayrollSal.setTotalCompSalOfficeAllocYTD(root.getCompB_total3()); totalPerPayrollSal.setTotalCompSalTotalCostYTD(root.getCompB_total()); LtcYtdCompSalTotals recoveredPerPayrollSal = new LtcYtdCompSalTotals(); @@ -1132,7 +1131,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY recoveredPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); recoveredPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_recovered1()); recoveredPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_recovered2()); - recoveredPerPayrollSal.setTotalCompSalOfficeAllocYTD(root.getCompB_recovered3()); recoveredPerPayrollSal.setTotalCompSalTotalCostYTD(root.getCompB_recovered()); LtcYtdCompSalTotals accruedPerPayrollSal = new LtcYtdCompSalTotals(); @@ -1140,7 +1138,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY accruedPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); accruedPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_accrued1()); accruedPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_accrued2()); - accruedPerPayrollSal.setTotalCompSalOfficeAllocYTD(root.getCompB_accrued3()); accruedPerPayrollSal.setTotalCompSalTotalCostYTD(root.getCompB_accrued()); LtcYtdCompSalTotals otherPerPayrollSal = new LtcYtdCompSalTotals(); @@ -1148,7 +1145,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY otherPerPayrollSal.setConfirmationId(root.getForm().getConfirmationId()); otherPerPayrollSal.setTotalCompSalStaffYTD(root.getCompB_laborOther1()); otherPerPayrollSal.setTotalCompSalContractServicesYTD(root.getCompB_laborOther2()); - otherPerPayrollSal.setTotalCompSalOfficeAllocYTD(root.getCompB_laborOther3()); otherPerPayrollSal.setTotalCompSalTotalCostYTD(root.getCompB_laborOther()); Collections.addAll(ltcYtdCompsalTtls,totalPerPayrollSal,recoveredPerPayrollSal,accruedPerPayrollSal,otherPerPayrollSal); From b701d42dd89a02fa7233e3306375c73d5388da27 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 17:32:22 -0400 Subject: [PATCH 151/183] removed "OfficeAlloc" column no longer used for all files --- .../bc/gov/chefs/etl/constant/Constants.java | 9 ++--- .../ltc/quarterly/model/LtcYtdCompHrs.java | 9 ----- .../model/LtcYtdCompHrsSubtotals.java | 8 ---- .../quarterly/model/LtcYtdCompHrsTotals.java | 10 ----- .../LtcQuarterlyYtdApiResponseProcessor.java | 38 ------------------- 5 files changed, 3 insertions(+), 71 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 41f16701..67186b70 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -201,18 +201,15 @@ public class Constants { HEADERS.put(LTC_YTD_COMP_HRS, new String[] { "CONFIRMATION_ID", "COMP_HRS_TYPE", "COMP_HRS_NAME", - "COMP_HRS_STAFF_YTD", "COMP_HRS_CONTRACT_SERVICES_YTD", "COMP_HRS_OFFICE_ALLOC_YTD", - "COMP_TOTAL_WORKED_HRS_YTD" }); + "COMP_HRS_STAFF_YTD", "COMP_HRS_CONTRACT_SERVICES_YTD", "COMP_TOTAL_WORKED_HRS_YTD" }); HEADERS.put(LTC_YTD_COMP_HRS_SUBTOTALS, new String[] { "Confirmation_ID", "Comp_Hrs_Type", "Sub_Total_Comp_Hrs_Staff_YTD", - "Sub_Total_Comp_Hrs_Contract_Services_YTD", "Sub_Total_Comp_Hrs_Office_Alloc_YTD", - "Sub_Total_Comp_Total_Worked_Hrs_YTD", }); + "Sub_Total_Comp_Hrs_Contract_Services_YTD", "Sub_Total_Comp_Total_Worked_Hrs_YTD", }); HEADERS.put(LTC_YTD_COMP_HRS_TOTALS, new String[] { "Confirmation_ID", "Comp_Hrs_Total_Type", "Total_Comp_Hrs_Staff_YTD", - "Total_Comp_Hrs_Contract_Services_YTD", "Total_Comp_Hrs_Office_Alloc_YTD", - "Total_Comp_Hrs_Total_Cost_YTD", }); + "Total_Comp_Hrs_Contract_Services_YTD", "Total_Comp_Hrs_Total_Cost_YTD", }); HEADERS.put(LTC_YTD_COMP_ADD_POS, new String[] { "CONFIRMATION_ID", "ADD_POS_TYPE", "ADD_POS_NAME", "ADD_POS_CONTRACTED_OUT_YTD", "ADD_POS_LEGAL_NAME_CONTRACT_SERVICE_YTD", "ADD_POS_PERCENT_SERVICE_CONTRACT_OUT_YTD", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java index ec3813d3..0dbfe159 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java @@ -16,7 +16,6 @@ public class LtcYtdCompHrs implements IModel { //private String compHrsPerPayrollYtd; private String compHrsStaffYtd; private String compHrsContractServicesYtd; - private String compHrsOfficeAllocYtd; private String compTotalWorkedHrsYtd; public String getConfirmationId() { @@ -50,13 +49,6 @@ public String getCompHrsContractServicesYtd() { public void setCompHrsContractServicesYtd(String compHrsContractServicesYtd) { this.compHrsContractServicesYtd = StringUtils.defaultIfEmpty(compHrsContractServicesYtd, Constants.DEFAULT_DECIMAL_VALUE); } - public String getCompHrsOfficeAllocYtd() { - return StringUtils.isEmpty(compHrsOfficeAllocYtd) ? "0" : compHrsOfficeAllocYtd; - } - public void setCompHrsOfficeAllocYtd(String compHrsOfficeAllocYtd) { - this.compHrsOfficeAllocYtd = StringUtils.defaultIfEmpty(compHrsOfficeAllocYtd, Constants.DEFAULT_DECIMAL_VALUE); - } - public String getCompTotalWorkedHrsYtd() { return compTotalWorkedHrsYtd.isBlank() ? "0" : compTotalWorkedHrsYtd; } @@ -80,7 +72,6 @@ public List getCsvElements() { elements.add(this.getCompHrsName()); elements.add(this.getCompHrsStaffYtd()); elements.add(this.getCompHrsContractServicesYtd()); - elements.add(this.getCompHrsOfficeAllocYtd()); elements.add(this.getCompTotalWorkedHrsYtd()); return elements; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsSubtotals.java index fe46ee6d..2912c61f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsSubtotals.java @@ -14,7 +14,6 @@ public class LtcYtdCompHrsSubtotals implements IModel { private String compHrsType; private String subTotalCompHrsStaffYTD; private String subTotalCompHrsContractServicesYTD; - private String subTotalCompHrsOfficeAllocYTD; private String subTotalCompTotalWorkedHrsYTD; public String getConfirmationID() { @@ -41,12 +40,6 @@ public String getSubTotalCompHrsContractServicesYTD() { public void setSubTotalCompHrsContractServicesYTD(String subTotalCompHrsContractServicesYTD) { this.subTotalCompHrsContractServicesYTD = subTotalCompHrsContractServicesYTD; } - public String getSubTotalCompHrsOfficeAllocYTD() { - return StringUtils.isBlank(subTotalCompHrsOfficeAllocYTD) ? "0" : subTotalCompHrsOfficeAllocYTD; - } - public void setSubTotalCompHrsOfficeAllocYTD(String subTotalCompHrsOfficeAllocYTD) { - this.subTotalCompHrsOfficeAllocYTD = subTotalCompHrsOfficeAllocYTD; - } public String getSubTotalCompTotalWorkedHrsYTD() { return StringUtils.isBlank(subTotalCompTotalWorkedHrsYTD) ? "0" : subTotalCompTotalWorkedHrsYTD; } @@ -70,7 +63,6 @@ public List getCsvElements() { elements.add(this.getCompHrsType()); elements.add(this.getSubTotalCompHrsStaffYTD()); elements.add(this.getSubTotalCompHrsContractServicesYTD()); - elements.add(this.getSubTotalCompHrsOfficeAllocYTD()); elements.add(this.getSubTotalCompTotalWorkedHrsYTD()); return elements; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsTotals.java index 4ede1c76..2fe0e1ca 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrsTotals.java @@ -14,7 +14,6 @@ public class LtcYtdCompHrsTotals implements IModel{ private String compHrsTotalType; private String totalCompHrsStaffYTD; private String totalCompHrsContractServicesYTD; - private String totalCompHrsOfficeAllocYTD; private String totalCompTotalWorkedHrsYTD; @@ -51,14 +50,6 @@ public void setTotalCompHrsContractServicesYTD(String totalCompHrsContractServic this.totalCompHrsContractServicesYTD = totalCompHrsContractServicesYTD; } - public String getTotalCompHrsOfficeAllocYTD() { - return StringUtils.isBlank(totalCompHrsOfficeAllocYTD) ? "0" : totalCompHrsOfficeAllocYTD; - } - - public void setTotalCompHrsOfficeAllocYTD(String totalCompHrsOfficeAllocYTD) { - this.totalCompHrsOfficeAllocYTD = totalCompHrsOfficeAllocYTD; - } - public String getTotalCompTotalWorkedHrsYTD() { return StringUtils.isBlank(totalCompTotalWorkedHrsYTD) ? "0" : totalCompTotalWorkedHrsYTD; } @@ -86,7 +77,6 @@ public List getCsvElements() { // elements.add(this.getTotalCompHrsPerPayrollYTD()); elements.add(this.getTotalCompHrsStaffYTD()); elements.add(this.getTotalCompHrsContractServicesYTD()); - elements.add(this.getTotalCompHrsOfficeAllocYTD()); elements.add(this.getTotalCompTotalWorkedHrsYTD()); return elements; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 254a1c32..303b3dc0 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1154,7 +1154,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //supportFoodServicesHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP1()); supportFoodServicesHrs.setCompHrsStaffYtd(root.getSupportH_item11()); supportFoodServicesHrs.setCompHrsContractServicesYtd(root.getSupportH_item21()); - supportFoodServicesHrs.setCompHrsOfficeAllocYtd(root.getCompH_item31()); supportFoodServicesHrs.setCompHrsName(root.getSupport_label1()); supportFoodServicesHrs.setCompHrsType(root.getSupport_label()); supportFoodServicesHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1164,7 +1163,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //supportLaundryServicesHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP2()); supportLaundryServicesHrs.setCompHrsStaffYtd(root.getSupportH_item12()); supportLaundryServicesHrs.setCompHrsContractServicesYtd(root.getSupportH_item22()); - supportLaundryServicesHrs.setCompHrsOfficeAllocYtd(root.getCompH_item32()); supportLaundryServicesHrs.setCompHrsName(root.getSupport_label2()); supportLaundryServicesHrs.setCompHrsType(root.getSupport_label()); supportLaundryServicesHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1174,7 +1172,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //supportHousekeepingHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP3()); supportHousekeepingHrs.setCompHrsStaffYtd(root.getSupportH_item13()); supportHousekeepingHrs.setCompHrsContractServicesYtd(root.getSupportH_item23()); - supportHousekeepingHrs.setCompHrsOfficeAllocYtd(root.getCompH_item33()); supportHousekeepingHrs.setCompHrsName(root.getSupport_label3()); supportHousekeepingHrs.setCompHrsType(root.getSupport_label()); supportHousekeepingHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1184,7 +1181,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY // supportPlantMntnceHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP4()); supportPlantMntnceHrs.setCompHrsStaffYtd(root.getSupportH_item14()); supportPlantMntnceHrs.setCompHrsContractServicesYtd(root.getSupportH_item24()); - supportPlantMntnceHrs.setCompHrsOfficeAllocYtd(root.getCompH_item34()); supportPlantMntnceHrs.setCompHrsName(root.getSupport_label4()); supportPlantMntnceHrs.setCompHrsType(root.getSupport_label()); supportPlantMntnceHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1195,7 +1191,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY // adminAdministratorHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP5()); adminAdministratorHrs.setCompHrsStaffYtd(root.getAdminH_item11()); adminAdministratorHrs.setCompHrsContractServicesYtd(root.getAdminH_item21()); - adminAdministratorHrs.setCompHrsOfficeAllocYtd(""); adminAdministratorHrs.setCompHrsName(root.getAdmin_label1()); adminAdministratorHrs.setCompHrsType(root.getAdmin_label()); adminAdministratorHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1206,7 +1201,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //adminDirOfCareHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP6()); adminDirOfCareHrs.setCompHrsStaffYtd(root.getAdminH_item12()); adminDirOfCareHrs.setCompHrsContractServicesYtd(root.getAdminH_item22()); - adminDirOfCareHrs.setCompHrsOfficeAllocYtd(""); adminDirOfCareHrs.setCompHrsName(root.getAdmin_label2()); adminDirOfCareHrs.setCompHrsType(root.getAdmin_label()); adminDirOfCareHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1216,7 +1210,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY // adminDeptManagersHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP7()); adminDeptManagersHrs.setCompHrsStaffYtd(root.getAdminH_item13()); adminDeptManagersHrs.setCompHrsContractServicesYtd(root.getAdminH_item23()); - adminDeptManagersHrs.setCompHrsOfficeAllocYtd(""); adminDeptManagersHrs.setCompHrsName(root.getAdmin_label3()); adminDeptManagersHrs.setCompHrsType(root.getAdmin_label()); adminDeptManagersHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1226,7 +1219,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //adminSupportHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP8()); adminSupportHrs.setCompHrsStaffYtd(root.getAdminH_item14()); adminSupportHrs.setCompHrsContractServicesYtd(root.getAdminH_item24()); - adminSupportHrs.setCompHrsOfficeAllocYtd(""); adminSupportHrs.setCompHrsName(root.getAdmin_label4()); adminSupportHrs.setCompHrsType(root.getAdmin_label()); adminSupportHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1236,7 +1228,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY // adminPastoCareWrkrHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP9()); adminPastoCareWrkrHrs.setCompHrsStaffYtd(root.getAdminH_item15()); adminPastoCareWrkrHrs.setCompHrsContractServicesYtd(root.getAdminH_item25()); - adminPastoCareWrkrHrs.setCompHrsOfficeAllocYtd(""); adminPastoCareWrkrHrs.setCompHrsName(root.getAdmin_label5()); adminPastoCareWrkrHrs.setCompHrsType(root.getAdmin_label()); adminPastoCareWrkrHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1246,7 +1237,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //adminClrksHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP10()); adminClrksHrs.setCompHrsStaffYtd(root.getAdminH_item16()); adminClrksHrs.setCompHrsContractServicesYtd(root.getAdminH_item26()); - adminClrksHrs.setCompHrsOfficeAllocYtd(""); adminClrksHrs.setCompHrsName(root.getAdmin_label6()); adminClrksHrs.setCompHrsType(root.getAdmin_label()); adminClrksHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1256,7 +1246,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY // adminClncCrdinatorHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP11()); adminClncCrdinatorHrs.setCompHrsStaffYtd(root.getAdminH_item17()); adminClncCrdinatorHrs.setCompHrsContractServicesYtd(root.getAdminH_item27()); - adminClncCrdinatorHrs.setCompHrsOfficeAllocYtd(""); adminClncCrdinatorHrs.setCompHrsName(root.getAdmin_label7()); adminClncCrdinatorHrs.setCompHrsType(root.getAdmin_label()); adminClncCrdinatorHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1265,7 +1254,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompHrs adminScreenersGreeters = new LtcYtdCompHrs(); adminScreenersGreeters.setCompHrsStaffYtd(root.getAdminH_item18()); adminScreenersGreeters.setCompHrsContractServicesYtd(root.getAdminH_item28()); - adminScreenersGreeters.setCompHrsOfficeAllocYtd(""); adminScreenersGreeters.setCompHrsName(root.getAdmin_label8()); adminScreenersGreeters.setCompHrsType(root.getAdmin_label()); adminScreenersGreeters.setConfirmationId(root.getForm().getConfirmationId()); @@ -1274,7 +1262,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompHrs adminHCSW = new LtcYtdCompHrs(); adminHCSW.setCompHrsStaffYtd(root.getAdminH_item19()); adminHCSW.setCompHrsContractServicesYtd(root.getAdminH_item29()); - adminHCSW.setCompHrsOfficeAllocYtd(""); adminHCSW.setCompHrsName(root.getAdmin_label9()); adminHCSW.setCompHrsType(root.getAdmin_label()); adminHCSW.setConfirmationId(root.getForm().getConfirmationId()); @@ -1284,7 +1271,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY // adminOtherHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP12()); adminOtherHrs.setCompHrsStaffYtd(root.getAdminH_item110()); adminOtherHrs.setCompHrsContractServicesYtd(root.getAdminH_item210()); - adminOtherHrs.setCompHrsOfficeAllocYtd(""); adminOtherHrs.setCompHrsName(root.getAdmin_label10()); adminOtherHrs.setCompHrsType(root.getAdmin_label()); adminOtherHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1295,7 +1281,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //nursingRNHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP13()); nursingRNHrs.setCompHrsStaffYtd(root.getCompH_item113()); nursingRNHrs.setCompHrsContractServicesYtd(root.getCompH_item213()); - nursingRNHrs.setCompHrsOfficeAllocYtd(root.getCompH_item313()); nursingRNHrs.setCompHrsName(root.getNursing_label_comp1()); nursingRNHrs.setCompHrsType(root.getNursing_label_comp()); nursingRNHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1305,7 +1290,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //nursingLPNHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP14()); nursingLPNHrs.setCompHrsStaffYtd(root.getCompH_item114()); nursingLPNHrs.setCompHrsContractServicesYtd(root.getCompH_item214()); - nursingLPNHrs.setCompHrsOfficeAllocYtd(root.getCompH_item314()); nursingLPNHrs.setCompHrsName(root.getNursing_label_comp2()); nursingLPNHrs.setCompHrsType(root.getNursing_label_comp()); nursingLPNHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1315,7 +1299,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //nursingHCAHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP15()); nursingHCAHrs.setCompHrsStaffYtd(root.getCompH_item115()); nursingHCAHrs.setCompHrsContractServicesYtd(root.getCompH_item215()); - nursingHCAHrs.setCompHrsOfficeAllocYtd(root.getCompH_item315()); nursingHCAHrs.setCompHrsName(root.getNursing_label_comp3()); nursingHCAHrs.setCompHrsType(root.getNursing_label_comp()); nursingHCAHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1325,7 +1308,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //nursingOthHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP16()); nursingOthHrs.setCompHrsStaffYtd(root.getCompH_item116()); nursingOthHrs.setCompHrsContractServicesYtd(root.getCompH_item216()); - nursingOthHrs.setCompHrsOfficeAllocYtd(root.getCompH_item316()); nursingOthHrs.setCompHrsName(root.getNursing_label_comp4()); nursingOthHrs.setCompHrsType(root.getNursing_label_comp()); nursingOthHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1335,7 +1317,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedProfOTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP17()); alliedProfOTHrs.setCompHrsStaffYtd(root.getCompH_item117()); alliedProfOTHrs.setCompHrsContractServicesYtd(root.getCompH_item217()); - alliedProfOTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item317()); alliedProfOTHrs.setCompHrsName(root.getAlliedProf_label_comp1()); alliedProfOTHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfOTHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1345,7 +1326,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedProfPTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP18()); alliedProfPTHrs.setCompHrsStaffYtd(root.getCompH_item118()); alliedProfPTHrs.setCompHrsContractServicesYtd(root.getCompH_item218()); - alliedProfPTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item318()); alliedProfPTHrs.setCompHrsName(root.getAlliedProf_label_comp2()); alliedProfPTHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfPTHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1355,7 +1335,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedProfDTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP19()); alliedProfDTHrs.setCompHrsStaffYtd(root.getCompH_item119()); alliedProfDTHrs.setCompHrsContractServicesYtd(root.getCompH_item219()); - alliedProfDTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item319()); alliedProfDTHrs.setCompHrsName(root.getAlliedProf_label_comp3()); alliedProfDTHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfDTHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1365,7 +1344,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedProfSWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP20()); alliedProfSWHrs.setCompHrsStaffYtd(root.getCompH_item120()); alliedProfSWHrs.setCompHrsContractServicesYtd(root.getCompH_item220()); - alliedProfSWHrs.setCompHrsOfficeAllocYtd(root.getCompH_item320()); alliedProfSWHrs.setCompHrsName(root.getAlliedProf_label_comp4()); alliedProfSWHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfSWHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1375,7 +1353,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedProfSWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP20()); alliedProfSLPHrs.setCompHrsStaffYtd(root.getCompH_item121()); alliedProfSLPHrs.setCompHrsContractServicesYtd(root.getCompH_item221()); - alliedProfSLPHrs.setCompHrsOfficeAllocYtd(root.getCompH_item321()); alliedProfSLPHrs.setCompHrsName(root.getAlliedProf_label_comp5()); alliedProfSLPHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfSLPHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1385,7 +1362,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedProfSWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP20()); alliedProfRTHrs.setCompHrsStaffYtd(root.getCompH_item128()); alliedProfRTHrs.setCompHrsContractServicesYtd(root.getCompH_item228()); - alliedProfRTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item328()); alliedProfRTHrs.setCompHrsName(root.getAlliedProf_label_comp6()); alliedProfRTHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfRTHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1395,7 +1371,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedProfOTHHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP21()); alliedProfOTHHrs.setCompHrsStaffYtd(root.getCompH_item129()); alliedProfOTHHrs.setCompHrsContractServicesYtd(root.getCompH_item229()); - alliedProfOTHHrs.setCompHrsOfficeAllocYtd(root.getCompH_item329()); alliedProfOTHHrs.setCompHrsName(root.getAlliedProf_label_comp7()); alliedProfOTHHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfOTHHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1405,7 +1380,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedNPRTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP22()); alliedNPRTHrs.setCompHrsStaffYtd(root.getCompH_item122()); alliedNPRTHrs.setCompHrsContractServicesYtd(root.getCompH_item222()); - alliedNPRTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item322()); alliedNPRTHrs.setCompHrsName(root.getAlliedNP_label_comp1()); alliedNPRTHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPRTHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1415,7 +1389,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedNPRAHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP23()); alliedNPRAHrs.setCompHrsStaffYtd(root.getCompH_item123()); alliedNPRAHrs.setCompHrsContractServicesYtd(root.getCompH_item223()); - alliedNPRAHrs.setCompHrsOfficeAllocYtd(root.getCompH_item323()); alliedNPRAHrs.setCompHrsName(root.getAlliedNP_label_comp2()); alliedNPRAHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPRAHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1425,7 +1398,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedNPAWHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP24()); alliedNPAWHrs.setCompHrsStaffYtd(root.getCompH_item124()); alliedNPAWHrs.setCompHrsContractServicesYtd(root.getCompH_item224()); - alliedNPAWHrs.setCompHrsOfficeAllocYtd(root.getCompH_item324()); alliedNPAWHrs.setCompHrsName(root.getAlliedNP_label_comp3()); alliedNPAWHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPAWHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1435,7 +1407,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedNPMTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP25()); alliedNPMTHrs.setCompHrsStaffYtd(root.getCompH_item125()); alliedNPMTHrs.setCompHrsContractServicesYtd(root.getCompH_item225()); - alliedNPMTHrs.setCompHrsOfficeAllocYtd(root.getCompH_item325()); alliedNPMTHrs.setCompHrsName(root.getAlliedNP_label_comp4()); alliedNPMTHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPMTHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1445,7 +1416,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedNPATHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP26()); alliedNPATHrs.setCompHrsStaffYtd(root.getCompH_item126()); alliedNPATHrs.setCompHrsContractServicesYtd(root.getCompH_item226()); - alliedNPATHrs.setCompHrsOfficeAllocYtd(root.getCompH_item326()); alliedNPATHrs.setCompHrsName(root.getAlliedNP_label_comp5()); alliedNPATHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPATHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1455,7 +1425,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedNPOTHHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP27()); alliedNPOTHHrs.setCompHrsStaffYtd(root.getCompH_item127()); alliedNPOTHHrs.setCompHrsContractServicesYtd(root.getCompH_item227()); - alliedNPOTHHrs.setCompHrsOfficeAllocYtd(root.getCompH_item327()); alliedNPOTHHrs.setCompHrsName(root.getAlliedNP_label_comp6()); alliedNPOTHHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPOTHHrs.setConfirmationId(root.getForm().getConfirmationId()); @@ -1474,7 +1443,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY supportHrsSubtotals.setCompHrsType(root.getSupport_label()); supportHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getSupportH_sum1()); supportHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getSupportH_sum2()); - supportHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum31()); supportHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getSupportH_calcsum()); LtcYtdCompHrsSubtotals adminHrsSubtotals = new LtcYtdCompHrsSubtotals(); @@ -1482,7 +1450,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminHrsSubtotals.setCompHrsType(root.getAdmin_label()); adminHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getAdminH_sum1()); adminHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getAdminH_sum2()); - adminHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum32()); adminHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getAdminH_calcsum()); LtcYtdCompHrsSubtotals nursingHrsSubtotals = new LtcYtdCompHrsSubtotals(); @@ -1490,7 +1457,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingHrsSubtotals.setCompHrsType(root.getNursing_label_comp()); nursingHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum13()); nursingHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum23()); - nursingHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum33()); nursingHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getCompH_calcsum3()); LtcYtdCompHrsSubtotals alliedHrsSubtotals = new LtcYtdCompHrsSubtotals(); @@ -1498,7 +1464,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedHrsSubtotals.setCompHrsType(root.getAlliedProf_label_comp()); alliedHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum14()); alliedHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum24()); - alliedHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum34()); alliedHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getCompH_calcsum4()); LtcYtdCompHrsSubtotals alliedNPHrsSubtotals = new LtcYtdCompHrsSubtotals(); @@ -1506,7 +1471,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY alliedNPHrsSubtotals.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPHrsSubtotals.setSubTotalCompHrsStaffYTD(root.getCompH_sum15()); alliedNPHrsSubtotals.setSubTotalCompHrsContractServicesYTD(root.getCompH_sum25()); - alliedNPHrsSubtotals.setSubTotalCompHrsOfficeAllocYTD(root.getCompH_sum35()); alliedNPHrsSubtotals.setSubTotalCompTotalWorkedHrsYTD(root.getCompH_calcsum5()); Collections.addAll(ltcYtdCompHrsSubttls, supportHrsSubtotals,adminHrsSubtotals,nursingHrsSubtotals,alliedHrsSubtotals,alliedNPHrsSubtotals); @@ -1516,7 +1480,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY totalPerPayrollHrsTotals.setCompHrsTotalType(root.getCompH_total_label()); totalPerPayrollHrsTotals.setTotalCompHrsStaffYTD(root.getCompH_total1()); totalPerPayrollHrsTotals.setTotalCompHrsContractServicesYTD(root.getCompH_total2()); - totalPerPayrollHrsTotals.setTotalCompHrsOfficeAllocYTD(root.getCompH_total3()); totalPerPayrollHrsTotals.setTotalCompTotalWorkedHrsYTD(root.getCompH_total()); totalPerPayrollHrsTotals.setConfirmationID(root.getForm().getConfirmationId()); @@ -1524,7 +1487,6 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY accuredHrsTotals.setCompHrsTotalType(root.getCompH_accrued_label()); accuredHrsTotals.setTotalCompHrsStaffYTD(root.getCompH_accrued2()); accuredHrsTotals.setTotalCompHrsContractServicesYTD(root.getCompH_accrued3()); - accuredHrsTotals.setTotalCompHrsOfficeAllocYTD(root.getCompH_accrued4()); accuredHrsTotals.setTotalCompTotalWorkedHrsYTD(root.getCompH_accrued()); accuredHrsTotals.setConfirmationID(root.getForm().getConfirmationId()); From 3847297faffdb9cdbfb7198a5c72c490e6182973 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 17:43:14 -0400 Subject: [PATCH 152/183] remmaping bugfix --- .../etl/forms/ltc/quarterly/json/Root.java | 152 ++++++++---------- .../LtcQuarterlyYtdApiResponseProcessor.java | 20 +-- 2 files changed, 81 insertions(+), 91 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 19e7a909..46727ddd 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -841,16 +841,6 @@ public class Root{ public String compH_accrued3; public String compH_accrued4; public String supportH_calc1; - @JsonProperty("adminH_item3-6") - public String adminH_item36; - @JsonProperty("adminH_item3-7") - public String adminH_item37; - @JsonProperty("adminH_item3-8") - public String adminH_item38; - @JsonProperty("adminH_item3-9") - public String adminH_item39; - @JsonProperty("adminH_item3-10") - public String adminH_item310; public String compH_calc13; public String compH_calc14; public String compH_calc15; @@ -871,16 +861,6 @@ public class Root{ public String compH_calc29; public String supportH_calc3; public String supportH_calc4; - @JsonProperty("adminH_item3-1") - public String adminH_item31; - @JsonProperty("adminH_item3-2") - public String adminH_item32; - @JsonProperty("adminH_item3-3") - public String adminH_item33; - @JsonProperty("adminH_item3-4") - public String adminH_item34; - @JsonProperty("adminH_item3-5") - public String adminH_item35; public String supportH_calcsum; public String adminH_calcsum; public String compH_calcsum3; @@ -938,7 +918,17 @@ public class Root{ public String supportH_item13; @JsonProperty("supportH_item1-4") public String supportH_item14; - @JsonProperty("adminH_item1-1") + public String adminH_calc1; + public String adminH_calc2; + public String adminH_calc3; + public String adminH_calc4; + public String adminH_calc5; + public String adminH_calc6; + public String adminH_calc7; + public String adminH_calc8; + public String adminH_calc9; + public String adminH_calc10; + @JsonProperty("adminH_item1-1") public String adminH_item11; @JsonProperty("adminH_item1-2") public String adminH_item12; @@ -6118,36 +6108,6 @@ public String getSupportH_calc1() { public void setSupportH_calc1(String compH_calc1) { this.supportH_calc1 = compH_calc1; } - public String getAdminH_item36() { - return adminH_item36; - } - public void setAdminH_item36(String compH_calc10) { - this.adminH_item36 = compH_calc10; - } - public String getAdminH_item37() { - return adminH_item37; - } - public void setAdminH_item37(String compH_calc11) { - this.adminH_item37 = compH_calc11; - } - public String getAdminH_item38() { - return adminH_item38; - } - public void setAdminH_item38(String adminH_item38) { - this.adminH_item38 = adminH_item38; - } - public String getAdminH_item39() { - return adminH_item39; - } - public void setAdminH_item39(String adminH_item39) { - this.adminH_item39 = adminH_item39; - } - public String getAdminH_item310() { - return adminH_item310; - } - public void setAdminH_item310(String compH_calc12) { - this.adminH_item310 = compH_calc12; - } public String getCompH_calc13() { return compH_calc13; } @@ -6268,36 +6228,6 @@ public String getSupportH_calc4() { public void setSupportH_calc4(String compH_calc4) { this.supportH_calc4 = compH_calc4; } - public String getAdminH_item31() { - return adminH_item31; - } - public void setAdminH_item31(String compH_calc5) { - this.adminH_item31 = compH_calc5; - } - public String getAdminH_item32() { - return adminH_item32; - } - public void setAdminH_item32(String compH_calc6) { - this.adminH_item32 = compH_calc6; - } - public String getAdminH_item33() { - return adminH_item33; - } - public void setAdminH_item33(String compH_calc7) { - this.adminH_item33 = compH_calc7; - } - public String getAdminH_item34() { - return adminH_item34; - } - public void setAdminH_item34(String compH_calc8) { - this.adminH_item34 = compH_calc8; - } - public String getAdminH_item35() { - return adminH_item35; - } - public void setAdminH_item35(String compH_calc9) { - this.adminH_item35 = compH_calc9; - } public String getSupportH_calcsum() { return supportH_calcsum; } @@ -6484,6 +6414,66 @@ public String getSupportH_item14() { public void setSupportH_item14(String compH_item14) { this.supportH_item14 = compH_item14; } + public String getAdminH_calc1() { + return adminH_calc1; + } + public void setAdminH_calc1(String adminH_calc1) { + this.adminH_calc1 = adminH_calc1; + } + public String getAdminH_calc2() { + return adminH_calc2; + } + public void setAdminH_calc2(String adminH_calc2) { + this.adminH_calc2 = adminH_calc2; + } + public String getAdminH_calc3() { + return adminH_calc3; + } + public void setAdminH_calc3(String adminH_calc3) { + this.adminH_calc3 = adminH_calc3; + } + public String getAdminH_calc4() { + return adminH_calc4; + } + public void setAdminH_calc4(String adminH_calc4) { + this.adminH_calc4 = adminH_calc4; + } + public String getAdminH_calc5() { + return adminH_calc5; + } + public void setAdminH_calc5(String adminH_calc5) { + this.adminH_calc5 = adminH_calc5; + } + public String getAdminH_calc6() { + return adminH_calc6; + } + public void setAdminH_calc6(String adminH_calc6) { + this.adminH_calc6 = adminH_calc6; + } + public String getAdminH_calc7() { + return adminH_calc7; + } + public void setAdminH_calc7(String adminH_calc7) { + this.adminH_calc7 = adminH_calc7; + } + public String getAdminH_calc8() { + return adminH_calc8; + } + public void setAdminH_calc8(String adminH_calc8) { + this.adminH_calc8 = adminH_calc8; + } + public String getAdminH_calc9() { + return adminH_calc9; + } + public void setAdminH_calc9(String adminH_calc9) { + this.adminH_calc9 = adminH_calc9; + } + public String getAdminH_calc10() { + return adminH_calc10; + } + public void setAdminH_calc10(String adminH_calc10) { + this.adminH_calc10 = adminH_calc10; + } public String getAdminH_item11() { return adminH_item11; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 303b3dc0..ff23a2b0 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1194,7 +1194,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminAdministratorHrs.setCompHrsName(root.getAdmin_label1()); adminAdministratorHrs.setCompHrsType(root.getAdmin_label()); adminAdministratorHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminAdministratorHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item31()); + adminAdministratorHrs.setCompTotalWorkedHrsYtd(root.getAdminH_calc1()); LtcYtdCompHrs adminDirOfCareHrs = new LtcYtdCompHrs(); @@ -1204,7 +1204,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminDirOfCareHrs.setCompHrsName(root.getAdmin_label2()); adminDirOfCareHrs.setCompHrsType(root.getAdmin_label()); adminDirOfCareHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminDirOfCareHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item32()); + adminDirOfCareHrs.setCompTotalWorkedHrsYtd(root.getAdminH_calc2()); LtcYtdCompHrs adminDeptManagersHrs = new LtcYtdCompHrs(); // adminDeptManagersHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP7()); @@ -1213,7 +1213,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminDeptManagersHrs.setCompHrsName(root.getAdmin_label3()); adminDeptManagersHrs.setCompHrsType(root.getAdmin_label()); adminDeptManagersHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminDeptManagersHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item33()); + adminDeptManagersHrs.setCompTotalWorkedHrsYtd(root.getAdminH_calc3()); LtcYtdCompHrs adminSupportHrs = new LtcYtdCompHrs(); //adminSupportHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP8()); @@ -1222,7 +1222,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminSupportHrs.setCompHrsName(root.getAdmin_label4()); adminSupportHrs.setCompHrsType(root.getAdmin_label()); adminSupportHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminSupportHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item34()); + adminSupportHrs.setCompTotalWorkedHrsYtd(root.getAdminH_calc4()); LtcYtdCompHrs adminPastoCareWrkrHrs = new LtcYtdCompHrs(); // adminPastoCareWrkrHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP9()); @@ -1231,7 +1231,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminPastoCareWrkrHrs.setCompHrsName(root.getAdmin_label5()); adminPastoCareWrkrHrs.setCompHrsType(root.getAdmin_label()); adminPastoCareWrkrHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminPastoCareWrkrHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item35()); + adminPastoCareWrkrHrs.setCompTotalWorkedHrsYtd(root.getAdminH_calc5()); LtcYtdCompHrs adminClrksHrs = new LtcYtdCompHrs(); //adminClrksHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP10()); @@ -1240,7 +1240,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminClrksHrs.setCompHrsName(root.getAdmin_label6()); adminClrksHrs.setCompHrsType(root.getAdmin_label()); adminClrksHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminClrksHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item36()); + adminClrksHrs.setCompTotalWorkedHrsYtd(root.getAdminH_calc6()); LtcYtdCompHrs adminClncCrdinatorHrs = new LtcYtdCompHrs(); // adminClncCrdinatorHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP11()); @@ -1249,7 +1249,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminClncCrdinatorHrs.setCompHrsName(root.getAdmin_label7()); adminClncCrdinatorHrs.setCompHrsType(root.getAdmin_label()); adminClncCrdinatorHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminClncCrdinatorHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item37()); + adminClncCrdinatorHrs.setCompTotalWorkedHrsYtd(root.getAdminH_calc7()); LtcYtdCompHrs adminScreenersGreeters = new LtcYtdCompHrs(); adminScreenersGreeters.setCompHrsStaffYtd(root.getAdminH_item18()); @@ -1257,7 +1257,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminScreenersGreeters.setCompHrsName(root.getAdmin_label8()); adminScreenersGreeters.setCompHrsType(root.getAdmin_label()); adminScreenersGreeters.setConfirmationId(root.getForm().getConfirmationId()); - adminScreenersGreeters.setCompTotalWorkedHrsYtd(root.getAdminH_item38()); + adminScreenersGreeters.setCompTotalWorkedHrsYtd(root.getAdminH_calc8()); LtcYtdCompHrs adminHCSW = new LtcYtdCompHrs(); adminHCSW.setCompHrsStaffYtd(root.getAdminH_item19()); @@ -1265,7 +1265,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminHCSW.setCompHrsName(root.getAdmin_label9()); adminHCSW.setCompHrsType(root.getAdmin_label()); adminHCSW.setConfirmationId(root.getForm().getConfirmationId()); - adminHCSW.setCompTotalWorkedHrsYtd(root.getAdminH_item39()); + adminHCSW.setCompTotalWorkedHrsYtd(root.getAdminH_calc9()); LtcYtdCompHrs adminOtherHrs = new LtcYtdCompHrs(); // adminOtherHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP12()); @@ -1274,7 +1274,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY adminOtherHrs.setCompHrsName(root.getAdmin_label10()); adminOtherHrs.setCompHrsType(root.getAdmin_label()); adminOtherHrs.setConfirmationId(root.getForm().getConfirmationId()); - adminOtherHrs.setCompTotalWorkedHrsYtd(root.getAdminH_item310()); + adminOtherHrs.setCompTotalWorkedHrsYtd(root.getAdminH_calc10()); /* Nursing, Allied, Non Allied Hours */ LtcYtdCompHrs nursingRNHrs = new LtcYtdCompHrs(); From d75643a1dba5d1ea111a9acc3e6f2365aa12472d Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 17:52:48 -0400 Subject: [PATCH 153/183] fixed mapping and removed unused mapping, bugfix --- .../etl/forms/ltc/quarterly/json/Root.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 46727ddd..c2e2eb22 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -837,9 +837,8 @@ public class Root{ public String compB_total2; public String compB_total3; public String compH_accrued; + public String compH_accrued1; public String compH_accrued2; - public String compH_accrued3; - public String compH_accrued4; public String supportH_calc1; public String compH_calc13; public String compH_calc14; @@ -6090,17 +6089,11 @@ public String getCompH_accrued2() { public void setCompH_accrued2(String compH_accrued2) { this.compH_accrued2 = compH_accrued2; } - public String getCompH_accrued3() { - return compH_accrued3; + public String getCompH_accrued1() { + return compH_accrued1; } - public void setCompH_accrued3(String compH_accrued3) { - this.compH_accrued3 = compH_accrued3; - } - public String getCompH_accrued4() { - return compH_accrued4; - } - public void setCompH_accrued4(String compH_accrued4) { - this.compH_accrued4 = compH_accrued4; + public void setCompH_accrued1(String compH_accrued1) { + this.compH_accrued1 = compH_accrued1; } public String getSupportH_calc1() { return supportH_calc1; From 1c13413c3f724ea5d8d8e405a81c3429db158f85 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 17:52:57 -0400 Subject: [PATCH 154/183] mapping bugfix --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index ff23a2b0..0f2f6eaf 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1485,8 +1485,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompHrsTotals accuredHrsTotals = new LtcYtdCompHrsTotals(); accuredHrsTotals.setCompHrsTotalType(root.getCompH_accrued_label()); - accuredHrsTotals.setTotalCompHrsStaffYTD(root.getCompH_accrued2()); - accuredHrsTotals.setTotalCompHrsContractServicesYTD(root.getCompH_accrued3()); + accuredHrsTotals.setTotalCompHrsStaffYTD(root.getCompH_accrued1()); + accuredHrsTotals.setTotalCompHrsContractServicesYTD(root.getCompH_accrued2()); accuredHrsTotals.setTotalCompTotalWorkedHrsYTD(root.getCompH_accrued()); accuredHrsTotals.setConfirmationID(root.getForm().getConfirmationId()); From 7d955df52ceae67fd5ff0ec18c50a073b1b5ef3c Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 18:19:09 -0400 Subject: [PATCH 155/183] mapping bugfix --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 0f2f6eaf..80392dfe 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -779,8 +779,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingCareCostSubtotals.setSubTotalDirCareCostNonProdHrsSickYTD(root.getNursingNProdC_sum21()); nursingCareCostSubtotals.setSubTotalDirCareCostNonProdHrsOtherServYTD(root.getNursingNProdC_sum31()); nursingCareCostSubtotals.setSubTotalDirCareCostNonProdHrsTotalYTD(root.getNursingNProdC_calcsum1()); - nursingCareCostSubtotals.setSubTotalDirCareCostHourlyRateStaffYTD(root.getNursingStaffRate1()); - nursingCareCostSubtotals.setSubTotalDirCareCostHourlyRateContractedYTD(root.getNursingContractRate1()); + nursingCareCostSubtotals.setSubTotalDirCareCostHourlyRateStaffYTD(root.getNursingStaffRate_total()); + nursingCareCostSubtotals.setSubTotalDirCareCostHourlyRateContractedYTD(root.getNursingContractRate_total()); LtcYtdDirectCareCostSubtotals alliedCareCostSubtotals = new LtcYtdDirectCareCostSubtotals(); alliedCareCostSubtotals.setConfirmationID(root.getForm().getConfirmationId()); From abbb0fbfb18fce6ac9d63bb87c5ad4ec7cc52b30 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Wed, 10 May 2023 18:38:43 -0400 Subject: [PATCH 156/183] mapping bugfix --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 80392dfe..325d1f4c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2538,7 +2538,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY occRateQ2.setOccRateBedTypes("Private Beds"); occRateQ2.setPlanMaxOccDays(root.getyTDPlannedPrivateQ2()); occRateQ2.setYtdMaxOccDays(root.getyTDMaxPrivateQ2()); - occRateQ2.setYtdOccDays(root.getyTDOccupiedInScopeQ2()); + occRateQ2.setYtdOccDays(root.getyTDOccupiedPrivateQ2()); occRateQ2.setPercentOcc(root.getOccupiedPercentagePrivateQ2()); occRateQ2.setOccRateQuarter("Q2"); //occRateQ2.setOccRateNotes(root.getNoteInScopeQ2()); From 7de756d0cd5bb742b3b5d410f92b3573b79ca065 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 11 May 2023 12:15:28 -0400 Subject: [PATCH 157/183] rennamed constant, using end user form rather than test form --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 67186b70..b4d3f1d9 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -40,8 +40,8 @@ public class Constants { public static final String LTC_FACILITY_PREPARER = "LTC_FACILITY_PREPARER"; /* LTC Quarterly YTD */ - public final static String LTC_YTD_USERNAME = "ltc.ytd.test.username"; - public final static String LTC_YTD_PASSWORD = "ltc.ytd.test.password"; + public final static String LTC_YTD_USERNAME = "ltc.ytd.username"; + public final static String LTC_YTD_PASSWORD = "ltc.ytd.password"; public final static String IN_SCOPE = "inScope"; public final static String OUT_OF_SCOPE = "outOfScope"; public final static String PRIVATE_BED = "privateBed"; From 672f33342ce34a6ef20205eac32a8d70522190f1 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 18 May 2023 22:20:19 -0400 Subject: [PATCH 158/183] 1. Added Other_Comp_Sal_Other_name and updated all affected fields --- .../java/ca/bc/gov/chefs/etl/constant/Constants.java | 8 +++++--- .../etl/forms/ltc/quarterly/model/LtcYtdCompSal.java | 9 +++++++++ .../LtcQuarterlyYtdApiResponseProcessor.java | 12 ++++++++---- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index b4d3f1d9..0ab78d77 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -40,8 +40,8 @@ public class Constants { public static final String LTC_FACILITY_PREPARER = "LTC_FACILITY_PREPARER"; /* LTC Quarterly YTD */ - public final static String LTC_YTD_USERNAME = "ltc.ytd.username"; - public final static String LTC_YTD_PASSWORD = "ltc.ytd.password"; + public final static String LTC_YTD_USERNAME = "ltc.ytd.test.username"; + public final static String LTC_YTD_PASSWORD = "ltc.ytd.test.password"; public final static String IN_SCOPE = "inScope"; public final static String OUT_OF_SCOPE = "outOfScope"; public final static String PRIVATE_BED = "privateBed"; @@ -52,6 +52,8 @@ public class Constants { // Constants for Sub table: LTC_YTD_COMP_ADD_POS public final static String POS_TYPE_OTHER = "Other"; + public final static String DEFAULT_OTHER_VALUE = "Other"; + /* Form Names */ public final static String LTC_BED_YTD_OCCUPIED_DAYS = "LTC_BED_YTD_OCCUPIED_DAYS"; public final static String LTC_BED_YTD_OCCUPANCY_RATE = "LTC_BED_YTD_OCCUPANCY_RATE"; @@ -189,7 +191,7 @@ public class Constants { HEADERS.put(LTC_YTD_COMP_SAL, new String[] { "CONFIRMATION_ID", "COMP_SAL_TYPE", "COMP_SAL_NAME", "COMP_SAL_STAFF_YTD", - "COMP_SAL_CONTRACT_SERVICES_YTD", "COMP_SAL_TOTAL_COST_YTD" }); + "COMP_SAL_CONTRACT_SERVICES_YTD", "COMP_SAL_TOTAL_COST_YTD", "COMP_SAL_OTHER_NAME" }); HEADERS.put(LTC_YTD_COMP_SAL_SUBTOTALS, new String[] { "Confirmation_ID", "Comp_Sal_Type", "Sub_Total_Comp_Sal_Staff_YTD", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java index cbecb0b6..dbe33e1e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompSal.java @@ -16,6 +16,8 @@ public class LtcYtdCompSal implements IModel{ private String compSalStaffYtd; private String compSalContractServicesYtd; private String compSalTotalCostYtd; + private String compSalOtherName = Constants.DEFAULT_STRING_VALUE; + public String getCompSalTotalCostYtd() { return compSalTotalCostYtd; } @@ -52,6 +54,12 @@ public String getCompSalContractServicesYtd() { public void setCompSalContractServicesYtd(String compSalContractServicesYtd) { this.compSalContractServicesYtd = StringUtils.defaultIfEmpty(compSalContractServicesYtd, Constants.DEFAULT_DECIMAL_VALUE); } + public String getCompSalOtherName() { + return compSalOtherName; + } + public void setCompSalOtherName(String compSalOtherName) { + this.compSalOtherName = compSalOtherName; + } @Override public String getFileName() { // TODO Auto-generated method stub @@ -70,6 +78,7 @@ public List getCsvElements() { elements.add(this.getCompSalStaffYtd()); elements.add(this.getCompSalContractServicesYtd()); elements.add(this.getCompSalTotalCostYtd()); + elements.add(this.getCompSalOtherName()); return elements; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 325d1f4c..7fe50c34 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -928,10 +928,11 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal adminOther = new LtcYtdCompSal(); adminOther.setCompSalStaffYtd(root.getAdminC_item110()); adminOther.setCompSalContractServicesYtd(root.getAdminC_item210()); - adminOther.setCompSalName(root.getAdmin_label10()); + adminOther.setCompSalName(Constants.DEFAULT_OTHER_VALUE); adminOther.setCompSalType(root.getAdmin_label()); adminOther.setConfirmationId(root.getForm().getConfirmationId()); adminOther.setCompSalTotalCostYtd(root.getAdminC_calc10()); + adminOther.setCompSalOtherName(root.getAdmin_label10()); /* Direct Care Nursing */ LtcYtdCompSal nursingRNSal = new LtcYtdCompSal(); @@ -963,10 +964,11 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal nursingOthSal = new LtcYtdCompSal(); nursingOthSal.setCompSalStaffYtd(root.getCompB_item116()); nursingOthSal.setCompSalContractServicesYtd(root.getCompB_item216()); - nursingOthSal.setCompSalName(root.getNursing_label_comp4()); + nursingOthSal.setCompSalName(Constants.DEFAULT_OTHER_VALUE); nursingOthSal.setCompSalType(root.getNursing_label_comp()); nursingOthSal.setConfirmationId(root.getForm().getConfirmationId()); nursingOthSal.setCompSalTotalCostYtd(root.getCompB_calc16()); + nursingOthSal.setCompSalOtherName(root.getNursing_label_comp4()); /* Allied Professional */ LtcYtdCompSal alliedProfOTSal = new LtcYtdCompSal(); @@ -1020,10 +1022,11 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedProfOTHSal = new LtcYtdCompSal(); alliedProfOTHSal.setCompSalStaffYtd(root.getCompB_item129()); alliedProfOTHSal.setCompSalContractServicesYtd(root.getCompB_item229()); - alliedProfOTHSal.setCompSalName(root.getAlliedProf_label_comp7()); + alliedProfOTHSal.setCompSalName(Constants.DEFAULT_OTHER_VALUE); alliedProfOTHSal.setCompSalType(root.getAlliedProf_label_comp()); alliedProfOTHSal.setConfirmationId(root.getForm().getConfirmationId()); alliedProfOTHSal.setCompSalTotalCostYtd(root.getCompB_calc29()); + alliedProfOTHSal.setCompSalOtherName(root.getAlliedProf_label_comp7()); /* Allied Non Professional */ LtcYtdCompSal alliedNPRTSal = new LtcYtdCompSal(); @@ -1069,10 +1072,11 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdCompSal alliedNPOTHSal = new LtcYtdCompSal(); alliedNPOTHSal.setCompSalStaffYtd(root.getCompB_item127()); alliedNPOTHSal.setCompSalContractServicesYtd(root.getCompB_item227()); - alliedNPOTHSal.setCompSalName(root.getAlliedNP_label_comp6()); + alliedNPOTHSal.setCompSalName(Constants.DEFAULT_OTHER_VALUE); alliedNPOTHSal.setCompSalType(root.getAlliedNP_label_comp()); alliedNPOTHSal.setConfirmationId(root.getForm().getConfirmationId()); alliedNPOTHSal.setCompSalTotalCostYtd(root.getCompB_calc27()); + alliedNPOTHSal.setCompSalOtherName(root.getAlliedNP_label_comp6()); Collections.addAll(ltcYtdCompSal, supportFoodServices, supportLaundryServices, supportHousekeeping, supportPlantMntnce, adminAdministrator, adminDirOfCare, adminDeptManagers, adminSupport, From 33120bd7e678769ae70e0ba85c89e24429e4c8a2 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 18 May 2023 22:27:33 -0400 Subject: [PATCH 159/183] 2. Added Comp_Hrs_Other_name and updated all affected fields --- .../java/ca/bc/gov/chefs/etl/constant/Constants.java | 4 ++-- .../etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java | 8 ++++++++ .../LtcQuarterlyYtdApiResponseProcessor.java | 12 ++++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 0ab78d77..712d36ab 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -202,8 +202,8 @@ public class Constants { "Total_Comp_Sal_Contract_Services_YTD", "Total_Comp_Sal_Total_Cost_YTD" }); HEADERS.put(LTC_YTD_COMP_HRS, - new String[] { "CONFIRMATION_ID", "COMP_HRS_TYPE", "COMP_HRS_NAME", - "COMP_HRS_STAFF_YTD", "COMP_HRS_CONTRACT_SERVICES_YTD", "COMP_TOTAL_WORKED_HRS_YTD" }); + new String[] { "CONFIRMATION_ID", "COMP_HRS_TYPE", "COMP_HRS_NAME", "COMP_HRS_STAFF_YTD", + "COMP_HRS_CONTRACT_SERVICES_YTD", "COMP_TOTAL_WORKED_HRS_YTD", "COMP_HRS_OTHER_NAME" }); HEADERS.put(LTC_YTD_COMP_HRS_SUBTOTALS, new String[] { "Confirmation_ID", "Comp_Hrs_Type", "Sub_Total_Comp_Hrs_Staff_YTD", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java index 0dbfe159..96bf2e49 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompHrs.java @@ -17,7 +17,14 @@ public class LtcYtdCompHrs implements IModel { private String compHrsStaffYtd; private String compHrsContractServicesYtd; private String compTotalWorkedHrsYtd; + private String compHrsOtherName = Constants.DEFAULT_STRING_VALUE; + public String getCompHrsOtherName() { + return compHrsOtherName; + } + public void setCompHrsOtherName(String compHrsOtherName) { + this.compHrsOtherName = compHrsOtherName; + } public String getConfirmationId() { return confirmationId; } @@ -73,6 +80,7 @@ public List getCsvElements() { elements.add(this.getCompHrsStaffYtd()); elements.add(this.getCompHrsContractServicesYtd()); elements.add(this.getCompTotalWorkedHrsYtd()); + elements.add(this.getCompHrsOtherName()); return elements; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 7fe50c34..c4be3013 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1275,10 +1275,11 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY // adminOtherHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP12()); adminOtherHrs.setCompHrsStaffYtd(root.getAdminH_item110()); adminOtherHrs.setCompHrsContractServicesYtd(root.getAdminH_item210()); - adminOtherHrs.setCompHrsName(root.getAdmin_label10()); + adminOtherHrs.setCompHrsName(Constants.DEFAULT_OTHER_VALUE); adminOtherHrs.setCompHrsType(root.getAdmin_label()); adminOtherHrs.setConfirmationId(root.getForm().getConfirmationId()); adminOtherHrs.setCompTotalWorkedHrsYtd(root.getAdminH_calc10()); + adminOtherHrs.setCompHrsOtherName(root.getAdmin_label10()); /* Nursing, Allied, Non Allied Hours */ LtcYtdCompHrs nursingRNHrs = new LtcYtdCompHrs(); @@ -1312,10 +1313,11 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //nursingOthHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP16()); nursingOthHrs.setCompHrsStaffYtd(root.getCompH_item116()); nursingOthHrs.setCompHrsContractServicesYtd(root.getCompH_item216()); - nursingOthHrs.setCompHrsName(root.getNursing_label_comp4()); + nursingOthHrs.setCompHrsName(Constants.DEFAULT_OTHER_VALUE); nursingOthHrs.setCompHrsType(root.getNursing_label_comp()); nursingOthHrs.setConfirmationId(root.getForm().getConfirmationId()); nursingOthHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc16()); + nursingOthHrs.setCompHrsOtherName(root.getNursing_label_comp4()); LtcYtdCompHrs alliedProfOTHrs = new LtcYtdCompHrs(); //alliedProfOTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP17()); @@ -1375,10 +1377,11 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedProfOTHHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP21()); alliedProfOTHHrs.setCompHrsStaffYtd(root.getCompH_item129()); alliedProfOTHHrs.setCompHrsContractServicesYtd(root.getCompH_item229()); - alliedProfOTHHrs.setCompHrsName(root.getAlliedProf_label_comp7()); + alliedProfOTHHrs.setCompHrsName(Constants.DEFAULT_OTHER_VALUE); alliedProfOTHHrs.setCompHrsType(root.getAlliedProf_label_comp()); alliedProfOTHHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedProfOTHHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc29()); + alliedProfOTHHrs.setCompHrsOtherName(root.getAlliedProf_label_comp7()); LtcYtdCompHrs alliedNPRTHrs = new LtcYtdCompHrs(); //alliedNPRTHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP22()); @@ -1429,10 +1432,11 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY //alliedNPOTHHrs.setCompHrsPerPayrollYtd(root.getCompH_PHP27()); alliedNPOTHHrs.setCompHrsStaffYtd(root.getCompH_item127()); alliedNPOTHHrs.setCompHrsContractServicesYtd(root.getCompH_item227()); - alliedNPOTHHrs.setCompHrsName(root.getAlliedNP_label_comp6()); + alliedNPOTHHrs.setCompHrsName(Constants.DEFAULT_OTHER_VALUE); alliedNPOTHHrs.setCompHrsType(root.getAlliedNP_label_comp()); alliedNPOTHHrs.setConfirmationId(root.getForm().getConfirmationId()); alliedNPOTHHrs.setCompTotalWorkedHrsYtd(root.getCompH_calc27()); + alliedNPOTHHrs.setCompHrsOtherName(root.getAlliedNP_label_comp6()); Collections.addAll(ltcYtdCompHrs, supportFoodServicesHrs, supportLaundryServicesHrs, supportHousekeepingHrs, supportPlantMntnceHrs, adminAdministratorHrs, adminDirOfCareHrs, adminDeptManagersHrs, From 7e10f35e33eaf9cb703abe7287e3824773c11832 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 18 May 2023 22:40:20 -0400 Subject: [PATCH 160/183] 3.a Added column total benefits to YTD_Submission and populating field --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- .../etl/forms/ltc/quarterly/model/LtcYtdSubmission.java | 8 ++++++++ .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 712d36ab..78e66818 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -175,7 +175,7 @@ public class Constants { // LTC Quarterly YTD HEADERS.put(LTC_YTD_SUBMISSION, new String[] { "CONFIRMATION_ID", "IS_DELETED", "SUBMISSION_DATE", "SUBMITTED_BY", "CCIMS_ID", "SUBMISSION_TYPE", - "PERIOD","SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD" }); + "PERIOD","SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD", "TOTAL_BENEFITS" }); HEADERS.put(LTC_YTD_REV, new String[] { "CONFIRMATION_ID", "REV_TYPE", "REV_NAME", "REV_YTD", "REV_NOTES", }); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java index 3852efa2..908e891a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java @@ -27,6 +27,7 @@ public class LtcYtdSubmission implements IModel { private String nbTotalBeds; private String nbFundedBeds; private String occRateThreshold; + private String totalBenefits; private List ltcBedYtdMaxOccupancy; private List ltcBedYtdOccupancyRate; @@ -81,6 +82,7 @@ public List getCsvElements() { elements.add(this.getNbTotalBeds()); elements.add(this.getNbFundedBeds()); elements.add(this.getOccRateThreshold()); + elements.add(this.getTotalBenefits()); return elements; } @@ -394,6 +396,12 @@ public void setLtcYtdSumTotals(List ltcYtdSumTotals) { this.ltcYtdSumTotals = ltcYtdSumTotals; } + public String getTotalBenefits() { + return totalBenefits; + } + public void setTotalBenefits(String totalBenefits) { + this.totalBenefits = totalBenefits; + } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index c4be3013..352743b7 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -115,6 +115,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY ltcYtdSubmission.setNbTotalBeds(root.getNumberOfTotalBeds()); ltcYtdSubmission.setNbFundedBeds(root.getNumberOfTotalFundedBeds()); ltcYtdSubmission.setOccRateThreshold(root.getThreshold()); + ltcYtdSubmission.setTotalBenefits(root.getBenefit_value_total()); /* START : Direct Care Hours */ /* Productive and NP Nursing */ // why no subtotal and total? From b129dd4398b76a1c9821ec514f7562f534140cb5 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 18 May 2023 22:46:37 -0400 Subject: [PATCH 161/183] 3.b Added new row with "Less: Benefit Recovery" --- .../bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java | 7 +++++++ .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index c2e2eb22..2643f97f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -2107,7 +2107,14 @@ public class Root{ public String opEx_YTD_label38; @JsonProperty("opEx_YTD_label-39") public String opEx_YTD_label39; + public String benefit_value_rec_label; + public String getBenefit_value_rec_label() { + return benefit_value_rec_label; + } + public void setBenefit_value_rec_label(String benefit_value_rec_label) { + this.benefit_value_rec_label = benefit_value_rec_label; + } public String getOpEx_1A_label() { return opEx_1A_label; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 352743b7..1a891527 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1695,8 +1695,15 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY otherBenefit.setBenefitsPercentageAlloc(root.getBenefit_percentage8()); otherBenefit.setConfirmationId(root.getForm().getConfirmationId()); + LtcYtdCompBenefits lessBenefitsRecovery = new LtcYtdCompBenefits(); + lessBenefitsRecovery.setBenefitsAmountYtd(root.getBenefit_value_rec()); + lessBenefitsRecovery.setBenefitsType(root.getBenefit_value_rec_label()); + lessBenefitsRecovery.setBenefitsPercentageAlloc(root.getBenefit_percentage_rec()); + lessBenefitsRecovery.setConfirmationId(root.getForm().getConfirmationId()); + Collections.addAll(ltcYtdCompBenefits, empInsBenefit, canPenPlnBenefit, wrkrCompBoardBenefit, - empHlthTaxBenefit, penPlanBenefit, exHlthDntlBenefit, grpLifeBenefit, otherBenefit); + empHlthTaxBenefit, penPlanBenefit, exHlthDntlBenefit, grpLifeBenefit, otherBenefit, + lessBenefitsRecovery); /* Are we setting the subtotal and total things? */ /* Summary of Rev & Exp Budget */ From 15e73c5f71816fe9b6cf72856a21119d228dc99c Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 18 May 2023 23:11:37 -0400 Subject: [PATCH 162/183] 4.b Added Total_Salaries_Wages, Benefits_percent to LTC_Submission --- .../bc/gov/chefs/etl/constant/Constants.java | 3 ++- .../etl/forms/ltc/quarterly/json/Root.java | 10 +++++----- .../ltc/quarterly/model/LtcYtdSubmission.java | 20 +++++++++++++++++++ .../LtcQuarterlyYtdApiResponseProcessor.java | 2 ++ 4 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 78e66818..1b8bce17 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -175,7 +175,8 @@ public class Constants { // LTC Quarterly YTD HEADERS.put(LTC_YTD_SUBMISSION, new String[] { "CONFIRMATION_ID", "IS_DELETED", "SUBMISSION_DATE", "SUBMITTED_BY", "CCIMS_ID", "SUBMISSION_TYPE", - "PERIOD","SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD", "TOTAL_BENEFITS" }); + "PERIOD","SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD", "TOTAL_SALARIES_WAGES", + "TOTAL_BENEFITS", "BENEFITS_PERCENT" }); HEADERS.put(LTC_YTD_REV, new String[] { "CONFIRMATION_ID", "REV_TYPE", "REV_NAME", "REV_YTD", "REV_NOTES", }); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 2643f97f..25c83b02 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -565,7 +565,7 @@ public class Root{ public String bTotal_benefits; public String bTotal_recSalaryWage; public String bTotal_salaryWage; - public String bTotal_value_sum1; + public String bTotal_value_sum; public String bTotal_YTDSalaryWage; public String ccimsid; public String compB_accrued; @@ -5094,11 +5094,11 @@ public String getbTotal_salaryWage() { public void setbTotal_salaryWage(String bTotal_salaryWage) { this.bTotal_salaryWage = bTotal_salaryWage; } - public String getbTotal_value_sum1() { - return bTotal_value_sum1; + public String getbTotal_value_sum() { + return bTotal_value_sum; } - public void setbTotal_value_sum1(String bTotal_value_sum1) { - this.bTotal_value_sum1 = bTotal_value_sum1; + public void setbTotal_value_sum(String bTotal_value_sum) { + this.bTotal_value_sum = bTotal_value_sum; } public String getbTotal_YTDSalaryWage() { return bTotal_YTDSalaryWage; diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java index 908e891a..469ab729 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java @@ -27,7 +27,9 @@ public class LtcYtdSubmission implements IModel { private String nbTotalBeds; private String nbFundedBeds; private String occRateThreshold; + private String totalSalariesWages; private String totalBenefits; + private String benefitsPercent; private List ltcBedYtdMaxOccupancy; private List ltcBedYtdOccupancyRate; @@ -82,7 +84,9 @@ public List getCsvElements() { elements.add(this.getNbTotalBeds()); elements.add(this.getNbFundedBeds()); elements.add(this.getOccRateThreshold()); + elements.add(this.getTotalSalariesWages()); elements.add(this.getTotalBenefits()); + elements.add(this.getBenefitsPercent()); return elements; } @@ -404,4 +408,20 @@ public void setTotalBenefits(String totalBenefits) { this.totalBenefits = totalBenefits; } + public String getBenefitsPercent() { + return benefitsPercent; + } + + public void setBenefitsPercent(String benefitsPercent) { + this.benefitsPercent = benefitsPercent; + } + + public String getTotalSalariesWages() { + return totalSalariesWages; + } + + public void setTotalSalariesWages(String totalSalariesWages) { + this.totalSalariesWages = totalSalariesWages; + } + } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 1a891527..77714b8d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -115,7 +115,9 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY ltcYtdSubmission.setNbTotalBeds(root.getNumberOfTotalBeds()); ltcYtdSubmission.setNbFundedBeds(root.getNumberOfTotalFundedBeds()); ltcYtdSubmission.setOccRateThreshold(root.getThreshold()); + ltcYtdSubmission.setTotalSalariesWages(root.getbTotal_YTDSalaryWage()); ltcYtdSubmission.setTotalBenefits(root.getBenefit_value_total()); + ltcYtdSubmission.setBenefitsPercent(root.getbTotal_value_sum()); /* START : Direct Care Hours */ /* Productive and NP Nursing */ // why no subtotal and total? From c1bd2087bb9bcce31e4886719504d347f7737866 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 18 May 2023 23:22:48 -0400 Subject: [PATCH 163/183] 5. LTC_YTD_DIRECT_CARE_HRS new field Dir_Care_Prod_Hrs_Agency_Stuff_Util_YTD --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- .../forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java | 8 ++++++++ .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 5 +++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 1b8bce17..26e4bd26 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -222,7 +222,7 @@ public class Constants { HEADERS.put(LTC_YTD_DIRECT_CARE_HRS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "DIR_CARE_NAME", "DIR_CARE_OTHER_VALUE", "DIR_CARE_PROD_HRS_REG_YTD", "DIR_CARE_PROD_HRS_OT_YTD", "DIR_CARE_PROD_HRS_CONTRACTED_YTD", - "DIR_CARE_PROD_HRS_SUBTOTAL_YTD", "DIR_CARE_PROD_HRS_TOTAL_YTD", "DIR_CARE_NON_PROD_HRS_VAC_YTD", + "DIR_CARE_PROD_HRS_SUBTOTAL_YTD", "DIR_CARE_PROD_HRS_AGENCY_STUFF_UTIL_YTD", "DIR_CARE_PROD_HRS_TOTAL_YTD", "DIR_CARE_NON_PROD_HRS_VAC_YTD", "DIR_CARE_NON_PROD_HRS_SICK_YTD", "DIR_CARE_NON_PROD_HRS_OTHER_YTD", "DIR_CARE_NON_PROD_HRS_TOTAL_YTD", "DIR_CARE_TOTAL_HRS_PAID_YTD" }); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java index 1f1b2e3b..fab0d8cc 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java @@ -24,7 +24,14 @@ public class LtcYtdDirectCareHrs implements IModel{ private String dirCareNonProdHrsOtherYtd; private String dirCareNonProdHrsTotalYtd; private String dirCareTotalHrsPaidYtd; + private String dirCareProdHrsAgencyStuffUtilYtd = Constants.DEFAULT_STRING_VALUE; + public String getDirCareProdHrsAgencyStuffUtilYtd() { + return dirCareProdHrsAgencyStuffUtilYtd; + } + public void setDirCareProdHrsAgencyStuffUtilYtd(String dirCareProdHrsAgencyStuffUtilYtd) { + this.dirCareProdHrsAgencyStuffUtilYtd = dirCareProdHrsAgencyStuffUtilYtd; + } public String getConfirmationId() { return confirmationId; } @@ -129,6 +136,7 @@ public List getCsvElements() { elements.add(this.getDirCareProdHrsOtYtd()); elements.add(this.getDirCareProdHrsContractedYtd()); elements.add(this.getDirCareProdHrsSubtotalYtd()); + elements.add(this.getDirCareProdHrsAgencyStuffUtilYtd()); elements.add(this.getDirCareProdHrsTotalYtd()); elements.add(this.getDirCareNonProdHrsVacYtd()); elements.add(this.getDirCareNonProdHrsSickYtd()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 77714b8d..ffdb41f0 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -135,6 +135,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingRNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub1()); nursingRNProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP1()); nursingRNProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc1()); + nursingRNProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHCS1()); LtcYtdDirectCareHrs nursingLPNProdH = new LtcYtdDirectCareHrs(); nursingLPNProdH.setDirCareProdHrsRegYtd(root.getNursingProdH_item12()); @@ -150,6 +151,8 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingLPNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub2()); nursingLPNProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP2()); nursingLPNProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc2()); + nursingLPNProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHCS2()); + LtcYtdDirectCareHrs nursingHCAProdH = new LtcYtdDirectCareHrs(); @@ -166,6 +169,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingHCAProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub3()); nursingHCAProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP3()); nursingHCAProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc3()); + nursingHCAProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHCS3()); LtcYtdDirectCareHrs nursingOthProdH = new LtcYtdDirectCareHrs(); nursingOthProdH.setDirCareProdHrsRegYtd(root.getNursingProdH_item14()); @@ -182,6 +186,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingOthProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP4()); nursingOthProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc4()); nursingOthProdH.setDirCareOtherValue(root.getNursing_label4()); + nursingOthProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHCS4()); // to check what is with the subtotal fields From a14d5b162dcaa6783e06037c2a1a6a6d61ef5a19 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 18 May 2023 23:33:15 -0400 Subject: [PATCH 164/183] 6. LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS new field Sub_Total_Dir_Care_Prod_Hrs_Agency_Stuff_Util_YTD --- .../java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- .../gov/chefs/etl/forms/ltc/quarterly/json/Root.java | 9 ++++++++- .../quarterly/model/LtcYtdDirectCareHrsSubTotals.java | 10 ++++++++++ .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 1 + 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 26e4bd26..80e41369 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -229,7 +229,7 @@ public class Constants { HEADERS.put(LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "SUB_TOTAL_DIR_CARE_PROD_HRS_REGULAR_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_OT_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_SUBTOTAL_YTD","SUB_TOTAL_DIR_CARE_PROD_HRS_CONT_SERV_YTD", - "SUB_TOTAL_DIR_CARE_PROD_HRS_TOTAL_YTD", + "SUB_TOTAL_DIR_CARE_PROD_HRS_AGENCY_STUFF_UTIL_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_TOTAL_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_VAC_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_SICK_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_OTHER_SERV_YTD", "SUB_TOTAL_DIR_CARE_NON_PROD_HRS_TOTAL_YTD", "SUB_TOTAL_DIR_CARE_TOTAL_HRS_PAID_YTD", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 25c83b02..d142adcf 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -1417,7 +1417,8 @@ public class Root{ public String alliedNP_label_CSP6; public String nursingProdH_THPsum1; public String nursingProdHCS_subsum1; - public String nursingProdHCS1; + public String nursingProdHASU_subsum; + public String nursingProdHCS1; public String nursingProdHCS2; public String nursingProdHCS3; public String nursingProdHCS4; @@ -8412,6 +8413,12 @@ public String getNursingProdHCS_subsum1() { public void setNursingProdHCS_subsum1(String nursingProdHCS_subsum1) { this.nursingProdHCS_subsum1 = nursingProdHCS_subsum1; } + public String getNursingProdHASU_subsum() { + return nursingProdHASU_subsum; + } + public void setNursingProdHASU_subsum(String nursingProdHASU_subsum) { + this.nursingProdHASU_subsum = nursingProdHASU_subsum; + } public String getNursingProdHCS1() { return nursingProdHCS1; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java index d809ad7e..36b8581c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java @@ -16,6 +16,7 @@ public class LtcYtdDirectCareHrsSubTotals implements IModel{ private String subTotalDirCareProdHrsOTYTD; private String subTotalDirCareProdHrsSubtotalYTD; private String subTotalDirCareProdHrsContServYTD; + private String subTotalDirCareProdHrsAgencyStaffUtil = Constants.DEFAULT_STRING_VALUE; private String subTotalDirCareProdHrsTotalYTD; private String subTotalDirCareNonProdHrsVacYTD; private String subTotalDirCareNonProdHrsSickYTD; @@ -120,6 +121,14 @@ public void setSubTotalDirCareTotalHrsPaidYTD(String subTotalDirCareTotalHrsPaid this.subTotalDirCareTotalHrsPaidYTD = subTotalDirCareTotalHrsPaidYTD; } + public String getSubTotalDirCareProdHrsAgencyStaffUtil() { + return subTotalDirCareProdHrsAgencyStaffUtil; + } + + public void setSubTotalDirCareProdHrsAgencyStaffUtil(String subTotalDirCareProdHrsAgencyStaffUtil) { + this.subTotalDirCareProdHrsAgencyStaffUtil = subTotalDirCareProdHrsAgencyStaffUtil; + } + @Override public String getFileName() { // TODO Auto-generated method stub @@ -140,6 +149,7 @@ public List getCsvElements() { elements.add(this.getSubTotalDirCareProdHrsOTYTD()); elements.add(this.getSubTotalDirCareProdHrsSubtotalYTD()); elements.add(this.getSubTotalDirCareProdHrsContServYTD()); + elements.add(this.getSubTotalDirCareProdHrsAgencyStaffUtil()); elements.add(this.getSubTotalDirCareProdHrsTotalYTD()); elements.add(this.getSubTotalDirCareNonProdHrsVacYTD()); elements.add(this.getSubTotalDirCareNonProdHrsSickYTD()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index ffdb41f0..d87ccde6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -416,6 +416,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsOtherServYTD(root.getNursingNProdH_sum31()); nursingDirCareHrsSubTotal.setSubTotalDirCareNonProdHrsTotalYTD(root.getNursingNProdH_calcsum1()); nursingDirCareHrsSubTotal.setConfirmationID(root.getForm().getConfirmationId()); + nursingDirCareHrsSubTotal.setSubTotalDirCareProdHrsAgencyStaffUtil(root.getNursingProdHASU_subsum()); LtcYtdDirectCareHrsSubTotals alliedDirCareHrsSubTotal = new LtcYtdDirectCareHrsSubTotals(); From cb286fc736063520146bc6d216aad33ea1459a75 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 18 May 2023 23:37:41 -0400 Subject: [PATCH 165/183] 5. Bugfix, corrected mapping of the newly added field. --- .../etl/forms/ltc/quarterly/json/Root.java | 30 ++++++++++++++++++- .../LtcQuarterlyYtdApiResponseProcessor.java | 8 ++--- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index d142adcf..a5eb8768 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -1422,7 +1422,11 @@ public class Root{ public String nursingProdHCS2; public String nursingProdHCS3; public String nursingProdHCS4; - public String nursingProvider1; + public String nursingProdHASU1; + public String nursingProdHASU2; + public String nursingProdHASU3; + public String nursingProdHASU4; + public String nursingProvider1; public String nursingProvider2; public String nursingProvider3; public String nursingProvider4; @@ -8443,6 +8447,30 @@ public String getNursingProdHCS4() { public void setNursingProdHCS4(String nursingProdHCS4) { this.nursingProdHCS4 = nursingProdHCS4; } + public String getNursingProdHASU1() { + return nursingProdHASU1; + } + public void setNursingProdHASU1(String nursingProdHASU1) { + this.nursingProdHASU1 = nursingProdHASU1; + } + public String getNursingProdHASU2() { + return nursingProdHASU2; + } + public void setNursingProdHASU2(String nursingProdHASU2) { + this.nursingProdHASU2 = nursingProdHASU2; + } + public String getNursingProdHASU3() { + return nursingProdHASU3; + } + public void setNursingProdHASU3(String nursingProdHASU3) { + this.nursingProdHASU3 = nursingProdHASU3; + } + public String getNursingProdHASU4() { + return nursingProdHASU4; + } + public void setNursingProdHASU4(String nursingProdHASU4) { + this.nursingProdHASU4 = nursingProdHASU4; + } public String getNursingProvider1() { return nursingProvider1; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index d87ccde6..919e083b 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -135,7 +135,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingRNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub1()); nursingRNProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP1()); nursingRNProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc1()); - nursingRNProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHCS1()); + nursingRNProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHASU1()); LtcYtdDirectCareHrs nursingLPNProdH = new LtcYtdDirectCareHrs(); nursingLPNProdH.setDirCareProdHrsRegYtd(root.getNursingProdH_item12()); @@ -151,7 +151,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingLPNProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub2()); nursingLPNProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP2()); nursingLPNProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc2()); - nursingLPNProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHCS2()); + nursingLPNProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHASU2()); @@ -169,7 +169,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingHCAProdH.setDirCareProdHrsTotalYtd(root.getNursingProdH_sub3()); nursingHCAProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP3()); nursingHCAProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc3()); - nursingHCAProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHCS3()); + nursingHCAProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHASU3()); LtcYtdDirectCareHrs nursingOthProdH = new LtcYtdDirectCareHrs(); nursingOthProdH.setDirCareProdHrsRegYtd(root.getNursingProdH_item14()); @@ -186,7 +186,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingOthProdH.setDirCareTotalHrsPaidYtd(root.getNursingNProdH_THP4()); nursingOthProdH.setDirCareNonProdHrsTotalYtd(root.getNursingNProdH_calc4()); nursingOthProdH.setDirCareOtherValue(root.getNursing_label4()); - nursingOthProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHCS4()); + nursingOthProdH.setDirCareProdHrsAgencyStuffUtilYtd(root.getNursingProdHASU4()); // to check what is with the subtotal fields From 574cfeef2d77cb8913831138fc0bebc295a0e5e6 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Thu, 18 May 2023 23:52:32 -0400 Subject: [PATCH 166/183] 7. LTC_YTD_DIRECT_CARE_COST new field Dir_Care_Cost_Prod_Hrs_Agency_Stuff_Util_YTD --- .../bc/gov/chefs/etl/constant/Constants.java | 3 +- .../etl/forms/ltc/quarterly/json/Root.java | 30 ++++++++++++++++++- .../quarterly/model/LtcYtdDirectCareCost.java | 10 ++++++- .../LtcQuarterlyYtdApiResponseProcessor.java | 4 +++ 4 files changed, 44 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 80e41369..7ec2ac7e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -239,7 +239,8 @@ public class Constants { HEADERS.put(LTC_YTD_DIRECT_CARE_COST, new String[] { "CONFIRMATION_ID", "DIR_CARE_COST_TYPE", "DIR_CARE_COST_NAME","DIR_CARE_OTHER_VALUE", "DIR_CARE_COST_PROD_HRS_REG_YTD", "DIR_CARE_COST_PROD_HRS_OT_YTD", - "DIR_CARE_CST_PROD_HRS_CONTRACTED_YTD", "DIR_CARE_COST_PROD_HRS_SUBTOTAL_YTD", + "DIR_CARE_CST_PROD_HRS_CONTRACTED_YTD", "DIR_CARE_COST_PROD_HRS_SUBTOTAL_YTD", + "DIR_CARE_COST_PROD_HRS_AGENCY_STUFF_UTIL_YTD", "DIR_CARE_COST_PROD_HRS_TOTAL_YTD", "DIR_CARE_COST_NON_PROD_HRS_VAC_YTD", "DIR_CARE_COST_NON_PROD_HRS_SICK_YTD", "DIR_CARE_COST_NON_PROD_HRS_OTHER_YTD", "DIR_CARE_COST_NON_PROD_HRS_TOTAL_YTD", "DIR_CARE_COST_TOTAL_HRS_PAID_YTD", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index a5eb8768..43d8467e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -1311,7 +1311,11 @@ public class Root{ public String nursingProdCCS2; public String nursingProdCCS3; public String nursingProdCCS4; - public String nursingProdH_calc1; + public String nursingProdCASU1; + public String nursingProdCASU2; + public String nursingProdCASU3; + public String nursingProdCASU4; + public String nursingProdH_calc1; public String nursingProdH_calc2; public String nursingProdH_calc3; public String nursingProdH_calc4; @@ -8045,6 +8049,30 @@ public String getNursingProdCCS4() { public void setNursingProdCCS4(String nursingProdCCS4) { this.nursingProdCCS4 = nursingProdCCS4; } + public String getNursingProdCASU1() { + return nursingProdCASU1; + } + public void setNursingProdCASU1(String nursingProdCASU1) { + this.nursingProdCASU1 = nursingProdCASU1; + } + public String getNursingProdCASU2() { + return nursingProdCASU2; + } + public void setNursingProdCASU2(String nursingProdCASU2) { + this.nursingProdCASU2 = nursingProdCASU2; + } + public String getNursingProdCASU3() { + return nursingProdCASU3; + } + public void setNursingProdCASU3(String nursingProdCASU3) { + this.nursingProdCASU3 = nursingProdCASU3; + } + public String getNursingProdCASU4() { + return nursingProdCASU4; + } + public void setNursingProdCASU4(String nursingProdCASU4) { + this.nursingProdCASU4 = nursingProdCASU4; + } public String getNursingProdH_calc1() { return nursingProdH_calc1; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java index 882dce59..dc3a40b3 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java @@ -12,7 +12,7 @@ public class LtcYtdDirectCareCost implements IModel{ private String confirmationId; private String dirCareCostType; private String dirCareCostName; - private String dirCareOtherValue = ""; + private String dirCareOtherValue = Constants.DEFAULT_STRING_VALUE; private String dirCareCostProdHrsRegYtd; private String dirCareCostProdHrsOtYtd; private String dirCareCostProdHrsContractedYtd; @@ -25,7 +25,14 @@ public class LtcYtdDirectCareCost implements IModel{ private String dirCareCostTotalHrsPaidYtd; private String dirCareCostHourlyRateStaffYtd; private String dirCareCostHourlyRateContractedYtd; + private String dirCareCostProdHrsAgencyStaffUtil = Constants.DEFAULT_STRING_VALUE; + public String getDirCareCostProdHrsAgencyStaffUtil() { + return dirCareCostProdHrsAgencyStaffUtil; + } + public void setDirCareCostProdHrsAgencyStaffUtil(String dirCareCostProdHrsAgencyStaffUtil) { + this.dirCareCostProdHrsAgencyStaffUtil = dirCareCostProdHrsAgencyStaffUtil; + } public String getConfirmationId() { return confirmationId; } @@ -143,6 +150,7 @@ public List getCsvElements() { elements.add(this.getDirCareCostProdHrsOtYtd()); elements.add(this.getDirCareCostProdHrsContractedYtd()); elements.add(this.getDirCareCostProdHrsSubtotalYtd()); + elements.add(this.getDirCareCostProdHrsAgencyStaffUtil()); elements.add(this.getDirCareCostProdHrsTotalYtd()); elements.add(this.getDirCareCostNonProdHrsVacYtd()); elements.add(this.getDirCareCostNonProdHrsSickYtd()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 919e083b..80f7835d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -469,6 +469,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingRNProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc1()); nursingRNProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate1()); nursingRNProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate1()); + nursingRNProdC.setDirCareCostProdHrsAgencyStaffUtil(root.getNursingProdCASU1()); /* END : Direct Care Cost */ LtcYtdDirectCareCost nursingLPNProdC = new LtcYtdDirectCareCost(); @@ -487,6 +488,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingLPNProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc2()); nursingLPNProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate2()); nursingLPNProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate2()); + nursingLPNProdC.setDirCareCostProdHrsAgencyStaffUtil(root.getNursingProdCASU2()); @@ -506,6 +508,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingHCAProdC.setDirCareCostNonProdHrsTotalYtd(root.getNursingNProdC_calc3()); nursingHCAProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate3()); nursingHCAProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate3()); + nursingHCAProdC.setDirCareCostProdHrsAgencyStaffUtil(root.getNursingProdCASU3()); LtcYtdDirectCareCost nursingOthProdC = new LtcYtdDirectCareCost(); @@ -525,6 +528,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingOthProdC.setDirCareCostHourlyRateStaffYtd(root.getNursingStaffRate4()); nursingOthProdC.setDirCareCostHourlyRateContractedYtd(root.getNursingContractRate4()); nursingOthProdC.setDirCareOtherValue(root.getNursing_label4()); + nursingOthProdC.setDirCareCostProdHrsAgencyStaffUtil(root.getNursingProdCASU4()); From 7e55d4754526ede706c17774ec0064d7a72e2f9c Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 19 May 2023 00:02:58 -0400 Subject: [PATCH 167/183] 8. LTC_YTD_DIRECT_CARE_COST_SUB_TOTALS new field Sub_Total_Dir_Care_Cost_Prod_Hrs_Agency_Stuff_Util_YTD --- .../java/ca/bc/gov/chefs/etl/constant/Constants.java | 1 + .../gov/chefs/etl/forms/ltc/quarterly/json/Root.java | 9 ++++++++- .../quarterly/model/LtcYtdDirectCareCostSubtotals.java | 10 ++++++++++ .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 7ec2ac7e..fa0e6f1f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -254,6 +254,7 @@ public class Constants { "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_OT_YTD", "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_SUBTOTAL_YTD", "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_CONT_SERV_YTD", + "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_AGENCY_STUFF_UTIL_YTD", "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_TOTAL_YTD", "SUB_TOTAL_DIR_CARE_COST_NON_PROD_HRS_VAC_YTD", "SUB_TOTAL_DIR_CARE_COST_NON_PROD_HRS_SICK_YTD", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index 43d8467e..bdbb1a33 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -1182,7 +1182,8 @@ public class Root{ public String numberOfTotalBeds; public String numberOfTotalFundedBeds; public String nursingContractRate_total; - public String nursingContractRate1; + public String nursingProdCASU_subsum; + public String nursingContractRate1; public String nursingContractRate2; public String nursingContractRate3; public String nursingContractRate4; @@ -7515,6 +7516,12 @@ public String getNursingContractRate_total() { public void setNursingContractRate_total(String nursingContractRate_total) { this.nursingContractRate_total = nursingContractRate_total; } + public String getNursingProdCASU_subsum() { + return nursingProdCASU_subsum; + } + public void setNursingProdCASU_subsum(String nursingProdCASU_subsum) { + this.nursingProdCASU_subsum = nursingProdCASU_subsum; + } public String getNursingContractRate1() { return nursingContractRate1; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java index f994cb1e..ab5582dc 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java @@ -16,6 +16,7 @@ public class LtcYtdDirectCareCostSubtotals implements IModel{ private String subTotalDirCareCostProdHrsOTYTD; private String subTotalDirCareCostProdHrsSubtotalYTD; private String subTotalDirCareCostProdHrsContServYTD; + private String subTotalDirCareCostProdHrsAgencyStaffUtil = Constants.DEFAULT_STRING_VALUE; private String subTotalDirCareCostProdHrsTotalYTD; private String subTotalDirCareCostNonProdHrsVacYTD; private String subTotalDirCareCostNonProdHrsSickYTD; @@ -74,6 +75,14 @@ public void setSubTotalDirCareCostProdHrsContServYTD(String subTotalDirCareCostP this.subTotalDirCareCostProdHrsContServYTD = subTotalDirCareCostProdHrsContServYTD; } + public String getSubTotalDirCareCostProdHrsAgencyStaffUtil() { + return subTotalDirCareCostProdHrsAgencyStaffUtil; + } + + public void setSubTotalDirCareCostProdHrsAgencyStaffUtil(String subTotalDirCareCostProdHrsAgencyStaffUtil) { + this.subTotalDirCareCostProdHrsAgencyStaffUtil = subTotalDirCareCostProdHrsAgencyStaffUtil; + } + public String getSubTotalDirCareCostProdHrsTotalYTD() { return subTotalDirCareCostProdHrsTotalYTD; } @@ -158,6 +167,7 @@ public List getCsvElements() { elements.add(this.getSubTotalDirCareCostProdHrsOTYTD()); elements.add(this.getSubTotalDirCareCostProdHrsSubtotalYTD()); elements.add(this.getSubTotalDirCareCostProdHrsContServYTD()); + elements.add(this.getSubTotalDirCareCostProdHrsAgencyStaffUtil()); elements.add(this.getSubTotalDirCareCostProdHrsTotalYTD()); elements.add(this.getSubTotalDirCareCostNonProdHrsVacYTD()); elements.add(this.getSubTotalDirCareCostNonProdHrsSickYTD()); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 80f7835d..ebf651bc 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -794,6 +794,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY nursingCareCostSubtotals.setSubTotalDirCareCostNonProdHrsTotalYTD(root.getNursingNProdC_calcsum1()); nursingCareCostSubtotals.setSubTotalDirCareCostHourlyRateStaffYTD(root.getNursingStaffRate_total()); nursingCareCostSubtotals.setSubTotalDirCareCostHourlyRateContractedYTD(root.getNursingContractRate_total()); + nursingCareCostSubtotals.setSubTotalDirCareCostProdHrsAgencyStaffUtil(root.getNursingProdCASU_subsum()); LtcYtdDirectCareCostSubtotals alliedCareCostSubtotals = new LtcYtdDirectCareCostSubtotals(); alliedCareCostSubtotals.setConfirmationID(root.getForm().getConfirmationId()); From 8993f15d522ec41b2de2bee3d43b726d97acab34 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 19 May 2023 00:26:25 -0400 Subject: [PATCH 168/183] 9. TC_BED_YTD_MAX_OCCUPANCY, manually added "Inventory" to empty quarters, uppercase for data --- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index ebf651bc..e9d611bd 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2290,7 +2290,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY for (BedGrid0 maxOcp : root.getBedGrid0()) { LtcBedYtdMaxOccupancy numOfBeds = new LtcBedYtdMaxOccupancy(); numOfBeds.setBedFundingType(maxOcp.getBedType()); - numOfBeds.setQuarterInventory(maxOcp.getQuarter()); + numOfBeds.setQuarterInventory("Inventory"); numOfBeds.setConfirmationId(root.getForm().getConfirmationId()); numOfBeds.setStartDate(maxOcp.getStartDate0()); numOfBeds.setEndDate(maxOcp.getEndDate0()); @@ -2399,7 +2399,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY numOfBeds.setEndDate(maxOcp.getEndDate1()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds1()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays1()); - numOfBeds.setQuarterInventory(root.getQuarter()); + numOfBeds.setQuarterInventory("Q1"); numOfBeds.setNotes(maxOcp.getQuarterNote1()); numOfBeds.setBedSubype(maxOcp.getSubTypeLabel()); ltcBedYtdMaxOccupancies.add(numOfBeds); @@ -2496,7 +2496,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY numOfBeds.setEndDate(maxOcp.getEndDate2()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds2()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays2()); - numOfBeds.setQuarterInventory(root.getQuarter()); + numOfBeds.setQuarterInventory("Q2"); numOfBeds.setNotes(maxOcp.getNotes2()); numOfBeds.setBedSubype(maxOcp.getSubTypeLabel()); ltcBedYtdMaxOccupancies.add(numOfBeds); @@ -2594,7 +2594,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY numOfBeds.setEndDate(maxOcp.getEndDate3()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds3()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays3()); - numOfBeds.setQuarterInventory(root.getQuarter()); + numOfBeds.setQuarterInventory("Q3"); numOfBeds.setNotes(maxOcp.getNotes3()); numOfBeds.setBedSubype(maxOcp.getSubTypeLabel()); ltcBedYtdMaxOccupancies.add(numOfBeds); @@ -2683,7 +2683,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY numOfBeds.setEndDate(maxOcp.getEndDate4()); numOfBeds.setNumberOfBeds(maxOcp.getNumberOfBeds4()); numOfBeds.setMaximumBedDays(maxOcp.getMaximumBedDays4()); - numOfBeds.setQuarterInventory(root.getQuarter()); + numOfBeds.setQuarterInventory("Q4"); numOfBeds.setNotes(maxOcp.getNotes4()); numOfBeds.setBedSubype(maxOcp.getSubTypeLabel()); ltcBedYtdMaxOccupancies.add(numOfBeds); From 101705fb23a22c56e19c2cf8a43d20d1dce01d6d Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 19 May 2023 00:49:51 -0400 Subject: [PATCH 169/183] 11. LTC_YTD_REV_SUB_TOTALS, dded Sub_Total_Rev _Notes field --- .../java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- .../forms/ltc/quarterly/model/LtcYtdRevSubTotals.java | 9 ++++++++- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 7 +++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index fa0e6f1f..e446afa6 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -180,7 +180,7 @@ public class Constants { HEADERS.put(LTC_YTD_REV, new String[] { "CONFIRMATION_ID", "REV_TYPE", "REV_NAME", "REV_YTD", "REV_NOTES", }); - HEADERS.put(LTC_YTD_REV_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "REV_TYPE", "SUB_TOTAL_REV_YTD" }); + HEADERS.put(LTC_YTD_REV_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "REV_TYPE", "SUB_TOTAL_REV_YTD", "SUB_TOTAL_REV_NOTES"}); HEADERS.put(LTC_YTD_EXP, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "EXP_NAME", "EXP_YTD", "EXP_NOTES", }); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java index f3f1f188..7332ef4a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java @@ -13,7 +13,7 @@ public class LtcYtdRevSubTotals implements IModel { private String confirmationId; private String revType; private String subTotalRevYtd; - + private String subTotalRevNotes; public String getConfirmationId() { return confirmationId; @@ -33,6 +33,12 @@ public String getSubTotalRevYtd() { public void setSubTotalRevYtd(String subTotalRevYtd) { this.subTotalRevYtd = subTotalRevYtd; } + public String getSubTotalRevNotes() { + return subTotalRevNotes; + } + public void setSubTotalRevNotes(String subTotalRevNotes) { + this.subTotalRevNotes = subTotalRevNotes; + } @Override @@ -50,6 +56,7 @@ public List getCsvElements() { elements.add(this.getConfirmationId()); elements.add(this.getRevType()); elements.add(this.getSubTotalRevYtd()); + elements.add(this.getSubTotalRevNotes()); return elements; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index e9d611bd..433e4ff4 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -1893,36 +1893,43 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY revFromHA1Subttl.setConfirmationId(root.getForm().getConfirmationId()); revFromHA1Subttl.setRevType(root.getOpRev_1_label()); revFromHA1Subttl.setSubTotalRevYtd(root.getOpRev_sum11()); + revFromHA1Subttl.setSubTotalRevNotes(root.getOpRev_sum_note1()); LtcYtdRevSubTotals revFromHA2Subttl = new LtcYtdRevSubTotals(); revFromHA2Subttl.setConfirmationId(root.getForm().getConfirmationId()); revFromHA2Subttl.setRevType(root.getOpRev_2_label()); revFromHA2Subttl.setSubTotalRevYtd(root.getOpRev_sum12()); + revFromHA2Subttl.setSubTotalRevNotes(root.getOpRev_sum_note2()); LtcYtdRevSubTotals revFromHA4Subttl = new LtcYtdRevSubTotals(); revFromHA4Subttl.setConfirmationId(root.getForm().getConfirmationId()); revFromHA4Subttl.setRevType(root.getOpRev_4_label()); revFromHA4Subttl.setSubTotalRevYtd(root.getOpRev_sum13()); + revFromHA4Subttl.setSubTotalRevNotes(root.getOpRev_sum_note3()); LtcYtdRevSubTotals clntRevSubttl = new LtcYtdRevSubTotals(); clntRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); clntRevSubttl.setRevType(root.getOpRev_client_label()); clntRevSubttl.setSubTotalRevYtd(root.getOpRev_sum14()); + clntRevSubttl.setSubTotalRevNotes(root.getOpRev_sum_note4()); LtcYtdRevSubTotals othRevSubttl = new LtcYtdRevSubTotals(); othRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); othRevSubttl.setRevType(root.getOpRev_otherRev_label()); othRevSubttl.setSubTotalRevYtd(root.getOpRev_sum15()); + othRevSubttl.setSubTotalRevNotes(root.getOpRev_sum_note5()); LtcYtdRevSubTotals opRevSubttl = new LtcYtdRevSubTotals(); opRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); opRevSubttl.setRevType(root.getOpRev_YTD_total_label()); opRevSubttl.setSubTotalRevYtd(root.getOpRev_YTD_total()); + opRevSubttl.setSubTotalRevNotes(root.getOpRev_total_note()); LtcYtdRevSubTotals nonOpRevSubttl = new LtcYtdRevSubTotals(); nonOpRevSubttl.setConfirmationId(root.getForm().getConfirmationId()); nonOpRevSubttl.setRevType(root.getNopRev_label()); nonOpRevSubttl.setSubTotalRevYtd(root.getNopRev_sum11()); + nonOpRevSubttl.setSubTotalRevNotes(root.getNopRev_sub_note()); Collections.addAll(ltcYtdRevSubTtls, revFromHA1Subttl,revFromHA2Subttl,revFromHA4Subttl,clntRevSubttl,othRevSubttl,opRevSubttl, nonOpRevSubttl); From 6e7e16a42be59ea573358f48e57bb517f50f1c5d Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 19 May 2023 13:45:56 -0400 Subject: [PATCH 170/183] 12. Added Operating Surplus / (Deficit) before dep, and Non-operating Surplus total to LTC_YTD_SUM_TOTALS --- .../etl/forms/ltc/quarterly/json/Root.java | 17 +++++++++++- .../LtcQuarterlyYtdApiResponseProcessor.java | 27 ++++++++++++++----- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index bdbb1a33..db3191ef 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -1471,6 +1471,9 @@ public class Root{ public String opEx_data_total_label; public String opRev_YTD_total_label; public String opSu_data_total_label; + @JsonProperty("opSuB_item1-1_label") + public String opSuB_item11_label; + public String nopSu_data_label; public String opEx_note_sum6; public String opEx_note1; public String opEx_note10; @@ -1682,7 +1685,7 @@ public class Root{ public String opRev_YTD9; public String opSu_data_total; public String opSu_data_total_note; - @JsonProperty("opRev_item1-1") + @JsonProperty("opSuB_item1-1") public String opSuB_item11; public String opSuB_note; public String outScopeBedTotal1; @@ -10738,4 +10741,16 @@ public String getOpSu_data_total_label() { public void setOpSu_data_total_label(String opSu_data_total_label) { this.opSu_data_total_label = opSu_data_total_label; } + public String getOpSuB_item11_label() { + return opSuB_item11_label; + } + public void setOpSuB_item11_label(String opSuB_item11_label) { + this.opSuB_item11_label = opSuB_item11_label; + } + public String getNopSu_data_label() { + return nopSu_data_label; + } + public void setNopSu_data_label(String nopSu_data_label) { + this.nopSu_data_label = nopSu_data_label; + } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 433e4ff4..f82d8b7e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2189,13 +2189,26 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY /* END */ /* LtcYtdSumTotals */ - LtcYtdSumTotals YtdTotal = new LtcYtdSumTotals(); - YtdTotal.setConfirmationId(root.getForm().getConfirmationId()); - YtdTotal.setTotName(root.getOpSu_data_total_label()); - YtdTotal.setSumYTD(root.getOpSu_data_total()); - YtdTotal.setTotNotes(root.getOpSu_data_total_note()); - - ltcYtdSumTotals.add(YtdTotal); + LtcYtdSumTotals totalNonOperatingSurplus = new LtcYtdSumTotals(); + totalNonOperatingSurplus.setConfirmationId(root.getForm().getConfirmationId()); + totalNonOperatingSurplus.setTotName(root.getNopSu_data_label()); + totalNonOperatingSurplus.setSumYTD(root.getNopSu_data1()); + totalNonOperatingSurplus.setTotNotes(root.getNopSu_note()); + + LtcYtdSumTotals operatingSurplusBeforeDepreciation = new LtcYtdSumTotals(); + operatingSurplusBeforeDepreciation.setConfirmationId(root.getForm().getConfirmationId()); + operatingSurplusBeforeDepreciation.setTotName(root.getOpSuB_item11_label()); + operatingSurplusBeforeDepreciation.setSumYTD(root.getOpSuB_item11()); + operatingSurplusBeforeDepreciation.setTotNotes(root.getOpSuB_note()); + + LtcYtdSumTotals totalOperatingSurplus = new LtcYtdSumTotals(); + totalOperatingSurplus.setConfirmationId(root.getForm().getConfirmationId()); + totalOperatingSurplus.setTotName(root.getOpSu_data_total_label()); + totalOperatingSurplus.setSumYTD(root.getOpSu_data_total()); + totalOperatingSurplus.setTotNotes(root.getOpSu_data_total_note()); + + Collections.addAll(ltcYtdSumTotals, operatingSurplusBeforeDepreciation, totalNonOperatingSurplus, + totalOperatingSurplus); /* END */ From 9daf33f25f3d879322053fa29074eed92cbb9016 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 19 May 2023 15:00:21 -0400 Subject: [PATCH 171/183] 14. Capturing Exp Subtotal before salary/wages/accruals. added to LTCYTDEXPSUBTOTALS table --- .../quarterly/model/LtcYtdExpSubTotals.java | 12 ++++----- .../LtcQuarterlyYtdApiResponseProcessor.java | 25 ++++++++++++------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java index d54d0b91..321a1e31 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java @@ -12,7 +12,7 @@ public class LtcYtdExpSubTotals implements IModel { private String confirmationId; private String expType; - private String subTotalRevYtd; + private String subTotalExpYtd; public String getConfirmationId() { return confirmationId; @@ -26,11 +26,11 @@ public String getExpType() { public void setExpType(String expType) { this.expType = StringUtils.defaultIfEmpty(expType, Constants.DEFAULT_STRING_VALUE); } - public String getSubTotalRevYtd() { - return subTotalRevYtd; + public String getSubTotalExpYtd() { + return subTotalExpYtd; } - public void setSubTotalRevYtd(String subTotalRevYtd) { - this.subTotalRevYtd = subTotalRevYtd; + public void setSubTotalExpYtd(String subTotalExpYtd) { + this.subTotalExpYtd = subTotalExpYtd; } @Override @@ -47,7 +47,7 @@ public List getCsvElements() { List elements = new ArrayList<>(); elements.add(this.getConfirmationId()); elements.add(this.getExpType()); - elements.add(this.getSubTotalRevYtd()); + elements.add(this.getSubTotalExpYtd()); return elements; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index f82d8b7e..587e7f40 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2135,40 +2135,47 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY LtcYtdExpSubTotals staffCost1ASubtotal = new LtcYtdExpSubTotals(); staffCost1ASubtotal.setConfirmationId(root.getForm().getConfirmationId()); staffCost1ASubtotal.setExpType(root.getOpEx_1A_label()); - staffCost1ASubtotal.setSubTotalRevYtd(root.getOpEx_sum11()); + staffCost1ASubtotal.setSubTotalExpYtd(root.getOpEx_sum11()); LtcYtdExpSubTotals staffCost1BSubtotal = new LtcYtdExpSubTotals(); staffCost1BSubtotal.setConfirmationId(root.getForm().getConfirmationId()); staffCost1BSubtotal.setExpType(root.getOpEx_1B_label()); - staffCost1BSubtotal.setSubTotalRevYtd(root.getOpEx_sum12()); + staffCost1BSubtotal.setSubTotalExpYtd(root.getOpEx_sum12()); LtcYtdExpSubTotals propertyCostSubtotal = new LtcYtdExpSubTotals(); propertyCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); propertyCostSubtotal.setExpType(root.getOpEx_2_label()); - propertyCostSubtotal.setSubTotalRevYtd(root.getOpEx_sum13()); + propertyCostSubtotal.setSubTotalExpYtd(root.getOpEx_sum13()); LtcYtdExpSubTotals suppliesSubtotal = new LtcYtdExpSubTotals(); suppliesSubtotal.setConfirmationId(root.getForm().getConfirmationId()); suppliesSubtotal.setExpType(root.getOpEx_3_label()); - suppliesSubtotal.setSubTotalRevYtd(root.getOpEx_sum14()); + suppliesSubtotal.setSubTotalExpYtd(root.getOpEx_sum14()); LtcYtdExpSubTotals adminCostSubtotal = new LtcYtdExpSubTotals(); adminCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); adminCostSubtotal.setExpType(root.getOpEx_4_label()); - adminCostSubtotal.setSubTotalRevYtd(root.getOpEx_sum15()); + adminCostSubtotal.setSubTotalExpYtd(root.getOpEx_sum15()); LtcYtdExpSubTotals operatingCostSubtotal = new LtcYtdExpSubTotals(); operatingCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); operatingCostSubtotal.setExpType(root.getOpEx_data_total_label()); - operatingCostSubtotal.setSubTotalRevYtd(root.getOpEx_data_total()); + operatingCostSubtotal.setSubTotalExpYtd(root.getOpEx_data_total()); LtcYtdExpSubTotals nonOperationalExpSubtotal = new LtcYtdExpSubTotals(); nonOperationalExpSubtotal.setConfirmationId(root.getForm().getConfirmationId()); nonOperationalExpSubtotal.setExpType(root.getNopEx_label()); - nonOperationalExpSubtotal.setSubTotalRevYtd(root.getNopEx_sum11()); + nonOperationalExpSubtotal.setSubTotalExpYtd(root.getNopEx_sum11()); - Collections.addAll(ltcYtdExpSubttls,staffCost1ASubtotal,staffCost1BSubtotal,propertyCostSubtotal,suppliesSubtotal,adminCostSubtotal,operatingCostSubtotal, - nonOperationalExpSubtotal); + LtcYtdExpSubTotals beforeSalaryWagesRecAcc = new LtcYtdExpSubTotals(); + beforeSalaryWagesRecAcc.setConfirmationId(root.getForm().getConfirmationId()); + beforeSalaryWagesRecAcc.setExpType("Before salary/wages rec./accruals"); + beforeSalaryWagesRecAcc.setSubTotalExpYtd(root.getOpEx_sub1()); + + // /getOpEx_sub1() + + Collections.addAll(ltcYtdExpSubttls,staffCost1ASubtotal,staffCost1BSubtotal,propertyCostSubtotal,suppliesSubtotal,adminCostSubtotal,operatingCostSubtotal, nonOperationalExpSubtotal, + beforeSalaryWagesRecAcc); /* END */ From 1efa8f3068a9ab98b317215e4eea1fd82cf69388 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 19 May 2023 15:16:04 -0400 Subject: [PATCH 172/183] Extra comment: LTC_YTD_EXP_SUB_TOTALS also has new field for notes: Sub_Total_Exp_Notes --- .../java/ca/bc/gov/chefs/etl/constant/Constants.java | 2 +- .../forms/ltc/quarterly/model/LtcYtdExpSubTotals.java | 9 ++++++++- .../processor/LtcQuarterlyYtdApiResponseProcessor.java | 8 ++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index e446afa6..38a8ecf1 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -184,7 +184,7 @@ public class Constants { HEADERS.put(LTC_YTD_EXP, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "EXP_NAME", "EXP_YTD", "EXP_NOTES", }); - HEADERS.put(LTC_YTD_EXP_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "SUB_TOTAL_EXP_YTD", }); + HEADERS.put(LTC_YTD_EXP_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "SUB_TOTAL_EXP_YTD", "SUB_TOTAL_EXP_NOTES"}); HEADERS.put(LTC_YTD_DEP, new String[] { "CONFIRMATION_ID", "DEP_NAME", "DEP_YTD", "DEP_NOTES"}); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java index 321a1e31..ae1ec2fa 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java @@ -13,6 +13,7 @@ public class LtcYtdExpSubTotals implements IModel { private String confirmationId; private String expType; private String subTotalExpYtd; + private String subTotalExpNotes; public String getConfirmationId() { return confirmationId; @@ -32,7 +33,12 @@ public String getSubTotalExpYtd() { public void setSubTotalExpYtd(String subTotalExpYtd) { this.subTotalExpYtd = subTotalExpYtd; } - + public String getSubTotalExpNotes() { + return subTotalExpNotes; + } + public void setSubTotalExpNotes(String subTotalExpNotes) { + this.subTotalExpNotes = subTotalExpNotes; + } @Override public String getFileName() { // TODO Auto-generated method stub @@ -48,6 +54,7 @@ public List getCsvElements() { elements.add(this.getConfirmationId()); elements.add(this.getExpType()); elements.add(this.getSubTotalExpYtd()); + elements.add(this.getSubTotalExpNotes()); return elements; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 587e7f40..9240b779 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -2136,41 +2136,49 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY staffCost1ASubtotal.setConfirmationId(root.getForm().getConfirmationId()); staffCost1ASubtotal.setExpType(root.getOpEx_1A_label()); staffCost1ASubtotal.setSubTotalExpYtd(root.getOpEx_sum11()); + staffCost1ASubtotal.setSubTotalExpNotes(root.getOpEx_sum_note1()); LtcYtdExpSubTotals staffCost1BSubtotal = new LtcYtdExpSubTotals(); staffCost1BSubtotal.setConfirmationId(root.getForm().getConfirmationId()); staffCost1BSubtotal.setExpType(root.getOpEx_1B_label()); staffCost1BSubtotal.setSubTotalExpYtd(root.getOpEx_sum12()); + staffCost1BSubtotal.setSubTotalExpNotes(root.getOpEx_sum_note2()); LtcYtdExpSubTotals propertyCostSubtotal = new LtcYtdExpSubTotals(); propertyCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); propertyCostSubtotal.setExpType(root.getOpEx_2_label()); propertyCostSubtotal.setSubTotalExpYtd(root.getOpEx_sum13()); + propertyCostSubtotal.setSubTotalExpNotes(root.getOpEx_sum_note3()); LtcYtdExpSubTotals suppliesSubtotal = new LtcYtdExpSubTotals(); suppliesSubtotal.setConfirmationId(root.getForm().getConfirmationId()); suppliesSubtotal.setExpType(root.getOpEx_3_label()); suppliesSubtotal.setSubTotalExpYtd(root.getOpEx_sum14()); + suppliesSubtotal.setSubTotalExpNotes(root.getOpEx_sum_note4()); LtcYtdExpSubTotals adminCostSubtotal = new LtcYtdExpSubTotals(); adminCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); adminCostSubtotal.setExpType(root.getOpEx_4_label()); adminCostSubtotal.setSubTotalExpYtd(root.getOpEx_sum15()); + adminCostSubtotal.setSubTotalExpNotes(root.getOpEx_sum_note5()); LtcYtdExpSubTotals operatingCostSubtotal = new LtcYtdExpSubTotals(); operatingCostSubtotal.setConfirmationId(root.getForm().getConfirmationId()); operatingCostSubtotal.setExpType(root.getOpEx_data_total_label()); operatingCostSubtotal.setSubTotalExpYtd(root.getOpEx_data_total()); + operatingCostSubtotal.setSubTotalExpNotes(root.getOpEx_total_note()); LtcYtdExpSubTotals nonOperationalExpSubtotal = new LtcYtdExpSubTotals(); nonOperationalExpSubtotal.setConfirmationId(root.getForm().getConfirmationId()); nonOperationalExpSubtotal.setExpType(root.getNopEx_label()); nonOperationalExpSubtotal.setSubTotalExpYtd(root.getNopEx_sum11()); + nonOperationalExpSubtotal.setSubTotalExpNotes(root.getNopEx_sub_note()); LtcYtdExpSubTotals beforeSalaryWagesRecAcc = new LtcYtdExpSubTotals(); beforeSalaryWagesRecAcc.setConfirmationId(root.getForm().getConfirmationId()); beforeSalaryWagesRecAcc.setExpType("Before salary/wages rec./accruals"); beforeSalaryWagesRecAcc.setSubTotalExpYtd(root.getOpEx_sub1()); + beforeSalaryWagesRecAcc.setSubTotalExpNotes(root.getOpEx_sub_note()); // /getOpEx_sub1() From 5b40735d02659067b68c4903ce310961fc635c7f Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 19 May 2023 15:29:54 -0400 Subject: [PATCH 173/183] Extra comment: Adding new column named TOTAL_VACANCIES to YTD_SUBMISSION table. --- .../java/ca/bc/gov/chefs/etl/constant/Constants.java | 4 ++-- .../gov/chefs/etl/forms/ltc/quarterly/json/Root.java | 8 ++++++++ .../forms/ltc/quarterly/model/LtcYtdSubmission.java | 12 +++++++++++- .../LtcQuarterlyYtdApiResponseProcessor.java | 1 + 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 38a8ecf1..ee6b0163 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -175,8 +175,8 @@ public class Constants { // LTC Quarterly YTD HEADERS.put(LTC_YTD_SUBMISSION, new String[] { "CONFIRMATION_ID", "IS_DELETED", "SUBMISSION_DATE", "SUBMITTED_BY", "CCIMS_ID", "SUBMISSION_TYPE", - "PERIOD","SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD", "TOTAL_SALARIES_WAGES", - "TOTAL_BENEFITS", "BENEFITS_PERCENT" }); + "PERIOD","SUBMISSION_FY", "NB_TOTAL_BEDS", "NB_FUNDED_BEDS", "OCC_RATE_THRESHOLD", + "TOTAL_BENEFITS", "TOTAL_SALARIES_WAGES", "BENEFITS_PERCENT", "TOTAL_VACANCIES" }); HEADERS.put(LTC_YTD_REV, new String[] { "CONFIRMATION_ID", "REV_TYPE", "REV_NAME", "REV_YTD", "REV_NOTES", }); diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index db3191ef..cc961732 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -2121,7 +2121,15 @@ public class Root{ @JsonProperty("opEx_YTD_label-39") public String opEx_YTD_label39; public String benefit_value_rec_label; + @JsonProperty("nursingNVP_sum1-1") + public String nursingNVP_sum11; + public String getNursingNVP_sum11() { + return nursingNVP_sum11; + } + public void setNursingNVP_sum11(String nursingNVP_sum11) { + this.nursingNVP_sum11 = nursingNVP_sum11; + } public String getBenefit_value_rec_label() { return benefit_value_rec_label; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java index 469ab729..35a2e49d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java @@ -30,6 +30,7 @@ public class LtcYtdSubmission implements IModel { private String totalSalariesWages; private String totalBenefits; private String benefitsPercent; + private String totalVacancies; private List ltcBedYtdMaxOccupancy; private List ltcBedYtdOccupancyRate; @@ -84,9 +85,10 @@ public List getCsvElements() { elements.add(this.getNbTotalBeds()); elements.add(this.getNbFundedBeds()); elements.add(this.getOccRateThreshold()); - elements.add(this.getTotalSalariesWages()); elements.add(this.getTotalBenefits()); + elements.add(this.getTotalSalariesWages()); elements.add(this.getBenefitsPercent()); + elements.add(this.getTotalVacancies()); return elements; } @@ -416,6 +418,14 @@ public void setBenefitsPercent(String benefitsPercent) { this.benefitsPercent = benefitsPercent; } + public String getTotalVacancies() { + return totalVacancies; + } + + public void setTotalVacancies(String totalVacancies) { + this.totalVacancies = totalVacancies; + } + public String getTotalSalariesWages() { return totalSalariesWages; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index 9240b779..acd55b25 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -118,6 +118,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY ltcYtdSubmission.setTotalSalariesWages(root.getbTotal_YTDSalaryWage()); ltcYtdSubmission.setTotalBenefits(root.getBenefit_value_total()); ltcYtdSubmission.setBenefitsPercent(root.getbTotal_value_sum()); + ltcYtdSubmission.setTotalVacancies(root.getNursingNVP_sum11()); /* START : Direct Care Hours */ /* Productive and NP Nursing */ // why no subtotal and total? From e2d9afaee3c428d9bb3a1ae69ed64a6469466f97 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 22 May 2023 17:36:40 -0400 Subject: [PATCH 174/183] 10. Staffing vacancies - new table. LTC_YTD_DIRECT_CARE_VACANCY. With complete mapping --- .../bc/gov/chefs/etl/constant/Constants.java | 7 ++ .../etl/forms/ltc/quarterly/json/Root.java | 32 +++++++++ .../model/LtcYtdDirectCareVacancy.java | 67 +++++++++++++++++++ .../ltc/quarterly/model/LtcYtdSubmission.java | 10 +++ .../LtcQuarterlyYtdApiResponseProcessor.java | 34 ++++++++++ 5 files changed, 150 insertions(+) create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareVacancy.java diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index ee6b0163..a855ed8a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -81,6 +81,7 @@ public class Constants { public static final String LTC_YTD_DIRECT_CARE_COST_SUBTOTALS = "LTC_YTD_DIRECT_CARE_COST_SUBTOTALS"; public static final String LTC_BED_YTD_OCCUPANCY_RATE_TOTALS = "LTC_BED_YTD_OCCUPANCY_RATE_TOTALS"; public static final String LTC_BED_YTD_OCCUPIED_DAYS_TOTALS = "LTC_BED_YTD_OCCUPIED_DAYS_TOTALS"; + public static final String LTC_YTD_DIRECT_CARE_VACANCY = "LTC_YTD_DIRECT_CARE_VACANCY"; /* File Constants */ public final static String PROPERTIES_DATA_DIR = "data-dir"; @@ -304,5 +305,11 @@ public class Constants { "TOTAL_YTD_OCC_DAYS", "TOTAL_PERCENT_OCC" }); + HEADERS.put(LTC_YTD_DIRECT_CARE_VACANCY, new String[] { + "CONFIRMATION_ID", + "DIR_CARE_VACANCY_TYPE", + "DIR_CARE_VACANCY_NAME", + "DIR_CARE_VAC_POSITIONS" + }); } } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java index cc961732..e8f7ae20 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/json/Root.java @@ -2123,7 +2123,39 @@ public class Root{ public String benefit_value_rec_label; @JsonProperty("nursingNVP_sum1-1") public String nursingNVP_sum11; + @JsonProperty("nursingNVP_item1-1") + public String nursingNVP_item11; + @JsonProperty("nursingNVP_item1-2") + public String nursingNVP_item12; + @JsonProperty("nursingNVP_item1-3") + public String nursingNVP_item13; + @JsonProperty("nursingNVP_item1-4") + public String nursingNVP_item14; + public String getNursingNVP_item11() { + return nursingNVP_item11; + } + public void setNursingNVP_item11(String nursingNVP_item11) { + this.nursingNVP_item11 = nursingNVP_item11; + } + public String getNursingNVP_item12() { + return nursingNVP_item12; + } + public void setNursingNVP_item12(String nursingNVP_item12) { + this.nursingNVP_item12 = nursingNVP_item12; + } + public String getNursingNVP_item13() { + return nursingNVP_item13; + } + public void setNursingNVP_item13(String nursingNVP_item13) { + this.nursingNVP_item13 = nursingNVP_item13; + } + public String getNursingNVP_item14() { + return nursingNVP_item14; + } + public void setNursingNVP_item14(String nursingNVP_item14) { + this.nursingNVP_item14 = nursingNVP_item14; + } public String getNursingNVP_sum11() { return nursingNVP_sum11; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareVacancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareVacancy.java new file mode 100644 index 00000000..5dd0013c --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareVacancy.java @@ -0,0 +1,67 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.core.model.IModel; + +public class LtcYtdDirectCareVacancy implements IModel { + + private String confirmationId; + private String directCareVacancyType; + private String directCareVacancyName; + private String directCareVacPositions; + + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = confirmationId; + } + public String getDirectCareVacancyType() { + return directCareVacancyType; + } + public void setDirectCareVacancyType(String directCareVacancyType) { + this.directCareVacancyType = directCareVacancyType; + } + public String getDirectCareVacancyName() { + return directCareVacancyName; + } + public void setDirectCareVacancyName(String directCareVacancyName) { + this.directCareVacancyName = directCareVacancyName; + } + public String getDirectCareVacPositions() { + return directCareVacPositions; + } + public void setDirectCareVacPositions(String directCareVacPositions) { + this.directCareVacPositions = directCareVacPositions; + } + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_DIRECT_CARE_VACANCY; + } + @Override + public List getCsvElements() { + List elements = new ArrayList<>(); + elements.add(this.getConfirmationId()); + elements.add(this.getDirectCareVacancyType()); + elements.add(this.getDirectCareVacancyName()); + elements.add(this.getDirectCareVacPositions()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } + + +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java index 35a2e49d..0e5bf8fe 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java @@ -56,6 +56,7 @@ public class LtcYtdSubmission implements IModel { private List ltcBedYtdMaxOccTtls; private List ltcBedYtdOccDaysTtls; private List ltcBedYtdOccRateTtls; + private List LtcYtdDirectCareVacancy; @Override @@ -119,6 +120,7 @@ public List getObjects() { ltcQtdInstances.addAll(this.getLtcBedYtdMaxOccTtls()); ltcQtdInstances.addAll(this.getLtcBedYtdOccDaysTtls()); ltcQtdInstances.addAll(this.getLtcBedYtdOccRateTtls()); + ltcQtdInstances.addAll(this.getLtcYtdDirectCareVacancy()); return ltcQtdInstances; } @@ -379,6 +381,14 @@ public void setLtcBedYtdOccRateTtls(List ltcBedYtd this.ltcBedYtdOccRateTtls = ltcBedYtdOccRateTtls; } + public List getLtcYtdDirectCareVacancy() { + return LtcYtdDirectCareVacancy; + } + + public void setLtcYtdDirectCareVacancy(List ltcYtdDirectCareVacancy) { + this.LtcYtdDirectCareVacancy = ltcYtdDirectCareVacancy; + } + public String getSubmissionFy() { return submissionFy; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index acd55b25..bb33aa44 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -41,6 +41,7 @@ import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDirectCareCostSubtotals; import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDirectCareHrs; import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDirectCareHrsSubTotals; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDirectCareVacancy; import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdExp; import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdExpSubTotals; import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdRev; @@ -101,6 +102,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY List ltcBedYtdOccupiedDays = new ArrayList<>(); List ltcBedYtdOccDaysTtls = new ArrayList<>(); List ltcBedYtdOccRateTtls = new ArrayList<>(); + List LtcYtdDirectCareVacancy = new ArrayList<>(); /* Form Meta */ @@ -2320,6 +2322,37 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY // subtotal // total operating expenses + //DIRECT CARE VACANCY : + //LtcYtdDirectCareVacancy + + LtcYtdDirectCareVacancy directCareVacancyNurseRN = new LtcYtdDirectCareVacancy(); + directCareVacancyNurseRN.setConfirmationId(root.getForm().getConfirmationId()); + directCareVacancyNurseRN.setDirectCareVacancyType(root.getNursing_label()); + directCareVacancyNurseRN.setDirectCareVacancyName(root.getNursing_label1()); + directCareVacancyNurseRN.setDirectCareVacPositions(root.getNursingNVP_item11()); + + LtcYtdDirectCareVacancy directCareVacancyNurseLPN = new LtcYtdDirectCareVacancy(); + directCareVacancyNurseLPN.setConfirmationId(root.getForm().getConfirmationId()); + directCareVacancyNurseLPN.setDirectCareVacancyType(root.getNursing_label()); + directCareVacancyNurseLPN.setDirectCareVacancyName(root.getNursing_label2()); + directCareVacancyNurseLPN.setDirectCareVacPositions(root.getNursingNVP_item12()); + + LtcYtdDirectCareVacancy directCareVacancyNurseHCA = new LtcYtdDirectCareVacancy(); + directCareVacancyNurseHCA.setConfirmationId(root.getForm().getConfirmationId()); + directCareVacancyNurseHCA.setDirectCareVacancyType(root.getNursing_label()); + directCareVacancyNurseHCA.setDirectCareVacancyName(root.getNursing_label3()); + directCareVacancyNurseHCA.setDirectCareVacPositions(root.getNursingNVP_item13()); + + LtcYtdDirectCareVacancy directCareVacancyNurseOther = new LtcYtdDirectCareVacancy(); + directCareVacancyNurseOther.setConfirmationId(root.getForm().getConfirmationId()); + directCareVacancyNurseOther.setDirectCareVacancyType(root.getNursing_label()); + directCareVacancyNurseOther.setDirectCareVacancyName(root.getNursing_label4()); + directCareVacancyNurseOther.setDirectCareVacPositions(root.getNursingNVP_item14()); + + Collections.addAll(LtcYtdDirectCareVacancy, directCareVacancyNurseRN, directCareVacancyNurseLPN, + directCareVacancyNurseHCA, directCareVacancyNurseOther); + + /* Bed Inventory */ /* mandatory bed grid */ @@ -2832,6 +2865,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY ltcYtdSubmission.setLtcBedYtdMaxOccTtls(ltcBedYtdMaxOccTtls); ltcYtdSubmission.setLtcBedYtdOccDaysTtls(ltcBedYtdOccDaysTtls); ltcYtdSubmission.setLtcBedYtdOccRateTtls(ltcBedYtdOccRateTtls); + ltcYtdSubmission.setLtcYtdDirectCareVacancy(LtcYtdDirectCareVacancy); ltcYtdSubmissions.add(ltcYtdSubmission); From b5d85cb589ae7d4e853a6e776a6301c88ec67804 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Mon, 22 May 2023 17:38:54 -0400 Subject: [PATCH 175/183] Removed ".test" from constant file for ltc ytd --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index a855ed8a..94fcbbec 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -40,8 +40,8 @@ public class Constants { public static final String LTC_FACILITY_PREPARER = "LTC_FACILITY_PREPARER"; /* LTC Quarterly YTD */ - public final static String LTC_YTD_USERNAME = "ltc.ytd.test.username"; - public final static String LTC_YTD_PASSWORD = "ltc.ytd.test.password"; + public final static String LTC_YTD_USERNAME = "ltc.ytd.username"; + public final static String LTC_YTD_PASSWORD = "ltc.ytd.password"; public final static String IN_SCOPE = "inScope"; public final static String OUT_OF_SCOPE = "outOfScope"; public final static String PRIVATE_BED = "privateBed"; From 81ed12f8a35eda22d246c8b8a6a166a27751f807 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 30 May 2023 14:22:41 -0400 Subject: [PATCH 176/183] added new table LTC_YTD_DEP_SUB_TOTALS --- .../bc/gov/chefs/etl/constant/Constants.java | 3 + .../quarterly/model/LtcYtdDepSubTotals.java | 57 +++++++++++++++++++ .../ltc/quarterly/model/LtcYtdSubmission.java | 8 +++ .../LtcQuarterlyYtdApiResponseProcessor.java | 13 +++++ 4 files changed, 81 insertions(+) create mode 100644 src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDepSubTotals.java diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 94fcbbec..9955310e 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -70,6 +70,7 @@ public class Constants { public static final String LTC_YTD_REV_SUB_TOTALS = "LTC_YTD_REV_SUB_TOTALS"; public static final String LTC_YTD_EXP_SUB_TOTALS = "LTC_YTD_EXP_SUB_TOTALS"; public static final String LTC_YTD_DEP = "LTC_YTD_DEP"; + public static final String LTC_YTD_DEP_SUB_TOTALS = "LTC_YTD_DEP_SUB_TOTALS"; public static final String LTC_YTD_SUM_TOTALS = "LTC_YTD_SUM_TOTALS"; public final static String LTC_FACILITY = "LTC_FACILITY"; public static final String LTC_YTD_COMP_SAL_SUBTOTALS = "LTC_YTD_COMP_SAL_SUBTOTALS"; @@ -189,6 +190,8 @@ public class Constants { HEADERS.put(LTC_YTD_DEP, new String[] { "CONFIRMATION_ID", "DEP_NAME", "DEP_YTD", "DEP_NOTES"}); + HEADERS.put(LTC_YTD_DEP_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "SUB_TOTAL_DEP_YTD", "SUB_TOTAL_DEP_NOTES"}); + HEADERS.put(LTC_YTD_SUM_TOTALS, new String[] { "CONFIRMATION_ID", "TOT_NAME", "SUM_YTD","TOT_NOTES"}); HEADERS.put(LTC_YTD_COMP_SAL, diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDepSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDepSubTotals.java new file mode 100644 index 00000000..be178bef --- /dev/null +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDepSubTotals.java @@ -0,0 +1,57 @@ +package ca.bc.gov.chefs.etl.forms.ltc.quarterly.model; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; + +import ca.bc.gov.chefs.etl.constant.Constants; +import ca.bc.gov.chefs.etl.core.model.IModel; + +public class LtcYtdDepSubTotals implements IModel { + + private String confirmationId; + private String subTotalDepYtd; + private String subTotalDepNotes; + + public String getConfirmationId() { + return confirmationId; + } + public void setConfirmationId(String confirmationId) { + this.confirmationId = StringUtils.defaultIfEmpty(confirmationId, Constants.DEFAULT_STRING_VALUE); + } + public String getSubTotalDepYtd() { + return subTotalDepYtd; + } + public void setSubTotalDepYtd(String subTotalDepYtd) { + this.subTotalDepYtd = StringUtils.defaultIfEmpty(subTotalDepYtd, Constants.DEFAULT_DECIMAL_VALUE); + } + public String getSubTotalDepNotes() { + return subTotalDepNotes; + } + public void setSubTotalDepNotes(String subTotalDepNotes) { + this.subTotalDepNotes = subTotalDepNotes; + } + + @Override + public String getFileName() { + // TODO Auto-generated method stub + return null; + } + @Override + public String getFormType() { + return Constants.LTC_YTD_DEP_SUB_TOTALS; + } + @Override + public List getCsvElements() { + List elements = new ArrayList(); + elements.add(this.getConfirmationId()); + elements.add(this.getSubTotalDepYtd()); + elements.add(this.getSubTotalDepNotes()); + return elements; + } + @Override + public List getObjects() { + return new ArrayList<>(); + } +} diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java index 0e5bf8fe..c77140c0 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdSubmission.java @@ -43,6 +43,7 @@ public class LtcYtdSubmission implements IModel { private List ltcYtdDirectCareHrs; private List ltcYtdExp; private List ltcYtdDep; + private List ltcYtdDepSubTotals; private List ltcYtdRev; private List ltcYtdExpSubttls; private List ltcYtdRevSubttls; @@ -108,6 +109,7 @@ public List getObjects() { ltcQtdInstances.addAll(this.getLtcYtdExp()); ltcQtdInstances.addAll(this.getLtcYtdRev()); ltcQtdInstances.addAll(this.getLtcYtdDep()); + ltcQtdInstances.addAll(this.getLtcYtdDepSubTotals()); ltcQtdInstances.addAll(this.getLtcYtdSumTotals()); ltcQtdInstances.addAll(this.getLtcYtdExpSubttls()); ltcQtdInstances.addAll(this.getLtcYtdRevSubttls()); @@ -403,7 +405,13 @@ public List getLtcYtdDep() { public void setLtcYtdDep(List ltcYtdDep) { this.ltcYtdDep = ltcYtdDep; } + public List getLtcYtdDepSubTotals() { + return ltcYtdDepSubTotals; + } + public void setLtcYtdDepSubTotals(List ltcYtdDepSubTotals) { + this.ltcYtdDepSubTotals = ltcYtdDepSubTotals; + } public List getLtcYtdSumTotals() { return ltcYtdSumTotals; } diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java index bb33aa44..a324698c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/processor/LtcQuarterlyYtdApiResponseProcessor.java @@ -37,6 +37,7 @@ import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdCompSalSubtotals; import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdCompSalTotals; import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDep; +import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDepSubTotals; import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDirectCareCost; import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDirectCareCostSubtotals; import ca.bc.gov.chefs.etl.forms.ltc.quarterly.model.LtcYtdDirectCareHrs; @@ -95,6 +96,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY List ltcYtdExpSubttls = new ArrayList(); List ltcYtdExp = new ArrayList<>(); List ltcYtdDep = new ArrayList<>(); + List ltcYtdDepSubTotals = new ArrayList<>(); List ltcYtdSumTotals = new ArrayList<>(); List ltcBedYtdOccupancyRates = new ArrayList<>(); List ltcBedYtdMaxOccupancies = new ArrayList<>(); @@ -2206,6 +2208,16 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY Collections.addAll(ltcYtdDep, buildingDep, furnitureEquipmentDep); /* END */ + /* LTC YTD SUBTOTALS */ + + LtcYtdDepSubTotals subTotalYtdDep = new LtcYtdDepSubTotals(); + subTotalYtdDep.setConfirmationId(root.getForm().getConfirmationId()); + subTotalYtdDep.setSubTotalDepYtd(root.getOpEx_sum16()); + subTotalYtdDep.setSubTotalDepNotes(root.getOpEx_note_sum6()); + + Collections.addAll(ltcYtdDepSubTotals, subTotalYtdDep); + /* END */ + /* LtcYtdSumTotals */ LtcYtdSumTotals totalNonOperatingSurplus = new LtcYtdSumTotals(); totalNonOperatingSurplus.setConfirmationId(root.getForm().getConfirmationId()); @@ -2852,6 +2864,7 @@ private List parseYtdQuarterlyRequest(List ltcQuarterlyY ltcYtdSubmission.setLtcYtdDirectCareHrs(ltcYtdDcHrs); ltcYtdSubmission.setLtcYtdExp(ltcYtdExp); ltcYtdSubmission.setLtcYtdDep(ltcYtdDep); + ltcYtdSubmission.setLtcYtdDepSubTotals(ltcYtdDepSubTotals); ltcYtdSubmission.setLtcYtdSumTotals(ltcYtdSumTotals); ltcYtdSubmission.setLtcYtdRev(ltcYtdRev); ltcYtdSubmission.setLtcYtdExpSubttls(ltcYtdExpSubttls); From 231a35be8b891fa1cd7ef492a6db22317799b44c Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 30 May 2023 14:46:44 -0400 Subject: [PATCH 177/183] replacing percentage value with default error value if found value is "NaN" --- .../etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java index fa0f1865..1ca14c89 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdCompBenefits.java @@ -33,14 +33,12 @@ public String getBenefitsAmountYtd() { public void setBenefitsAmountYtd(String benefitsAmountYtd) { this.benefitsAmountYtd = StringUtils.defaultIfEmpty(benefitsAmountYtd, Constants.DEFAULT_DECIMAL_VALUE); } - - - public String getBenefitsPercentageAlloc() { return StringUtils.isEmpty(benefitsPercentageAlloc) ? "0" : benefitsPercentageAlloc; } public void setBenefitsPercentageAlloc(String benefitsPercentageAlloc) { - this.benefitsPercentageAlloc = benefitsPercentageAlloc; + this.benefitsPercentageAlloc = + benefitsPercentageAlloc.equals("NaN") ? Constants.DEFAULT_DECIMAL_VALUE : benefitsPercentageAlloc; } @Override public String getFileName() { From 447c969b36403ae4a4a1bc1028f4a847602d223d Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 30 May 2023 14:47:30 -0400 Subject: [PATCH 178/183] DirectCareVacany required field replaced by default value if empty --- .../etl/forms/ltc/quarterly/model/LtcYtdDirectCareVacancy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareVacancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareVacancy.java index 5dd0013c..9d55594f 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareVacancy.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareVacancy.java @@ -32,7 +32,7 @@ public String getDirectCareVacancyName() { return directCareVacancyName; } public void setDirectCareVacancyName(String directCareVacancyName) { - this.directCareVacancyName = directCareVacancyName; + this.directCareVacancyName = StringUtils.defaultIfEmpty(directCareVacancyName, Constants.DEFAULT_STRING_VALUE); } public String getDirectCareVacPositions() { return directCareVacPositions; From d82d9def56a515f672d8b8e8ac6eeefca4f50a36 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 30 May 2023 14:48:07 -0400 Subject: [PATCH 179/183] modified default values to better show missing data --- src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index 9955310e..de700ace 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -20,8 +20,8 @@ public class Constants { public final static String CHEFS_API_URL = "chefs.http.uri"; /* Default values for empty Strings and Numbers */ - public final static String DEFAULT_STRING_VALUE = ""; - public final static String DEFAULT_DECIMAL_VALUE = "0"; + public final static String DEFAULT_STRING_VALUE = "Not Provided"; + public final static String DEFAULT_DECIMAL_VALUE = "-99"; /* AIMS */ public final static String AIMS_USERNAME = "aims.username"; From 204f8004bce9c6dea17869dd189a5017501905f1 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Tue, 30 May 2023 15:12:56 -0400 Subject: [PATCH 180/183] default value for required field --- .../etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java index 3cbfd954..83ecb66c 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancy.java @@ -43,7 +43,7 @@ public String getBedSubype() { return bedSubype; } public void setBedSubype(String bedSubype) { - this.bedSubype = bedSubype; + this.bedSubype = StringUtils.defaultIfEmpty(bedSubype, Constants.DEFAULT_STRING_VALUE); } public String getStartDate() { return startDate.isBlank() || startDate.isEmpty() ? Constants.DEFAULT_STRING_VALUE : CSVUtil.getFormattedDate(startDate); From d813d350d160f637a729e8f0dd9ae89b31b8f606 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 2 Jun 2023 08:02:14 -0400 Subject: [PATCH 181/183] DIR_CARE_COST, string default value replaced by numbers default values --- .../etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java index dc3a40b3..8f4244d2 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCost.java @@ -61,19 +61,19 @@ public String getDirCareCostProdHrsRegYtd() { return StringUtils.isBlank(dirCareCostProdHrsRegYtd) ? "0" : dirCareCostProdHrsRegYtd; } public void setDirCareCostProdHrsRegYtd(String dirCareCostProdHrsRegYtd) { - this.dirCareCostProdHrsRegYtd = StringUtils.defaultIfEmpty(dirCareCostProdHrsRegYtd, Constants.DEFAULT_STRING_VALUE); + this.dirCareCostProdHrsRegYtd = StringUtils.defaultIfEmpty(dirCareCostProdHrsRegYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getDirCareCostProdHrsOtYtd() { return StringUtils.isBlank(dirCareCostProdHrsOtYtd) ? "0" : dirCareCostProdHrsOtYtd; } public void setDirCareCostProdHrsOtYtd(String dirCareCostProdHrsOtYtd) { - this.dirCareCostProdHrsOtYtd = StringUtils.defaultIfEmpty(dirCareCostProdHrsOtYtd, Constants.DEFAULT_STRING_VALUE); + this.dirCareCostProdHrsOtYtd = StringUtils.defaultIfEmpty(dirCareCostProdHrsOtYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getDirCareCostProdHrsContractedYtd() { return StringUtils.isBlank(dirCareCostProdHrsContractedYtd) ? "0" : dirCareCostProdHrsContractedYtd; } public void setDirCareCostProdHrsContractedYtd(String dirCareCostProdHrsContractedYtd) { - this.dirCareCostProdHrsContractedYtd = StringUtils.defaultIfEmpty(dirCareCostProdHrsContractedYtd, Constants.DEFAULT_STRING_VALUE); + this.dirCareCostProdHrsContractedYtd = StringUtils.defaultIfEmpty(dirCareCostProdHrsContractedYtd, Constants.DEFAULT_DECIMAL_VALUE); } public String getDirCareCostNonProdHrsVacYtd() { return dirCareCostNonProdHrsVacYtd; From 4a93f3add7ca77d28beaa39ecb5036c1cf229f16 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 2 Jun 2023 08:48:35 -0400 Subject: [PATCH 182/183] default decimal value for dirCareProdHrsAgencyStuffUtilYtd --- .../etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java index fab0d8cc..ffd72f4d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrs.java @@ -24,7 +24,7 @@ public class LtcYtdDirectCareHrs implements IModel{ private String dirCareNonProdHrsOtherYtd; private String dirCareNonProdHrsTotalYtd; private String dirCareTotalHrsPaidYtd; - private String dirCareProdHrsAgencyStuffUtilYtd = Constants.DEFAULT_STRING_VALUE; + private String dirCareProdHrsAgencyStuffUtilYtd = Constants.DEFAULT_DECIMAL_VALUE; public String getDirCareProdHrsAgencyStuffUtilYtd() { return dirCareProdHrsAgencyStuffUtilYtd; From adb41790087f7964a3aabb2f7be4ab6e4d67b434 Mon Sep 17 00:00:00 2001 From: SimoChami Date: Fri, 2 Jun 2023 10:23:04 -0400 Subject: [PATCH 183/183] name change for generated files, following HealthIdeas expected file names --- .../bc/gov/chefs/etl/constant/Constants.java | 32 +++++++++---------- .../model/LtcBedYtdMaxOccupancyTotals.java | 2 +- .../model/LtcBedYtdOccupancyRateTotals.java | 2 +- .../model/LtcBedYtdOccupiedDaysTotals.java | 2 +- .../quarterly/model/LtcYtdDepSubTotals.java | 2 +- .../model/LtcYtdDirectCareCostSubtotals.java | 2 +- .../model/LtcYtdDirectCareHrsSubTotals.java | 2 +- .../quarterly/model/LtcYtdExpSubTotals.java | 2 +- .../quarterly/model/LtcYtdRevSubTotals.java | 2 +- 9 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java index de700ace..21b102df 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java +++ b/src/main/java/ca/bc/gov/chefs/etl/constant/Constants.java @@ -67,21 +67,21 @@ public class Constants { public final static String LTC_YTD_EXP = "LTC_YTD_EXP"; public final static String LTC_YTD_COMP_BENEFITS = "LTC_YTD_COMP_BENEFITS"; public final static String LTC_YTD_SUBMISSION = "LTC_YTD_SUBMISSION"; - public static final String LTC_YTD_REV_SUB_TOTALS = "LTC_YTD_REV_SUB_TOTALS"; - public static final String LTC_YTD_EXP_SUB_TOTALS = "LTC_YTD_EXP_SUB_TOTALS"; + public static final String LTC_YTD_REV_SUBTOTALS = "LTC_YTD_REV_SUBTOTALS"; + public static final String LTC_YTD_EXP_SUBTOTALS = "LTC_YTD_EXP_SUBTOTALS"; public static final String LTC_YTD_DEP = "LTC_YTD_DEP"; - public static final String LTC_YTD_DEP_SUB_TOTALS = "LTC_YTD_DEP_SUB_TOTALS"; + public static final String LTC_YTD_DEP_SUBTOTALS = "LTC_YTD_DEP_SUBTOTALS"; public static final String LTC_YTD_SUM_TOTALS = "LTC_YTD_SUM_TOTALS"; public final static String LTC_FACILITY = "LTC_FACILITY"; public static final String LTC_YTD_COMP_SAL_SUBTOTALS = "LTC_YTD_COMP_SAL_SUBTOTALS"; - public static final String LTC_BED_YTD_MAX_OCCUPANCY_TOTALS = "LTC_BED_YTD_MAX_OCCUPANCY_TOTALS"; + public static final String LTC_BED_YTD_MAX_OCCY_TOTALS = "LTC_BED_YTD_MAX_OCCY_TOTALS"; public static final String LTC_YTD_COMP_HRS_SUBTOTALS = "LTC_YTD_COMP_HRS_SUBTOTALS"; public static final String LTC_YTD_COMP_HRS_TOTALS = "LTC_YTD_COMP_HRS_TOTALS"; public static final String LTC_YTD_COMP_SAL_TOTALS = "LTC_YTD_COMP_SAL_TOTALS"; - public static final String LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS = "LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS"; - public static final String LTC_YTD_DIRECT_CARE_COST_SUBTOTALS = "LTC_YTD_DIRECT_CARE_COST_SUBTOTALS"; - public static final String LTC_BED_YTD_OCCUPANCY_RATE_TOTALS = "LTC_BED_YTD_OCCUPANCY_RATE_TOTALS"; - public static final String LTC_BED_YTD_OCCUPIED_DAYS_TOTALS = "LTC_BED_YTD_OCCUPIED_DAYS_TOTALS"; + public static final String LTC_YTD_DIRECT_CARE_HRS_SUBS = "LTC_YTD_DIRECT_CARE_HRS_SUBS"; + public static final String LTC_YTD_DIRECT_CARE_COST_SUBS = "LTC_YTD_DIRECT_CARE_COST_SUBS"; + public static final String LTC_BED_YTD_OCCUPANCY_RATE_TOT = "LTC_BED_YTD_OCCUPANCY_RATE_TOT"; + public static final String LTC_BED_YTD_OCCUPIED_DAYS_TOT = "LTC_BED_YTD_OCCUPIED_DAYS_TOT"; public static final String LTC_YTD_DIRECT_CARE_VACANCY = "LTC_YTD_DIRECT_CARE_VACANCY"; /* File Constants */ @@ -182,15 +182,15 @@ public class Constants { HEADERS.put(LTC_YTD_REV, new String[] { "CONFIRMATION_ID", "REV_TYPE", "REV_NAME", "REV_YTD", "REV_NOTES", }); - HEADERS.put(LTC_YTD_REV_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "REV_TYPE", "SUB_TOTAL_REV_YTD", "SUB_TOTAL_REV_NOTES"}); + HEADERS.put(LTC_YTD_REV_SUBTOTALS, new String[] { "CONFIRMATION_ID", "REV_TYPE", "SUB_TOTAL_REV_YTD", "SUB_TOTAL_REV_NOTES"}); HEADERS.put(LTC_YTD_EXP, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "EXP_NAME", "EXP_YTD", "EXP_NOTES", }); - HEADERS.put(LTC_YTD_EXP_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "SUB_TOTAL_EXP_YTD", "SUB_TOTAL_EXP_NOTES"}); + HEADERS.put(LTC_YTD_EXP_SUBTOTALS, new String[] { "CONFIRMATION_ID", "EXP_TYPE", "SUB_TOTAL_EXP_YTD", "SUB_TOTAL_EXP_NOTES"}); HEADERS.put(LTC_YTD_DEP, new String[] { "CONFIRMATION_ID", "DEP_NAME", "DEP_YTD", "DEP_NOTES"}); - HEADERS.put(LTC_YTD_DEP_SUB_TOTALS, new String[] { "CONFIRMATION_ID", "SUB_TOTAL_DEP_YTD", "SUB_TOTAL_DEP_NOTES"}); + HEADERS.put(LTC_YTD_DEP_SUBTOTALS, new String[] { "CONFIRMATION_ID", "SUB_TOTAL_DEP_YTD", "SUB_TOTAL_DEP_NOTES"}); HEADERS.put(LTC_YTD_SUM_TOTALS, new String[] { "CONFIRMATION_ID", "TOT_NAME", "SUM_YTD","TOT_NOTES"}); @@ -230,7 +230,7 @@ public class Constants { "DIR_CARE_NON_PROD_HRS_SICK_YTD", "DIR_CARE_NON_PROD_HRS_OTHER_YTD", "DIR_CARE_NON_PROD_HRS_TOTAL_YTD", "DIR_CARE_TOTAL_HRS_PAID_YTD" }); - HEADERS.put(LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS, + HEADERS.put(LTC_YTD_DIRECT_CARE_HRS_SUBS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "SUB_TOTAL_DIR_CARE_PROD_HRS_REGULAR_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_OT_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_SUBTOTAL_YTD","SUB_TOTAL_DIR_CARE_PROD_HRS_CONT_SERV_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_AGENCY_STUFF_UTIL_YTD", "SUB_TOTAL_DIR_CARE_PROD_HRS_TOTAL_YTD", @@ -251,7 +251,7 @@ public class Constants { "DIR_CARE_COST_HOURLY_RATE_STAFF_YTD", "DIR_CARE_COST_HOURLY_RATE_CONTRACTED_YTD" }); - HEADERS.put(LTC_YTD_DIRECT_CARE_COST_SUBTOTALS, new String[] { + HEADERS.put(LTC_YTD_DIRECT_CARE_COST_SUBS, new String[] { "CONFIRMATION_ID", "DIR_CARE_TYPE", "SUB_TOTAL_DIR_CARE_COST_PROD_HRS_REGULAR_YTD", @@ -273,7 +273,7 @@ public class Constants { new String[] { "CONFIRMATION_ID", "QUARTER_INVENTORY", "BED_FUNDING_TYPE", "BED_SUBTYPE", "START_DATE", "END_DATE", "NUMBER_OF_BEDS", "MAXIMUM_BED_DAYS", "NOTES" }); - HEADERS.put(LTC_BED_YTD_MAX_OCCUPANCY_TOTALS, new String[] { + HEADERS.put(LTC_BED_YTD_MAX_OCCY_TOTALS, new String[] { "CONFIRMATION_ID", "BED_OCCUPANCY_TYPE", "BED_FUNDING_TYPE", @@ -287,7 +287,7 @@ public class Constants { HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS, new String[] { "CONFIRMATION_ID", "OCC_QUARTER", "OCC_MONTH", "OCC_DAYS_YTD_IN_SCOPE_PUBLIC", "OCC_DAYS_YTD_OUT_SCOPE_PUBLIC", "OCC_DAYS_YTD_PRIVATE","OCC_DAYS_YTD_TOTAL_DAYS" }); - HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS_TOTALS, new String[] { + HEADERS.put(LTC_BED_YTD_OCCUPIED_DAYS_TOT, new String[] { "CONFIRMATION_ID", "OCC_QUARTER", "TOTAL_OCC_DAYS_YTD_IN_SCOPE_PUBLIC", @@ -300,7 +300,7 @@ public class Constants { new String[] { "CONFIRMATION_ID", "OCC_RATE_QUARTER", "OCC_RATE_BED_TYPES", "PLAN_MAX_OCC_DAYS", "YTD_MAX_OCC_DAYS", "YTD_OCC_DAYS", "PERCENT_OCC", "OCC_RATE_NOTES", }); - HEADERS.put(LTC_BED_YTD_OCCUPANCY_RATE_TOTALS, new String[] { + HEADERS.put(LTC_BED_YTD_OCCUPANCY_RATE_TOT, new String[] { "CONFIRMATION_ID", "OCC_RATE_QUARTER", "TOTAL_PLAN_MAX_OCC_DAYS", diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancyTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancyTotals.java index 9ce2e2b0..5be727fc 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancyTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdMaxOccupancyTotals.java @@ -91,7 +91,7 @@ public String getFileName() { @Override public String getFormType() { - return Constants.LTC_BED_YTD_MAX_OCCUPANCY_TOTALS; + return Constants.LTC_BED_YTD_MAX_OCCY_TOTALS; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRateTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRateTotals.java index 72551c34..8baa8aea 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRateTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupancyRateTotals.java @@ -73,7 +73,7 @@ public String getFileName() { @Override public String getFormType() { - return Constants.LTC_BED_YTD_OCCUPANCY_RATE_TOTALS; + return Constants.LTC_BED_YTD_OCCUPANCY_RATE_TOT; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java index 69964277..7da1cb6a 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcBedYtdOccupiedDaysTotals.java @@ -61,7 +61,7 @@ public String getFileName() { } @Override public String getFormType() { - return Constants.LTC_BED_YTD_OCCUPIED_DAYS_TOTALS; + return Constants.LTC_BED_YTD_OCCUPIED_DAYS_TOT; } @Override public List getCsvElements() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDepSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDepSubTotals.java index be178bef..ffdfd882 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDepSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDepSubTotals.java @@ -40,7 +40,7 @@ public String getFileName() { } @Override public String getFormType() { - return Constants.LTC_YTD_DEP_SUB_TOTALS; + return Constants.LTC_YTD_DEP_SUBTOTALS; } @Override public List getCsvElements() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java index ab5582dc..5c922724 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareCostSubtotals.java @@ -155,7 +155,7 @@ public String getFileName() { @Override public String getFormType() { - return Constants.LTC_YTD_DIRECT_CARE_COST_SUBTOTALS; + return Constants.LTC_YTD_DIRECT_CARE_COST_SUBS; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java index 36b8581c..1635d60d 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdDirectCareHrsSubTotals.java @@ -137,7 +137,7 @@ public String getFileName() { @Override public String getFormType() { - return Constants.LTC_YTD_DIRECT_CARE_HRS_SUB_TOTALS; + return Constants.LTC_YTD_DIRECT_CARE_HRS_SUBS; } @Override diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java index ae1ec2fa..3108c017 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdExpSubTotals.java @@ -46,7 +46,7 @@ public String getFileName() { } @Override public String getFormType() { - return Constants.LTC_YTD_EXP_SUB_TOTALS; + return Constants.LTC_YTD_EXP_SUBTOTALS; } @Override public List getCsvElements() { diff --git a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java index 7332ef4a..926c4dc8 100644 --- a/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java +++ b/src/main/java/ca/bc/gov/chefs/etl/forms/ltc/quarterly/model/LtcYtdRevSubTotals.java @@ -48,7 +48,7 @@ public String getFileName() { } @Override public String getFormType() { - return Constants.LTC_YTD_REV_SUB_TOTALS; + return Constants.LTC_YTD_REV_SUBTOTALS; } @Override public List getCsvElements() {