Merge branch 'EDRD-Main' of https://github.com/bcgov/MoH-SAT into EDR…

…D-Sprint-9
bcgov · Nov 9, 2024 · 9b674f0 · 9b674f0
2 parents bc16b28 + f05443d
commit 9b674f0
Show file tree

Hide file tree

Showing 13 changed files with 4,398 additions and 10 deletions.
diff --git a/dev-app-post/main/default/assignmentRules/Case.assignmentRules-meta.xml b/dev-app-post/main/default/assignmentRules/Case.assignmentRules-meta.xml
@@ -91,7 +91,7 @@
             <criteriaItems>
                 <field>Case.Status</field>
                 <operation>equals</operation>
-                <value>Under Review,Approved,Received,More Information Requested</value>
+                <value>Under Review,Approved,Received,More Information Requested,Not Approved</value>
             </criteriaItems>
         </ruleEntry>
     </assignmentRule>

diff --git a/force-app/main/default/classes/ODRIntegration.cls b/force-app/main/default/classes/ODRIntegration.cls
@@ -190,6 +190,8 @@ public with sharing class ODRIntegration {
                 practIdCode = '91';
             } when 'Nurse Practitioner' {
                 practIdCode = '96';
+            } when 'Physician Assistant' {
+                practIdCode = 'M9';    
             } when 'Nurse' {
                 practIdCode = 'R9';
             } when 'Dentist' {

diff --git a/force-app/main/default/classes/ODRIntegrationTest.cls b/force-app/main/default/classes/ODRIntegrationTest.cls
@@ -202,6 +202,8 @@ public class ODRIntegrationTest {
         System.assertEquals(Physician, '91');
         String nursePractitioner = ODRIntegration.getPractitionerCode('Nurse Practitioner');
         System.assertEquals(nursePractitioner, '96');
+        String PhysicianAssistant = ODRIntegration.getPractitionerCode('Physician Assistant');
+        System.assertEquals(PhysicianAssistant, 'M9');
         String Nurse = ODRIntegration.getPractitionerCode('Nurse');
         System.assertEquals(Nurse, 'R9');
         String Dentist = ODRIntegration.getPractitionerCode('Dentist');

diff --git a/force-app/main/default/layouts/Case-SA Request.layout-meta.xml b/force-app/main/default/layouts/Case-SA Request.layout-meta.xml
@@ -109,7 +109,7 @@
                 <field>Termination_Date__c</field>
             </layoutItems>
             <layoutItems>
-                <behavior>Readonly</behavior>
+                <behavior>Edit</behavior>
                 <field>Max_Days_Supply__c</field>
             </layoutItems>
         </layoutColumns>

diff --git a/force-app/main/default/objects/Contact/fields/Provider_Type__c.field-meta.xml b/force-app/main/default/objects/Contact/fields/Provider_Type__c.field-meta.xml
@@ -19,6 +19,16 @@
                 <default>false</default>
                 <label>Nurse Practitioner</label>
             </value>
+            <value>
+                <fullName>Pharmacist</fullName>
+                <default>false</default>
+                <label>Pharmacist</label>
+            </value>
+            <value>
+                <fullName>Physician Assistant</fullName>
+                <default>false</default>
+                <label>Physician Assistant</label>
+            </value>
             <value>
                 <fullName>Nurse</fullName>
                 <default>false</default>
@@ -49,11 +59,6 @@
                 <default>false</default>
                 <label>Naturopathic Practitioner</label>
             </value>
-            <value>
-                <fullName>Pharmacist</fullName>
-                <default>false</default>
-                <label>Pharmacist</label>
-            </value>
             <value>
                 <fullName>Optometrist</fullName>
                 <default>false</default>

diff --git a/force-app/main/default/objects/PersonAccount/recordTypes/Provider.recordType-meta.xml b/force-app/main/default/objects/PersonAccount/recordTypes/Provider.recordType-meta.xml
@@ -547,6 +547,10 @@
             <fullName>Physician</fullName>
             <default>true</default>
         </values>
+        <values>
+            <fullName>Physician Assistant</fullName>
+            <default>false</default>
+        </values>
         <values>
             <fullName>Podiatrist</fullName>
             <default>false</default>