Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/repository/MedicineCodeNode.java

@@ -1,11 +1,30 @@
 package com.diagbot.repository;
 
-import com.diagbot.dto.*;
-import com.diagbot.entity.node.*;
+import com.diagbot.dto.BillNeoDTO;
+import com.diagbot.dto.DrugBillNeoDTO;
+import com.diagbot.dto.DrugInfoDTO;
+import com.diagbot.dto.HighRiskNeoDTO;
+import com.diagbot.dto.NodeNeoDTO;
+import com.diagbot.entity.node.HerbDeptClass;
+import com.diagbot.entity.node.HerbFangJiCate;
+import com.diagbot.entity.node.HerbFangJiClass;
+import com.diagbot.entity.node.HerbYiBaoClass;
+import com.diagbot.entity.node.HerbZhiLiaoClass;
+import com.diagbot.entity.node.MedChemClass;
+import com.diagbot.entity.node.MedClass;
+import com.diagbot.entity.node.MedCode;
+import com.diagbot.entity.node.MedCodeName;
+import com.diagbot.entity.node.MedJiePouClass;
+import com.diagbot.entity.node.MedProdName;
+import com.diagbot.entity.node.MedRegName;
+import com.diagbot.entity.node.MedYaoLiClass;
+import com.diagbot.entity.node.MedYiBaoClass;
+import com.diagbot.entity.node.MedZhiLiaoClass;
+import com.diagbot.entity.node.Medicine;
+import com.diagbot.entity.node.ProdName;
+import com.diagbot.entity.node.RegName;
 import com.diagbot.util.NeoUtil;
-import com.sun.xml.internal.bind.v2.runtime.reflect.opt.Const;
 
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -176,7 +195,6 @@ public class MedicineCodeNode {
     }
 
 
-
     /**
      * 处理处方开单合理性
      */
@@ -199,7 +217,7 @@ public class MedicineCodeNode {
 
             medicine = medicineRepository.findByNameIs(medname);
 
-            if (medicine != null && medicine.size()>0) {
+            if (medicine != null && medicine.size() > 0) {
                 drugBillNeoDTO = MedicinetoDrugDTO(medicine.get(0));
 
                 billNeoDTO.setDrugBillNeoDTO(drugBillNeoDTO);
@@ -213,7 +231,6 @@ public class MedicineCodeNode {
     }
 
 
-
     /**
      * 获取药品商品名称列表
      */
@@ -238,7 +255,6 @@ public class MedicineCodeNode {
     }
 
 
-
     /**
      * 获取高危药品数据
      */