Merge branch 'dev/icss' into debug

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

@@ -16,6 +16,7 @@ import com.diagbot.service.impl.VitalOrderServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.VitalOrderVO;
 import com.google.common.collect.Lists;
@@ -118,12 +119,8 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
                 .eq("sub_type", 0)
                 .notIn("id", vitalIds);
         List<QuestionInfo> unOrderVitals = questionFacade.list(unOrderedVitalQueryWrapper);
-        List<QuestionShortDTO> unOrderedVitalList = Lists.newLinkedList();
-        for (QuestionInfo questionInfo : unOrderVitals) {
-            QuestionShortDTO questionShortDTO = new QuestionShortDTO();
-            BeanUtil.copyProperties(questionInfo, questionShortDTO);
-            unOrderedVitalList.add(questionShortDTO);
-        }
+        List<QuestionShortDTO> unOrderedVitalList
+                = BeanUtil.listCopyTo(unOrderVitals, QuestionShortDTO.class);
         vitalOrderDTO.setUnOrderedVitals(unOrderedVitalList);
 
         return vitalOrderDTO;
@@ -149,12 +146,8 @@ public class VitalOrderFacade extends VitalOrderServiceImpl {
                 .notIn("id", vitalIds);
         List<QuestionInfo> vitals = questionFacade.list(unOrderedVitalQueryWrapper);
 
-        List<QuestionShortDTO> questionShortDTOList = Lists.newLinkedList();
-        for (QuestionInfo questionInfo : vitals) {
-            QuestionShortDTO questionShortDTO = new QuestionShortDTO();
-            BeanUtil.copyProperties(questionInfo, questionShortDTO);
-            questionShortDTOList.add(questionShortDTO);
-        }
+        List<QuestionShortDTO> questionShortDTOList
+                = BeanUtil.listCopyTo(vitals, QuestionShortDTO.class);
         return questionShortDTOList;
     }