|
@@ -178,7 +178,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
String processedKey = null;
|
|
String processedKey = null;
|
|
|
- if(vo.getField().equals("productName")){
|
|
|
|
|
|
|
+ // if(vo.getField().equals("productName")){
|
|
|
if (originalKey != null) {
|
|
if (originalKey != null) {
|
|
|
processedKey = originalKey.replace(BRACKET_NUM_EN, "").replace(BRACKET_NUM_CN, "");
|
|
processedKey = originalKey.replace(BRACKET_NUM_EN, "").replace(BRACKET_NUM_CN, "");
|
|
|
}
|
|
}
|
|
@@ -188,8 +188,8 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
|
|
|
promptWordsMap.put(processedChange, medicine.getForbiddenKeywords());
|
|
promptWordsMap.put(processedChange, medicine.getForbiddenKeywords());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- }
|
|
|
|
|
- if(vo.getField().equals("ingredient")){
|
|
|
|
|
|
|
+ // }
|
|
|
|
|
+ // if(vo.getField().equals("ingredient")){
|
|
|
String processedIngredient = null;
|
|
String processedIngredient = null;
|
|
|
if (originalIngredient != null) {
|
|
if (originalIngredient != null) {
|
|
|
processedIngredient = originalIngredient.replace(BRACKET_NUM_EN, "").replace(BRACKET_NUM_CN, "");
|
|
processedIngredient = originalIngredient.replace(BRACKET_NUM_EN, "").replace(BRACKET_NUM_CN, "");
|
|
@@ -200,7 +200,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
|
|
|
promptWordsMap.put(medicineIngredientChange, medicine.getMedicineIngredient());
|
|
promptWordsMap.put(medicineIngredientChange, medicine.getMedicineIngredient());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- }
|
|
|
|
|
|
|
+ // }
|
|
|
String keyWords = vo.getKeywords();
|
|
String keyWords = vo.getKeywords();
|
|
|
DrugComponentAnalyzer.CheckResult checkResult = DrugComponentAnalyzer.checkForbiddenComponents(forbiddenKeywords, keyWords);
|
|
DrugComponentAnalyzer.CheckResult checkResult = DrugComponentAnalyzer.checkForbiddenComponents(forbiddenKeywords, keyWords);
|
|
|
boolean forbidden = checkResult.isForbidden();
|
|
boolean forbidden = checkResult.isForbidden();
|