更新药品开单合理性

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

@@ -31,7 +31,7 @@ public class Age extends BaseNode  {
 	@Relationship(type = "药品通用名称禁忌年龄", direction = Relationship.INCOMING)
 	private Set<Medicine> medicines = new HashSet<>();
 
-	@Relationship(type = "药品注册名称禁忌年龄", direction = Relationship.INCOMING)
+	@Relationship(type = "药品注册名称禁忌体征", direction = Relationship.INCOMING)
 	private Set<MedRegName> medRegNames = new HashSet<>();
 
 }

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

@@ -37,7 +37,7 @@ public class Group extends BaseNode  {
 	@Relationship(type = "药品通用名称禁忌禁忌人群", direction = Relationship.INCOMING)
 	private Set<Medicine> medicines = new HashSet<>();
 
-	@Relationship(type = "药品注册名称禁忌禁忌人群", direction = Relationship.INCOMING)
+	@Relationship(type = "药品注册名称禁忌人群", direction = Relationship.INCOMING)
 	private Set<MedRegName> medRegNames = new HashSet<>();
 
 }

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

@@ -24,10 +24,10 @@ public class MedRegName extends BaseNode  {
 	@Property(name = "禁忌给药途径")
 	private String conflict_geiyao;
 
-	@Relationship(type = "药品注册名称禁忌年龄", direction = Relationship.OUTGOING)
-	private Set<Age> age = new HashSet<>();
+	@Relationship(type = "药品注册名称禁忌体征", direction = Relationship.OUTGOING)
+	private Set<Vital> vital = new HashSet<>();
 
-	@Relationship(type = "药品注册名称禁忌禁忌人群", direction = Relationship.OUTGOING)
+	@Relationship(type = "药品注册名称禁忌人群", direction = Relationship.OUTGOING)
 	private Set<Group> group = new HashSet<>();
 
 	@Relationship(type = "药品注册名称禁忌药物过敏原", direction = Relationship.OUTGOING)

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

@@ -24,8 +24,8 @@ public class Medicine extends BaseNode  {
 	@Relationship(type = "药品通用名称禁忌禁忌人群", direction = Relationship.OUTGOING)
 	private Set<Group> group = new HashSet<>();
 
-	@Relationship(type = "药品通用名称禁忌年龄", direction = Relationship.OUTGOING)
-	private Set<Age> age = new HashSet<>();
+	@Relationship(type = "药品通用名称禁忌体征", direction = Relationship.OUTGOING)
+	private Set<Vital> vital = new HashSet<>();
 
 	@Relationship(type = "药品通用名称禁忌疾病", direction = Relationship.OUTGOING)
 	private Set<Disease> disease = new HashSet<>();

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

@@ -29,6 +29,9 @@ public class Vital extends BaseNode  {
 	@Property(name = "范围")
 	private Integer range;
 
+	@Property(name = "体征指标")
+	private String vitalname;
+
 	@Relationship(type = "辅助检查名称禁忌体征", direction = Relationship.INCOMING)
 	private Set<Pacs> pacss = new HashSet<>();
 
@@ -38,4 +41,7 @@ public class Vital extends BaseNode  {
 	@Relationship(type = "体征相关医保疾病名称", direction = Relationship.OUTGOING)
 	private Set<YiBaoDiseaseName> disease = new HashSet<>();
 
+	@Relationship(type = "药品注册名称禁忌体征", direction = Relationship.INCOMING)
+	private Set<MedRegName> medRegNames = new HashSet<>();
+
 }

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

@@ -77,9 +77,9 @@ public class MedRegNameNode {
 
     public DrugBillNeoDTO MedRegNametoDrugDTO(MedRegName medRegName, DrugBillNeoDTO drugBillNeoDTO) {
 
-        Set<Age> ages = medRegName.getAge();
-        for (Age age : ages) {
-            NodeNeoDTO nodeNeoDTO = NeoUtil.fillNodeNeoDTO(age);
+        Set<Vital> vitals = medRegName.getVital();
+        for (Vital vital : vitals) {
+            NodeNeoDTO nodeNeoDTO = NeoUtil.fillNodeNeoDTO(vital);
             drugBillNeoDTO.setAgeNeoDTO(nodeNeoDTO);
         }
 

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

@@ -4,12 +4,7 @@ import com.diagbot.dto.BillNeoDTO;
 import com.diagbot.dto.DrugBillNeoDTO;
 import com.diagbot.dto.DrugInfoDTO;
 import com.diagbot.dto.NodeNeoDTO;
-import com.diagbot.entity.node.Age;
-import com.diagbot.entity.node.Disease;
-import com.diagbot.entity.node.Group;
-import com.diagbot.entity.node.MedAllergen;
-import com.diagbot.entity.node.MedRegName;
-import com.diagbot.entity.node.Medicine;
+import com.diagbot.entity.node.*;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.NeoUtil;
 
@@ -24,9 +19,9 @@ public class MedicineNode {
     public DrugBillNeoDTO MedicinetoDrugDTO(Medicine medicine) {
         DrugBillNeoDTO drugBillNeoDTO = new DrugBillNeoDTO();
 
-        Set<Age> ages = medicine.getAge();
-        for (Age age : ages) {
-            NodeNeoDTO nodeNeoDTO = NeoUtil.fillNodeNeoDTO(age);
+        Set<Vital> vitals = medicine.getVital();
+        for (Vital vital : vitals) {
+            NodeNeoDTO nodeNeoDTO = NeoUtil.fillNodeNeoDTO(vital);
             drugBillNeoDTO.setAgeNeoDTO(nodeNeoDTO);
         }
 

src/main/java/com/diagbot/util/NeoUtil.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.PushBaseDTO;
 import com.diagbot.entity.node.Age;
+import com.diagbot.entity.node.Vital;
 import com.diagbot.entity.node.YiBaoDiseaseName;
 import com.diagbot.repository.Constants;
 import com.diagbot.repository.NodeInfo;
@@ -143,23 +144,25 @@ public class NeoUtil {
     }
 
 
-    public static NodeNeoDTO fillNodeNeoDTO(Age age) {
+    public static NodeNeoDTO fillNodeNeoDTO(Vital vital) {
         NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
         Integer range;
         BigDecimal max, min;
 
-        nodeNeoDTO.setName(age.getName());
+        nodeNeoDTO.setName(vital.getName());
 
-        max = (age.getMaxval()==null)?null:new BigDecimal(age.getMaxval());
+        max = (vital.getMaxval()==null)?null:new BigDecimal(vital.getMaxval());
         nodeNeoDTO.setMax(max);
 
-        min = (age.getMinval()==null)?null:new BigDecimal(age.getMinval());
+        min = (vital.getMinval()==null)?null:new BigDecimal(vital.getMinval());
         nodeNeoDTO.setMin(min);
 
-        range = (age.getRange()==null)?0:age.getRange();
+        range = (vital.getRange()==null)?0:vital.getRange();
         nodeNeoDTO.setValType(range);
 
-        nodeNeoDTO.setName(age.getTermname());
+        nodeNeoDTO.setUnit(vital.getUnit());
+
+        nodeNeoDTO.setTermtype(vital.getVitalname());
 
         return nodeNeoDTO;
     }