changes

API/serializers.py

@@ -1,6 +1,8 @@
 from django.contrib.auth.models import User
 from UserManagement import models as user_management_models
+from ValidationManagement import models as validation_management_models
 from Core import models as core_models
+from TerminologyServicesManagement import models as terminology_services_management
 from rest_framework import serializers
 
 
@@ -31,7 +33,7 @@ class Meta:
 class TransactionSummarySerializer(serializers.ModelSerializer):
 
     class Meta:
-        model = core_models.TransactionSummary
+        model = validation_management_models.TransactionSummary
         fields = '__all__'
 
 
@@ -202,6 +204,55 @@ class IncomingRevenueReceivedSerializer(serializers.Serializer):
     items = IncomingRevenueReceivedItemsSerializer(many=True, read_only=False)
 
 
+class ICD10SubCodeSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = terminology_services_management.ICD10SubCode
+        fields = ('id','icd10_sub_code', 'icd10_sub_code_description')
+
+
+class ICD10CodeSerializer(serializers.ModelSerializer):
+    sub_code =  ICD10SubCodeSerializer(many=True, read_only=False)
+
+    class Meta:
+        model = terminology_services_management.ICD10Code
+        fields = ('id','icd10_code', 'icd10_description', 'sub_code')
 
 
+class ICD10CodeSubCategorySerializer(serializers.ModelSerializer):
+    code = ICD10CodeSerializer(many=True, read_only=False)
+
+    class Meta:
+        model = terminology_services_management.ICD10CodeSubCategory
+        fields = ['id', 'description','icd10_code_category','code']
+
+
+class ICD10CodeCategorySerializer(serializers.ModelSerializer):
+    sub_category = ICD10CodeSubCategorySerializer(many=True, read_only=False)
+
+    class Meta:
+        model = terminology_services_management.ICD10CodeCategory
+        fields = ('id', 'description', 'sub_category')
 
+
+class CPTCodeSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = terminology_services_management.CPTCode
+        fields = ('id','cpt_code','cpt_description')
+
+
+class CPTCodeSubCategorySerializer(serializers.ModelSerializer):
+    code = CPTCodeSerializer(many=True, read_only=False)
+
+    class Meta:
+        model = terminology_services_management.CPTCodeSubCategory
+        fields = ('id','description', 'code')
+
+
+class CPTCodeCategorySerializer(serializers.ModelSerializer):
+    sub_category = CPTCodeSubCategorySerializer(many=True, read_only=False)
+
+    class Meta:
+        model = terminology_services_management.CPTCodeCategory
+        fields = ('id', 'description', 'sub_category')

API/urls.py

@@ -10,6 +10,8 @@
 router.register('death_by_disease_cases_not_at_facility', views.DeathByDiseaseCaseNotAtFacilityView)
 router.register('bed_occupancy', views.BedOccupancyView)
 router.register('revenue_received', views.RevenueReceivedView)
+router.register('icd10', views.ICD10View)
+router.register('cpt', views.CPTCodeView)
 
 
 urlpatterns = [

API/validators.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from dateutil.parser import parse
-from Core.models import FieldValidationMapping, ValidationRule, TransactionSummary, TransactionSummaryLine, PayloadThreshold
+from ValidationManagement.models import FieldValidationMapping, ValidationRule, TransactionSummary, TransactionSummaryLine, PayloadThreshold
 import json
 
 

API/views.py

@@ -5,21 +5,21 @@
     DeathByDiseaseCaseAtFacilityItemsSerializer, \
     DeathByDiseaseCaseNotAtFacilityItemsSerializer, RevenueReceivedItemsSerializer,BedOccupancyItemsSerializer, \
     ServiceReceivedItemsSerializer, IncomingDeathByDiseaseCaseNotAtTheFacilitySerializer, \
-    IncomingServicesReceivedSerializer, IncomingBedOccupancySerializer, IncomingRevenueReceivedSerializer
-from Core.models import TransactionSummary, RevenueReceived, DeathByDiseaseCaseAtFacility, \
-    DeathByDiseaseCaseNotAtFacility,ServiceReceived, BedOccupancy,BedOccupancyReport, RevenueReceivedItems, ServiceReceivedItems, \
+    IncomingServicesReceivedSerializer, IncomingBedOccupancySerializer, IncomingRevenueReceivedSerializer, \
+    ICD10CodeCategorySerializer, CPTCodeCategorySerializer
+from Core.models import RevenueReceived, DeathByDiseaseCaseAtFacility, \
+    DeathByDiseaseCaseNotAtFacility,ServiceReceived, BedOccupancy, RevenueReceivedItems, ServiceReceivedItems, \
     DeathByDiseaseCaseAtFacilityItems, DeathByDiseaseCaseNotAtFacilityItems, BedOccupancyItems
-import datetime
-from MasterData import models as master_data_models
-import json
 from API import validators as validators
+from ValidationManagement import models as validation_management_models
+from TerminologyServicesManagement import models as terminology_services_management
 
 
 # Create your views here.
 class TransactionSummaryView(viewsets.ModelViewSet):
-    queryset = TransactionSummary.objects.all()
+    queryset = validation_management_models.TransactionSummary.objects.all()
     serializer_class = TransactionSummarySerializer
-    permission_classes = ()
+    permission_classes = (IsAuthenticated, )
 
 
 class ServiceReceivedView(viewsets.ModelViewSet):
@@ -376,3 +376,15 @@ def list(self, request):
         queryset = BedOccupancyItems.objects.all().order_by('-id')
         serializer = BedOccupancyItemsSerializer(queryset, many=True)
         return Response(serializer.data)
+
+
+class ICD10View(viewsets.ModelViewSet):
+    queryset = terminology_services_management.ICD10CodeCategory.objects.all()
+    serializer_class = ICD10CodeCategorySerializer
+    permission_classes = ()
+
+
+class CPTCodeView(viewsets.ModelViewSet):
+    queryset = terminology_services_management.CPTCodeCategory.objects.all()
+    serializer_class = CPTCodeCategorySerializer
+    permission_classes = ()

Core/admin.py

@@ -1,30 +1,10 @@
 from django.contrib import admin
-from .models import TransactionSummary,ValidationRule , FieldValidationMapping, TransactionSummaryLine, \
-    ServiceReceived, ServiceReceivedItems, DeathByDiseaseCaseAtFacility, DeathByDiseaseCaseAtFacilityItems, \
+from .models import ServiceReceived, ServiceReceivedItems, DeathByDiseaseCaseAtFacility, DeathByDiseaseCaseAtFacilityItems, \
     DeathByDiseaseCaseNotAtFacility, DeathByDiseaseCaseNotAtFacilityItems, BedOccupancy, BedOccupancyItems, \
-    RevenueReceived, RevenueReceivedItems, PayloadThreshold
+    RevenueReceived, RevenueReceivedItems
 from django.contrib.admin import helpers
 
 # Register your models here.
-class TransactionSummaryAdmin(admin.ModelAdmin):
-    list_display = ('id','transaction_date_time','message_type','org_name','facility_hfr_code',
-                    'total_passed','total_failed','facility_hfr_code')
-    search_fields = ['facility_hfr_code',]
-
-
-class TransactionSummaryLinesAdmin(admin.ModelAdmin):
-    list_display = ('id','transaction','payload_object','transaction_status',
-                    'error_message')
-    search_fields = []
-
-
-class ValidationRuleAdmin(admin.ModelAdmin):
-    list_display = ('id','description','rule_name')
-    search_fields = ['description',]
-
-    def has_delete_permission(self, request, obj=None):
-        return False
-
 class ServiceReceivedAdmin(admin.ModelAdmin):
     list_display = ('id', 'org_name', 'facility_hfr_code')
     search_fields = ['org_name', ]
@@ -80,20 +60,6 @@ class RevenueReceivedItemsAdmin(admin.ModelAdmin):
     search_fields = ['payer_id', ]
 
 
-class FieldValidationMappingAdmin(admin.ModelAdmin):
-    list_display = ('id', 'message_type','field','validation_rule')
-    search_fields = ['message_type', ]
-
-
-class PayloadThresholdAdmin(admin.ModelAdmin):
-    list_display = ('id', 'payload_description','payload_code','percentage_threshold')
-    search_fields = ['payload_Description', ]
-
-
-admin.site.register(TransactionSummary, TransactionSummaryAdmin)
-admin.site.register(TransactionSummaryLine, TransactionSummaryLinesAdmin)
-admin.site.register(ValidationRule, ValidationRuleAdmin)
-admin.site.register(FieldValidationMapping, FieldValidationMappingAdmin)
 admin.site.register(ServiceReceived, ServiceReceivedAdmin)
 admin.site.register(ServiceReceivedItems, ServiceReceivedItemsAdmin)
 admin.site.register(DeathByDiseaseCaseAtFacility, DeathByDiseaseCaseAtFacilityAdmin)
@@ -104,5 +70,4 @@ class PayloadThresholdAdmin(admin.ModelAdmin):
 admin.site.register(BedOccupancyItems, BedOccupancyItemsAdmin)
 admin.site.register(RevenueReceived, RevenueReceivedAdmin)
 admin.site.register(RevenueReceivedItems, RevenueReceivedItemsAdmin)
-admin.site.register(PayloadThreshold, PayloadThresholdAdmin)
 

Core/apps.py

@@ -3,3 +3,4 @@
 
 class CoreConfig(AppConfig):
     name = 'Core'
+    verbose_name = 'EMR Data Management'

Core/forms.py

@@ -1,6 +1,6 @@
 from django import forms
 from API import validators as validators
-from .models import PayloadUpload
+from ValidationManagement.models import PayloadUpload
 
 class PayloadImportForm(forms.ModelForm):