hccinfhir 0.0.7__tar.gz → 0.0.9__tar.gz

{hccinfhir-0.0.7 → hccinfhir-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: hccinfhir
-Version: 0.0.7
+Version: 0.0.9
 Summary: HCC Algorithm for FHIR Resources
 Project-URL: Homepage, https://github.com/mimilabs/hccinfhir
 Project-URL: Issues, https://github.com/mimilabs/hccinfhir/issues

{hccinfhir-0.0.7 → hccinfhir-0.0.9}/hccinfhir/datamodels.py

@@ -69,9 +69,9 @@ class Demographics(BaseModel):
     """
     age: Union[int, float] = Field(..., description="[required] Beneficiary age")
     sex: Literal['M', 'F', '1', '2'] = Field(..., description="[required] Beneficiary sex")
-    dual_elgbl_cd: Optional[Literal[None, 'NA', '99', '00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10']] = Field('NA', description="Dual status code")
-    orec: Optional[Literal[None, '0', '1', '2', '3']] = Field('0', description="Original reason for entitlement")
-    crec: Optional[Literal[None, '0', '1', '2', '3']] = Field('0', description="Current reason for entitlement")
+    dual_elgbl_cd: Optional[Literal[None, '', 'NA', '99', '00', '01', '02', '03', '04', '05', '06', '07', '08', '09', '10']] = Field('NA', description="Dual status code")
+    orec: Optional[Literal[None, '', '0', '1', '2', '3']] = Field('', description="Original reason for entitlement")
+    crec: Optional[Literal[None, '', '0', '1', '2', '3']] = Field('', description="Current reason for entitlement")
     new_enrollee: Optional[bool] = Field(False, description="True if beneficiary is a new enrollee")
     snp: Optional[bool] = Field(False, description="True if beneficiary is in SNP")
     version: Optional[str] = Field("V2", description="Version of categorization used (V2, V4, V6)")
@@ -90,6 +90,8 @@ class Demographics(BaseModel):
 class RAFResult(TypedDict):
     """Type definition for RAF calculation results"""
     risk_score: float
+    risk_score_demographics: float
+    risk_score_hcc: float
     hcc_list: List[str]
     cc_to_dx: Dict[str, Set[str]]
     coefficients: Dict[str, float]

{hccinfhir-0.0.7 → hccinfhir-0.0.9}/hccinfhir/model_calculate.py

@@ -76,11 +76,17 @@ def calculate_raf(diagnosis_codes: List[str],
     hcc_set = apply_hierarchies(hcc_set, model_name)
     interactions = apply_interactions(demographics, hcc_set, model_name)
     coefficients = apply_coefficients(demographics, hcc_set, interactions, model_name)
+
+    coefficients_demographics = apply_coefficients(demographics, set(), {}, model_name)
     
     risk_score = sum(coefficients.values())
+    risk_score_demographics = sum(coefficients_demographics.values())
+    risk_score_hcc = risk_score - risk_score_demographics
 
     return {
         'risk_score': risk_score, 
+        'risk_score_demographics': risk_score_demographics,
+        'risk_score_hcc': risk_score_hcc,
         'hcc_list': list(hcc_set),
         'cc_to_dx': cc_to_dx,
         'coefficients': coefficients,

{hccinfhir-0.0.7 → hccinfhir-0.0.9}/hccinfhir/model_demographics.py

@@ -120,9 +120,9 @@ def categorize_demographics(age: Union[int, float],
     
     # V2/V4 Logic (Medicare Population)
     elif version in ('V2', 'V4'):
-        if orec is None:
-            raise ValueError("OREC is required for V2/V4 categorization")
-        
+        if orec is None or orec == '':
+            orec = '0' # Default to 0 if OREC is None
+
         # New enrollee logic
         if new_enrollee:
             prefix = 'NEF' if std_sex == '2' else 'NEM'

{hccinfhir-0.0.7 → hccinfhir-0.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hccinfhir"
-version = "0.0.7"
+version = "0.0.9"
 authors = [
   { name="Yubin Park", email="yubin.park@mimilabs.ai" },
 ]