api/eqpt_views.py

@@ -170,6 +170,7 @@ def eqpt_result(request):

                         'fever_num': fever_num,
              

                     })
              

                 
              

                +
              

                 def protect_user_privacy(field):
              

                     if (field.get('key', '') == 'phone'):
              

                         phone = list(field.get('value', ''))
              
@@ -182,6 +183,7 @@ def protect_user_privacy(field):

                 
              

                     return field.get('value', '')
              

                 
              

                +
              

                 def get_screen_data(point=None, point_id=None):
              

                     if not point:
              

                         try:
              
@@ -200,7 +202,7 @@ def get_screen_data(point=None, point_id=None):

                         ipuis = ipuis.exclude(last_submit_at__range=(start_dt, end_dt), temperature__gt=0.0, temperature__lte=settings.FEVER_TEMPERATURE)
              

                 
              

                         ipuis = [{**ipui.data, **{
              

                -            field.get('key', ''): protect_user_privacy(field) for field in ipui.fields }} for ipui in ipuis]
              

                +            field.get('key', ''): protect_user_privacy(field) for field in ipui.fields}} for ipui in ipuis]
              

                         reminds = [{
              

                             'name': ipui.get('name'),
              

                             'room': ipui.get('room'),
              
@@ -220,7 +222,7 @@ def get_screen_data(point=None, point_id=None):

                                 ipui['status'] = '未使用'
              

                                 ipuis_unused.append(ipui)
              

                                 continue
              

                -                
              

                +
              

                             last_submit_at = tc.make_naive(last_submit_at)
              

                 
              

                             if (start_dt < last_submit_at < end_dt) and temperature > settings.FEVER_TEMPERATURE:
              
@@ -230,11 +232,11 @@ def get_screen_data(point=None, point_id=None):

                                 ipui['temperature'] = '-'
              

                                 ipui['status'] = '未测温'
              

                                 ipuis_not_upload.append(ipui)
              

                -            
              

                +
              

                         not_upload_temperature_num = len(ipuis_unused) + len(ipuis_not_upload)
              

                         has_upload_temperature_num = total_active_eqpt_num - not_upload_temperature_num
              

                         normal_num = has_upload_temperature_num - len(ipuis_fever)
              

                -        
              

                +
              

                         return {
              

                             'eqpts': ipuis_fever + ipuis_unused + ipuis_not_upload,
              

                             'reminds': reminds,
              
@@ -246,7 +248,6 @@ def get_screen_data(point=None, point_id=None):

                             'update_time': tc.local_string(),
              

                         }
              

                 
              

                -    
              

                     has_upload_temperature_num = len([1 for ipui in ipuis if ipui.get('temperature_has_upload', '') == IsolationPointUserInfo.HAS_YET_UPLOAD])
              

                     fever_num = len([1 for ipui in ipuis if ipui.get('temperature', 0) > settings.FEVER_TEMPERATURE and ipui.get('temperature_has_upload') == IsolationPointUserInfo.HAS_YET_UPLOAD])
              

                 
              

equipment/models.py

@@ -6,6 +6,7 @@ from django_models_ext import BaseModelMixin, SexModelMixin

                 from jsonfield import JSONField
              

                 from shortuuidfield import ShortUUIDField
              

                 from TimeConvert import TimeConvert as tc
              

                +import datetime
              

                 
              

                 from utils.redis.rqrurl import get_qrcode_url
              

                 
              
@@ -184,6 +185,17 @@ class IsolationPointUserInfo(BaseModelMixin):

                         return IsolationPointUserInfo.HAS_NOT_CONNECTED
              

                 
              

                     @property
              

                +    def get_antigen_result(self):
              

                +        today = datetime.date.today()
              

                +        if not self.detect_at:
              

                +            return '-'
              

                +
              

                +        if today.day == self.detect_at.day and today.month == self.detect_at.month and today.year == self.detect_at.year:
              

                +            return '-' if self.antigen_result == 2 else self.get_antigen_result_display()
              

                +        else:
              

                +            return '-'
              

                +
              

                +    @property
              

                     def data(self):
              

                         return {
              

                             'pk': self.pk,
              
@@ -197,7 +209,7 @@ class IsolationPointUserInfo(BaseModelMixin):

                             'last_submit_at': self.last_submit_at,
              

                             'last_report_time': tc.local_string(utc_dt=self.last_submit_at, format='%m-%d %H:%M') if self.last_submit_at else '',
              

                             'remark': self.remark or '',
              

                -            'antigen_result': self.get_antigen_result_display(),
              

                +            'antigen_result': self.get_antigen_result,
              

                             'detect_at': tc.local_string(utc_dt=self.detect_at, format='%m-%d %H:%M') if self.detect_at else '',
              

                         }