dcce1082 by 周伟奇

fix bug

1 parent 725a8e62
......@@ -37,7 +37,7 @@ def field_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_set):
input_str = info_dict.get(compare_tuple[0])
ocr_str = ocr_res.get(compare_tuple[1])
compare_res, ocr_output = getattr(cp, compare_tuple[2])(
info_dict.get(compare_tuple[0]), ocr_res.get(compare_tuple[1]), idx, **compare_tuple[3])
input_str, ocr_str, idx, **compare_tuple[3])
if idx == 0 and compare_res == consts.RESULT_N:
break
is_find = True
......@@ -69,7 +69,7 @@ def usedcar_info_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_s
input_str = info_dict.get(compare_tuple[0])
ocr_str = ocr_res.get(compare_tuple[1])
compare_res, ocr_output = getattr(cp, compare_tuple[2])(
info_dict.get(compare_tuple[0]), ocr_res.get(compare_tuple[1]), idx, **compare_tuple[3])
input_str, ocr_str, idx, **compare_tuple[3])
if idx == 0 and compare_res == consts.RESULT_N:
if ocr_str is not None:
no_match_vino.append(ocr_str)
......@@ -84,8 +84,10 @@ def usedcar_info_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_s
res_set.add(compare_res)
if not is_find:
res_set.add(consts.RESULT_N)
for compare_tuple in compare_list:
for idx, compare_tuple in enumerate(compare_list):
info_dict[compare_tuple[4]] = consts.RESULT_N
if idx == 0:
continue
if compare_tuple[0] in info_dict:
del info_dict[compare_tuple[0]]
return is_find, no_match_vino
......@@ -142,9 +144,6 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id):
order_individual_cus_info_list = []
for individual_cus_info in individual_cus_info_list:
order_individual_cus_info = get_order_dict(individual_cus_info, consts.IN_ORDER)
# sep营业执照
if is_sep and order_individual_cus_info.get('companyName') is not None:
field_compare(order_individual_cus_info, ocr_res_dict, consts.BL_OCR_FIELD, consts.TCSEP, res_set)
# 个人信息证件
id_type = order_individual_cus_info.get('idType')
......@@ -153,6 +152,10 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id):
continue
field_compare(order_individual_cus_info, ocr_res_dict, compare_info_list[0], compare_info_list[1], res_set)
# sep营业执照
if is_sep and order_individual_cus_info.get('companyName') is not None:
field_compare(order_individual_cus_info, ocr_res_dict, consts.BL_OCR_FIELD, consts.TCSEP, res_set)
order_individual_cus_info_list.append(order_individual_cus_info)
comparison_res['OCR_Input']['individualCusInfo'] = order_individual_cus_info_list
......
......@@ -100,7 +100,7 @@ class Comparison:
else:
compare_str = self.CSOTH
return self.build_res(input_str == compare_str), ocr_str
return self.build_res(input_str == compare_str), compare_str
cp = Comparison()
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!