|
@@ -15,7 +15,7 @@ import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
/**
|
|
- * @Description:
|
|
|
|
|
|
+ * @Description: 从图谱去开单数据聚合
|
|
* @author: gaodm
|
|
* @author: gaodm
|
|
* @time: 2020/10/22 9:24
|
|
* @time: 2020/10/22 9:24
|
|
*/
|
|
*/
|
|
@@ -54,36 +54,78 @@ public class BillNeoAggregate {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 药品
|
|
|
|
+ *
|
|
|
|
+ * @param billNeoVO
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@DataProvider("getDrugBill")
|
|
@DataProvider("getDrugBill")
|
|
public List<BillNeoDTO> getDrugBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
public List<BillNeoDTO> getDrugBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
return neoFacade.getDrugBill(billNeoVO.getDrugList());
|
|
return neoFacade.getDrugBill(billNeoVO.getDrugList());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 检查
|
|
|
|
+ *
|
|
|
|
+ * @param billNeoVO
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@DataProvider("getPacsBill")
|
|
@DataProvider("getPacsBill")
|
|
public List<BillNeoDTO> getPacsBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
public List<BillNeoDTO> getPacsBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
return neoFacade.getPacsBill(billNeoVO.getPacsList());
|
|
return neoFacade.getPacsBill(billNeoVO.getPacsList());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 检验明细
|
|
|
|
+ *
|
|
|
|
+ * @param billNeoVO
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@DataProvider("getLisDetailBill")
|
|
@DataProvider("getLisDetailBill")
|
|
public List<BillNeoDTO> getLisDetailBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
public List<BillNeoDTO> getLisDetailBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
return neoFacade.getLisDetailBill(billNeoVO.getLisDetailList());
|
|
return neoFacade.getLisDetailBill(billNeoVO.getLisDetailList());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 检验套餐
|
|
|
|
+ *
|
|
|
|
+ * @param billNeoVO
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@DataProvider("getLisBill")
|
|
@DataProvider("getLisBill")
|
|
public List<BillNeoDTO> getLisBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
public List<BillNeoDTO> getLisBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
return neoFacade.getLisBill(billNeoVO.getLisList());
|
|
return neoFacade.getLisBill(billNeoVO.getLisList());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 手术和操作
|
|
|
|
+ *
|
|
|
|
+ * @param billNeoVO
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@DataProvider("getOperationBill")
|
|
@DataProvider("getOperationBill")
|
|
public List<BillNeoDTO> getOperationBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
public List<BillNeoDTO> getOperationBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
return neoFacade.getOperationBill(billNeoVO.getOperationList());
|
|
return neoFacade.getOperationBill(billNeoVO.getOperationList());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 联合项目
|
|
|
|
+ *
|
|
|
|
+ * @param billNeoVO
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@DataProvider("getCombiOpBill")
|
|
@DataProvider("getCombiOpBill")
|
|
public List<BillNeoDTO> getCombiOpBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
public List<BillNeoDTO> getCombiOpBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
return neoFacade.getCombiOpBill(billNeoVO.getCombiopList());
|
|
return neoFacade.getCombiOpBill(billNeoVO.getCombiopList());
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 输血
|
|
|
|
+ *
|
|
|
|
+ * @param billNeoVO
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@DataProvider("getTransfusionBill")
|
|
@DataProvider("getTransfusionBill")
|
|
public List<BillNeoDTO> getTransfusionBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
public List<BillNeoDTO> getTransfusionBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
|
|
return neoFacade.getTransfusionBill(billNeoVO.getTransfusionList());
|
|
return neoFacade.getTransfusionBill(billNeoVO.getTransfusionList());
|