经营范围校验

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -553,64 +553,46 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
      */
     public Boolean validateShopBusinessScope(String businessScope, String productTypeName) {
         Set<String> judgmentSet = new HashSet<>();
-        Boolean res = Boolean.TRUE;
+        Boolean res = Boolean.FALSE;
         switch (productTypeName) {
             case "中成药":
                 judgmentSet.add("中成药");
-                judgmentSet.add("中成药");
-                judgmentSet.add("药品零售");
                 break;
             case "处方药":
-                judgmentSet.add("处方药/化学药制剂");
-                judgmentSet.add("处方药/化学药制剂");
-                judgmentSet.add("药品零售");
+                judgmentSet.add("处方药");
+                judgmentSet.add("化学药制剂");
                 break;
             case "中药饮片":
                 judgmentSet.add("中药饮片");
-                judgmentSet.add("中药饮片");
-                judgmentSet.add("药品零售");
                 break;
             case "保健食品":
-                judgmentSet.add("保健食品销售");
-                judgmentSet.add("保健食品销售");
                 judgmentSet.add("保健食品销售");
                 break;
             case "I类器械":
                 judgmentSet.add("第一类医疗器械销售");
-                judgmentSet.add("第一类医疗器械销售");
-                judgmentSet.add("第一类医疗器械备案凭证");
                 break;
             case "II类器械":
                 judgmentSet.add("第二类医疗器械销售");
-                judgmentSet.add("第二类医疗器械销售");
-                judgmentSet.add("第二类医疗器械备案凭证");
                 break;
             case "III类器械":
-                judgmentSet.add("第二类医疗器械经营");
-                judgmentSet.add("第二类医疗器械经营");
-                judgmentSet.add("第二类医疗器械注册证");
+                judgmentSet.add("第三类医疗器械经营");
                 break;
             case "甲类非处方":
-                judgmentSet.add("甲类非处方药/化学药制剂");
-                judgmentSet.add("甲类非处方药/化学药制剂");
+                judgmentSet.add("化学药制剂");
                 judgmentSet.add("药品零售");
                 break;
             case "乙类非处方":
-                judgmentSet.add("乙类非处方药/化学药制剂");
-                judgmentSet.add("乙类非处方药/化学药制剂");
-                judgmentSet.add("药品零售");
+                judgmentSet.add("化学药制剂");
+                judgmentSet.add("乙类非处方药");
                 break;
         }
 
         if(null != judgmentSet && !judgmentSet.isEmpty()){
            for(String item:judgmentSet){
-               res = res && businessScope.contains(item);
-               if(!res) break;
+               res = businessScope.contains(item);
+               if(res) break;
            }
         }
-        else{
-            res = false;
-        }
         return res;
     }