|
@@ -74,7 +74,10 @@ public class NationalMatchService {
|
|
|
}
|
|
|
return ResultVoUtil.success(list);
|
|
|
} else if (type == NationalMatchType.HERBAL){
|
|
|
- List<SiCentralHerbal> list = dao.selectNationalHerbals(param.getName());
|
|
|
+ String[] splits = param.getName().split("(");
|
|
|
+ splits = splits[0].split("\\(");
|
|
|
+ String name = splits[0].replaceAll("颗粒", "");
|
|
|
+ List<SiCentralHerbal> list = dao.selectNationalHerbals(name.trim());
|
|
|
if (null == list || list.isEmpty()) {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有符合条件的国家目录。");
|
|
|
}
|
|
@@ -124,10 +127,14 @@ public class NationalMatchService {
|
|
|
return ResultVoUtil.success("取消匹配成功。");
|
|
|
}
|
|
|
|
|
|
- public ResultVo<String> updateServiceItem(StandardLocalItem param) {
|
|
|
+ public ResultVo<String> updateLocalItem(StandardLocalItem param) {
|
|
|
String staffId = TokenUtil.getTokenUserId();
|
|
|
- dao.updateServiceItem(param.getName(), param.getUnit(), param.getPrice(), staffId,
|
|
|
- param.getStandardCode(), param.getSpecification(), param.getCode());
|
|
|
+ if (param.getType() < NationalMatchType.SERVICE) {
|
|
|
+ dao.updateMedicine(param.getName(), staffId, param.getCode());
|
|
|
+ } else {
|
|
|
+ dao.updateServiceItem(param.getName(), param.getUnit(), param.getPrice(), staffId,
|
|
|
+ param.getStandardCode(), param.getSpecification(), param.getCode());
|
|
|
+ }
|
|
|
log.info("【操作员:{}】修改项目:{}", staffId, param);
|
|
|
return ResultVoUtil.success("修改成功。");
|
|
|
}
|