|
@@ -46,7 +46,7 @@ public class CommonCheck extends AbstractHandler {
|
|
|
result.setKeywords(cateName);
|
|
result.setKeywords(cateName);
|
|
|
if(cateName.contains("非处方") && fsStoreScrm.getBusinessScope().contains(cateName)){
|
|
if(cateName.contains("非处方") && fsStoreScrm.getBusinessScope().contains(cateName)){
|
|
|
result.setFlag(true);
|
|
result.setFlag(true);
|
|
|
- result.setMessage("包含所属!");
|
|
|
|
|
|
|
+ result.setMessage("包含所属!" + cateName);
|
|
|
result.setBusinessStr(fsStoreScrm.getBusinessScope());
|
|
result.setBusinessStr(fsStoreScrm.getBusinessScope());
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
@@ -58,7 +58,7 @@ public class CommonCheck extends AbstractHandler {
|
|
|
if(null != ocrResult){
|
|
if(null != ocrResult){
|
|
|
boolean equalsR = ocrResult.contains(cateName);
|
|
boolean equalsR = ocrResult.contains(cateName);
|
|
|
result.setFlag(equalsR);
|
|
result.setFlag(equalsR);
|
|
|
- result.setMessage(equalsR?"识别成功,包含所属!":"对比失败,不包含你所选类目");
|
|
|
|
|
|
|
+ result.setMessage(equalsR?"识别成功,包含所属!" + cateName:"对比失败,不包含你所选类目" + cateName);
|
|
|
result.setBusinessStr(ocrResult);
|
|
result.setBusinessStr(ocrResult);
|
|
|
}else{
|
|
}else{
|
|
|
result.setFlag(false);
|
|
result.setFlag(false);
|
|
@@ -68,7 +68,7 @@ public class CommonCheck extends AbstractHandler {
|
|
|
result.setBusinessStr(fsStoreScrmOcr.getDrugLicenseTxt());
|
|
result.setBusinessStr(fsStoreScrmOcr.getDrugLicenseTxt());
|
|
|
boolean equalsR = fsStoreScrmOcr.getDrugLicenseTxt().contains(cateName);
|
|
boolean equalsR = fsStoreScrmOcr.getDrugLicenseTxt().contains(cateName);
|
|
|
result.setFlag(equalsR);
|
|
result.setFlag(equalsR);
|
|
|
- result.setMessage(equalsR?"识别成功,包含所属!":"对比失败,不包含你所选类目");
|
|
|
|
|
|
|
+ result.setMessage(equalsR?"识别成功,包含所属!" + cateName:"对比失败,不包含你所选类目" + cateName);
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
//调用对比,看经营范围是否包含这个类别
|
|
//调用对比,看经营范围是否包含这个类别
|