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

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

@@ -25,6 +25,9 @@ public class Age extends BaseNode  {
 	@Property(name = "范围")
 	private Integer range;
 
+	@Property(name = "名称")
+	private String termname;
+
 	@Relationship(type = "药品通用名称禁忌年龄", direction = Relationship.INCOMING)
 	private Set<Medicine> medicine = new HashSet<>();
 

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

@@ -13,19 +13,18 @@ public class MedicineNode {
 
     public DrugBillNeoDTO MedicinetoDrugDTO(Medicine medicine, MedicineRepository medicineRepository) {
         DrugBillNeoDTO drugBillNeoDTO = new DrugBillNeoDTO();
-        NodeInfo nodeInfo = new NodeInfo();
 
         Set<Age> ages = medicine.getAge();
         for (Age age : ages) {
-            NodeNeoDTO nodeNeoDTO = fillNodeNeoDTO(age, medicineRepository.getKeys());
+            NodeNeoDTO nodeNeoDTO = fillNodeNeoDTO(age);
             drugBillNeoDTO.setAgeNeoDTO(nodeNeoDTO);
         }
 
         Set<Group> groups = medicine.getGroup();
         for (Group group : groups) {
             NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
-            nodeInfo.setName(group.getName());
-            nodeInfo.setTypeval(Constants.group);
+            nodeNeoDTO.setName(group.getName());
+            nodeNeoDTO.setTermtype(Constants.group);
             drugBillNeoDTO.getGroup().add(nodeNeoDTO);
         }
 
@@ -33,8 +32,8 @@ public class MedicineNode {
         Set<MedAllergen> medAllergens = medicine.getMedAllergens();
         for (MedAllergen medAllergen : medAllergens) {
             NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
-            nodeInfo.setName(medAllergen.getName());
-            nodeInfo.setTypeval(Constants.medallergen);
+            nodeNeoDTO.setName(medAllergen.getName());
+            nodeNeoDTO.setTermtype(Constants.medallergen);
             drugBillNeoDTO.getAllergicmeds().add(nodeNeoDTO);
         }
 
@@ -42,8 +41,8 @@ public class MedicineNode {
         Set<Disease> diseases = medicine.getDisease();
         for (Disease disease : diseases) {
             NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
-            nodeInfo.setName(disease.getName());
-            nodeInfo.setTypeval(Constants.disease);
+            nodeNeoDTO.setName(disease.getName());
+            nodeNeoDTO.setTermtype(Constants.disease);
             drugBillNeoDTO.getDisease().add(nodeNeoDTO);
         }
 
@@ -51,28 +50,23 @@ public class MedicineNode {
     }
 
 
-    public NodeNeoDTO fillNodeNeoDTO(Age age, List<String> keys) {
+    public NodeNeoDTO fillNodeNeoDTO(Age age) {
         NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
         Integer range;
         BigDecimal max, min;
 
         nodeNeoDTO.setName(age.getName());
-        for (String key : keys) {
-            switch (key) {
-                case "最大值":
-                    max = (age.getMaxval()==null)?null:new BigDecimal(age.getMaxval());
-                    nodeNeoDTO.setMax(max);
-                    break;
-                case "最小值":
-                    min = (age.getMinval()==null)?null:new BigDecimal(age.getMinval());
-                    nodeNeoDTO.setMin(min);
-                    break;
-                case "范围":
-                    range = (age.getRange()==null)?0:age.getRange();
-                    nodeNeoDTO.setValType(range);
-                    break;
-            }
-        }
+
+        max = (age.getMaxval()==null)?null:new BigDecimal(age.getMaxval());
+        nodeNeoDTO.setMax(max);
+
+        min = (age.getMinval()==null)?null:new BigDecimal(age.getMinval());
+        nodeNeoDTO.setMin(min);
+
+        range = (age.getRange()==null)?0:age.getRange();
+        nodeNeoDTO.setValType(range);
+
+        nodeNeoDTO.setName(age.getTermname());
 
         return nodeNeoDTO;
     }