Merge Develop

care/facility/api/serializers/shifting.py

@@ -25,6 +25,7 @@
 from care.facility.models.bed import ConsultationBed
 from care.facility.models.notification import Notification
 from care.facility.models.patient_base import DISEASE_STATUS_CHOICES, DiseaseStatusEnum
+from care.facility.models.patient_base import NewDischargeReasonEnum
 from care.facility.models.patient_consultation import PatientConsultation
 from care.users.api.serializers.lsg import StateSerializer
 from care.users.api.serializers.user import UserBaseMinimumSerializer

care/utils/tests/test_utils.py

@@ -7,7 +7,6 @@
 from django.test import override_settings
 from django.utils.timezone import make_aware, now
 from faker import Faker
-from pytz import unicode
 from rest_framework import status
 from rest_framework_simplejwt.tokens import RefreshToken
 
@@ -19,6 +18,7 @@
     SHIFTING_STATUS_CHOICES,
     SYMPTOM_CHOICES,
     VEHICLE_CHOICES,
+    Ambulance,
     Disease,
     DiseaseStatusEnum,
     Facility,