Revert "合并辅检和手术操作的开单项处理方式"

This reverts commit fe7a552a

src/main/java/com/diagbot/aggregate/BillNeoAggregate.java

@@ -61,8 +61,7 @@ public class BillNeoAggregate {
 
     @DataProvider("getPacsBill")
     public List<BillNeoDTO> getPacsBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
-//        return neoFacade.getPacsBill(billNeoVO.getPacsList());
-        return neoFacade.getPacsOperationBill(billNeoVO.getPacsList());
+        return neoFacade.getPacsBill(billNeoVO.getPacsList());
     }
 
     @DataProvider("getLisDetailBill")
@@ -77,8 +76,7 @@ public class BillNeoAggregate {
 
     @DataProvider("getOperationBill")
     public List<BillNeoDTO> getOperationBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
-//        return neoFacade.getOperationBill(billNeoVO.getOperationList());
-        return neoFacade.getPacsOperationBill(billNeoVO.getOperationList());
+        return neoFacade.getOperationBill(billNeoVO.getOperationList());
     }
 
     @DataProvider("getCombiOpBill")

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

@@ -898,25 +898,6 @@ public class NeoFacade {
     }
 
 
-
-    /**
-     * 处理辅检和手术操作开单合理性
-     */
-    public List<BillNeoDTO> getPacsOperationBill(List<Map<String, String>> terms) {
-
-        PacsNameNode pacsNode = new PacsNameNode();
-        List<BillNeoDTO> billNeoDTOs = pacsNode.getPacsBill(terms, pacsNameRepository);
-
-        PacsSubNameNode pacsSubNode = new PacsSubNameNode();
-        billNeoDTOs.addAll(pacsSubNode.getSubPacsBill(terms, pacsSubNameRepository));
-
-        YiBaoOperationNameNode yiBaoOpNode = new YiBaoOperationNameNode();
-        billNeoDTOs.addAll(yiBaoOpNode.getOperationBill(terms, yiBaoOperationRepository));
-
-        return billNeoDTOs;
-    }
-
-
     /**
      * 处理联合项目开单合理性
      */