浏览代码

更新图谱返回的体征数字处理的方法

MarkHuang 4 年之前
父节点
当前提交
7bb0e834c9

+ 2 - 2
src/main/java/com/diagbot/entity/node/Vital.java

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

+ 2 - 2
src/main/java/com/diagbot/repository/LisNode.java

@@ -43,8 +43,8 @@ public class LisNode {
 		Set<Vital> vitals = lis.getVitals();
 		for (Vital vital : vitals) {
 			String name = vital.getName();
-			String min = vital.getMinval();
-			String max = vital.getMaxval();
+			String min = (vital.getMinval()==null)?"":vital.getMinval().toString();
+			String max = (vital.getMaxval()==null)?"":vital.getMaxval().toString();
 			String unit = vital.getUnit();
 			lisBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(name, min, max, unit));
 		}

+ 2 - 2
src/main/java/com/diagbot/repository/MedicineNode.java

@@ -47,8 +47,8 @@ public class MedicineNode {
         Set<Vital> vitals = medicine.getVitals();
         for (Vital vital : vitals) {
             String name = vital.getName();
-            String min = vital.getMinval();
-            String max = vital.getMaxval();
+            String min = (vital.getMinval()==null)?"":vital.getMinval().toString();
+            String max = (vital.getMaxval()==null)?"":vital.getMaxval().toString();
             String unit = vital.getUnit();
             drugBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(name, min, max, unit));
         }

+ 2 - 2
src/main/java/com/diagbot/repository/PACSNode.java

@@ -45,8 +45,8 @@ public class PACSNode {
         Set<Vital> vitals = pacs.getVitals();
         for (Vital vital : vitals) {
             String name = vital.getName();
-            String min = vital.getMinval();
-            String max = vital.getMaxval();
+            String min = (vital.getMinval()==null)?"":vital.getMinval().toString();
+            String max = (vital.getMaxval()==null)?"":vital.getMaxval().toString();
             String unit = vital.getUnit();
             pacsBillNeoDTO.getVitals().add(NeoUtil.updateNodeInfo(name, min, max, unit));
         }

+ 2 - 2
src/main/java/com/diagbot/util/NeoUtil.java

@@ -12,11 +12,11 @@ public class NeoUtil {
         name = (null==name)?"":name;
         nodeNeoDTO.setName(name);
 
-        if (null!=min) {
+        if (null!=min && min.trim().length()>0) {
             nodeNeoDTO.setMin(new BigDecimal(min));
         }
 
-        if (null!=max) {
+        if (null!=max && max.trim().length()>0) {
             nodeNeoDTO.setMax(new BigDecimal(max));
         }