From 6f2674752029cd2c3f969fef940c5c5abdc8fc4f Mon Sep 17 00:00:00 2001 From: deepakmulamalla Date: Thu, 12 Dec 2024 21:50:41 -0500 Subject: [PATCH 1/5] Changes Related to EDRD-98 --- .../SA_Account_Record_Page.flexipage-meta.xml | 6 ++--- .../SA_Account_Record_Page.flexipage-meta.xml | 6 ++--- ...lidate_ACR_CR_Role.validationRule-meta.xml | 16 ++++++++++++++ ...rt_ForCommitteeRec.validationRule-meta.xml | 22 +++++++++++++++++++ 4 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 force-app/main/default/objects/AccountContactRelation/validationRules/EDRD_Validate_ACR_CR_Role.validationRule-meta.xml create mode 100644 force-app/main/default/objects/AccountContactRelation/validationRules/EDRD_Validate_ACR_Insert_ForCommitteeRec.validationRule-meta.xml diff --git a/dev-app-post/main/default/flexipages/SA_Account_Record_Page.flexipage-meta.xml b/dev-app-post/main/default/flexipages/SA_Account_Record_Page.flexipage-meta.xml index cf38731f1..e0e65b46c 100644 --- a/dev-app-post/main/default/flexipages/SA_Account_Record_Page.flexipage-meta.xml +++ b/dev-app-post/main/default/flexipages/SA_Account_Record_Page.flexipage-meta.xml @@ -87,13 +87,13 @@ CONTACT.ACCOUNT_NAME - Contact.Provider_Type__c + ACCCONRELATION.ROLES - Contact.Provider_Identifier__c + Contact.Provider_Type__c - ACCCONRELATION.ROLES + Contact.Provider_Identifier__c diff --git a/force-app/main/default/flexipages/SA_Account_Record_Page.flexipage-meta.xml b/force-app/main/default/flexipages/SA_Account_Record_Page.flexipage-meta.xml index 7778b0287..62390c337 100644 --- a/force-app/main/default/flexipages/SA_Account_Record_Page.flexipage-meta.xml +++ b/force-app/main/default/flexipages/SA_Account_Record_Page.flexipage-meta.xml @@ -87,13 +87,13 @@ CONTACT.ACCOUNT_NAME - Contact.Provider_Type__c + ACCCONRELATION.ROLES - Contact.Provider_Identifier__c + Contact.Provider_Type__c - ACCCONRELATION.ROLES + Contact.Provider_Identifier__c diff --git a/force-app/main/default/objects/AccountContactRelation/validationRules/EDRD_Validate_ACR_CR_Role.validationRule-meta.xml b/force-app/main/default/objects/AccountContactRelation/validationRules/EDRD_Validate_ACR_CR_Role.validationRule-meta.xml new file mode 100644 index 000000000..5bfcea2d4 --- /dev/null +++ b/force-app/main/default/objects/AccountContactRelation/validationRules/EDRD_Validate_ACR_CR_Role.validationRule-meta.xml @@ -0,0 +1,16 @@ + + + EDRD_Validate_ACR_CR_Role + true + Prevents EDRD users from creating a Committee-Reviewer relationship with the role "Physician" when specific Account and Contact record types are used. + AND( + CONTAINS($UserRole.Name, "EDRD"), + Account.RecordType.DeveloperName = 'EDRD_Committee', + OR( + Contact.Account.RecordType.DeveloperName = 'Provider', + Contact.Account.RecordType.DeveloperName = 'Committee_Reviewer' + ), + INCLUDES(Roles, 'Physician') +) + An EDRD user cannot create a Committee-Reviewer relationship with the role as Physician. + diff --git a/force-app/main/default/objects/AccountContactRelation/validationRules/EDRD_Validate_ACR_Insert_ForCommitteeRec.validationRule-meta.xml b/force-app/main/default/objects/AccountContactRelation/validationRules/EDRD_Validate_ACR_Insert_ForCommitteeRec.validationRule-meta.xml new file mode 100644 index 000000000..4e37bf170 --- /dev/null +++ b/force-app/main/default/objects/AccountContactRelation/validationRules/EDRD_Validate_ACR_Insert_ForCommitteeRec.validationRule-meta.xml @@ -0,0 +1,22 @@ + + + EDRD_Validate_ACR_Insert_ForCommitteeRec + true + Prevents EDRD users from creating an inactive Committee-Reviewer relationship when the Account and Contact record types are specific and roles include Reviewer, Chair, or Vice Chair. + AND( + ISNEW(), + CONTAINS($UserRole.Name, "EDRD"), + Account.RecordType.DeveloperName = 'EDRD_Committee', + OR( + Contact.Account.RecordType.DeveloperName = 'Provider', + Contact.Account.RecordType.DeveloperName = 'Committee_Reviewer' + ), + OR( + INCLUDES(Roles, 'Reviewer'), + INCLUDES(Roles, 'Chair'), + INCLUDES(Roles, 'Vice Chair') + ), + NOT(IsActive) +) + An EDRD user cannot create an inactive Committee - Reviewer relationship. + From 0882af14cade77e73d2da74d3ac503e46547581f Mon Sep 17 00:00:00 2001 From: deepakmulamalla Date: Fri, 13 Dec 2024 08:56:55 -0500 Subject: [PATCH 2/5] Changes related EDRD-Flow --- .../EDRD_SuperUser.customPermission-meta.xml | 6 ++++++ .../MoH_Standard_User_Rule.validationRule-meta.xml | 1 + .../permissionsets/EDRD_Super_User.permissionset-meta.xml | 4 ++++ 3 files changed, 11 insertions(+) create mode 100644 force-app/main/default/customPermissions/EDRD_SuperUser.customPermission-meta.xml diff --git a/force-app/main/default/customPermissions/EDRD_SuperUser.customPermission-meta.xml b/force-app/main/default/customPermissions/EDRD_SuperUser.customPermission-meta.xml new file mode 100644 index 000000000..16324e6ea --- /dev/null +++ b/force-app/main/default/customPermissions/EDRD_SuperUser.customPermission-meta.xml @@ -0,0 +1,6 @@ + + + Created for EDRD-Super user Permission set. + false + + diff --git a/force-app/main/default/objects/Account/validationRules/MoH_Standard_User_Rule.validationRule-meta.xml b/force-app/main/default/objects/Account/validationRules/MoH_Standard_User_Rule.validationRule-meta.xml index fa46a3ef9..0b5ed879c 100644 --- a/force-app/main/default/objects/Account/validationRules/MoH_Standard_User_Rule.validationRule-meta.xml +++ b/force-app/main/default/objects/Account/validationRules/MoH_Standard_User_Rule.validationRule-meta.xml @@ -7,6 +7,7 @@ NOT(ISNEW()), NOT($Permission.SA_Team_Lead), NOT($Permission.EDRD_MOH_STAFF), NOT($Permission.EDRD_PHSA_PSP_Staff), +NOT($Permission.EDRD_SuperUser), ESA_Bypass_Validation__pc = FALSE) You don't have permission to edit the Account Name. diff --git a/force-app/main/default/permissionsets/EDRD_Super_User.permissionset-meta.xml b/force-app/main/default/permissionsets/EDRD_Super_User.permissionset-meta.xml index 5f229950f..860d03045 100644 --- a/force-app/main/default/permissionsets/EDRD_Super_User.permissionset-meta.xml +++ b/force-app/main/default/permissionsets/EDRD_Super_User.permissionset-meta.xml @@ -92,6 +92,10 @@ true ESA_CMD_Super_Stamps__mdt + + true + EDRD_SuperUser + true Account.Description From 5fea1d8cbe3876afe9b35d89f7ab2923ba9366d3 Mon Sep 17 00:00:00 2001 From: deepakmulamalla Date: Mon, 16 Dec 2024 14:31:58 -0500 Subject: [PATCH 3/5] Changes to EDRD Flow --- .../flows/Create_EDRD_Case.flow-meta.xml | 327 +++++++++++++----- 1 file changed, 238 insertions(+), 89 deletions(-) diff --git a/dev-app-post/main/default/flows/Create_EDRD_Case.flow-meta.xml b/dev-app-post/main/default/flows/Create_EDRD_Case.flow-meta.xml index 0e76486c7..8bd8bd776 100644 --- a/dev-app-post/main/default/flows/Create_EDRD_Case.flow-meta.xml +++ b/dev-app-post/main/default/flows/Create_EDRD_Case.flow-meta.xml @@ -20,7 +20,7 @@ Assigning_Manual_Patient_SF_Details - 1612 + 1667 998 SFPatientId @@ -36,7 +36,7 @@ Assigning_Manual_PatientDetails - 1216 + 1271 998 Patient_FirstName @@ -87,7 +87,7 @@ Assigning_PatientDetails - 622 + 567 782 Patient_FirstName @@ -138,7 +138,7 @@ Assigning_SFPatientId_create - 556 + 435 1430 SFPatientId @@ -154,7 +154,7 @@ Assigning_SFPatientId_createManuallyPHN - 1084 + 1139 1430 SFPatientId @@ -170,7 +170,7 @@ Assigning_SFPatientId_createNoPHN - 1348 + 1403 1430 SFPatientId @@ -186,7 +186,7 @@ Assigning_SFPatientId_update - 292 + 171 1538 SFPatientId @@ -203,7 +203,7 @@ Assignment_CDL_Record 402 - 5750 + 5858 Insert_CDL_Records Add @@ -219,7 +219,7 @@ Assignment_Renewal_CDL_Record 930 - 5750 + 5858 Insert_CDL_Records Add @@ -235,7 +235,7 @@ Update_CD_with_Entity_Id 930 - 5642 + 5750 CDL_Record.ContentDocumentId Assign @@ -272,7 +272,7 @@ Update_CD_with_Entity_Id_NewCaseType 402 - 5642 + 5750 CDL_Record.ContentDocumentId Assign @@ -361,7 +361,7 @@ Check_createpatientvalue - 1414 + 1469 890 Assigning_Manual_Patient_SF_Details @@ -387,7 +387,7 @@ check_Insert_CDL_list_is_not_empty 842 - 5942 + 6050 Copy_2_of_Update_EDRDRenewCase_withPSPOwner @@ -412,7 +412,7 @@ check_Insert_CDL_list_is_not_empty_NewCaseType 314 - 5942 + 6050 Update_EDRDNewCase_withPSPOwner @@ -436,7 +436,7 @@ Check_isManaulPHNPresent - 1216 + 1271 1214 Manual_Create_patientRecord_NoPHN @@ -461,7 +461,7 @@ Check_patientFoundInSF - 424 + 303 1214 Create_patientRecordWithEMPI @@ -512,7 +512,7 @@ Choose_case_option 578 - 4610 + 4718 Get_Case_Record_Type_for_renewal @@ -537,7 +537,7 @@ Copy_1_of_Renewal_Indefinite_Funding_check2 842 - 5234 + 5342 Create_Medication_Request_with_New_Renewal_Case_without_indef @@ -558,11 +558,36 @@ + + Deceased_Check_patientFoundInSF + + 831 + 1214 + + PatientDeceased_ErrorScreen + + Default Outcome + + Deceased_If_PHN_found + and + + searchedPatientRecId + IsNull + + false + + + + UpdateDeceased_patientRecordWithEMPI + + + + Decision_10 842 - 4826 + 4934 New_renewal_case_creation_for_RecType_Renew_without_indef @@ -587,7 +612,7 @@ Medication_details_New_Renewal_decision 776 - 3386 + 3494 Renwal_Medication_details @@ -612,7 +637,7 @@ New_Indefinite_Funding_check 314 - 4826 + 4934 New_case_Creation_for_Rec_type_New_without_indef @@ -637,7 +662,7 @@ New_Indefinite_Funding_check2 314 - 5234 + 5342 Create_Medication_request_with_New_Case_without_indef @@ -662,7 +687,7 @@ Other_Medication_Decision 578 - 3170 + 3278 Indication_Screen @@ -694,7 +719,7 @@ validate_ACR_Relationship 578 - 3986 + 4094 Get_PSP_Queue @@ -864,7 +889,7 @@ validate_CPERecord 578 - 2330 + 2438 Create_CPEStatus_Active @@ -918,7 +943,7 @@ validate_EDRDCPRecord 1018 - 2114 + 2222 CP_ErrorScreen @@ -942,18 +967,18 @@ validate_Is_patient_deceased - 622 + 567 890 - PatientDeceased_ErrorScreen + Deceased_PatientSummary_Screen Default Outcome Patient_Not_Deceased and - Patient_PHN - NotEqualTo + Patient_Deceased + EqualTo No @@ -964,7 +989,7 @@ - Changes related EMPI Integrations-v1.5 - adding Physician Roles + Changes related EMPI Integrations-v1.6 - Changes to Deceased condition & Update caseTypeSet Picklist @@ -1027,7 +1052,7 @@ Iterate_CD_Records 842 - 5534 + 5642 UploadScreenDocument.contentDocIds Asc @@ -1041,7 +1066,7 @@ Iterate_CD_Records_NewCaseType 314 - 5534 + 5642 UploadScreenDocument.contentDocIds Asc @@ -1074,7 +1099,7 @@ Create_ACR_CusP_Active_Status 314 - 4094 + 4202 Get_PSP_Queue @@ -1115,7 +1140,7 @@ Create_ACR_NotCusP_EDRD_DM 1018 - 4094 + 4202 Get_PSP_Queue @@ -1156,7 +1181,7 @@ Create_CPEStatus_Active 798 - 2438 + 2546 Search_Provider_for_New_Case @@ -1191,7 +1216,7 @@ Create_Medication_request_with_New_Case 182 - 5342 + 5450 MedicationRequestRec Iterate_CD_Records_NewCaseType @@ -1298,7 +1323,7 @@ Create_Medication_request_with_New_Case_without_indef 446 - 5342 + 5450 MedicationRequestRec Iterate_CD_Records_NewCaseType @@ -1399,7 +1424,7 @@ Create_Medication_Request_with_New_Renewal_Case 710 - 5342 + 5450 MedicationRequestRec Iterate_CD_Records @@ -1506,7 +1531,7 @@ Create_Medication_Request_with_New_Renewal_Case_without_indef 974 - 5342 + 5450 MedicationRequestRec Iterate_CD_Records @@ -1606,7 +1631,7 @@ Create_patientRecordWithEMPI - 556 + 435 1322 Assigning_SFPatientId_create @@ -1660,7 +1685,7 @@ Create_RelatedCDLfor_RenewalCase 710 - 6050 + 6158 Copy_2_of_Update_EDRDRenewCase_withPSPOwner @@ -1670,7 +1695,7 @@ Create_RelatedCDLfor_RenewalCase_NewCaseType 182 - 6050 + 6158 Update_EDRDNewCase_withPSPOwner @@ -1679,7 +1704,7 @@ Manual_Create_patientRecord - 1084 + 1139 1322 Assigning_SFPatientId_createManuallyPHN @@ -1732,7 +1757,7 @@ Manual_Create_patientRecord_NoPHN - 1348 + 1403 1322 Assigning_SFPatientId_createNoPHN @@ -1780,7 +1805,7 @@ New_case_Creation_for_Rec_type_New 182 - 4934 + 5042 Get_Newly_created_Case @@ -1875,7 +1900,7 @@ New_case_Creation_for_Rec_type_New_without_indef 446 - 4934 + 5042 Get_Newly_created_Case_without_indef @@ -1964,7 +1989,7 @@ New_renewal_case_creation_for_RecType_Renew 710 - 4934 + 5042 Get_newly_created_Renewal_Rec @@ -2059,7 +2084,7 @@ New_renewal_case_creation_for_RecType_Renew_without_indef 974 - 4934 + 5042 Get_newly_created_Renewal_Rec_without_indef @@ -2144,11 +2169,38 @@ Case true + + Deceased_Get_Patient_Record + + 831 + 1106 + true + + Deceased_Check_patientFoundInSF + + and + + Patient_Identifier__pc + EqualTo + + Patient_PHN + + + Account + searchedPatientRecId + Id + Name + Patient_Identifier__pc + PersonBirthdate + Patient_is_Deceased__pc + PersonContactId + PersonGender + get_ACRRecord 578 - 3878 + 3986 false validate_ACR_Relationship @@ -2176,7 +2228,7 @@ Get_Case_Record_Type 314 - 4718 + 4826 false New_Indefinite_Funding_check @@ -2206,7 +2258,7 @@ Get_Case_Record_Type_for_renewal 842 - 4718 + 4826 false Decision_10 @@ -2236,7 +2288,7 @@ Get_EDRD_MR_Record_Type 578 - 3062 + 3170 false Other_Medication_Decision @@ -2264,7 +2316,7 @@ Get_EDRDCPRecord 1018 - 2006 + 2114 false validate_EDRDCPRecord @@ -2291,7 +2343,7 @@ Get_Medication 578 - 2954 + 3062 true Get_EDRD_MR_Record_Type @@ -2330,7 +2382,7 @@ Get_Newly_created_Case 182 - 5042 + 5150 true New_Indefinite_Funding_check2 @@ -2357,7 +2409,7 @@ Get_Newly_created_Case_without_indef 446 - 5042 + 5150 true New_Indefinite_Funding_check2 @@ -2384,7 +2436,7 @@ Get_newly_created_Renewal_Rec 710 - 5042 + 5150 false Copy_1_of_Renewal_Indefinite_Funding_check2 @@ -2411,7 +2463,7 @@ Get_newly_created_Renewal_Rec_without_indef 974 - 5042 + 5150 false Copy_1_of_Renewal_Indefinite_Funding_check2 @@ -2438,7 +2490,7 @@ Get_Patient_Contact_rec 578 - 4394 + 4502 false Get_Provider_Contact_Rec @@ -2467,7 +2519,7 @@ Get_Patient_Records - 424 + 303 1106 true @@ -2495,7 +2547,7 @@ Get_Patient_Records_After_Create_Update 1018 - 1898 + 2006 true Get_EDRDCPRecord @@ -2552,7 +2604,7 @@ Get_Provider_Contact_Rec 578 - 4502 + 4610 false Choose_case_option @@ -2577,7 +2629,7 @@ Get_Provider_Record_for_New_case 578 - 2738 + 2846 true Medication_Request @@ -2602,7 +2654,7 @@ Get_PSP_Queue 578 - 4286 + 4394 false Get_Patient_Contact_rec @@ -2630,7 +2682,7 @@ get_RelatedCPERecord 578 - 2222 + 2330 false validate_CPERecord @@ -2688,7 +2740,7 @@ Copy_2_of_Update_EDRDRenewCase_withPSPOwner 842 - 6242 + 6350 Success @@ -2712,7 +2764,7 @@ Update_ACR_CusP_Status 50 - 4094 + 4202 Get_PSP_Queue @@ -2742,7 +2794,7 @@ Update_ACR_NotCusP_EDRD_DM 754 - 4094 + 4202 Get_PSP_Queue @@ -2772,7 +2824,7 @@ Update_CPEStatus_Active 534 - 2438 + 2546 Search_Provider_for_New_Case @@ -2809,7 +2861,7 @@ Update_EDRDNewCase_withPSPOwner 314 - 6242 + 6350 Sucees @@ -2832,7 +2884,7 @@ Update_patientRecordWithEMPI - 292 + 171 1322 Update_patientRecordWithEMPI_BypassVR @@ -2886,7 +2938,7 @@ Update_patientRecordWithEMPI_BypassVR - 292 + 171 1430 Assigning_SFPatientId_update @@ -2907,12 +2959,90 @@ Account + + UpdateDeceased_patientRecordWithEMPI + + 699 + 1322 + + UpdateDeceased_patientRecordWithEMPI_BypassVR + + and + + Patient_Identifier__pc + EqualTo + + Patient_PHN + + + + EDRD_Bypass_Validation__pc + + true + + + + FirstName + + Patient_FirstName + + + + LastName + + Patient_LastName + + + + Patient_is_Deceased__pc + + true + + + + PersonBirthdate + + Patient_DOB + + + + PersonGender + + Patient_Gender + + + Account + + + UpdateDeceased_patientRecordWithEMPI_BypassVR + + 699 + 1430 + + PatientDeceased_ErrorScreen + + and + + Patient_Identifier__pc + EqualTo + + Patient_PHN + + + + EDRD_Bypass_Validation__pc + + false + + + Account + SystemModeWithoutSharing CP_ErrorScreen 1458 - 2222 + 2330 false true false @@ -2924,11 +3054,30 @@ true false + + Deceased_PatientSummary_Screen + + 831 + 998 + true + true + false + + Deceased_Get_Patient_Record + + + Deceased_PatientSummary + <p><strong><u>Patient Details</u></strong></p><p>Patient Name: {!Patient_FirstName}{!Patient_LastName}</p><p><span style="color: rgb(68, 68, 68); background-color: rgb(255, 255, 255);">Patient Identifier: {!Patient_PHN}</span></p><p>Patient Date of Birth: {!Patient_DOB}</p><p>Patient Gender: {!Patient_Gender}</p><p><span style="background-color: rgb(255, 255, 255); font-size: 12px; color: rgb(68, 68, 68);">Patient is Deceased: {!Patient_Deceased}</span></p> + DisplayText + + true + false + Indication_Screen 776 - 3278 + 3386 true true true @@ -2957,7 +3106,7 @@ Medication_Request 578 - 2846 + 2954 true true false @@ -3033,7 +3182,7 @@ MedicationRequestDetails 644 - 3494 + 3602 true true false @@ -3286,7 +3435,7 @@ Other_Medication 380 - 3278 + 3386 true true true @@ -3373,7 +3522,7 @@ Other_Medication_details 380 - 3386 + 3494 true true false @@ -3396,8 +3545,8 @@ PatientDeceased_ErrorScreen - 820 - 998 + 831 + 1622 false true false @@ -3412,7 +3561,7 @@ PatientSummary_Screen - 424 + 303 998 true true @@ -3431,7 +3580,7 @@ PatientSummary_ScreenManual - 1216 + 1271 1106 true true @@ -3451,7 +3600,7 @@ Renwal_Medication_details 908 - 3494 + 3602 true true false @@ -3696,7 +3845,7 @@ Search_Patient_in_SF - 1414 + 1469 782 true true @@ -3720,7 +3869,7 @@ Search_Provider_for_New_Case 578 - 2630 + 2738 true true false @@ -3742,7 +3891,7 @@ Success 842 - 6350 + 6458 false true false @@ -3826,7 +3975,7 @@ Sucees 314 - 6350 + 6458 false true false @@ -3910,7 +4059,7 @@ Upload_Supporting_Documents 578 - 3770 + 3878 true true false From c361b8001e2b8226b2a9e362bb3c8185a1b82bf9 Mon Sep 17 00:00:00 2001 From: deepakmulamalla Date: Tue, 17 Dec 2024 23:09:47 -0500 Subject: [PATCH 4/5] Changes to Role-Standard Value set --- ...countContactRole.standardValueSet-meta.xml | 17 +++++++++++++- ...countContactRole.standardValueSet-meta.xml | 23 +++++++++++++++---- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/dev-app-pre/main/default/standardValueSets/AccountContactRole.standardValueSet-meta.xml b/dev-app-pre/main/default/standardValueSets/AccountContactRole.standardValueSet-meta.xml index f8494c924..86d487785 100644 --- a/dev-app-pre/main/default/standardValueSets/AccountContactRole.standardValueSet-meta.xml +++ b/dev-app-pre/main/default/standardValueSets/AccountContactRole.standardValueSet-meta.xml @@ -1,6 +1,6 @@ - false + true Physician false - Other + Chair false - + + + + Reviewer + false + + + + Vice Chair + false + From 00ecddbd1f33146607f68b3147c940978f7dbcf8 Mon Sep 17 00:00:00 2001 From: deepakmulamalla Date: Sat, 21 Dec 2024 14:30:22 -0500 Subject: [PATCH 5/5] Changes Related to EDRD-1150 --- .../layouts/PersonAccount-Provider Layout.layout-meta.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/force-app/main/default/layouts/PersonAccount-Provider Layout.layout-meta.xml b/force-app/main/default/layouts/PersonAccount-Provider Layout.layout-meta.xml index 82abe5310..4330aa8d0 100644 --- a/force-app/main/default/layouts/PersonAccount-Provider Layout.layout-meta.xml +++ b/force-app/main/default/layouts/PersonAccount-Provider Layout.layout-meta.xml @@ -55,11 +55,11 @@ Provider_Specialty__pc - Edit + Readonly Committee__pc - Edit + Readonly Committee_Name__pc