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

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

@@ -344,13 +344,19 @@ public class PushFacade {
      */
     public List<ConceptPushDTO> addQuestionId(List<ConceptPushDTO> concepts, Integer type) {
         QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
-        List<String> nameList = concepts.stream().map(concept -> concept.getName()).collect(Collectors.toList());
-        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("type", type).ne("tag_type", TagTypeEnum.T8.getKey());
+        List<String> nameList = concepts.stream()
+                .map(concept -> concept.getName())
+                .collect(Collectors.toList());
+        questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("type", type)
+                .ne("tag_type", TagTypeEnum.T8.getKey());
         //化验填写单匹配name
-        if (type.equals(ConceptTypeEnum.Lis.getKey())) {
-            questionInfoQueryWrapper.in("name", nameList);
-        } else {
-            questionInfoQueryWrapper.in("tag_name", nameList);
+        if (ListUtil.isNotEmpty(nameList)) {
+            if (type.equals(ConceptTypeEnum.Lis.getKey())) {
+                questionInfoQueryWrapper.in("name", nameList);
+            } else {
+                questionInfoQueryWrapper.in("tag_name", nameList);
+            }
         }
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
         if (ListUtil.isNotEmpty(questionInfoList)) {

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

@@ -501,7 +501,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         dictionaryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("group_type", 4)
                 .eq("return_type", 1)
-                .notIn("val", types)
+                .notIn(ListUtil.isNotEmpty(types), "val", types)
                 .orderByAsc("order_no");
         if (getModuleTypeVO.getRelationId() != null && getModuleTypeVO.getRelationId().intValue() == -1) {
             //如果是-1时返回所有子模板

knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseFacade.java

@@ -181,7 +181,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                 .eq("type_id", 18)
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("is_concept", 1)
-                .notIn("name", disName)
+                .notIn(ListUtil.isNotEmpty(disName), "name", disName)
         ).getRecords();
         List<Diagnose> diagnoseData = new ArrayList<>();
         for (LibraryInfo diagnose : diagnoses) {

precman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -338,7 +338,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 .eq("group_type", 1)
                 .eq("return_type", 1)
                 .orderByAsc("order_no")
-                .notIn("val", types);
+                .notIn(ListUtil.isNotEmpty(types), "val", types);
         List<DictionaryInfo> dictionaryInfoList = dictionaryFacade.list(dictionaryInfoQueryWrapper);
         List<GetModuleTypeDTO> getModuleTypeDTOS = new ArrayList<>();
         for (DictionaryInfo dictionaryInfo : dictionaryInfoList) {