辅检和手术开单项合并

src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -1,17 +1,23 @@
 package com.diagbot.facade;
 
+import com.diagbot.biz.push.entity.Item;
+import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.dto.PushDTO;
 import com.diagbot.entity.HospitalInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.util.BeanUtil;
 import com.diagbot.util.CoreUtil;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.SearchData;
+import com.google.common.collect.Lists;
 import io.github.lvyahui8.spring.facade.DataFacade;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,6 +38,20 @@ public class AssembleFacade {
      */
     public SearchData assembleData(SearchData searchData) {
         searchData.setAgeNum(CoreUtil.convertAge(searchData.getAge()));
+        //合并辅检和手术开单项
+        List<Pacs> pacsOrderVO = searchData.getPacsOrder();
+        List<Item> operationOrderVO = searchData.getOperationOrder();
+        if (pacsOrderVO == null) {
+            pacsOrderVO = Lists.newLinkedList();
+        }
+        if (operationOrderVO == null) {
+            operationOrderVO = Lists.newLinkedList();
+        }
+        List<Pacs> combinePacsOrder = pacsOrderVO;
+        combinePacsOrder.addAll(BeanUtil.listCopyTo(operationOrderVO, Pacs.class));
+        searchData.setPacsOrder(combinePacsOrder);
+        searchData.setOperationOrder(BeanUtil.listCopyTo(combinePacsOrder, Item.class));
+
         HospitalInfo hospitalInfo = hospitalInfoFacade.getById(searchData.getHospitalId());
         Integer isConnect = 0;
         if (hospitalInfo != null && hospitalInfo.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {