Decouple ANC logic from tclose #1027
Conversation
…nancy_PostAbortionCaseManagement, HSI_Labour_ReceivesSkilledBirthAttendanceDuringLabour, HSI_Labour_ReceivesComprehensiveEmergencyObstetricCare
…patientCare including for seeking care from the population and being admitted
…ur_ReceivesComprehensiveEmergencyObstetricCare
|
To do:
|
… doesnt run do to constraints determined by the healthsystem model
There was a problem hiding this comment.
@marghe-molaro - I think this is done now. If I had more time i'd re-run all the calibrations etc but I think the logic makes sense now. Would you be able to have a look and see what you think? would be good to simplify when we have more time
|
Thank you so much @joehcollins !! Just one last thing - it seems that there are still some errors in test_newborn_outcomes.py? Just wanted to check if you had spotted that? |
|
Ahh annoying!! i blindly submitted and hoped for the best!! I'll have a look (also latest master isnt merged in yet) |
|
Ok fixed - just waiting for confirmation on github |
|
Great, seems to be passing all tests now! Will review later today and give you any feedback asap! |
src/tlo/methods/labour.py
Outdated
| def not_available(self): | ||
| self.module.run_if_receives_skilled_birth_attendance_cant_run(self) |
There was a problem hiding this comment.
don't see how not_available is ever called.
| def not_available(self): | ||
| self.module.ectopic_pregnancy_treatment_doesnt_run(self) |
There was a problem hiding this comment.
never called not_available `: delete?
|
Thanks @joehcollins and @marghe-molaro for this. It seems fine to me. I noticed that there were these definitions of |
|
hi @tbhallett - thanks for reviewing. I can't remember any reason for those functions being used so fine to be removed!! |
This reverts commit bbf33e2 **** & subsequent changes
* Revert "Decouple ANC logic from tclose (#1027)" This reverts commit bbf33e2 **** & subsequent changes * removed old logic relating to pnc_date that should have been rolled back --------- Co-authored-by: joehcollins <[email protected]>
* Revert "Decouple ANC logic from tclose (#1027)" This reverts commit bbf33e2 **** & subsequent changes * Enforce expeption for anc modules during tclose overwriting * removed old logic relating to pnc_date that should have been rolled back * Style fixes * Create scenario file to test if error in anc modules has been solved when overwriting tclose to 10 days * Increase population size * Correct CareOfWomenDuringPregnancy * check module name against a tuple of name of modules * factorize for DEFAULT_DAYS_OFFSET_VALUE_FOR_TCLOSE_IF_NONE_SPECIFIED --------- Co-authored-by: Tim Hallett <[email protected]> Co-authored-by: joehcollins <[email protected]>
As a separate note: in some of these HSIs, upon checking whether the person is no longer alive, the returned footprint should be blank, rather than unchanged.
HSI_CareOfWomenDuringPregnancy_PostAbortionCaseManagement
“t open” – abortion_onset (mni dictionary)
HSI_Labour_ReceivesSkilledBirthAttendanceDuringLabour
“t open” – la_due_date_current_pregnancy
HSI_Labour_ReceivesComprehensiveEmergencyObstetricCare
“t open” – la_due_date_current_pregnancy (check)
Some changes needed:
HSI_CareOfWomenDuringPregnancy_AntenatalWardInpatientCare
“t open” – Complication onset which needs to be added.
HSI_Labour_ReceivesPostnatalCheck
Depends on if its ‘early’ or ‘late’ PNC…
HSI_NewbornOutcomes_ReceivesPostnatalCheck
Depends on if its ‘early’ or ‘late’ PNC…
HSI_CareOfWomenDuringPregnancy_TreatmentForEctopicPregnancy
Depends if pre or post rupture…