hccinfhir 0.0.7__py3-none-any.whl → 0.0.9__py3-none-any.whl

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/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/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.dist-info → hccinfhir-0.0.9.dist-info}/METADATA

@@ -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.dist-info → hccinfhir-0.0.9.dist-info}/RECORD

@@ -1,13 +1,13 @@
 hccinfhir/__init__.py,sha256=OCyYCv4jTOlYHZbTw2DTks3e6_YT1N2JXAOuyR03KNE,43
-hccinfhir/datamodels.py,sha256=FtClk2wsBREqIHLGWyw95BKuOllLG1QcRNATNnn2F0Q,4866
+hccinfhir/datamodels.py,sha256=_eJ2HVRECVJdA_lX11iRDCkyoWUICbTYAZ711Ra9-Wg,4937
 hccinfhir/extractor.py,sha256=-jHVCIJqFAqvrI9GxkkXZVDQjKDa-7vF7v3PGMGAMnA,1801
 hccinfhir/extractor_837.py,sha256=vkTBCd0WBaJoTrUd-Z-zCIaoLk7KV2n4AGqIORhONIk,7147
 hccinfhir/extractor_fhir.py,sha256=Rg_L0Vg5tz_L2VJ_jvZwWz6RMlPAkHwj4LiK-OWQvrQ,8458
 hccinfhir/filter.py,sha256=8uYThN0-AqwVAKyti29WGiFwQKDiremMhYd_m6QcXhM,2193
 hccinfhir/hccinfhir.py,sha256=DxTkqbgVXsOsvX1M_UXemb68UMfC8oVCGus2CYIAiTM,6837
-hccinfhir/model_calculate.py,sha256=6cjWMtayC9fBxhTCnbqSJSlctblYz4Mn9vQYDXx-Iu8,3725
+hccinfhir/model_calculate.py,sha256=aCm6_jjyftGoit-P7tCQ5FYotDPlMxVNHwFhO5if3KE,4044
 hccinfhir/model_coefficients.py,sha256=UrDAEWBoqooSC8hy9YSUsLMmmfgIO0YGtVkui6ruOkE,5528
-hccinfhir/model_demographics.py,sha256=LZLlPQOtxPh3Md6q9xwztQ9PwrUo_gloNCYSa2bDirY,6578
+hccinfhir/model_demographics.py,sha256=CMnD2-Au9Q6HNZrJUZqVVJRDEmSuK8ZpF39I22JkX8M,6564
 hccinfhir/model_dx_to_cc.py,sha256=jCFlnAOBkfI9FrCX6tZIh-Sp_DW0HwpY7QrPXGtwInI,1765
 hccinfhir/model_hierarchies.py,sha256=e8QtSayTrfPv2wh149FjK7ToiEmU1ISYMA1Pi38iVk0,2700
 hccinfhir/model_interactions.py,sha256=ZLiKJepPjPkYceKDf7dLXoYE0p44I7t9y2sTOlrxojo,20264
@@ -36,7 +36,7 @@ hccinfhir/samples/sample_eob_1.json,sha256=_NGSVR2ysFpx-DcTvyga6dFCzhQ8Vi9fNzQEM
 hccinfhir/samples/sample_eob_2.json,sha256=FcnJcx0ApOczxjJ_uxVLzCep9THfNf4xs9Yf7hxk8e4,1769
 hccinfhir/samples/sample_eob_200.ndjson,sha256=CxpjeQ1DCMUzZILaM68UEhfxO0p45YGhDDoCZeq8PxU,1917986
 hccinfhir/samples/sample_eob_3.json,sha256=4BW4wOMBEEU9RDfJR15rBEvk0KNHyuMEh3e055y87Hc,2306
-hccinfhir-0.0.7.dist-info/METADATA,sha256=3AbiIBOeD4WiqcbXeqERiCi4D2m2DiE0qpnBrV51Io8,11567
-hccinfhir-0.0.7.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-hccinfhir-0.0.7.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-hccinfhir-0.0.7.dist-info/RECORD,,
+hccinfhir-0.0.9.dist-info/METADATA,sha256=DafI1RTHC6NfyAW7DcV26um2dXkxCmyrZDDjHaH4Pdw,11567
+hccinfhir-0.0.9.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+hccinfhir-0.0.9.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+hccinfhir-0.0.9.dist-info/RECORD,,