Merge remote-tracking branch 'origin/master' into indicationman

pom.xml

@@ -34,8 +34,8 @@
         <logstash.version>5.2</logstash.version>
         <docker-maven-plugin.version>1.2.1</docker-maven-plugin.version>
         <aggregator.version>1.1.3</aggregator.version>
-        <docker.image.prefix>192.168.2.236:5000/diagbotcloud</docker.image.prefix>
-        <registryUrl>http://192.168.2.236:5000/repository/diagbotcloud/</registryUrl>
+        <docker.image.prefix>192.168.2.121:5000/diagbotcloud</docker.image.prefix>
+        <registryUrl>http://192.168.2.121:5000/repository/diagbotcloud/</registryUrl>
     </properties>
 
     <dependencyManagement>

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

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

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

@@ -100,6 +100,7 @@ public class TestFacade {
             if (StringUtil.isBlank(bean.getStandName()) || bean.getNeoName().contains("本品")) {
                 continue;
             }
+            bean.setStandName(bean.getStandName().trim());
             if (StringUtil.isNotBlank(bean.getOrderType())) {
                 switch (bean.getOrderType()) {
                     case "实验室检查名称": // 细项