查体模板

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

@@ -164,16 +164,20 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
         List<Long> vitalIds = deptVitalList.stream()
                 .map(deptVitals -> deptVitals.getVitalId())
                 .collect(Collectors.toList());
-        List<QuestionInfo> vitalList = Lists.newArrayList(questionFacade.listByIds(vitalIds));
-        List<QuestionShortDTO> vitals = BeanUtil.listCopyTo(vitalList, QuestionShortDTO.class);
-        deptVitalDTO.setVitals(vitals);
+        if (vitalIds.size() > 0) {
+            List<QuestionInfo> vitalList = Lists.newArrayList(questionFacade.listByIds(vitalIds));
+            List<QuestionShortDTO> vitals = BeanUtil.listCopyTo(vitalList, QuestionShortDTO.class);
+            deptVitalDTO.setVitals(vitals);
+        }
 
         //未关联查体
         QueryWrapper<QuestionInfo> unSelectedVitalQueryWrapper = new QueryWrapper<>();
         unSelectedVitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                 eq("sub_type", 0).
-                notIn("id", vitalIds).
                 eq("type", QuestionTypeEnum.Vital.getKey());
+        if (vitalIds.size() > 0) {
+            unSelectedVitalQueryWrapper.notIn("id", vitalIds);
+        }
         List<QuestionInfo> unSelectedVitalList = questionFacade.list(unSelectedVitalQueryWrapper);
         List<QuestionShortDTO> unSelectedVitals = BeanUtil.listCopyTo(unSelectedVitalList, QuestionShortDTO.class);
         deptVitalDTO.setUnSelectedVitals(unSelectedVitals);