Merge branch 'dev/icss' into dev/icssNCD

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

@@ -365,7 +365,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
             }*/
             
             Map<String, List<QuestionInfo>> questionInfoListMap = questionInfos.stream().collect(Collectors.groupingBy(QuestionInfo::getTagName));
-            if(questionNames.size()==questionInfos.size()){
+            if(questionNames.size()==questionInfoListMap.size()){
             	List<QuestionInfo> questionInfos_ = questionInfos.stream().filter(p->p.getTagType()==TagTypeEnum.T8.getKey()||p.getTagType()==TagTypeEnum.T10.getKey()||p.getTagType()==TagTypeEnum.T11.getKey()).collect(Collectors.toList());
             	if(questionInfos_.size()>0){
             		sbf.append("(");

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

@@ -22,13 +22,13 @@ public class DisclaimerInformationVO {
     /**
      * 标题
      */
-	@NotBlank(message = "请输入标题")
+	@NotBlank(message = "标题不能为空")
     private String title;
 
     /**
      * 描述
      */
-	@NotBlank(message = "请输入描述")
+	@NotBlank(message = "内容不能为空")
     private String description;
 
     /**

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

@@ -26,7 +26,7 @@ public class VersionInfoVO {
 	/**
      * 名称
      */
-	@NotBlank(message = "请输入名称")
+	@NotBlank(message = "标题不能为空")
     private String name;
 
     /**

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

@@ -198,7 +198,7 @@
     <select id="getQuestionUsualsByDept" resultType="com.diagbot.dto.GetQuestionInfoDTO">
         SELECT a.* FROM `icss_question_info` a
         LEFT JOIN icss_question_usual b ON a.id = b.question_id
-        WHERE b.dept_id = #{deptId} AND a.type = #{type}
+        WHERE a.is_deleted = 'N' and b.is_deleted = 'N' and b.dept_id = #{deptId} AND a.type = #{type}
         GROUP BY a.id
     </select>