更新辅检开单合理性的返回数据结构中化验结果的数值范围

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

@@ -34,7 +34,7 @@ public class PacsBillNeoDTO {
     private List<String> procedures = new ArrayList<>();
 
     // 禁忌实验室检查
-    private List<String> Lis = new ArrayList<>();
+    private List<RangeNeoDTO> Lis = new ArrayList<>();
 
     // 禁忌疾病
     private List<String> disease = new ArrayList<>();

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

@@ -7,6 +7,7 @@ import lombok.Getter;
 import lombok.Setter;
 import org.neo4j.ogm.annotation.Labels;
 import org.neo4j.ogm.annotation.NodeEntity;
+import org.neo4j.ogm.annotation.Property;
 import org.neo4j.ogm.annotation.Relationship;
 
 import java.io.Serializable;
@@ -19,6 +20,15 @@ import java.util.Set;
 @NodeEntity(label = "实验室检查")
 public class LIS extends BaseNode  {
 
+    @Property(name = "最大值")
+    private String maxval;
+
+    @Property(name = "最小值")
+    private String minval;
+
+    @Property(name = "单位")
+    private String unit;
+
     @Relationship(type="实验室检查禁忌性别", direction = Relationship.OUTGOING)
     private Gender gender;
 

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

@@ -71,8 +71,21 @@ public class PACSNode {
 
         Set<LIS> liss = pacs.getLiss();
         for (LIS lis : liss) {
+            RangeNeoDTO rangeNeoDTO = new RangeNeoDTO();
             String lis_val = (lis==null)?"":lis.getName();
-            pacsBillNeoDTO.getLis().add(lis_val);
+            rangeNeoDTO.setName(lis_val);
+
+            if (lis.getUnit()!=null) {
+                rangeNeoDTO.setUnit(lis.getUnit());
+                if (null!=lis.getMinval()) {
+                    rangeNeoDTO.setMin(new BigDecimal(lis.getMinval()));
+                }
+                if (null!=lis.getMaxval()) {
+                    rangeNeoDTO.setMax(new BigDecimal(lis.getMaxval()));
+                }
+            }
+
+            pacsBillNeoDTO.getLis().add(rangeNeoDTO);
         }
 
         Set<Disease> diseases = pacs.getDiseases();