Merge branch 'feature/nl' into feature/0611

@@ -852,7 +852,7 @@ MVI_FIELD_ORDER = (('发票代码', '发票代码'),
                    ('主管税务机关及代码', '主管税务机关及代码'),
                    ('主管税务机关及代码', '主管税务机关及代码'),
                    ('吨位', '吨位'),
                    ('吨位', '吨位'),
                    ('限乘人数', '限乘人数'),)
                    ('限乘人数', '限乘人数'),)
-IC_PID = VAT_PID = VATS_PID = MVC_PID = MVI_PID = RP_PID = DDA_PID = None
+IC_PID = VAT_PID = VATS_PID = MVC_PID = MVI_PID = RP_PID = DDA_PID = HMH_PID = JYPZ_PID = None
 
 
 # 营业执照
 # 营业执照
 BL_CN_NAME = '营业执照'
 BL_CN_NAME = '营业执照'
@@ -977,6 +977,31 @@ DDA_FIELD_ORDER = (("check_Num", "缴费编号"),
                    ("to_bank", "公司名称2"),
                    ("to_bank", "公司名称2"),
                    ("collection_company", "收款企业名称"),)
                    ("collection_company", "收款企业名称"),)
 
 
+# 抵押登记豁免函
+HMH_CN_NAME = '抵押登记豁免函'
+HMH_CLASSIFY = 40
+HMH_FIELD_ORDER = (("借款/承租人姓名", "借款/承租人姓名"),
+                   ("证件号码", "证件号码"),
+                   ("合同编号", "合同编号"),
+                   ("渠道", "渠道"),
+                   ("借款人签字/盖章", "借款人签字/盖章"))
+
+# 二手车交易凭证
+JYPZ_CN_NAME = '二手车交易凭证'
+JYPZ_CLASSIFY = 39
+JYPZ_FIELD_ORDER = (("type", "标题"),
+                    ("authorized_dealer", "BMW授权经销商"),
+                    ("buyer_name", "购买方名称"),
+                    ("buyer_id", "购买方身份证号码/营业执照号码"),
+                    ("vin", "车辆识别代号/车架号码"),
+                    ("price", "车辆价格"),
+                    ("date", "购买方交易日期"),
+                    ("date", "出卖方交易日期"),
+                    ("date", "经销商交易日期"),
+                    ("stamp_signature_buyer", "购买方签字/盖章"),
+                    ("stamp_signature_seller", "出卖方签字/盖章"),
+                    ("stamp_signature_agent", "经销商签字/盖章"),)
+
 SUCCESS_CODE_SET = {'0', 0}
 SUCCESS_CODE_SET = {'0', 0}
 
 
 FIELD_ORDER_MAP = {
 FIELD_ORDER_MAP = {
@@ -1011,7 +1036,8 @@ LICENSE_ORDER = ((MVI_CLASSIFY, (MVI_PID, MVI_CN_NAME, MVI_FIELD_ORDER, False, F
                  (PP_CLASSIFY, (PP_PID, PP_CN_NAME, PP_FIELD_ORDER, False, False, MODEL_FIELD_PP)),
                  (PP_CLASSIFY, (PP_PID, PP_CN_NAME, PP_FIELD_ORDER, False, False, MODEL_FIELD_PP)),
                  (MVC_CLASSIFY, (MVC_PID, MVC_CN_NAME, None, True, True, MODEL_FIELD_MVC)),
                  (MVC_CLASSIFY, (MVC_PID, MVC_CN_NAME, None, True, True, MODEL_FIELD_MVC)),
                  (VAT_CLASSIFY, (VAT_PID, VAT_CN_NAME, VAT_FIELD_ORDER, False, False, MODEL_FIELD_VAT)),
                  (VAT_CLASSIFY, (VAT_PID, VAT_CN_NAME, VAT_FIELD_ORDER, False, False, MODEL_FIELD_VAT)),
-                 (DDA_CLASSIFY, (DDA_PID, DDA_CN_NAME, DDA_FIELD_ORDER, False, False, None)),
+                 (HMH_CLASSIFY, (HMH_PID, HMH_CN_NAME, HMH_FIELD_ORDER, False, False, None)),
+                 (JYPZ_CLASSIFY, (JYPZ_PID, JYPZ_CN_NAME, JYPZ_FIELD_ORDER, False, False, None)),
                  )
                  )
 
 
 FOLDER_LICENSE_ORDER = ((MVI_CLASSIFY, (MVI_PID, MVI_CN_NAME, MVI_FIELD_ORDER, False, False, MODEL_FIELD_MVI)),
 FOLDER_LICENSE_ORDER = ((MVI_CLASSIFY, (MVI_PID, MVI_CN_NAME, MVI_FIELD_ORDER, False, False, MODEL_FIELD_MVI)),
@@ -1023,7 +1049,7 @@ FOLDER_LICENSE_ORDER = ((MVI_CLASSIFY, (MVI_PID, MVI_CN_NAME, MVI_FIELD_ORDER, F
 LICENSE_CLASSIFY_MAPPING = dict(LICENSE_ORDER)
 LICENSE_CLASSIFY_MAPPING = dict(LICENSE_ORDER)
 
 
 OTHER_CLASSIFY_SET = {OTHER_CLASSIFY}
 OTHER_CLASSIFY_SET = {OTHER_CLASSIFY}
-LICENSE_CLASSIFY_SET_1 = {IC_CLASSIFY, VAT_CLASSIFY, MVC_CLASSIFY, MVI_CLASSIFY, UCI_CLASSIFY, DDA_CLASSIFY}
+LICENSE_CLASSIFY_SET_1 = {IC_CLASSIFY, VAT_CLASSIFY, MVC_CLASSIFY, MVI_CLASSIFY, UCI_CLASSIFY, DDA_CLASSIFY, HMH_CLASSIFY, JYPZ_CLASSIFY}
 LICENSE_CLASSIFY_SET_2 = {BL_CLASSIFY, EEP_CLASSIFY, DL_CLASSIFY, PP_CLASSIFY, BC_CLASSIFY}
 LICENSE_CLASSIFY_SET_2 = {BL_CLASSIFY, EEP_CLASSIFY, DL_CLASSIFY, PP_CLASSIFY, BC_CLASSIFY}
 
 
 NYYH_CLASSIFY = {17, 18}
 NYYH_CLASSIFY = {17, 18}

@@ -222,7 +222,12 @@ class Command(BaseCommand, LoggerMixin):
             dda_ocr_result[consts.DDA_IMG_PATH] = img_path
             dda_ocr_result[consts.DDA_IMG_PATH] = img_path
             dda_ocr_result[consts.DDA_PRO] = pro
             dda_ocr_result[consts.DDA_PRO] = pro
             license_summary.setdefault(classify, []).append(dda_ocr_result)
             license_summary.setdefault(classify, []).append(dda_ocr_result)
-
+        elif classify == consts.HMH_CLASSIFY:  # 抵押登记豁免函
+            hmh_ocr_result = {key: value.get('words', '') for key, value in license_data.get('result', {}).items()}
+            license_summary.setdefault(classify, []).append(hmh_ocr_result)
+        elif classify == consts.JYPZ_CLASSIFY:  # 二手车交易凭证
+            jypz_ocr_result = {key: value.get('words', '') for key, value in license_data.get('result', {}).items()}
+            license_summary.setdefault(classify, []).append(jypz_ocr_result)
         elif classify == consts.MVC_CLASSIFY:  # 车辆登记证 3/4页结果整合
         elif classify == consts.MVC_CLASSIFY:  # 车辆登记证 3/4页结果整合
             for mvc_dict in license_data:
             for mvc_dict in license_data:
                 try:
                 try: