|
@@ -80,8 +80,15 @@ public class LisMappingFacade extends LisMappingServiceImpl {
|
|
|
lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("meal_name", lisMappingVO.getMealName());
|
|
|
if (StringUtil.isBlank(lisMappingVO.getItemName())) {
|
|
|
+ if (!lisMappingVO.getMealName().equals(lisMappingVO.getUniqueName())) {
|
|
|
+ throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "化验公表名称不匹配");
|
|
|
+ }
|
|
|
lisMappingQueryWrapper.and(i -> i.isNull("item_name").or(j -> j.eq("item_name", "")));
|
|
|
} else {
|
|
|
+ String uniqueName = lisMappingVO.getMealName() + "--" + lisMappingVO.getItemName();
|
|
|
+ if (!uniqueName.equals(lisMappingVO.getUniqueName())) {
|
|
|
+ throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "化验公表名称不匹配");
|
|
|
+ }
|
|
|
lisMappingQueryWrapper.eq("item_name", lisMappingVO.getItemName());
|
|
|
}
|
|
|
List<LisMapping> lisMappingList = this.list(lisMappingQueryWrapper);
|