Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

icssman-service/src/main/java/com/diagbot/facade/LisMappingFacade.java

@@ -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);

icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -555,6 +555,7 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         paramMap.put("existName", questionIndexVO.getExistName());
         paramMap.put("notTagType", questionIndexVO.getNotTagType());
         paramMap.put("notControlType", questionIndexVO.getNotControlType());
+        paramMap.put("name", questionIndexVO.getName());
         List<QuestionInfo> res = this.index(paramMap);
         return res;
     }

icssman-service/src/main/java/com/diagbot/vo/QuestionIndexVO.java

@@ -14,6 +14,7 @@ import java.util.List;
 @Setter
 public class QuestionIndexVO {
     private String tagName;
+    private String name;
     private Integer sexType;
     private Integer age;
     private Integer type;

icssman-service/src/main/resources/mapper/QuestionInfoMapper.xml

@@ -48,6 +48,9 @@
     <select id="index" parameterType="java.util.Map" resultType="com.diagbot.entity.QuestionInfo">
         select * from `icss_question_info`
         where is_deleted = 'N'
+        <if test="name != null and name != ''">
+            and name like concat("%", #{name}, "%")
+        </if>
         <if test="tagName != null and tagName != ''">
             and tag_name like concat("%", #{tagName}, "%")
         </if>