更新数值范围类里的数值类型

src/main/java/com/diagbot/dto/RangeNeoDTO.java

@@ -7,10 +7,10 @@ import lombok.Data;
 public class RangeNeoDTO {
 
     // 最小值
-    private Integer min;
+    private Double min;
 
     // 最大值
-    private Integer max;
+    private Double max;
 
     // 单位
     private String unit;

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

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

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

@@ -15,8 +15,8 @@ public class MedicineNode {
         Age age = medicine.getAge();
         if (age!=null) {
             RangeNeoDTO ageNeoDTO = new RangeNeoDTO();
-            ageNeoDTO.setMin(age.getMinval());
-            ageNeoDTO.setMax(age.getMaxval());
+            ageNeoDTO.setMin(Double.valueOf(age.getMinval()));
+            ageNeoDTO.setMax(Double.valueOf(age.getMaxval()));
             drugBillNeoDTO.setAgeNeoDTO(ageNeoDTO);
         }
 

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

@@ -14,8 +14,8 @@ public class PACSNode {
         Age age = pacs.getAge();
         if (age!=null) {
             RangeNeoDTO ageNeoDTO = new RangeNeoDTO();
-            ageNeoDTO.setMin(age.getMinval());
-            ageNeoDTO.setMax(age.getMaxval());
+            ageNeoDTO.setMin(Double.valueOf(age.getMinval()));
+            ageNeoDTO.setMax(Double.valueOf(age.getMaxval()));
             pacsBillNeoDTO.setAgeNeoDTO(ageNeoDTO);
         }
 
@@ -33,11 +33,11 @@ public class PACSNode {
 
             if (clinicalfinding.getUnit()!=null) {
                 rangeNeoDTO.setUnit(clinicalfinding.getUnit());
-                rangeNeoDTO.setMin(clinicalfinding.getMinval());
-                rangeNeoDTO.setMax(clinicalfinding.getMaxval());
+                rangeNeoDTO.setMin(Double.valueOf(clinicalfinding.getMinval()));
+//                rangeNeoDTO.setMax(clinicalfinding.getMaxval());
             }
 
-//            pacsBillNeoDTO.getClinicfindings().add(clinicalfinding_val);
+            pacsBillNeoDTO.getClinicfindings().add(rangeNeoDTO);
         }
 
         Set<Medicine> conflict_medicines = pacs.getConflict_medicines();

src/main/java/com/diagbot/rule/AgeRule.java

@@ -24,13 +24,13 @@ public class AgeRule {
         Boolean flag = false;
         if (ageNeoDTO != null && wordCrfDTO.getAge() != null) {
             Integer age = wordCrfDTO.getAge();
-            Integer minAge = ageNeoDTO.getMin();
+            Double minAge = ageNeoDTO.getMin();
             if (minAge != null) {
                 if (age < minAge) {
                     flag = true;
                 }
             }
-            Integer maxAge = ageNeoDTO.getMax();
+            Double maxAge = ageNeoDTO.getMax();
             if (maxAge != null) {
                 if (age > minAge) {
                     flag = true;