Revert "Revert "更新药品开单合理性的方法""

This reverts commit f440dd6a

src/main/java/com/diagbot/entity/node/Age.java

@@ -0,0 +1,34 @@
+package com.diagbot.entity.node;
+
+import com.diagbot.biz.push.entity.Pacs;
+import com.diagbot.entity.node.base.BaseNode;
+import lombok.Getter;
+import lombok.Setter;
+import org.neo4j.ogm.annotation.NodeEntity;
+import org.neo4j.ogm.annotation.Property;
+import org.neo4j.ogm.annotation.Relationship;
+
+import java.util.HashSet;
+import java.util.Set;
+
+@Setter
+@Getter
+@NodeEntity(label = "年龄")
+public class Age extends BaseNode  {
+
+	@Property(name = "最小值")
+	private Double minval;
+
+	@Property(name = "最大值")
+	private Double maxval;
+
+	@Property(name = "范围")
+	private Integer range;
+
+	@Property(name = "名称")
+	private String termname;
+
+	@Relationship(type = "药品注册名称禁忌年龄", direction = Relationship.INCOMING)
+	private Set<MedRegName> medRegNames = new HashSet<>();
+
+}

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

@@ -6,58 +6,11 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.NeoUtil;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 public class MedicineNode {
 
 
-    public DrugBillNeoDTO MedicinetoDrugDTO(Medicine medicine) {
-        DrugBillNeoDTO drugBillNeoDTO = new DrugBillNeoDTO();
-        NodeInfo nodeInfo = new NodeInfo();
-
-        return drugBillNeoDTO;
-    }
-
-
-    /**
-     * 处理处方开单合理性
-     */
-    public List<BillNeoDTO> getDrugBill(Map<String, String> medsterm, MedicineRepository medicineRepository) {
-        List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
-        BillNeoDTO billNeoDTO;
-
-        DrugBillNeoDTO drugBillNeoDTO;
-
-        List<Medicine> medicine;
-        String medname;
-
-        for (String term : medsterm.keySet()) {
-            billNeoDTO = new BillNeoDTO();
-            medname = medsterm.get(term);
-            billNeoDTO.setName(term);
-            billNeoDTO.setStandname(medname);
-
-            drugBillNeoDTO = new DrugBillNeoDTO();
-
-            medicine = medicineRepository.findByNameIs(medname);
-
-            if (medicine != null && medicine.size() > 0) {
-                drugBillNeoDTO = MedicinetoDrugDTO(medicine.get(0));
-
-                billNeoDTO.setDrugBillNeoDTO(drugBillNeoDTO);
-
-                billNeoDTOs.add(billNeoDTO);
-            }
-        }
-
-
-        return billNeoDTOs;
-    }
-
-
     /**
      * 获取药品商品名称列表
      */