fix merge

@@ -16,6 +16,7 @@ class Comparison:
         self.CSIBM = 'CSIBM'
         self.CSIBM = 'CSIBM'
         self.CSSME = 'CSSME'
         self.CSSME = 'CSSME'
         self.CSOTH = 'CSOTH'
         self.CSOTH = 'CSOTH'
+        self.SPLIT_STR = '_'
 
 
         self.TYPE_MAPPING = (
         self.TYPE_MAPPING = (
             (r'个体工商户', self.CSIBM),
             (r'个体工商户', self.CSIBM),
@@ -109,6 +110,16 @@ class Comparison:
                 ocr_output = None
                 ocr_output = None
         return self.build_res(input_str == ocr_str), ocr_output
         return self.build_res(input_str == ocr_str), ocr_output
 
 
+    def mvi_special(self, amount_lower_str, amount_upper_str, bhsj_str, zzsse_str):
+        # 不含税价, 增值税税额
+        try:
+            if float(amount_lower_str) != rmb_handler.to_rmb_lower(amount_upper_str):
+                return self.RESULT_N
+        except Exception:
+            return self.RESULT_N
+        else:
+            return self.SPLIT_STR.join([bhsj_str, zzsse_str, self.RESULT_Y])
+
     def rmb_compare(self, input_str, ocr_str, idx, **kwargs):
     def rmb_compare(self, input_str, ocr_str, idx, **kwargs):
         if not isinstance(ocr_str, str) or not isinstance(input_str, str):
         if not isinstance(ocr_str, str) or not isinstance(input_str, str):
             return self.RESULT_NA, None
             return self.RESULT_NA, None
@@ -198,7 +209,7 @@ class Comparison:
         )
         )
         dti = DatetimeIndex(dt_array, tz=None, name=None)
         dti = DatetimeIndex(dt_array, tz=None, name=None)
         ts = dti[0]
         ts = dti[0]
-        if isinstance(ts, NaTType) or ts.date() < datetime.today().date():
+        if isinstance(ts, NaTType) or ts.date() < (datetime.today() + relativedelta(days=8)).date():
             return False
             return False
         else:
         else:
             return True
             return True