Merge branch 'dev/diagbotcloud20190911_disease' into dev/diagbotcloud20190918_vital

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

@@ -227,11 +227,14 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
      * @return
      */
     public Map<Long, List<QuestionDetail>> getQuestionDetailWithMap(List<Long> questionIds) {
-        List<QuestionDetail> detailList = questionDetailFacade.list(new QueryWrapper<QuestionDetail>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("question_id", questionIds)
-                .orderByAsc("order_no"));
-        Map<Long, List<QuestionDetail>> detailMap = EntityUtil.makeEntityListMap(detailList, "questionId");
+        Map<Long, List<QuestionDetail>> detailMap = new HashMap<>();
+        if (ListUtil.isNotEmpty(questionIds)) {
+            List<QuestionDetail> detailList = questionDetailFacade.list(new QueryWrapper<QuestionDetail>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .in("question_id", questionIds)
+                    .orderByAsc("order_no"));
+            detailMap = EntityUtil.makeEntityListMap(detailList, "questionId");
+        }
         return detailMap;
     }