fix dda

@@ -79,16 +79,30 @@ class Command(BaseCommand, LoggerMixin):
 
 
     def license1_process(self, ocr_data, all_res, classify):
     def license1_process(self, ocr_data, all_res, classify):
         # 类别：'0'身份证， '1'居住证
         # 类别：'0'身份证， '1'居住证
-        license_data = ocr_data.get('data', [])
+        license_data = ocr_data.get('data')
         if not license_data:
         if not license_data:
             return
             return
+        if isinstance(license_data, dict):
+            license_data.pop('base64_img', '')
         if classify == consts.IC_CLASSIFY:
         if classify == consts.IC_CLASSIFY:
-            for id_card_dict in license_data:
-                try:
-                    id_card_dict.pop('base64_img')
-                except Exception as e:
-                    continue
-        all_res.setdefault(classify, []).extend(license_data)
+            id_card_dict = {}
+            card_type = license_data.get('type', '')
+            is_ic = card_type.startswith('身份证')
+            is_info_side = card_type.endswith('信息面')
+            id_card_dict['类别'] = '0' if is_ic else '1'
+            if is_ic:
+                field_map = consts.IC_MAP_0 if is_info_side else consts.IC_MAP_1
+            else:
+                field_map = consts.RP_MAP_0 if is_info_side else consts.RP_MAP_1
+            for write_field, search_field in field_map:
+                id_card_dict[write_field] = license_data.get('words_result', {}).get(search_field, {}).get('words', '')
+            if not is_info_side:
+                start_time = license_data.get('words_result', {}).get('签发日期', {}).get('words', '')
+                end_time = license_data.get('words_result', {}).get('失效日期', {}).get('words', '')
+                id_card_dict['有效期限'] = '{0}-{1}'.format(start_time, end_time)
+            all_res.setdefault(classify, []).append(id_card_dict)
+        else:
+            all_res.setdefault(classify, []).extend(license_data)
 
 
     def license2_process(self, ocr_data, all_res, classify, img_path):
     def license2_process(self, ocr_data, all_res, classify, img_path):
         pid, _, _, _, _, _ = consts.LICENSE_CLASSIFY_MAPPING.get(classify)
         pid, _, _, _, _, _ = consts.LICENSE_CLASSIFY_MAPPING.get(classify)