Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-service/src/main/java/com/fs/hisStore/service/categoryVal/IIIMedicalDeviceCheck.java

@@ -53,7 +53,7 @@ public class IIIMedicalDeviceCheck extends AbstractHandler{
         }
         String medicalDevice3 = fsStoreScrm.getMedicalDevice3();
         String ocrStr = TxOcrClient.ExtractDocBasic(medicalDevice3, LicenseTypeEnum.MEDICAL_DEVICE_3);
-        boolean contains = ocrStr.contains(medicalDeviceCode);
+        boolean contains = ocrStr.replace("2017","").contains(medicalDeviceCode);
         result.setFlag(contains);
         result.setMessage(contains ? "器械编号符合所选商品分类3类器械标准" : "器械编号不符合所选商品分类3类器械标准");
         return result;

fs-service/src/main/java/com/fs/hisStore/service/categoryVal/IIMedicalDeviceCheck.java

@@ -64,7 +64,7 @@ public class IIMedicalDeviceCheck extends AbstractHandler{
         }
         String medicalDevice2 = fsStoreScrm.getMedicalDevice2();
         String ocrStr = TxOcrClient.ExtractDocBasic(medicalDevice2, LicenseTypeEnum.MEDICAL_DEVICE_2);
-        boolean contains = ocrStr.contains(medicalDeviceCode);
+        boolean contains = ocrStr.replace("2017","").contains(medicalDeviceCode);
         result.setFlag(contains);
         result.setMessage(contains ? "器械编号符合所选商品分类2类器械标准" : "器械编号不符合所选商品分类2类器械标准");
         return result;