@f1studio/form-spec 5.0.0-alpha.157 → 5.0.0-alpha.160

package/src/FormSpec.FS/FormSpec.ts

@@ -1648,6 +1648,60 @@ export function ClinicalPathway_MedicationAction_$reflection(): TypeInfo {
     return record_type("F1.Studio.ClinicalPathway.MedicationAction", [], ClinicalPathway_MedicationAction, () => [["Name", string_type], ["Dose", string_type], ["Route", string_type], ["Frequency", string_type], ["Duration", string_type], ["AsNeeded", bool_type]]);
 }
 
+export class ClinicalPathway_TreatmentAction extends Record implements IEquatable<ClinicalPathway_TreatmentAction>, IComparable<ClinicalPathway_TreatmentAction> {
+    readonly TreatmentId: Option<int32>;
+    readonly Name: string;
+    readonly ProviderId: Option<int32>;
+    readonly ScheduleId: Option<int32>;
+    readonly Signature: Option<string>;
+    readonly DateStart: ClinicalPathway_DueDate_$union;
+    readonly Duration: ClinicalPathway_DueDate_$union;
+    readonly Description: Option<string>;
+    readonly Priority: Option<ClinicalPathway_TaskPriority_$union>;
+    readonly SourceRelatedId: Option<int32>;
+    readonly CategoryId: Option<int32>;
+    constructor(TreatmentId: Option<int32>, Name: string, ProviderId: Option<int32>, ScheduleId: Option<int32>, Signature: Option<string>, DateStart: ClinicalPathway_DueDate_$union, Duration: ClinicalPathway_DueDate_$union, Description: Option<string>, Priority: Option<ClinicalPathway_TaskPriority_$union>, SourceRelatedId: Option<int32>, CategoryId: Option<int32>) {
+        super();
+        this.TreatmentId = TreatmentId;
+        this.Name = Name;
+        this.ProviderId = ProviderId;
+        this.ScheduleId = ScheduleId;
+        this.Signature = Signature;
+        this.DateStart = DateStart;
+        this.Duration = Duration;
+        this.Description = Description;
+        this.Priority = Priority;
+        this.SourceRelatedId = SourceRelatedId;
+        this.CategoryId = CategoryId;
+    }
+}
+
+export function ClinicalPathway_TreatmentAction_$reflection(): TypeInfo {
+    return record_type("F1.Studio.ClinicalPathway.TreatmentAction", [], ClinicalPathway_TreatmentAction, () => [["TreatmentId", option_type(int32_type)], ["Name", string_type], ["ProviderId", option_type(int32_type)], ["ScheduleId", option_type(int32_type)], ["Signature", option_type(string_type)], ["DateStart", ClinicalPathway_DueDate_$reflection()], ["Duration", ClinicalPathway_DueDate_$reflection()], ["Description", option_type(string_type)], ["Priority", option_type(ClinicalPathway_TaskPriority_$reflection())], ["SourceRelatedId", option_type(int32_type)], ["CategoryId", option_type(int32_type)]]);
+}
+
+export class ClinicalPathway_MedsetAction extends Record implements IEquatable<ClinicalPathway_MedsetAction>, IComparable<ClinicalPathway_MedsetAction> {
+    readonly MedsetId: Option<int32>;
+    readonly Name: string;
+    readonly ProviderId: Option<int32>;
+    readonly PharmacyId: Option<int32>;
+    readonly DateStart: ClinicalPathway_DueDate_$union;
+    readonly CategoryId: Option<int32>;
+    constructor(MedsetId: Option<int32>, Name: string, ProviderId: Option<int32>, PharmacyId: Option<int32>, DateStart: ClinicalPathway_DueDate_$union, CategoryId: Option<int32>) {
+        super();
+        this.MedsetId = MedsetId;
+        this.Name = Name;
+        this.ProviderId = ProviderId;
+        this.PharmacyId = PharmacyId;
+        this.DateStart = DateStart;
+        this.CategoryId = CategoryId;
+    }
+}
+
+export function ClinicalPathway_MedsetAction_$reflection(): TypeInfo {
+    return record_type("F1.Studio.ClinicalPathway.MedsetAction", [], ClinicalPathway_MedsetAction, () => [["MedsetId", option_type(int32_type)], ["Name", string_type], ["ProviderId", option_type(int32_type)], ["PharmacyId", option_type(int32_type)], ["DateStart", ClinicalPathway_DueDate_$reflection()], ["CategoryId", option_type(int32_type)]]);
+}
+
 export class ClinicalPathway_TestAction extends Record implements IEquatable<ClinicalPathway_TestAction>, IComparable<ClinicalPathway_TestAction> {
     readonly TestName: string;
     readonly TestType: string;
@@ -2027,7 +2081,10 @@ export class ClinicalPathway_ProblemAction extends Record implements IEquatable<
     readonly Onset: Option<Date>;
     readonly Status: ClinicalPathway_ProblemStatus_$union;
     readonly Notes: Option<string>;
-    constructor(CategoryId: Option<int32>, ProblemName: string, IcdCode: Option<string>, Onset: Option<Date>, Status: ClinicalPathway_ProblemStatus_$union, Notes: Option<string>) {
+    readonly Chronic: Option<int32>;
+    readonly Severity: Option<int32>;
+    readonly Inflammation: Option<int32>;
+    constructor(CategoryId: Option<int32>, ProblemName: string, IcdCode: Option<string>, Onset: Option<Date>, Status: ClinicalPathway_ProblemStatus_$union, Notes: Option<string>, Chronic: Option<int32>, Severity: Option<int32>, Inflammation: Option<int32>) {
         super();
         this.CategoryId = CategoryId;
         this.ProblemName = ProblemName;
@@ -2035,11 +2092,14 @@ export class ClinicalPathway_ProblemAction extends Record implements IEquatable<
         this.Onset = Onset;
         this.Status = Status;
         this.Notes = Notes;
+        this.Chronic = Chronic;
+        this.Severity = Severity;
+        this.Inflammation = Inflammation;
     }
 }
 
 export function ClinicalPathway_ProblemAction_$reflection(): TypeInfo {
-    return record_type("F1.Studio.ClinicalPathway.ProblemAction", [], ClinicalPathway_ProblemAction, () => [["CategoryId", option_type(int32_type)], ["ProblemName", string_type], ["IcdCode", option_type(string_type)], ["Onset", option_type(class_type("System.DateTimeOffset"))], ["Status", ClinicalPathway_ProblemStatus_$reflection()], ["Notes", option_type(string_type)]]);
+    return record_type("F1.Studio.ClinicalPathway.ProblemAction", [], ClinicalPathway_ProblemAction, () => [["CategoryId", option_type(int32_type)], ["ProblemName", string_type], ["IcdCode", option_type(string_type)], ["Onset", option_type(class_type("System.DateTimeOffset"))], ["Status", ClinicalPathway_ProblemStatus_$reflection()], ["Notes", option_type(string_type)], ["Chronic", option_type(int32_type)], ["Severity", option_type(int32_type)], ["Inflammation", option_type(int32_type)]]);
 }
 
 export class ClinicalPathway_PrescriptionAction extends Record implements IEquatable<ClinicalPathway_PrescriptionAction>, IComparable<ClinicalPathway_PrescriptionAction> {
@@ -2199,81 +2259,93 @@ export type ClinicalPathway_ActionInfo_$union =
     | ClinicalPathway_ActionInfo<9>
     | ClinicalPathway_ActionInfo<10>
     | ClinicalPathway_ActionInfo<11>
+    | ClinicalPathway_ActionInfo<12>
+    | ClinicalPathway_ActionInfo<13>
 
 export type ClinicalPathway_ActionInfo_$cases = {
     0: ["Medication", [ClinicalPathway_MedicationAction]],
-    1: ["Test", [ClinicalPathway_TestAction]],
-    2: ["Referral", [ClinicalPathway_ReferralAction]],
-    3: ["Education", [ClinicalPathway_EducationAction]],
-    4: ["Procedure", [ClinicalPathway_ProcedureAction]],
-    5: ["Documentation", [ClinicalPathway_DocumentationAction]],
-    6: ["Task", [ClinicalPathway_TaskAction]],
-    7: ["Alert", [ClinicalPathway_AlertAction]],
-    8: ["Problem", [ClinicalPathway_ProblemAction]],
-    9: ["Prescription", [ClinicalPathway_PrescriptionAction]],
-    10: ["SetFieldValue", [ClinicalPathway_SetFieldValueAction]],
-    11: ["NavigateToForm", [ClinicalPathway_NavigateToFormAction]]
+    1: ["Treatment", [ClinicalPathway_TreatmentAction]],
+    2: ["Medset", [ClinicalPathway_MedsetAction]],
+    3: ["Test", [ClinicalPathway_TestAction]],
+    4: ["Referral", [ClinicalPathway_ReferralAction]],
+    5: ["Education", [ClinicalPathway_EducationAction]],
+    6: ["Procedure", [ClinicalPathway_ProcedureAction]],
+    7: ["Documentation", [ClinicalPathway_DocumentationAction]],
+    8: ["Task", [ClinicalPathway_TaskAction]],
+    9: ["Alert", [ClinicalPathway_AlertAction]],
+    10: ["Problem", [ClinicalPathway_ProblemAction]],
+    11: ["Prescription", [ClinicalPathway_PrescriptionAction]],
+    12: ["SetFieldValue", [ClinicalPathway_SetFieldValueAction]],
+    13: ["NavigateToForm", [ClinicalPathway_NavigateToFormAction]]
 }
 
 export function ClinicalPathway_ActionInfo_Medication(Item: ClinicalPathway_MedicationAction) {
     return new ClinicalPathway_ActionInfo<0>(0, [Item]);
 }
 
-export function ClinicalPathway_ActionInfo_Test(Item: ClinicalPathway_TestAction) {
+export function ClinicalPathway_ActionInfo_Treatment(Item: ClinicalPathway_TreatmentAction) {
     return new ClinicalPathway_ActionInfo<1>(1, [Item]);
 }
 
-export function ClinicalPathway_ActionInfo_Referral(Item: ClinicalPathway_ReferralAction) {
+export function ClinicalPathway_ActionInfo_Medset(Item: ClinicalPathway_MedsetAction) {
     return new ClinicalPathway_ActionInfo<2>(2, [Item]);
 }
 
-export function ClinicalPathway_ActionInfo_Education(Item: ClinicalPathway_EducationAction) {
+export function ClinicalPathway_ActionInfo_Test(Item: ClinicalPathway_TestAction) {
     return new ClinicalPathway_ActionInfo<3>(3, [Item]);
 }
 
-export function ClinicalPathway_ActionInfo_Procedure(Item: ClinicalPathway_ProcedureAction) {
+export function ClinicalPathway_ActionInfo_Referral(Item: ClinicalPathway_ReferralAction) {
     return new ClinicalPathway_ActionInfo<4>(4, [Item]);
 }
 
-export function ClinicalPathway_ActionInfo_Documentation(Item: ClinicalPathway_DocumentationAction) {
+export function ClinicalPathway_ActionInfo_Education(Item: ClinicalPathway_EducationAction) {
     return new ClinicalPathway_ActionInfo<5>(5, [Item]);
 }
 
-export function ClinicalPathway_ActionInfo_Task(Item: ClinicalPathway_TaskAction) {
+export function ClinicalPathway_ActionInfo_Procedure(Item: ClinicalPathway_ProcedureAction) {
     return new ClinicalPathway_ActionInfo<6>(6, [Item]);
 }
 
-export function ClinicalPathway_ActionInfo_Alert(Item: ClinicalPathway_AlertAction) {
+export function ClinicalPathway_ActionInfo_Documentation(Item: ClinicalPathway_DocumentationAction) {
     return new ClinicalPathway_ActionInfo<7>(7, [Item]);
 }
 
-export function ClinicalPathway_ActionInfo_Problem(Item: ClinicalPathway_ProblemAction) {
+export function ClinicalPathway_ActionInfo_Task(Item: ClinicalPathway_TaskAction) {
     return new ClinicalPathway_ActionInfo<8>(8, [Item]);
 }
 
-export function ClinicalPathway_ActionInfo_Prescription(Item: ClinicalPathway_PrescriptionAction) {
+export function ClinicalPathway_ActionInfo_Alert(Item: ClinicalPathway_AlertAction) {
     return new ClinicalPathway_ActionInfo<9>(9, [Item]);
 }
 
-export function ClinicalPathway_ActionInfo_SetFieldValue(Item: ClinicalPathway_SetFieldValueAction) {
+export function ClinicalPathway_ActionInfo_Problem(Item: ClinicalPathway_ProblemAction) {
     return new ClinicalPathway_ActionInfo<10>(10, [Item]);
 }
 
-export function ClinicalPathway_ActionInfo_NavigateToForm(Item: ClinicalPathway_NavigateToFormAction) {
+export function ClinicalPathway_ActionInfo_Prescription(Item: ClinicalPathway_PrescriptionAction) {
     return new ClinicalPathway_ActionInfo<11>(11, [Item]);
 }
 
+export function ClinicalPathway_ActionInfo_SetFieldValue(Item: ClinicalPathway_SetFieldValueAction) {
+    return new ClinicalPathway_ActionInfo<12>(12, [Item]);
+}
+
+export function ClinicalPathway_ActionInfo_NavigateToForm(Item: ClinicalPathway_NavigateToFormAction) {
+    return new ClinicalPathway_ActionInfo<13>(13, [Item]);
+}
+
 export class ClinicalPathway_ActionInfo<Tag extends keyof ClinicalPathway_ActionInfo_$cases> extends Union<Tag, ClinicalPathway_ActionInfo_$cases[Tag][0]> {
     constructor(readonly tag: Tag, readonly fields: ClinicalPathway_ActionInfo_$cases[Tag][1]) {
         super();
     }
     cases() {
-        return ["Medication", "Test", "Referral", "Education", "Procedure", "Documentation", "Task", "Alert", "Problem", "Prescription", "SetFieldValue", "NavigateToForm"];
+        return ["Medication", "Treatment", "Medset", "Test", "Referral", "Education", "Procedure", "Documentation", "Task", "Alert", "Problem", "Prescription", "SetFieldValue", "NavigateToForm"];
     }
 }
 
 export function ClinicalPathway_ActionInfo_$reflection(): TypeInfo {
-    return union_type("F1.Studio.ClinicalPathway.ActionInfo", [], ClinicalPathway_ActionInfo, () => [[["Item", ClinicalPathway_MedicationAction_$reflection()]], [["Item", ClinicalPathway_TestAction_$reflection()]], [["Item", ClinicalPathway_ReferralAction_$reflection()]], [["Item", ClinicalPathway_EducationAction_$reflection()]], [["Item", ClinicalPathway_ProcedureAction_$reflection()]], [["Item", ClinicalPathway_DocumentationAction_$reflection()]], [["Item", ClinicalPathway_TaskAction_$reflection()]], [["Item", ClinicalPathway_AlertAction_$reflection()]], [["Item", ClinicalPathway_ProblemAction_$reflection()]], [["Item", ClinicalPathway_PrescriptionAction_$reflection()]], [["Item", ClinicalPathway_SetFieldValueAction_$reflection()]], [["Item", ClinicalPathway_NavigateToFormAction_$reflection()]]]);
+    return union_type("F1.Studio.ClinicalPathway.ActionInfo", [], ClinicalPathway_ActionInfo, () => [[["Item", ClinicalPathway_MedicationAction_$reflection()]], [["Item", ClinicalPathway_TreatmentAction_$reflection()]], [["Item", ClinicalPathway_MedsetAction_$reflection()]], [["Item", ClinicalPathway_TestAction_$reflection()]], [["Item", ClinicalPathway_ReferralAction_$reflection()]], [["Item", ClinicalPathway_EducationAction_$reflection()]], [["Item", ClinicalPathway_ProcedureAction_$reflection()]], [["Item", ClinicalPathway_DocumentationAction_$reflection()]], [["Item", ClinicalPathway_TaskAction_$reflection()]], [["Item", ClinicalPathway_AlertAction_$reflection()]], [["Item", ClinicalPathway_ProblemAction_$reflection()]], [["Item", ClinicalPathway_PrescriptionAction_$reflection()]], [["Item", ClinicalPathway_SetFieldValueAction_$reflection()]], [["Item", ClinicalPathway_NavigateToFormAction_$reflection()]]]);
 }
 
 export class ClinicalPathway_DecisionInfo extends Record implements IEquatable<ClinicalPathway_DecisionInfo>, IComparable<ClinicalPathway_DecisionInfo> {

package/src/FormSpec.FS/Integrations/Adapters/CorEMR/CorEMRFieldTypeMapper.ts

@@ -2,7 +2,7 @@ import { isNullOrWhiteSpace } from "@fable-org/fable-library-js/String.js";
 import { Helpers_generateDeterministicGuidRaw, Helpers_canonicalizeFieldKey } from "../../../Helpers.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
 import { CoreMRChoice, CoreMRItem } from "../../CorEMR/CoreMRTypes.js";
-import { Spec_FormField$1, Spec_FieldType_$union, Spec_FieldType_UnsupportedField, Spec_UnsupportedFieldInfo, Spec_FieldType_PluginField, Spec_PluginFieldConfig, Spec_FieldType_Message, Spec_MessageInfo, Spec_MessageType_Info, Spec_FieldType_DateTimeLocal, Spec_FieldType_Signature, Spec_SignatureInfo, Spec_FieldType_Date, Spec_FieldType_Radio, Spec_FieldType_Dropdown, Spec_SingleChoiceInfo, Spec_FieldType_CheckboxList, Spec_MultiChoiceInfo, Spec_FieldType_TextArea, Spec_FieldType_Text, Spec_TextInfo, Shared_FieldOption, Shared_FieldOptionKey, Shared_FieldKey } from "../../../FormSpec.js";
+import { Spec_FormField$1, Spec_FieldType_$union, Spec_FieldType_UnsupportedField, Spec_UnsupportedFieldInfo, Spec_FieldType_PluginField, Spec_PluginFieldConfig, Spec_FieldType_Message, Spec_MessageInfo, Spec_MessageType_Info, Spec_FieldType_DateTimeLocal, Spec_FieldType_Signature, Spec_SignatureInfo, Spec_FieldType_Date, Spec_FieldType_CheckboxList, Spec_MultiChoiceInfo, Spec_FieldType_Dropdown, Spec_FieldType_Radio, Spec_SingleChoiceInfo, Spec_FieldType_TextArea, Spec_FieldType_Text, Spec_TextInfo, Shared_FieldOption, Shared_FieldOptionKey, Shared_FieldKey } from "../../../FormSpec.js";
 import { isEmpty, ofArray, FSharpList, sortBy, map } from "@fable-org/fable-library-js/List.js";
 import { comparePrimitives } from "@fable-org/fable-library-js/Util.js";
 import { getElementTypeInfo } from "./CorEMRElementTypeMap.js";
@@ -55,9 +55,9 @@ export function mapFieldType(item: CoreMRItem, choices: FSharpList<CoreMRChoice>
         case 2:
             return Spec_FieldType_TextArea(new Spec_TextInfo(undefined));
         case 20:
-            return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
+            return Spec_FieldType_Radio(new Spec_SingleChoiceInfo(mappedChoices));
         case 21:
-            return Spec_FieldType_CheckboxList(new Spec_MultiChoiceInfo(mappedChoices));
+            return Spec_FieldType_Radio(new Spec_SingleChoiceInfo(mappedChoices));
         case 25:
             return Spec_FieldType_Dropdown(new Spec_SingleChoiceInfo(mappedChoices));
         case 26:

package/src/FormSpec.FS/Integrations/Adapters/CorEMR/CorEMRTriggerConverter.ts

@@ -1,7 +1,7 @@
 import { Helpers_generateDeterministicGuidRaw } from "../../../Helpers.js";
-import { ClinicalPathway_PathwayExecutionMode_MultiPathway, ClinicalPathway_MultiPathwayConfig, ClinicalPathway_ConflictResolution_CombineActions, ClinicalPathway_CombinationStrategy_AllMatching, ClinicalPathway_PathwayExecutionMode_$union, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_PathRequirement, ClinicalPathway_ConstraintDefinition, ClinicalPathway_PathwayExecutionMode_TriggerBased, ClinicalPathway_TriggerBasedConfig, ClinicalPathway_TransitionDefinition, ClinicalPathway_StateType_Terminal, ClinicalPathway_TerminalInfo, ClinicalPathway_StateType_CompoundAction, ClinicalPathway_StateType_Action, ClinicalPathway_StateDefinition, ClinicalPathway_StateType_Evaluation, ClinicalPathway_EvaluationInfo, Shared_TransitionKey, Shared_StateKey, ClinicalPathway_TransitionCondition_Always, ClinicalPathway_TransitionCondition_CompositeCondition, ClinicalPathway_LogicalOp_And, ClinicalPathway_TransitionCondition_$union, ClinicalPathway_TransitionCondition_FieldCondition, Shared_ConditionValue_Single, Shared_ConditionValue_Multiple, Shared_FieldKey, ClinicalPathway_ActionInfo_$union, ClinicalPathway_ActionInfo_Prescription, ClinicalPathway_PrescriptionAction, ClinicalPathway_ActionInfo_Medication, ClinicalPathway_MedicationAction, ClinicalPathway_ActionInfo_Problem, ClinicalPathway_ProblemAction, ClinicalPathway_ProblemStatus_Active, ClinicalPathway_ActionInfo_Task, ClinicalPathway_TaskAction, ClinicalPathway_ActionInfo_Alert, ClinicalPathway_AlertAction, ClinicalPathway_AlertSeverity_High, ClinicalPathway_RecurrencePattern, ClinicalPathway_RecurrenceEnd_OnDate, ClinicalPathway_RecurrenceEnd_Never, ClinicalPathway_DueDate_$union, ClinicalPathway_DueDate_DaysFromNow, ClinicalPathway_DueDate_Tomorrow, ClinicalPathway_DueDate_Today, ClinicalPathway_TaskPriority_$union, ClinicalPathway_TaskPriority_Low, ClinicalPathway_TaskPriority_Medium, ClinicalPathway_TaskPriority_High, ClinicalPathway_TriggerTiming_$union, ClinicalPathway_TriggerTiming_OnFormLoad, ClinicalPathway_TriggerTiming_OnFormSubmit, ClinicalPathway_TriggerTiming_OnFormSave, ClinicalPathway_FieldEvaluator_$union, ClinicalPathway_FieldEvaluator_NotInSet, ClinicalPathway_FieldEvaluator_ContainsAll, ClinicalPathway_FieldEvaluator_LessOrEqual, ClinicalPathway_FieldEvaluator_LessThan, ClinicalPathway_FieldEvaluator_GreaterOrEqual, ClinicalPathway_FieldEvaluator_GreaterThan, ClinicalPathway_FieldEvaluator_NotEquals, ClinicalPathway_FieldEvaluator_Equals, ClinicalPathway_FieldEvaluator_InSet } from "../../../FormSpec.js";
+import { ClinicalPathway_PathwayExecutionMode_MultiPathway, ClinicalPathway_MultiPathwayConfig, ClinicalPathway_ConflictResolution_CombineActions, ClinicalPathway_CombinationStrategy_AllMatching, ClinicalPathway_PathwayExecutionMode_$union, ClinicalPathway_ClinicalPathwaySpec, ClinicalPathway_PathRequirement, ClinicalPathway_ConstraintDefinition, ClinicalPathway_PathwayExecutionMode_TriggerBased, ClinicalPathway_TriggerBasedConfig, ClinicalPathway_TransitionDefinition, ClinicalPathway_StateType_Terminal, ClinicalPathway_TerminalInfo, ClinicalPathway_StateType_CompoundAction, ClinicalPathway_StateType_Action, ClinicalPathway_StateDefinition, ClinicalPathway_StateType_Evaluation, ClinicalPathway_EvaluationInfo, Shared_TransitionKey, Shared_StateKey, ClinicalPathway_TransitionCondition_Always, ClinicalPathway_TransitionCondition_CompositeCondition, ClinicalPathway_LogicalOp_And, ClinicalPathway_TransitionCondition_$union, ClinicalPathway_TransitionCondition_FieldCondition, Shared_ConditionValue_Single, Shared_ConditionValue_Multiple, Shared_FieldKey, ClinicalPathway_ActionInfo_$union, ClinicalPathway_ActionInfo_Prescription, ClinicalPathway_PrescriptionAction, ClinicalPathway_ActionInfo_Medset, ClinicalPathway_MedsetAction, ClinicalPathway_ActionInfo_Problem, ClinicalPathway_ProblemAction, ClinicalPathway_ProblemStatus_Active, ClinicalPathway_ActionInfo_Task, ClinicalPathway_TaskAction, ClinicalPathway_ActionInfo_Alert, ClinicalPathway_AlertAction, ClinicalPathway_AlertSeverity_High, ClinicalPathway_RecurrencePattern, ClinicalPathway_RecurrenceEnd_OnDate, ClinicalPathway_RecurrenceEnd_Never, ClinicalPathway_DueDate_$union, ClinicalPathway_DueDate_DaysFromNow, ClinicalPathway_DueDate_Tomorrow, ClinicalPathway_DueDate_Today, ClinicalPathway_TaskPriority_$union, ClinicalPathway_TaskPriority_Low, ClinicalPathway_TaskPriority_Medium, ClinicalPathway_TaskPriority_High, ClinicalPathway_TriggerTiming_$union, ClinicalPathway_TriggerTiming_OnFormLoad, ClinicalPathway_TriggerTiming_OnFormSubmit, ClinicalPathway_TriggerTiming_OnFormSave, ClinicalPathway_FieldEvaluator_$union, ClinicalPathway_FieldEvaluator_NotInSet, ClinicalPathway_FieldEvaluator_ContainsAll, ClinicalPathway_FieldEvaluator_LessOrEqual, ClinicalPathway_FieldEvaluator_LessThan, ClinicalPathway_FieldEvaluator_GreaterOrEqual, ClinicalPathway_FieldEvaluator_GreaterThan, ClinicalPathway_FieldEvaluator_NotEquals, ClinicalPathway_FieldEvaluator_Equals, ClinicalPathway_FieldEvaluator_InSet } from "../../../FormSpec.js";
 import { join, trimStart, trim, split, replace, toConsoleError, printf, toFail } from "@fable-org/fable-library-js/String.js";
-import { singleton, tryHead, append, cons, collect, mapIndexed, filter, empty, map as map_1, item as item_3, length, tryFind as tryFind_1, head, tail, isEmpty, choose, ofArray, tryPick, FSharpList } from "@fable-org/fable-library-js/List.js";
+import { tryHead, append, cons, collect, mapIndexed, filter, empty, map as map_1, item as item_3, length, tryFind as tryFind_1, head, tail, isEmpty, choose, singleton, ofArray, tryPick, FSharpList } from "@fable-org/fable-library-js/List.js";
 import { tryParse, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { FSharpRef } from "@fable-org/fable-library-js/Types.js";
 import { item as item_2 } from "@fable-org/fable-library-js/Array.js";
@@ -231,9 +231,9 @@ export function convertEvent(event: CoreMRTriggerEvent): ClinicalPathway_ActionI
             return ClinicalPathway_ActionInfo_Task(new ClinicalPathway_TaskAction(categoryId_1, category_1, description, convertPriority(priorityStr), parseDueDate(dateStr), assignee, parseRecurrence(recurEvery, recurEnd)));
         }
         case "problem":
-            return ClinicalPathway_ActionInfo_Problem(new ClinicalPathway_ProblemAction(tryEventParamInt(ofArray(["problem_list_id", "category_id", "id"])), "Problem", undefined, now(), ClinicalPathway_ProblemStatus_Active(), undefined));
+            return ClinicalPathway_ActionInfo_Problem(new ClinicalPathway_ProblemAction(tryEventParamInt(ofArray(["problem_list_id", "category_id", "id"])), "Problem", undefined, now(), ClinicalPathway_ProblemStatus_Active(), undefined, tryEventParamInt(singleton("chronic")), tryEventParamInt(singleton("severity")), tryEventParamInt(singleton("inflammation"))));
         case "medset":
-            return ClinicalPathway_ActionInfo_Medication(new ClinicalPathway_MedicationAction("Medication Set", "", "", "", "", false));
+            return ClinicalPathway_ActionInfo_Medset(new ClinicalPathway_MedsetAction(tryEventParamInt(singleton("medset_id")), defaultArg(tryFind<string, string>("medset_name", event.EventParams), "Medication Set"), tryEventParamInt(ofArray(["doctor", "provider"])), tryEventParamInt(singleton("pharmacy_id")), ClinicalPathway_DueDate_Today(), tryEventParamInt(singleton("category_id"))));
         case "prescription":
             return ClinicalPathway_ActionInfo_Prescription(new ClinicalPathway_PrescriptionAction("", "", "PO", "", "", 30, 0, true, undefined));
         default: