Counters adjustment
This commit is contained in:
@@ -1005,12 +1005,10 @@ def get_organization_counters(organization):
|
|||||||
organization_id = organization['id']
|
organization_id = organization['id']
|
||||||
stats = _get_organization_statistics(organization_id)
|
stats = _get_organization_statistics(organization_id)
|
||||||
|
|
||||||
|
organization["patients_count"] = stats.get("totalInclusions", 0)
|
||||||
organization["preincluded_count"] = stats.get("preIncluded", 0)
|
organization["preincluded_count"] = stats.get("preIncluded", 0)
|
||||||
organization["included_count"] = stats.get("included", 0)
|
organization["included_count"] = stats.get("included", 0)
|
||||||
organization["prematurely_terminated_count"] = stats.get("prematurelyTerminated", 0)
|
organization["prematurely_terminated_count"] = stats.get("prematurelyTerminated", 0)
|
||||||
organization["patients_count"] = (organization["preincluded_count"] +
|
|
||||||
organization["included_count"] +
|
|
||||||
organization["prematurely_terminated_count"])
|
|
||||||
return organization
|
return organization
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -430,11 +430,12 @@ def coherence_check(output_inclusions, organizations_list):
|
|||||||
if inc_org_id != org_id:
|
if inc_org_id != org_id:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
# API statistics exclude inclusions without signed consent
|
patients += 1
|
||||||
|
|
||||||
|
# API statistics exclude non-consented from status sub-counters only
|
||||||
if get_nested_value(inclusion, ["Inclusion", "Consent_Signed"]) is not True:
|
if get_nested_value(inclusion, ["Inclusion", "Consent_Signed"]) is not True:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
patients += 1
|
|
||||||
status = get_nested_value(inclusion, ["Inclusion", "Inclusion_Status"], default="")
|
status = get_nested_value(inclusion, ["Inclusion", "Inclusion_Status"], default="")
|
||||||
|
|
||||||
if isinstance(status, str):
|
if isinstance(status, str):
|
||||||
|
|||||||
Reference in New Issue
Block a user