@f1studio/form-spec 5.0.0-alpha.156 → 5.0.0-alpha.159

package/src/FormSpec.FS/PathwayDataExtractor.ts

@@ -1,53 +1,61 @@
-import { ClinicalPathway_TerminalInfo, Shared_StateKey, ClinicalPathway_StateType_$union, ClinicalPathway_EvaluationInfo, ClinicalPathway_ActionInfo_$union, ClinicalPathway_MedicationAction, ClinicalPathway_FieldValueSource_$union, ClinicalPathway_SetFieldValueAction, ClinicalPathway_NavigateToFormAction, ClinicalPathway_PrescriptionAction, ClinicalPathway_ProblemAction, ClinicalPathway_AlertAction, ClinicalPathway_TaskAction, ClinicalPathway_DocumentationAction, ClinicalPathway_ReferralAction, ClinicalPathway_TestAction, ClinicalPathway_EducationAction, ClinicalPathway_ProcedureAction } from "./FormSpec.js";
+import { ClinicalPathway_TerminalInfo, Shared_StateKey, ClinicalPathway_StateType_$union, ClinicalPathway_EvaluationInfo, ClinicalPathway_ActionInfo_$union, ClinicalPathway_MedicationAction, ClinicalPathway_FieldValueSource_$union, ClinicalPathway_SetFieldValueAction, ClinicalPathway_NavigateToFormAction, ClinicalPathway_PrescriptionAction, ClinicalPathway_ProblemAction, ClinicalPathway_AlertAction, ClinicalPathway_TaskAction, ClinicalPathway_DocumentationAction, ClinicalPathway_ReferralAction, ClinicalPathway_TestAction, ClinicalPathway_EducationAction, ClinicalPathway_ProcedureAction, ClinicalPathway_MedsetAction, ClinicalPathway_TreatmentAction } from "./FormSpec.js";
 import { split, replace, join, isNullOrWhiteSpace, substring, printf, toText } from "@fable-org/fable-library-js/String.js";
+import { Option, value as value_1, defaultArg } from "@fable-org/fable-library-js/Option.js";
 import { singleton, append, map, FSharpList, empty } from "@fable-org/fable-library-js/List.js";
-import { Option, value } from "@fable-org/fable-library-js/Option.js";
 import { item, map as map_1 } from "@fable-org/fable-library-js/Array.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
 
 export function extractActionText(action: ClinicalPathway_ActionInfo_$union): string {
     switch (action.tag) {
-        case /* Procedure */ 4: {
+        case /* Treatment */ 1: {
+            const t: ClinicalPathway_TreatmentAction = action.fields[0];
+            return toText(printf("Treatment: %s"))(t.Name);
+        }
+        case /* Medset */ 2: {
+            const m_1: ClinicalPathway_MedsetAction = action.fields[0];
+            return toText(printf("Medset: %s"))(m_1.Name);
+        }
+        case /* Procedure */ 6: {
             const p: ClinicalPathway_ProcedureAction = action.fields[0];
             return toText(printf("Procedure: %s"))(p.Name);
         }
-        case /* Education */ 3: {
+        case /* Education */ 5: {
             const e: ClinicalPathway_EducationAction = action.fields[0];
             return "Education";
         }
-        case /* Test */ 1: {
-            const t: ClinicalPathway_TestAction = action.fields[0];
-            return toText(printf("Test: %s"))(t.TestName);
+        case /* Test */ 3: {
+            const t_1: ClinicalPathway_TestAction = action.fields[0];
+            return toText(printf("Test: %s"))(t_1.TestName);
         }
-        case /* Referral */ 2: {
+        case /* Referral */ 4: {
             const r: ClinicalPathway_ReferralAction = action.fields[0];
             return toText(printf("Refer to %s"))(r.Target);
         }
-        case /* Documentation */ 5: {
+        case /* Documentation */ 7: {
             const d: ClinicalPathway_DocumentationAction = action.fields[0];
             return toText(printf("Document: %s"))(d.FormName);
         }
-        case /* Task */ 6: {
-            const t_1: ClinicalPathway_TaskAction = action.fields[0];
-            return toText(printf("Task: %s"))(t_1.Description);
+        case /* Task */ 8: {
+            const t_2: ClinicalPathway_TaskAction = action.fields[0];
+            return toText(printf("Task: %s"))(t_2.Description);
         }
-        case /* Alert */ 7: {
+        case /* Alert */ 9: {
             const a: ClinicalPathway_AlertAction = action.fields[0];
             return toText(printf("Alert: %s"))(a.Message);
         }
-        case /* Problem */ 8: {
+        case /* Problem */ 10: {
             const p_1: ClinicalPathway_ProblemAction = action.fields[0];
             return toText(printf("Problem: %s"))(p_1.ProblemName);
         }
-        case /* Prescription */ 9: {
+        case /* Prescription */ 11: {
             const p_2: ClinicalPathway_PrescriptionAction = action.fields[0];
             return toText(printf("Prescription: %s"))(p_2.Medication);
         }
-        case /* NavigateToForm */ 11: {
+        case /* NavigateToForm */ 13: {
             const n: ClinicalPathway_NavigateToFormAction = action.fields[0];
             return toText(printf("Navigate to: %s"))(n.FormId);
         }
-        case /* SetFieldValue */ 10: {
+        case /* SetFieldValue */ 12: {
             const s: ClinicalPathway_SetFieldValueAction = action.fields[0];
             const fieldGuid: string = s.TargetField.fields[0];
             const shortGuid: string = (fieldGuid.length > 8) ? (substring(fieldGuid, 0, 8) + "...") : fieldGuid;
@@ -80,43 +88,52 @@ export function extractActionText(action: ClinicalPathway_ActionInfo_$union): st
 
 export function extractActionDetails(action: ClinicalPathway_ActionInfo_$union): string {
     switch (action.tag) {
-        case /* Procedure */ 4:
+        case /* Treatment */ 1: {
+            const t: ClinicalPathway_TreatmentAction = action.fields[0];
+            const arg_5: string = defaultArg(t.Signature, "");
+            return toText(printf("Treatment: %s (%s)"))(t.Name)(arg_5);
+        }
+        case /* Medset */ 2: {
+            const m_1: ClinicalPathway_MedsetAction = action.fields[0];
+            return toText(printf("Medset: %s"))(m_1.Name);
+        }
+        case /* Procedure */ 6:
             return action.fields[0].Name;
-        case /* Education */ 3:
+        case /* Education */ 5:
             return join("; ", action.fields[0].Topics);
-        case /* Test */ 1: {
-            const t: ClinicalPathway_TestAction = action.fields[0];
-            return toText(printf("Test: %s"))(t.TestName);
+        case /* Test */ 3: {
+            const t_1: ClinicalPathway_TestAction = action.fields[0];
+            return toText(printf("Test: %s"))(t_1.TestName);
         }
-        case /* Referral */ 2: {
+        case /* Referral */ 4: {
             const r: ClinicalPathway_ReferralAction = action.fields[0];
             return toText(printf("Refer to %s (%s)"))(r.Target)(r.Reason);
         }
-        case /* Documentation */ 5: {
+        case /* Documentation */ 7: {
             const d: ClinicalPathway_DocumentationAction = action.fields[0];
             return toText(printf("Document: %s"))(d.FormName);
         }
-        case /* Task */ 6: {
-            const t_1: ClinicalPathway_TaskAction = action.fields[0];
-            return toText(printf("Task: %s"))(t_1.Description);
+        case /* Task */ 8: {
+            const t_2: ClinicalPathway_TaskAction = action.fields[0];
+            return toText(printf("Task: %s"))(t_2.Description);
         }
-        case /* Alert */ 7: {
+        case /* Alert */ 9: {
             const a: ClinicalPathway_AlertAction = action.fields[0];
             return toText(printf("Alert: %s"))(a.Message);
         }
-        case /* Problem */ 8: {
+        case /* Problem */ 10: {
             const p_1: ClinicalPathway_ProblemAction = action.fields[0];
             return toText(printf("Problem: %s"))(p_1.ProblemName);
         }
-        case /* Prescription */ 9: {
+        case /* Prescription */ 11: {
             const p_2: ClinicalPathway_PrescriptionAction = action.fields[0];
             return toText(printf("Prescription: %s"))(p_2.Medication);
         }
-        case /* NavigateToForm */ 11: {
+        case /* NavigateToForm */ 13: {
             const n: ClinicalPathway_NavigateToFormAction = action.fields[0];
             return toText(printf("Navigate to: %s"))(n.FormId);
         }
-        case /* SetFieldValue */ 10: {
+        case /* SetFieldValue */ 12: {
             const s: ClinicalPathway_SetFieldValueAction = action.fields[0];
             const guid: string = s.TargetField.fields[0];
             let valueText: string;
@@ -146,27 +163,31 @@ export function extractActionDetails(action: ClinicalPathway_ActionInfo_$union):
 
 export function extractActionType(action: ClinicalPathway_ActionInfo_$union): string {
     switch (action.tag) {
-        case /* Procedure */ 4:
+        case /* Treatment */ 1:
+            return "Treatment";
+        case /* Medset */ 2:
+            return "Medset";
+        case /* Procedure */ 6:
             return "Procedure";
-        case /* Education */ 3:
+        case /* Education */ 5:
             return "Education";
-        case /* Test */ 1:
+        case /* Test */ 3:
             return "Test";
-        case /* Referral */ 2:
+        case /* Referral */ 4:
             return "Referral";
-        case /* Documentation */ 5:
+        case /* Documentation */ 7:
             return "Documentation";
-        case /* Task */ 6:
+        case /* Task */ 8:
             return "Task";
-        case /* Alert */ 7:
+        case /* Alert */ 9:
             return "Alert";
-        case /* Problem */ 8:
+        case /* Problem */ 10:
             return "Problem";
-        case /* Prescription */ 9:
+        case /* Prescription */ 11:
             return "Prescription";
-        case /* SetFieldValue */ 10:
+        case /* SetFieldValue */ 12:
             return "SetFieldValue";
-        case /* NavigateToForm */ 11:
+        case /* NavigateToForm */ 13:
             return "NavigateToForm";
         default:
             return "Medication";
@@ -175,7 +196,7 @@ export function extractActionType(action: ClinicalPathway_ActionInfo_$union): st
 
 export function extractEvaluationDetails(evaluation: ClinicalPathway_EvaluationInfo): [string, FSharpList<string>] {
     let matchValue: Option<FSharpList<string>>;
-    return [evaluation.EvaluationName, (matchValue = evaluation.EvaluationNotes, (matchValue == null) ? empty<string>() : value(matchValue))] as [string, FSharpList<string>];
+    return [evaluation.EvaluationName, (matchValue = evaluation.EvaluationNotes, (matchValue == null) ? empty<string>() : value_1(matchValue))] as [string, FSharpList<string>];
 }
 
 export function extractEvaluationName(evaluation: ClinicalPathway_EvaluationInfo): string {

package/src/FormSpec.FS/PathwayExecutor.ts

@@ -1,10 +1,10 @@
 import { FSharpRef, Record, Union } from "@fable-org/fable-library-js/Types.js";
-import { fold, findIndex, tryPick, sortByDescending, truncate, length, sortBy, tryHead, filter as filter_1, ofArray as ofArray_1, append, empty, head, tail, concat, singleton, forAll, exists, collect, map as map_1, sumBy, sum, isEmpty, choose, tryFind, FSharpList } from "@fable-org/fable-library-js/List.js";
+import { fold, findIndex, tryPick, sortByDescending, truncate, length, sortBy, tryHead, filter as filter_1, ofArray as ofArray_1, append, empty, head, tail, concat, exists, singleton, forAll, collect, map as map_1, sumBy, sum, isEmpty, choose, tryFind, FSharpList } from "@fable-org/fable-library-js/List.js";
 import { tuple_type, bool_type, float64_type, lambda_type, class_type, record_type, int32_type, union_type, list_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
 import { ClinicalPathway_PathwayExecutionMode_$reflection, ClinicalPathway_SetFieldValueAction, ClinicalPathway_FieldValueSource_$union, ClinicalPathway_PathwayExecutionMode_$union, ClinicalPathway_SelectionStrategy_$union, ClinicalPathway_CombinationStrategy_$union, ClinicalPathway_StateType_$union, ClinicalPathway_StateDefinition, Shared_PluginPropertyKey, Shared_FieldOptionKey, ClinicalPathway_TransitionCondition_$union, ClinicalPathway_LogicalOp_$union, ClinicalPathway_StateEvaluator_$union, Shared_FieldValue_Single, Shared_ConditionValue_$union, Shared_MatrixAnswer, ClinicalPathway_FieldEvaluator_$union, Shared_PluginDataProperty, Shared_PluginDataProperty_$reflection, Spec_Score, Spec_ScoreRange, Spec_FormStep$1, Spec_FormField$1, Shared_FieldValue_$union, Shared_MatrixItemKey, Shared_FieldAnswer, Shared_FieldOption, Spec_FieldType, Shared_TransitionKey_$reflection, Shared_TransitionKey, Shared_FieldKey_$reflection, ClinicalPathway_ActionInfo_$reflection, Spec_FormSpec$1_$reflection, Spec_FieldType_$reflection, ClinicalPathway_ClinicalPathwaySpec_$reflection, Shared_FieldKey, ClinicalPathway_ActionInfo_$union, Spec_FieldType_$union, Spec_FormSpec$1, ClinicalPathway_ClinicalPathwaySpec, Shared_StateKey_$reflection, Shared_StateKey, ClinicalPathway_TransitionDefinition_$reflection, ClinicalPathway_TransitionDefinition } from "./FormSpec.js";
 import { tryParse as tryParse_1, float64, int32 } from "@fable-org/fable-library-js/Int32.js";
 import { int32ToString, equals, compare, comparePrimitives, IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
-import { difference, union, empty as empty_1, FSharpSet__get_IsEmpty, FSharpSet__get_Count, contains, ofList as ofList_1, isSubset, ofArray, map as map_2, toList, FSharpSet } from "@fable-org/fable-library-js/Set.js";
+import { difference, union, empty as empty_1, FSharpSet__get_IsEmpty, FSharpSet__get_Count, contains, isSubset, ofArray, FSharpSet__Contains, ofList as ofList_1, map as map_2, toList, FSharpSet } from "@fable-org/fable-library-js/Set.js";
 import { toArray, orElse, filter, map, defaultArg, value as value_4, bind, Option } from "@fable-org/fable-library-js/Option.js";
 import { tryFind as tryFind_1, FSharpMap, ofList, toList as toList_1 } from "@fable-org/fable-library-js/Map.js";
 import { updateField, getFieldDetails, FieldDetails$1, fieldToDetails } from "./FormSpecValues.js";
@@ -511,18 +511,30 @@ export function evaluateFieldCondition(actualValue: string, evaluator: ClinicalP
                 return false;
             }
         }
-        case /* InSet */ 2:
-            return exists<string>((v_9: string): boolean => (v_9.trim().toLocaleLowerCase() === actualValue.trim().toLocaleLowerCase()), evaluator.fields[0]);
-        case /* NotInSet */ 3:
-            return !exists<string>((v_10: string): boolean => (v_10.trim().toLocaleLowerCase() === actualValue.trim().toLocaleLowerCase()), evaluator.fields[0]);
+        case /* InSet */ 2: {
+            const values: FSharpList<string> = evaluator.fields[0];
+            const actualParts: string[] = map_3<string, string>((s: string): string => s.trim().toLocaleLowerCase(), actualValue.split(","));
+            const expectedSet: FSharpSet<string> = ofList_1<string>(map_1<string, string>((v_9: string): string => v_9.trim().toLocaleLowerCase(), values), {
+                Compare: comparePrimitives,
+            });
+            return actualParts.some((part: string): boolean => FSharpSet__Contains(expectedSet, part));
+        }
+        case /* NotInSet */ 3: {
+            const values_1: FSharpList<string> = evaluator.fields[0];
+            const actualParts_1: string[] = map_3<string, string>((s_1: string): string => s_1.trim().toLocaleLowerCase(), actualValue.split(","));
+            const expectedSet_1: FSharpSet<string> = ofList_1<string>(map_1<string, string>((v_10: string): string => v_10.trim().toLocaleLowerCase(), values_1), {
+                Compare: comparePrimitives,
+            });
+            return !actualParts_1.some((part_1: string): boolean => FSharpSet__Contains(expectedSet_1, part_1));
+        }
         case /* ContainsAll */ 4: {
             const values_2: FSharpList<string> = evaluator.fields[0];
-            const actualParts: FSharpSet<string> = ofArray<string>(map_3<string, string>((s: string): string => s.trim().toLocaleLowerCase(), actualValue.split(",")), {
+            const actualParts_2: FSharpSet<string> = ofArray<string>(map_3<string, string>((s_2: string): string => s_2.trim().toLocaleLowerCase(), actualValue.split(",")), {
                 Compare: comparePrimitives,
             });
-            return isSubset<string>(ofList_1<string>(map_1<string, string>((s_1: string): string => s_1.trim().toLocaleLowerCase(), values_2), {
+            return isSubset<string>(ofList_1<string>(map_1<string, string>((s_3: string): string => s_3.trim().toLocaleLowerCase(), values_2), {
                 Compare: comparePrimitives,
-            }), actualParts);
+            }), actualParts_2);
         }
         default:
             return actualValue.trim().toLocaleLowerCase() === expectedValue.trim().toLocaleLowerCase();
@@ -1192,7 +1204,7 @@ export function executeSetFieldValueAction(action: ClinicalPathway_SetFieldValue
  * Execute an action and return updated form spec
  */
 export function executeAction(action: ClinicalPathway_ActionInfo_$union, formSpec: Spec_FormSpec$1<Spec_FieldType_$union>): Spec_FormSpec$1<Spec_FieldType_$union> {
-    if (action.tag === /* SetFieldValue */ 10) {
+    if (action.tag === /* SetFieldValue */ 12) {
         return executeSetFieldValueAction(action.fields[0], formSpec);
     }
     else {

package/src/FormSpec.FS/TriggerActionDto.ts

@@ -1,9 +1,9 @@
 import { Record } from "@fable-org/fable-library-js/Types.js";
 import { int32 } from "@fable-org/fable-library-js/Int32.js";
-import { map, value, Option } from "@fable-org/fable-library-js/Option.js";
+import { orElse, defaultArg, map, value as value_2, Option } from "@fable-org/fable-library-js/Option.js";
 import { IComparable, IEquatable } from "@fable-org/fable-library-js/Util.js";
 import { record_type, bool_type, option_type, int32_type, string_type, TypeInfo } from "@fable-org/fable-library-js/Reflection.js";
-import { ClinicalPathway_ActionInfo_$union, ClinicalPathway_ProblemAction, ClinicalPathway_AlertAction, ClinicalPathway_RecurrencePattern, ClinicalPathway_RecurrenceEnd_$union, ClinicalPathway_TaskAction, ClinicalPathway_DueDate_$union, ClinicalPathway_TaskPriority_$union } from "./FormSpec.js";
+import { ClinicalPathway_ActionInfo_$union, ClinicalPathway_MedsetAction, ClinicalPathway_TreatmentAction, ClinicalPathway_ProblemAction, ClinicalPathway_AlertAction, ClinicalPathway_RecurrencePattern, ClinicalPathway_RecurrenceEnd_$union, ClinicalPathway_TaskAction, ClinicalPathway_DueDate_$union, ClinicalPathway_TaskPriority_$union } from "./FormSpec.js";
 import { fromDateTimeOffset, today, addDays, toString } from "@fable-org/fable-library-js/Date.js";
 import { FSharpList, choose } from "@fable-org/fable-library-js/List.js";
 
@@ -20,7 +20,18 @@ export class TriggerActionDto extends Record implements IEquatable<TriggerAction
     readonly ScheduleEnd: Option<string>;
     readonly ProblemListId: Option<int32>;
     readonly FormItemId: Option<int32>;
-    constructor(ActionType: string, TriggerId: int32, TriggerActionId: int32, CategoryId: int32, CategoryName: string, Priority: Option<int32>, Description: Option<string>, DateStart: Option<string>, AllDay: Option<boolean>, ScheduleEnd: Option<string>, ProblemListId: Option<int32>, FormItemId: Option<int32>) {
+    readonly TreatmentId: Option<int32>;
+    readonly ScheduleId: Option<int32>;
+    readonly ProviderId: Option<int32>;
+    readonly Signature: Option<string>;
+    readonly SourceRelatedId: Option<int32>;
+    readonly RelatedType: Option<int32>;
+    readonly Chronic: Option<int32>;
+    readonly Severity: Option<int32>;
+    readonly Inflammation: Option<int32>;
+    readonly MedsetId: Option<int32>;
+    readonly PharmacyId: Option<int32>;
+    constructor(ActionType: string, TriggerId: int32, TriggerActionId: int32, CategoryId: int32, CategoryName: string, Priority: Option<int32>, Description: Option<string>, DateStart: Option<string>, AllDay: Option<boolean>, ScheduleEnd: Option<string>, ProblemListId: Option<int32>, FormItemId: Option<int32>, TreatmentId: Option<int32>, ScheduleId: Option<int32>, ProviderId: Option<int32>, Signature: Option<string>, SourceRelatedId: Option<int32>, RelatedType: Option<int32>, Chronic: Option<int32>, Severity: Option<int32>, Inflammation: Option<int32>, MedsetId: Option<int32>, PharmacyId: Option<int32>) {
         super();
         this.ActionType = ActionType;
         this.TriggerId = (TriggerId | 0);
@@ -34,11 +45,22 @@ export class TriggerActionDto extends Record implements IEquatable<TriggerAction
         this.ScheduleEnd = ScheduleEnd;
         this.ProblemListId = ProblemListId;
         this.FormItemId = FormItemId;
+        this.TreatmentId = TreatmentId;
+        this.ScheduleId = ScheduleId;
+        this.ProviderId = ProviderId;
+        this.Signature = Signature;
+        this.SourceRelatedId = SourceRelatedId;
+        this.RelatedType = RelatedType;
+        this.Chronic = Chronic;
+        this.Severity = Severity;
+        this.Inflammation = Inflammation;
+        this.MedsetId = MedsetId;
+        this.PharmacyId = PharmacyId;
     }
 }
 
 export function TriggerActionDto_$reflection(): TypeInfo {
-    return record_type("F1.Studio.TriggerActions.TriggerActionDto", [], TriggerActionDto, () => [["ActionType", string_type], ["TriggerId", int32_type], ["TriggerActionId", int32_type], ["CategoryId", int32_type], ["CategoryName", string_type], ["Priority", option_type(int32_type)], ["Description", option_type(string_type)], ["DateStart", option_type(string_type)], ["AllDay", option_type(bool_type)], ["ScheduleEnd", option_type(string_type)], ["ProblemListId", option_type(int32_type)], ["FormItemId", option_type(int32_type)]]);
+    return record_type("F1.Studio.TriggerActions.TriggerActionDto", [], TriggerActionDto, () => [["ActionType", string_type], ["TriggerId", int32_type], ["TriggerActionId", int32_type], ["CategoryId", int32_type], ["CategoryName", string_type], ["Priority", option_type(int32_type)], ["Description", option_type(string_type)], ["DateStart", option_type(string_type)], ["AllDay", option_type(bool_type)], ["ScheduleEnd", option_type(string_type)], ["ProblemListId", option_type(int32_type)], ["FormItemId", option_type(int32_type)], ["TreatmentId", option_type(int32_type)], ["ScheduleId", option_type(int32_type)], ["ProviderId", option_type(int32_type)], ["Signature", option_type(string_type)], ["SourceRelatedId", option_type(int32_type)], ["RelatedType", option_type(int32_type)], ["Chronic", option_type(int32_type)], ["Severity", option_type(int32_type)], ["Inflammation", option_type(int32_type)], ["MedsetId", option_type(int32_type)], ["PharmacyId", option_type(int32_type)]]);
 }
 
 /**
@@ -56,20 +78,22 @@ export function convertPriority(priority: ClinicalPathway_TaskPriority_$union):
 }
 
 /**
- * Convert ClinicalPathway.DueDate DU → ISO 8601 date string
+ * Convert ClinicalPathway.DueDate DU → date-only string (yyyy-MM-dd).
+ * Date-only format avoids timezone offset issues — the conduit computes
+ * date_end as end-of-day from the date portion.
  */
 export function convertDueDate(dueDate: ClinicalPathway_DueDate_$union): string {
     switch (dueDate.tag) {
         case /* Tomorrow */ 1:
-            return toString(addDays(today(), 1), "o");
+            return toString(addDays(today(), 1), "yyyy-MM-dd");
         case /* DaysFromNow */ 2: {
             const days: int32 = dueDate.fields[0] | 0;
-            return toString(addDays(today(), days), "o");
+            return toString(addDays(today(), days), "yyyy-MM-dd");
         }
         case /* SpecificDate */ 3:
-            return toString(fromDateTimeOffset(dueDate.fields[0], 0), "o");
+            return toString(fromDateTimeOffset(dueDate.fields[0], 0), "yyyy-MM-dd");
         default:
-            return toString(today(), "o");
+            return toString(today(), "yyyy-MM-dd");
     }
 }
 
@@ -77,31 +101,34 @@ function requireCategoryId(actionType: string, categoryName: string, categoryIdO
     if (categoryIdOpt == null) {
         throw new Error(`TriggerActionDto.convert: missing categoryId for actionType='${actionType}' category='${categoryName}'. CoreMR submit requires provenance category IDs.`);
     }
-    else if (value(categoryIdOpt) > 0) {
-        const id_1: int32 = value(categoryIdOpt) | 0;
+    else if (value_2(categoryIdOpt) > 0) {
+        const id_1: int32 = value_2(categoryIdOpt) | 0;
         return id_1 | 0;
     }
     else {
-        const id_2: int32 = value(categoryIdOpt) | 0;
+        const id_2: int32 = value_2(categoryIdOpt) | 0;
         throw new Error(`TriggerActionDto.convert: invalid categoryId=${id_2} for actionType='${actionType}' category='${categoryName}'. categoryId must be > 0.`);
     }
 }
 
 /**
- * Convert a list of ClinicalPathway ActionInfo (from PathwayExecutor.ExecutedActions)
- * into a list of TriggerActionDto ready for JSON serialization and bridge POST.
+ * BASE conversion: ClinicalPathway ActionInfo → TriggerActionDto.
+ * Provider-agnostic — converts only Task, Alert, Problem (generic clinical actions).
  * 
- * Only converts CoreMR-actionable types: Task, Alert, Problem.
- * Skips: Medication, Education, Referral, Procedure, Documentation, Prescription,
- * SetFieldValue, NavigateToForm (these are either Phase 2 or F1-internal).
+ * DOES NOT produce treatment or medset DTOs (those map to Medication in the pathway,
+ * which this function skips). DOES NOT enrich with trigger IDs from provenance.
  * 
- * Task with Recurrence.IsSome → ActionType = "recurring_task"
- * Task with Recurrence.IsNone → ActionType = "task"
+ * For CoreMR publishing, use CoreMRTriggerEnrichment.convertActionsForCoreMR instead —
+ * it calls this function internally, then adds treatment/medset DTOs and enriches
+ * with trigger IDs from provenance.
+ * 
+ * Direct callers: unit tests (testing base conversion logic in isolation).
+ * Production callers: NONE (production always goes through convertActionsForCoreMR).
  */
-export function convert(actions: FSharpList<ClinicalPathway_ActionInfo_$union>): FSharpList<TriggerActionDto> {
+export function convertActionsToBaseDtos(actions: FSharpList<ClinicalPathway_ActionInfo_$union>): FSharpList<TriggerActionDto> {
     return choose<ClinicalPathway_ActionInfo_$union, TriggerActionDto>((action: ClinicalPathway_ActionInfo_$union): Option<TriggerActionDto> => {
         switch (action.tag) {
-            case /* Task */ 6: {
+            case /* Task */ 8: {
                 const taskAction: ClinicalPathway_TaskAction = action.fields[0];
                 const actionType: string = (taskAction.Recurrence != null) ? "recurring_task" : "task";
                 return new TriggerActionDto(actionType, 0, 0, requireCategoryId(actionType, taskAction.Category, taskAction.CategoryId), taskAction.Category, convertPriority(taskAction.Priority), taskAction.Description, convertDueDate(taskAction.DueDate), true, map<ClinicalPathway_RecurrencePattern, string>((r: ClinicalPathway_RecurrencePattern): string => {
@@ -109,22 +136,30 @@ export function convert(actions: FSharpList<ClinicalPathway_ActionInfo_$union>):
                     switch (matchValue.tag) {
                         case /* AfterOccurrences */ 1: {
                             const n: int32 = matchValue.fields[0] | 0;
-                            return toString(addDays(today(), n), "o");
+                            return toString(addDays(today(), n), "yyyy-MM-dd");
                         }
                         case /* Never */ 2:
-                            return toString(addDays(today(), 7), "o");
+                            return toString(addDays(today(), 7), "yyyy-MM-dd");
                         default:
-                            return toString(fromDateTimeOffset(matchValue.fields[0], 0), "o");
+                            return toString(fromDateTimeOffset(matchValue.fields[0], 0), "yyyy-MM-dd");
                     }
-                }, taskAction.Recurrence), undefined, undefined);
+                }, taskAction.Recurrence), undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
             }
-            case /* Alert */ 7: {
+            case /* Alert */ 9: {
                 const alertAction: ClinicalPathway_AlertAction = action.fields[0];
-                return new TriggerActionDto("alert", 0, 0, requireCategoryId("alert", alertAction.Category, alertAction.CategoryId), alertAction.Category, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
+                return new TriggerActionDto("alert", 0, 0, requireCategoryId("alert", alertAction.Category, alertAction.CategoryId), alertAction.Category, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
             }
-            case /* Problem */ 8: {
+            case /* Problem */ 10: {
                 const problemAction: ClinicalPathway_ProblemAction = action.fields[0];
-                return new TriggerActionDto("problem", 0, 0, requireCategoryId("problem", problemAction.ProblemName, problemAction.CategoryId), problemAction.ProblemName, undefined, undefined, undefined, undefined, undefined, undefined, undefined);
+                return new TriggerActionDto("problem", 0, 0, requireCategoryId("problem", problemAction.ProblemName, problemAction.CategoryId), problemAction.ProblemName, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, problemAction.Chronic, problemAction.Severity, problemAction.Inflammation, undefined, undefined);
+            }
+            case /* Treatment */ 1: {
+                const t: ClinicalPathway_TreatmentAction = action.fields[0];
+                return new TriggerActionDto("treatment", 0, 0, defaultArg(orElse(t.CategoryId, t.TreatmentId), 0), t.Name, map<ClinicalPathway_TaskPriority_$union, int32>(convertPriority, t.Priority), t.Description, convertDueDate(t.DateStart), undefined, convertDueDate(t.Duration), undefined, undefined, t.TreatmentId, t.ScheduleId, t.ProviderId, t.Signature, t.SourceRelatedId, 3, undefined, undefined, undefined, undefined, undefined);
+            }
+            case /* Medset */ 2: {
+                const m: ClinicalPathway_MedsetAction = action.fields[0];
+                return new TriggerActionDto("medset", 0, 0, defaultArg(orElse(m.CategoryId, m.MedsetId), 0), m.Name, undefined, undefined, convertDueDate(m.DateStart), undefined, undefined, undefined, undefined, undefined, undefined, m.ProviderId, undefined, undefined, undefined, undefined, undefined, undefined, m.MedsetId, m.PharmacyId);
             }
             default:
                 return undefined;