diff --git a/src/apps/doc/management/commands/ocr_process.py b/src/apps/doc/management/commands/ocr_process.py index b572798..f247672 100644 --- a/src/apps/doc/management/commands/ocr_process.py +++ b/src/apps/doc/management/commands/ocr_process.py @@ -197,7 +197,32 @@ class Command(BaseCommand, LoggerMixin): res_list.append((pno, ino, part_idx, consts.RES_SUCCESS_EMPTY)) return res_list.append((pno, ino, part_idx, consts.RES_SUCCESS)) - if classify == consts.IC_CLASSIFY: + if classify == consts.MVC_CLASSIFY: # 车辆登记证 3/4页结果整合 + for mvc_dict in license_data: + try: + mvc_page = mvc_dict.pop('page') + except Exception as e: + pass + else: + if mvc_page == 'VehicleRegArea': + tmp_dict = { + '姓名/名称': [], + '身份证明名称/号码': [], + '转移登记日期': [], + } + mvc_res = mvc_dict.pop('results', {}) + for register_info in mvc_res.get('register_info', []): + if register_info.get('register_type', 0) == 2: + tmp_dict['姓名/名称'].append( + register_info.get('details', {}).get('name', {}).get('words', '')) + tmp_dict['身份证明名称/号码'].append( + register_info.get('details', {}).get('idno', {}).get('words', '')) + tmp_dict['转移登记日期'].append( + register_info.get('details', {}).get('date', {}).get('words', '')) + mvc_dict = tmp_dict + del tmp_dict + del mvc_res + if classify == consts.IC_CLASSIFY: # 身份证真伪 for id_card_dict in license_data: try: base64_img = id_card_dict.pop('base64_img') diff --git a/src/apps/doc/ocr/wb.py b/src/apps/doc/ocr/wb.py index 33134e8..a665015 100644 --- a/src/apps/doc/ocr/wb.py +++ b/src/apps/doc/ocr/wb.py @@ -659,30 +659,10 @@ class BSWorkbook(Workbook): if classify == consts.IC_CLASSIFY and license_dict.get('类别') == '1': # 居住证处理 license_summary.setdefault(consts.RP_CLASSIFY, []).append(license_dict) continue - if classify == consts.MVC_CLASSIFY: - try: - mvc_page = license_dict.pop('page') - except Exception as e: - pass - else: - if mvc_page == 'VehicleRegArea': - tmp_dict = { - '姓名/名称': [], - '身份证明名称/号码': [], - '转移登记日期': [], - } - mvc_res = license_dict.get('results', {}) - for register_info in mvc_res.get('register_info', []): - if register_info.get('register_type', 0) == 2: - tmp_dict['姓名/名称'].append(register_info.get('details', {}).get('name', {}).get('words', '')) - tmp_dict['身份证明名称/号码'].append(register_info.get('details', {}).get('idno', {}).get('words', '')) - tmp_dict['转移登记日期'].append(register_info.get('details', {}).get('date', {}).get('words', '')) - license_dict = tmp_dict - del tmp_dict if side_diff: key, field_order_yes, field_order_no = consts.FIELD_ORDER_MAP.get(classify) field_order = field_order_yes if key in license_dict else field_order_no - if classify == consts.MVI_CLASSIFY: + if classify == consts.MVI_CLASSIFY: # 机动车销售统一发票, 增加不含税价(逻辑计算) price = '' rate_str = license_dict.get('增值税税率') price_total_str = license_dict.get('价税合计小写')