fdb85ee1 by 周伟奇

fix TCSEP selfEmployedSubType

1 parent 4eccdb7d
...@@ -88,9 +88,6 @@ def field_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_set, ...@@ -88,9 +88,6 @@ def field_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_set,
88 break 88 break
89 for idx, compare_tuple in enumerate(compare_list): 89 for idx, compare_tuple in enumerate(compare_list):
90 input_str = info_dict.get(compare_tuple[0]) 90 input_str = info_dict.get(compare_tuple[0])
91 if not isinstance(input_str, str) and compare_tuple[0] == 'selfEmployedSubType':
92 continue
93
94 ocr_str = ocr_res.get(compare_tuple[1]) 91 ocr_str = ocr_res.get(compare_tuple[1])
95 compare_res, ocr_output = getattr(cp, compare_tuple[2])( 92 compare_res, ocr_output = getattr(cp, compare_tuple[2])(
96 input_str, ocr_str, idx, **compare_tuple[3]) 93 input_str, ocr_str, idx, **compare_tuple[3])
...@@ -117,7 +114,11 @@ def field_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_set, ...@@ -117,7 +114,11 @@ def field_compare(info_dict, ocr_res_dict, ocr_field, compare_list, res_set,
117 del info_dict[compare_tuple[0]] 114 del info_dict[compare_tuple[0]]
118 else: 115 else:
119 info_dict[compare_tuple[0]] = ocr_output 116 info_dict[compare_tuple[0]] = ocr_output
120 if not capital_ignore or idx != 1: 117 if capital_ignore and idx == 1:
118 pass
119 elif capital_ignore and idx == 2 and input_str is None:
120 pass
121 else:
121 res_set.add(compare_res) 122 res_set.add(compare_res)
122 if not is_find: 123 if not is_find:
123 res_set.add(consts.RESULT_N) 124 res_set.add(consts.RESULT_N)
...@@ -431,7 +432,7 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id): ...@@ -431,7 +432,7 @@ def compare(application_id, application_entity, uniq_seq, ocr_res_id):
431 total_fields += 3 432 total_fields += 3
432 if not successful_at_this_level: 433 if not successful_at_this_level:
433 for field_name, _, _, _, result_field in consts.TCSEP: 434 for field_name, _, _, _, result_field in consts.TCSEP:
434 if result_field in individual and individual.get(result_field) != consts.RESULT_Y: 435 if individual.get(result_field) != consts.RESULT_Y:
435 field_list.append(field_name) 436 field_list.append(field_name)
436 437
437 if len(field_list) > 0: 438 if len(field_list) > 0:
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!