更新图谱查询数据的方法

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

@@ -20,10 +20,10 @@ import java.util.Set;
 public class ClinicalFinding extends BaseNode  {
 
     @Property(name = "最大值")
-    private String maxval;
+    private Double maxval;
 
     @Property(name = "最小值")
-    private String minval;
+    private Double minval;
 
     @Property(name = "单位")
     private String unit;

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

@@ -21,10 +21,10 @@ import java.util.Set;
 public class LIS extends BaseNode  {
 
     @Property(name = "最大值")
-    private String maxval;
+    private Double maxval;
 
     @Property(name = "最小值")
-    private String minval;
+    private Double minval;
 
     @Property(name = "单位")
     private String unit;

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

@@ -21,10 +21,10 @@ import java.util.Set;
 public class PACS extends BaseNode  {
 
     @Property(name = "最大值")
-    private String maxval;
+    private Double maxval;
 
     @Property(name = "最小值")
-    private String minval;
+    private Double minval;
 
     @Property(name = "单位")
     private String unit;

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

@@ -34,8 +34,8 @@ public class LisNode {
 		Set<ClinicalFinding> clinicalfindings = lis.getClinicalfindings();
 		for (ClinicalFinding clinicalfinding : clinicalfindings) {
 			String name = clinicalfinding.getName();
-			String min = clinicalfinding.getMinval();
-			String max = clinicalfinding.getMaxval();
+			Double min = clinicalfinding.getMinval();
+			Double max = clinicalfinding.getMaxval();
 			String unit = clinicalfinding.getUnit();
 			lisBillNeoDTO.getClinicfindings().add(NeoUtil.updateNodeInfo(name, min, max, unit));
 		}
@@ -43,8 +43,8 @@ public class LisNode {
 		Set<Vital> vitals = lis.getVitals();
 		for (Vital vital : vitals) {
 			String name = vital.getName();
-			String min = (vital.getMinval()==null)?"":vital.getMinval().toString();
-			String max = (vital.getMaxval()==null)?"":vital.getMaxval().toString();
+			Double min = vital.getMinval();
+			Double max = vital.getMaxval();
 			String unit = vital.getUnit();
 			lisBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(name, min, max, unit));
 		}
@@ -76,8 +76,8 @@ public class LisNode {
 		Set<PACS> pacss = lis.getPacs();
 		for (PACS pacs : pacss) {
 			String name = pacs.getName();
-			String min = pacs.getMinval();
-			String max = pacs.getMaxval();
+			Double min = pacs.getMinval();
+			Double max = pacs.getMaxval();
 			String unit = pacs.getUnit();
 			lisBillNeoDTO.getPacs().add(NeoUtil.updateNodeInfo(name, min, max, unit));
 		}

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

@@ -36,8 +36,8 @@ public class LisPackNode {
 		Set<ClinicalFinding> clinicalfindings = lispack.getClinicalfindings();
 		for (ClinicalFinding clinicalfinding : clinicalfindings) {
 			String name = clinicalfinding.getName();
-			String min = clinicalfinding.getMinval();
-			String max = clinicalfinding.getMaxval();
+			Double min = clinicalfinding.getMinval();
+			Double max = clinicalfinding.getMaxval();
 			String unit = clinicalfinding.getUnit();
 			lisBillNeoDTO.getClinicfindings().add(NeoUtil.updateNodeInfo(name, min, max, unit));
 		}
@@ -69,8 +69,8 @@ public class LisPackNode {
 		Set<PACS> pacss = lispack.getPacs();
 		for (PACS pacs : pacss) {
 			String name = pacs.getName();
-			String min = pacs.getMinval();
-			String max = pacs.getMaxval();
+			Double min = pacs.getMinval();
+			Double max = pacs.getMaxval();
 			String unit = pacs.getUnit();
 			lisBillNeoDTO.getPacs().add(NeoUtil.updateNodeInfo(name, min, max, unit));
 		}

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

@@ -37,8 +37,8 @@ public class MedicineNode {
         Set<ClinicalFinding> clinicalfindings = medicine.getClinicalfindings();
         for (ClinicalFinding clinicalfinding : clinicalfindings) {
             String name = clinicalfinding.getName();
-            String min = clinicalfinding.getMinval();
-            String max = clinicalfinding.getMaxval();
+            Double min = clinicalfinding.getMinval();
+            Double max = clinicalfinding.getMaxval();
             String unit = clinicalfinding.getUnit();
             drugBillNeoDTO.getClinicfindings().add(NeoUtil.updateNodeInfo(name, min, max, unit));
         }
@@ -47,8 +47,8 @@ public class MedicineNode {
         Set<Vital> vitals = medicine.getVitals();
         for (Vital vital : vitals) {
             String name = vital.getName();
-            String min = (vital.getMinval()==null)?"":vital.getMinval().toString();
-            String max = (vital.getMaxval()==null)?"":vital.getMaxval().toString();
+            Double min = vital.getMinval();
+            Double max = vital.getMaxval();
             String unit = vital.getUnit();
             drugBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(name, min, max, unit));
         }
@@ -57,8 +57,8 @@ public class MedicineNode {
         Set<LIS> lisset = medicine.getLisset();
         for (LIS lis : lisset) {
             String name = lis.getName();
-            String min = lis.getMinval();
-            String max = lis.getMaxval();
+            Double min = lis.getMinval();
+            Double max = lis.getMaxval();
             String unit = lis.getUnit();
             drugBillNeoDTO.getLis().add(NeoUtil.updateNodeInfo(name, min, max, unit));
         }
@@ -67,8 +67,8 @@ public class MedicineNode {
         Set<PACS> pacsset = medicine.getPacs();
         for (PACS pacs : pacsset) {
             String name = pacs.getName();
-            String min = pacs.getMinval();
-            String max = pacs.getMaxval();
+            Double min = pacs.getMinval();
+            Double max = pacs.getMaxval();
             String unit = pacs.getUnit();
             drugBillNeoDTO.getPacs().add(NeoUtil.updateNodeInfo(name, min, max, unit));
         }

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

@@ -35,8 +35,8 @@ public class PACSNode {
         Set<ClinicalFinding> clinicalfindings = pacs.getClinicalfindings();
         for (ClinicalFinding clinicalfinding : clinicalfindings) {
             String name = clinicalfinding.getName();
-            String min = clinicalfinding.getMinval();
-            String max = clinicalfinding.getMaxval();
+            Double min = clinicalfinding.getMinval();
+            Double max = clinicalfinding.getMaxval();
             String unit = clinicalfinding.getUnit();
             pacsBillNeoDTO.getClinicfindings().add(NeoUtil.updateNodeInfo(name, min, max, unit));
         }
@@ -45,8 +45,8 @@ public class PACSNode {
         Set<Vital> vitals = pacs.getVitals();
         for (Vital vital : vitals) {
             String name = vital.getName();
-            String min = (vital.getMinval()==null)?"":vital.getMinval().toString();
-            String max = (vital.getMaxval()==null)?"":vital.getMaxval().toString();
+            Double min = vital.getMinval();
+            Double max = vital.getMaxval();
             String unit = vital.getUnit();
             pacsBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(name, min, max, unit));
         }
@@ -79,8 +79,8 @@ public class PACSNode {
         Set<LIS> liss = pacs.getLiss();
         for (LIS lis : liss) {
             String name = lis.getName();
-            String min = lis.getMinval();
-            String max = lis.getMaxval();
+            Double min = lis.getMinval();
+            Double max = lis.getMaxval();
             String unit = lis.getUnit();
             pacsBillNeoDTO.getLis().add(NeoUtil.updateNodeInfo(name, min, max, unit));
         }

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

@@ -6,17 +6,17 @@ import com.diagbot.dto.PushBaseDTO;
 import java.math.BigDecimal;
 
 public class NeoUtil {
-    public static NodeNeoDTO updateNodeInfo(String name, String min, String max, String unit) {
+    public static NodeNeoDTO updateNodeInfo(String name, Double min, Double max, String unit) {
         NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
 
         name = (null==name)?"":name;
         nodeNeoDTO.setName(name);
 
-        if (null!=min && min.trim().length()>0) {
+        if (null!=min) {
             nodeNeoDTO.setMin(new BigDecimal(min));
         }
 
-        if (null!=max && max.trim().length()>0) {
+        if (null!=max) {
             nodeNeoDTO.setMax(new BigDecimal(max));
         }