Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Track Occupation of Patient #1901

Merged
merged 1 commit into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions care/facility/api/serializers/patient.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@


class PatientMetaInfoSerializer(serializers.ModelSerializer):
occupation = ChoiceField(choices=PatientMetaInfo.OccupationChoices)
occupation = ChoiceField(choices=PatientMetaInfo.OccupationChoices, allow_null=True)

class Meta:
model = PatientMetaInfo
Expand Down Expand Up @@ -312,9 +312,8 @@ def create(self, validated_data):
Disease.objects.bulk_create(diseases, ignore_conflicts=True)

if meta_info:
meta_info_obj = PatientMetaInfo.objects.create(**meta_info)
patient.meta_info = meta_info_obj
patient.save()
patient.meta_info = PatientMetaInfo.objects.create(**meta_info)
patient.meta_info.save()

if contacted_patients:
contacted_patient_objs = [
Expand Down Expand Up @@ -361,8 +360,12 @@ def update(self, instance, validated_data):
Disease.objects.bulk_create(diseases, ignore_conflicts=True)

if meta_info:
for key, value in meta_info.items():
setattr(patient.meta_info, key, value)
if patient.meta_info is None:
meta_info_obj = PatientMetaInfo.objects.create(**meta_info)
patient.meta_info = meta_info_obj
else:
for key, value in meta_info.items():
setattr(patient.meta_info, key, value)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

possibly confirm that we are not allowing to edit internal fields in this manner. ( eg, id, uuid, FK's and so on.. )

patient.meta_info.save()

if self.partial is not True: # clear the list and enter details if PUT
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# Generated by Django 4.2.10 on 2024-02-20 13:26

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("facility", "0414_remove_bed_old_name"),
]

operations = [
migrations.AlterField(
model_name="patientmetainfo",
name="head_of_household",
field=models.BooleanField(blank=True, null=True),
),
migrations.AlterField(
model_name="patientmetainfo",
name="occupation",
field=models.IntegerField(
blank=True,
choices=[
(1, "STUDENT"),
(2, "BUSINESSMAN"),
(3, "HEALTH_CARE_WORKER"),
(4, "HEALTH_CARE_LAB_WORKER"),
(5, "ANIMAL_HANDLER"),
(6, "OTHERS"),
],
null=True,
),
),
]
15 changes: 7 additions & 8 deletions care/facility/models/patient.py
Original file line number Diff line number Diff line change
Expand Up @@ -577,17 +577,16 @@ def format_diagnoses(diagnosis_ids):
class PatientMetaInfo(models.Model):
class OccupationEnum(enum.Enum):
STUDENT = 1
MEDICAL_WORKER = 2
GOVT_EMPLOYEE = 3
PRIVATE_EMPLOYEE = 4
HOME_MAKER = 5
WORKING_ABROAD = 6
OTHERS = 7
BUSINESSMAN = 2
vigneshhari marked this conversation as resolved.
Show resolved Hide resolved
HEALTH_CARE_WORKER = 3
HEALTH_CARE_LAB_WORKER = 4
ANIMAL_HANDLER = 5
OTHERS = 6

OccupationChoices = [(item.value, item.name) for item in OccupationEnum]

occupation = models.IntegerField(choices=OccupationChoices)
head_of_household = models.BooleanField()
occupation = models.IntegerField(choices=OccupationChoices, blank=True, null=True)
head_of_household = models.BooleanField(blank=True, null=True)


class PatientContactDetails(models.Model):
Expand Down