辅检和手术开单项合并

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

@@ -38,20 +38,6 @@ 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())) {
@@ -66,6 +52,20 @@ public class AssembleFacade {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "入参映射出错" + e.getMessage());
             }
         }
+
+        //合并辅检和手术开单项
+        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));
         return searchData;
     }