修改2类医疗器械销售验证方式

fs-common/src/main/java/com/fs/common/utils/txocr/TxOcrClient.java

@@ -137,7 +137,7 @@ public class TxOcrClient  {
                 result.setKeywords(keywords);
                 result.setBusinessStr(business);
                 result.setFlag(business.contains(keywords));
-                result.setMessage(result.getFlag()?"包含":"不包含");
+                result.setMessage(result.getFlag()?"包含" + keywords:"不包含" + keywords);
                 result.setPerson(resp.getPerson());
                 result.setRegNum(resp.getRegNum());
                 result.setAddress(resp.getAddress());

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

@@ -31,6 +31,8 @@ public class IIMedicalDeviceCheck extends AbstractHandler{
 
     private static final List<String> medicalDeviceCodes = Arrays.asList("07", "14", "6840", "18", "19", "22");
 
+    private static final String II_MEDICAL_DEVICE = "第二类医疗器械销售";
+
     @Override
     public void afterPropertiesSet() throws Exception {
         ProductCategoryCheckFactory.register("232", this);
@@ -52,16 +54,17 @@ public class IIMedicalDeviceCheck extends AbstractHandler{
             result.setMessage("店铺不存在！");
             return result;
         }
+        //5是器免，对于器免的可以不需要2类证书
+        if(StoreProductTypeEnum.QI_MIAN.getValue().equals(productType) && medicalDeviceCodes.contains(medicalDeviceCode)){
+            String businessLicense = fsStoreScrm.getBusinessLicense();
+            //检查营业执照上是否包含-第二类医疗器械销售
+            return TxOcrClient.isContains(businessLicense,II_MEDICAL_DEVICE);
+        }
         if(StringUtils.isEmpty(fsStoreScrm.getMedicalDevice2())){
             result.setFlag(false);
             result.setMessage("没有上传2类证书不允许选择该分类！");
             return result;
         }
-        if(StoreProductTypeEnum.QI_MIAN.getValue().equals(productType) && medicalDeviceCodes.contains(medicalDeviceCode)){
-            result.setFlag(true);
-            result.setMessage("符合所选商品分类标准");
-            return result;
-        }
         String medicalDevice2 = fsStoreScrm.getMedicalDevice2();
         String ocrStr = TxOcrClient.ExtractDocBasic(medicalDevice2, LicenseTypeEnum.MEDICAL_DEVICE_2);
         boolean contains = ocrStr.replace("2017","").contains(medicalDeviceCode);