Skip to content

Commit

Permalink
fix: resolved comments
Browse files Browse the repository at this point in the history
  • Loading branch information
aeswibon committed Feb 13, 2024
1 parent 8f2d7ed commit 4142943
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 65 deletions.
Original file line number Diff line number Diff line change
@@ -1,70 +1,45 @@
# Generated by Django 4.2.8 on 2024-01-20 10:02

from django.db import migrations, models
from django.db.models.expressions import RawSQL


def forwards_func(apps, schema_editor):
DailyRound = apps.get_model("facility", "DailyRound")
daily_round_objects = DailyRound.objects.all()
objects = []
for obj in daily_round_objects:
if obj.consciousness_level == 0:
obj.consciousness_level = None
if obj.left_pupil_light_reaction == 0:
obj.left_pupil_light_reaction = None
if obj.right_pupil_light_reaction == 0:
obj.right_pupil_light_reaction = None
if obj.limb_response_upper_extremity_left == 0:
obj.limb_response_upper_extremity_left = None
if obj.limb_response_upper_extremity_right == 0:
obj.limb_response_upper_extremity_right = None
if obj.limb_response_lower_extremity_left == 0:
obj.limb_response_lower_extremity_left = None
if obj.limb_response_lower_extremity_right == 0:
obj.limb_response_lower_extremity_right = None
if obj.rhythm == 0:
obj.rhythm = None
if obj.ventilator_mode == 0:
obj.ventilator_mode = None
if obj.ventilator_interface == 0:
obj.ventilator_interface = None
if obj.ventilator_oxygen_modality == 0:
obj.ventilator_oxygen_modality = None
if obj.insulin_intake_frequency == 0:
obj.insulin_intake_frequency = None
if obj.bp and obj.bp.get("systolic") and obj.bp.get("diastolic"):
if obj.bp.get("systolic") < 0 and obj.bp.get("diastolic") < 0:
obj.bp = {}
else:
if obj.bp.get("systolic") < 0:
obj.bp.update({"systolic": None})
if obj.bp.get("diastolic") < 0:
obj.bp.update({"diastolic": None})
objects.append(obj)

DailyRound.objects.bulk_update(
objects,
[
"consciousness_level",
"left_pupil_light_reaction",
"right_pupil_light_reaction",
"limb_response_upper_extremity_left",
"limb_response_upper_extremity_right",
"limb_response_lower_extremity_left",
"limb_response_lower_extremity_right",
"rhythm",
"ventilator_mode",
"ventilator_interface",
"ventilator_oxygen_modality",
"insulin_intake_frequency",
"bp",
],
DailyRound.objects.filter(consciousness_level=0).update(consciousness_level=None)
DailyRound.objects.filter(left_pupil_light_reaction=0).update(
left_pupil_light_reaction=None
)
DailyRound.objects.filter(right_pupil_light_reaction=0).update(
right_pupil_light_reaction=None
)
DailyRound.objects.filter(limb_response_upper_extremity_left=0).update(
limb_response_upper_extremity_left=None
)
DailyRound.objects.filter(limb_response_lower_extremity_right=0).update(
limb_response_lower_extremity_right=None
)
DailyRound.objects.filter(rhythm=0).update(rhythm=None)
DailyRound.objects.filter(ventilator_mode=0).update(ventilator_mode=None)
DailyRound.objects.filter(ventilator_interface=0).update(ventilator_interface=None)
DailyRound.objects.filter(ventilator_oxygen_modality=0).update(
ventilator_oxygen_modality=None
)
DailyRound.objects.filter(insulin_intake_frequency=0).update(
insulin_intake_frequency=None
)
DailyRound.objects.filter(bp__systolic__lt=0, bp__diastolic__lt=0).update(bp={})
DailyRound.objects.filter(bp__contains={"systolic": {"$lt": 0}}).update(
bp=RawSQL("jsonb_set(bp, '{systolic}', 'null')", [])
)
DailyRound.objects.filter(bp__contains={"diastolic": {"$lt": 0}}).update(
bp=RawSQL("jsonb_set(bp, '{diastolic}', 'null')", [])
)


class Migration(migrations.Migration):
dependencies = [
("facility", "0407_alter_dailyround_additional_symptoms_and_more"),
("facility", "0413_eventtype_patientconsultationevent_and_more"),
]

operations = [
Expand Down
33 changes: 23 additions & 10 deletions care/facility/models/daily_round.py
Original file line number Diff line number Diff line change
Expand Up @@ -505,16 +505,29 @@ def set_push_score(item):

def save(self, *args, **kwargs):
# Calculate all automated columns and populate them
self.glasgow_total_calculated = (
self.cztn(self.glasgow_eye_open)
+ self.cztn(self.glasgow_motor_response)
+ self.cztn(self.glasgow_verbal_response)
)
self.total_intake_calculated = sum([x["quantity"] for x in self.infusions])
self.total_intake_calculated += sum([x["quantity"] for x in self.iv_fluids])
self.total_intake_calculated += sum([x["quantity"] for x in self.feeds])

self.total_output_calculated = sum([x["quantity"] for x in self.output])
if (
self.glasgow_eye_open is None
and self.glasgow_motor_response is None
and self.glasgow_verbal_response is None
):
self.glasgow_total_calculated = None
else:
self.glasgow_total_calculated = (

Check warning on line 515 in care/facility/models/daily_round.py

View check run for this annotation

Codecov / codecov/patch

care/facility/models/daily_round.py#L515

Added line #L515 was not covered by tests
self.cztn(self.glasgow_eye_open)
+ self.cztn(self.glasgow_motor_response)
+ self.cztn(self.glasgow_verbal_response)
)
if self.infusions is [] and self.iv_fluids is [] and self.feeds is []:
self.total_intake_calculated = None

Check warning on line 521 in care/facility/models/daily_round.py

View check run for this annotation

Codecov / codecov/patch

care/facility/models/daily_round.py#L521

Added line #L521 was not covered by tests
else:
self.total_intake_calculated = sum([x["quantity"] for x in self.infusions])
self.total_intake_calculated += sum([x["quantity"] for x in self.iv_fluids])
self.total_intake_calculated += sum([x["quantity"] for x in self.feeds])

if self.output is []:
self.total_output_calculated = None

Check warning on line 528 in care/facility/models/daily_round.py

View check run for this annotation

Codecov / codecov/patch

care/facility/models/daily_round.py#L528

Added line #L528 was not covered by tests
else:
self.total_output_calculated = sum([x["quantity"] for x in self.output])

# self.pressure_sore = self.update_pressure_sore()

Expand Down

0 comments on commit 4142943

Please sign in to comment.