Scenarios, improve reconstitution handling and UI

[halcwb]

This pull request introduces several improvements and bug fixes across the medication data parsing, dose rule logic, and product reconstitution flows. The main changes focus on enhancing unit handling, improving parsing robustness, and ensuring correct calculation and propagation of quantities and constraints throughout the medication and order generation process.

Medication parsing and data model improvements:

• Added support for parsing and storing Quantities for substances in the medication model, ensuring that these values are correctly read from input data and propagated through the system. [1] [2] [3] [4]
• Improved the parsing logic for dose limits to allow explicit specification of the target type (substance, component, or orderable), and updated all relevant call sites to use this more robust interface. [1] [2] [3] [4] [5]
• Enhanced the line parsing function to support both tab and space indentation, making it compatible with different FSI environments.

Order and constraint calculation enhancements:

• Refined the calculation of divisibility increments and constraints for both medication and product components, ensuring that units are matched and increments are set only when appropriate. [1] [2] [3]
• Improved the logic for collecting and assigning quantities and concentrations for grouped substances, especially when handling reconstituted products. [1] [2] [3]

Dose rule and product logic fixes:

• Adjusted dose rule logic to filter out limits with no constraints and to handle special cases for units like "dosis" and count units. [1] [2]
• Fixed product reconstitution logic to use consistent variable naming and correct calculation of volumes and concentrations.

Testing and script updates:

• Updated the F# script to use a new data provider and to directly test dose rule extraction and product reconstitution for a specific product.

Miscellaneous:

• Minor improvements such as importing missing modules and improving code clarity. [1] [2]

These changes collectively improve the correctness, maintainability, and robustness of the medication and dose rule processing pipeline.

@greptile: review.

[greptile-apps]

Greptile Overview

Greptile Summary

This PR enhances medication parsing, dose rule processing, and product reconstitution handling across the codebase. The changes improve unit handling, parsing robustness, and constraint propagation throughout the medication and order generation pipeline.

Key improvements:

• Added Quantities field to SubstanceItem for proper reconstitution tracking
• Enhanced parseDoseLimitOpt to accept explicit target type parameter (Substance/Component/Orderable)
• Added tab and space indentation support for FSI compatibility
• Improved dose limit filtering to exclude empty constraints via hasNoLimits
• Added special handling for "dosis" unit in dose rule logic
• Refactored ValueUnit.toString to support optional value/unit wrappers for flexible formatting
• Simplified variable markdown generation by delegating to toDelimitedString
• Improved reconstitution volume calculation with better variable naming (v → vol)
• Enhanced calculateDivisibility to match orderable/product units correctly
• Extracted printPrep function for better code organization

Issues found:

• Inconsistent string function casing (String.IsNullOrWhiteSpace vs String.isNullOrWhiteSpace) at Medication.fs:265
• Commented-out code block should be removed at Medication.fs:1525-1535

The changes are well-structured and maintain backward compatibility while adding necessary functionality for reconstitution scenarios.

Confidence Score: 4/5

• This PR is safe to merge with minor code style issues
• The PR implements well-documented enhancements to medication parsing and reconstitution handling. The logic changes are sound and improve robustness. Only minor issues found: inconsistent string function casing and commented-out code that should be removed. No critical bugs or security concerns detected.
• Pay attention to src/Informedica.GenORDER.Lib/Medication.fs for the casing inconsistency and commented code cleanup

Important Files Changed

Filename	Overview
src/Informedica.GenORDER.Lib/Medication.fs	Enhanced medication parsing with Quantities field, improved parseDoseLimitOpt to accept target parameter, added tab/space indentation support. Contains minor casing inconsistency and commented code.
src/Informedica.GenORDER.Lib/Order.fs	Refactored printPrep function extraction, fixed time printing bug (toValueUnitString instead of duplicate toValueUnitMarkdown), improved reconstitution handling with component quantity display.
src/Informedica.GenFORM.Lib/DoseRule.fs	Added filtering of empty dose limits via hasNoLimits, added special handling for "dosis" unit, improved unit string formatting call with proper parameters.
src/Informedica.GenFORM.Lib/Product.fs	Improved variable naming in reconstitution logic (renamed v to vol), cleaned up formatting, consistent calculation of reconstituted volumes and concentrations.
src/Informedica.GenUNITS.Lib/ValueUnit.fs	Added optional value/unit wrappers to toString function, refactored toDelimitedString calls with explicit isWithUnit parameter, improved unit formatting flexibility.
src/Informedica.GenSOLVER.Lib/Variable.fs	Simplified markdown generation by delegating unit handling to toDelimitedString, removed manual string manipulation, improved parameter naming (withUnit → isWithUnit).
src/Informedica.GenORDER.Lib/Types.fs	Added Quantities field to SubstanceItem type for reconstitution scenarios, properly documented the purpose of the new field.

Sequence Diagram

sequenceDiagram
    participant Parser as Medication Parser
    participant Med as Medication Model
    participant Order as Order Generator
    participant DR as DoseRule
    participant Prod as Product
    participant VU as ValueUnit

    Note over Parser,VU: Medication Parsing & Order Generation Flow

    Parser->>Parser: parseLine (tab/space support)
    Parser->>Parser: parseDoseLimitOpt(target, string)
    Note right of Parser: Now accepts target type:<br/>Substance/Component/Orderable
    
    Parser->>Med: Create SubstanceItem with Quantities
    Note right of Med: New field for reconstitution scenarios
    
    Med->>DR: Filter dose limits
    DR->>DR: hasNoLimits check
    Note right of DR: Filter out empty limits
    DR->>DR: Handle "dosis" unit
    Note right of DR: Special case for dosis/<br/>count units
    
    Med->>Prod: Process reconstitution
    Prod->>Prod: Calculate vol = ExpansionVolume + DiluentVolume
    Prod->>VU: Update concentrations
    VU->>VU: toString(vw, uw, hasGroup, loc, verb)
    Note right of VU: Enhanced with optional<br/>value/unit wrappers
    
    Med->>Order: setItemQtyConcConstraints
    Note right of Order: Set ComponentQuantity constraints
    Order->>Order: calculateDivisibility(pc, med)
    Note right of Order: Match orderable/product units
    
    Order->>Order: printPrep(printMd, sns, ord)
    Note right of Order: Extracted function for<br/>reconstitution display

Loading

[greptile-apps]

_{7 files reviewed, 2 comments}

_{Edit Code Review Agent Settings | Greptile}