Merge branch 'feature/license' into feature/mssql

@@ -34,4 +34,5 @@ data/*
 src/*.sh
 src/*.sh
 
 
 test*
 test*
-ocr_test.py
\ No newline at end of file
+ocr_test.py
+ocr_process.py
\ No newline at end of file

@@ -440,10 +440,23 @@ class Command(BaseCommand, LoggerMixin):
             merged_bs_summary = {}
             merged_bs_summary = {}
             card_num = 1
             card_num = 1
             for role_dict in unknown_summary.values():
             for role_dict in unknown_summary.values():
-                for summary in role_dict.values():
+                if len(role_dict) == 2 and consts.UNKNOWN_ROLE in role_dict:
+                    summary_dict = role_dict.pop(consts.UNKNOWN_ROLE, {})
+                    for summary in role_dict.values():
+                        summary_dict['confidence'].extend(summary['confidence'])
+                        summary_dict['role'] = summary['role']
+                        summary_dict['code'].extend(summary['code'])
+                        summary_dict['print_time'].extend(summary['print_time'])
+                        summary_dict['start_date'].extend(summary['start_date'])
+                        summary_dict['end_date'].extend(summary['end_date'])
+                        summary_dict['sheet'].extend(summary['sheet'])
                     card = '{0}_{1}'.format(consts.UNKNOWN_CARD, card_num)
                     card = '{0}_{1}'.format(consts.UNKNOWN_CARD, card_num)
-                    card_num += 1
-                    merged_bs_summary[card] = summary
+                    merged_bs_summary[card] = summary_dict
+                else:
+                    for summary in role_dict.values():
+                        card = '{0}_{1}'.format(consts.UNKNOWN_CARD, card_num)
+                        card_num += 1
+                        merged_bs_summary[card] = summary
         else:
         else:
             # 1卡号
             # 1卡号
             one_card = False
             one_card = False
@@ -460,6 +473,7 @@ class Command(BaseCommand, LoggerMixin):
                 for role, summary in classify_summary.items():
                 for role, summary in classify_summary.items():
                     if one_card or role in card_summary['role_set']:
                     if one_card or role in card_summary['role_set']:
                         merge_role.append(role)
                         merge_role.append(role)
+                        card_summary['confidence'].extend(summary['confidence'])
                         card_summary['sheet'].extend(summary['sheet'])
                         card_summary['sheet'].extend(summary['sheet'])
                         card_summary['code'].extend(summary['code'])
                         card_summary['code'].extend(summary['code'])
                         card_summary['print_time'].extend(summary['print_time'])
                         card_summary['print_time'].extend(summary['print_time'])

@@ -18,7 +18,7 @@ class DocHandler:
 
 
     def get_doc_list(self, doc_queryset, business_type):
     def get_doc_list(self, doc_queryset, business_type):
         for doc_dict in doc_queryset:
         for doc_dict in doc_queryset:
-            if doc_dict['status'] != DocStatus.COMPLETE.value:
+            if doc_dict['status'] not in [DocStatus.COMPLETE.value, DocStatus.UPLOAD_FAILED.value]:
                 continue
                 continue
             doc_id = doc_dict.get('id')
             doc_id = doc_dict.get('id')
             doc_dict['pdf_link'] = self.get_link(doc_id, business_type)
             doc_dict['pdf_link'] = self.get_link(doc_id, business_type)