Merge branch 'fix/1207' into feature/se

@@ -1501,7 +1501,7 @@ HMH_EN = 'Mortgage Waiver Letter'
 JYPZ_EN = 'Used Car Document'
 JYPZ_EN = 'Used Car Document'
 AFC_CONTRACT_EN = 'AFC Contract'
 AFC_CONTRACT_EN = 'AFC Contract'
 
 
-SKIP_CARD = {ID_EN, RP_EN, SME_BL_EN}
+SKIP_CARD = {SME_BL_EN}
 
 
 
 
 ID_COMPARE_LOGIC = {
 ID_COMPARE_LOGIC = {

@@ -1527,8 +1527,6 @@ def se_afc_contract_compare(license_en, ocr_res_dict, strip_list):
         ocr_res = ocr_res_list.pop()
         ocr_res = ocr_res_list.pop()
 
 
         for name, value in strip_list:
         for name, value in strip_list:
-            ocr_str_or_list = ocr_res.get(compare_logic[name][0])
-
             if name == consts.SE_AFC_CON_FIELD[21]:
             if name == consts.SE_AFC_CON_FIELD[21]:
                 if len(value) == 3:
                 if len(value) == 3:
                     reason = []
                     reason = []
@@ -1548,7 +1546,9 @@ def se_afc_contract_compare(license_en, ocr_res_dict, strip_list):
                     result = consts.RESULT_N
                     result = consts.RESULT_N
                     reason = consts.GZS_REASON_1
                     reason = consts.GZS_REASON_1
                 ocr_str = empty_str
                 ocr_str = empty_str
-            elif isinstance(ocr_str_or_list, str) or isinstance(ocr_str_or_list, list):
+            else:
+                ocr_str_or_list = ocr_res.get(compare_logic[name][0])
+                if isinstance(ocr_str_or_list, str) or isinstance(ocr_str_or_list, list):
                     result = getattr(cp, compare_logic[name][1])(value, ocr_str_or_list, **compare_logic[name][2])
                     result = getattr(cp, compare_logic[name][1])(value, ocr_str_or_list, **compare_logic[name][2])
                     if isinstance(ocr_str_or_list, list):
                     if isinstance(ocr_str_or_list, list):
                         ocr_str = json.dumps(ocr_str_or_list)
                         ocr_str = json.dumps(ocr_str_or_list)
@@ -1563,12 +1563,12 @@ def se_afc_contract_compare(license_en, ocr_res_dict, strip_list):
             img_path = empty_str
             img_path = empty_str
             error_type = empty_error_type if result == consts.RESULT_Y else ErrorType.OCR.value
             error_type = empty_error_type if result == consts.RESULT_Y else ErrorType.OCR.value
             if isinstance(value, list):
             if isinstance(value, list):
-                value = json.dumps(value)
+                value = json.dumps(value, ensure_ascii=False)
             result_field_list.append((name, value, result, ocr_str, img_path, error_type, reason))
             result_field_list.append((name, value, result, ocr_str, img_path, error_type, reason))
     else:
     else:
         for name, value in strip_list:
         for name, value in strip_list:
             if isinstance(value, list):
             if isinstance(value, list):
-                value = json.dumps(value)
+                value = json.dumps(value, ensure_ascii=False)
             result_field_list.append((name, value, consts.RESULT_N, empty_str, empty_str, ErrorType.NF.value,
             result_field_list.append((name, value, consts.RESULT_N, empty_str, empty_str, ErrorType.NF.value,
                                       '{0}未找到'.format(license_en)))
                                       '{0}未找到'.format(license_en)))