推理接口

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -243,21 +243,21 @@ public class PushFacade {
      */
     public LisKYJVO resultCalculation(LisKYJVO lisKYJVO) {
         if (lisKYJVO.getValue() != null) {
-            if (lisKYJVO.getMax() != null) {
-                Integer comResult = lisKYJVO.getValue().compareTo(lisKYJVO.getMax());
+            if (lisKYJVO.getMaxValue() != null) {
+                Integer comResult = lisKYJVO.getValue().compareTo(lisKYJVO.getMaxValue());
                 if (comResult > 0) {
                     lisKYJVO.setMultipleState(QuantitativeTypeEnum.Up.getName());
-                    if (!lisKYJVO.getMax().equals(0.0)) {
-                        lisKYJVO.setMultipleValue(lisKYJVO.getValue() / lisKYJVO.getMax());
+                    if (!lisKYJVO.getMaxValue().equals(0.0)) {
+                        lisKYJVO.setMultipleValue(lisKYJVO.getValue() / lisKYJVO.getMaxValue());
                     }
                 }
             }
-            if (lisKYJVO.getMin() != null) {
-                Integer comResult = lisKYJVO.getValue().compareTo(lisKYJVO.getMax());
+            if (lisKYJVO.getMinValue() != null) {
+                Integer comResult = lisKYJVO.getValue().compareTo(lisKYJVO.getMinValue());
                 if (comResult < 0) {
                     lisKYJVO.setMultipleState(QuantitativeTypeEnum.Down.getName());
-                    if (!lisKYJVO.getMax().equals(0.0)) {
-                        lisKYJVO.setMultipleValue(lisKYJVO.getValue() / lisKYJVO.getMin());
+                    if (!lisKYJVO.getMinValue().equals(0.0)) {
+                        lisKYJVO.setMultipleValue(lisKYJVO.getValue() / lisKYJVO.getMinValue());
                     }
                 }
             }

icss-service/src/main/java/com/diagbot/vo/LisInfo.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:化验信息
+ * @Author:zhaops
+ * @time: 2018/12/19 14:03
+ */
+@Getter
+@Setter
+public class LisInfo {
+    private String name;//套餐名称
+    private String detailName;//化验项名称
+    private Double value;//值
+    private Double maxValue;//最大值
+    private Double minValue;//最小值
+    private String units;//单位
+    private String otherValue;//其他结果，包括阴性阳性，文字描述等
+}

icss-service/src/main/java/com/diagbot/vo/LisKYJVO.java

@@ -13,8 +13,8 @@ import lombok.Setter;
 public class LisKYJVO {
     private String name;//名称
     private Double value;//值
-    private Double max;//最大值
-    private Double min;//最小值
+    private Double maxValue;//最大值
+    private Double minValue;//最小值
     private String units;//单位
     private String multipleState;//定量状态 0-正常 1-升高 2-降低
     private Double multipleValue;//倍数