Merge branch 'dev/icss' into dev/icssNCD

icssman-service/src/main/java/com/diagbot/dto/RetrievalListDTO.java

@@ -33,7 +33,7 @@ public class RetrievalListDTO {
 	 * 标签归属
 	 */
 	@ApiModelProperty(value="标签归属")
-	private String questionType;
+	private Integer questionType;
 	
 	/**
 	 * 本体

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

@@ -32,7 +32,6 @@ import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.Retrieval;
 import com.diagbot.entity.RetrievalMapping;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.enums.TagTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -231,7 +230,7 @@ public class RetrievalFacade extends RetrievalServiceImpl {
 
         List<Long> questionIds = retrievalListDTOList.stream().map(i -> i.getQuestionId()).collect(Collectors.toList());
         
-        Map<Long,String> questionInfoTypeNameMap = questionFacade.listByIds(questionIds).stream().collect(Collectors.toMap(QuestionInfo::getId, i->QuestionTypeEnum.getName(i.getType())));
+        Map<Long,Integer> questionInfoTypeNameMap = questionFacade.listByIds(questionIds).stream().collect(Collectors.toMap(QuestionInfo::getId, i->i.getType()));
 
         QueryWrapper<RetrievalMapping> retrievalMappingQe = new QueryWrapper<RetrievalMapping>();
         retrievalMappingQe.in("question_id", questionIds);