Merge remote-tracking branch 'origin/master'

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

@@ -71,18 +71,18 @@ public interface PacsNameRepository extends Neo4jRepository<PacsName, Long> {
     List<BaseNodeInfo> indexIgnoreLabel(@Param("name") String name, @Param("pycode") String pycode, @Param("size") Integer size);
 
     @Query("MATCH (n) WHERE any(label in labels(n) WHERE label in ['辅助检查名称', '辅助检查子项目名称'])\n" +
-            "n.`静态知识标识` = $isKL \n" +
+            "AND n.`静态知识标识` = $isKL \n" +
             "AND (toLower(n.`name`) = toLower($name)  OR  toLower(n.`拼音编码`) = toLower($pycode))\n" +
             "RETURN labels(n) as labels,n.name as name\n" +
             "UNION\n" +
             "MATCH (n) WHERE any(label in labels(n) WHERE label in ['辅助检查名称', '辅助检查子项目名称'])\n" +
-            "n.`静态知识标识` = $isKL \n" +
+            "AND n.`静态知识标识` = $isKL \n" +
             "AND (toLower(n.`name`) STARTS WITH toLower($name) OR toLower(n.`拼音编码`) STARTS WITH toLower($pycode))\n" +
             "WITH n SKIP 0 LIMIT $size\n" +
             "RETURN labels(n) as labels,n.name as name\n" +
             "UNION \n" +
             "MATCH (n) WHERE any(label in labels(n) WHERE label in ['辅助检查名称', '辅助检查子项目名称'])\n" +
-            "n.`静态知识标识` = $isKL  \n" +
+            "AND n.`静态知识标识` = $isKL  \n" +
             "AND (toLower(n.`name`) CONTAINS toLower($name) OR toLower(n.`拼音编码`) CONTAINS toLower($pycode))  \n" +
             "WITH n SKIP 0 LIMIT $size\n" +
             "RETURN labels(n) as labels,n.name as name\n")

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

@@ -0,0 +1,79 @@
+package com.diagbot.util;
+
+import com.diagbot.biz.push.entity.Lis;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @description: 参数工具类
+ * @author: zhoutg
+ * @time: 2020/7/30 15:18
+ */
+@Slf4j
+public class ParamUtil {
+
+    /**
+     * 化验结果设置
+     *
+     * @param list
+     */
+    public static void dealLis(List<Lis> list) {
+        if (ListUtil.isEmpty(list)) {
+            return ;
+        }
+        for (Lis lis : list) {
+            String otherValue = lis.getOtherValue();
+            Double value = lis.getValue();
+            if (StringUtil.isNotBlank(otherValue)) {
+                switch (otherValue) {
+                    case "阳性":
+                    case "阴性":
+                        lis.setResult(otherValue);
+                        break;
+                    case "+":
+                    case "++":
+                    case "+++":
+                    case "++++":
+                        lis.setResult("阳性");
+                        break;
+                    default: // 其他类型
+                        lis.setResult(otherValue);
+                        break;
+                }
+            } else if (value != null) {
+                Double max = lis.getMaxValue();
+                Double min = lis.getMinValue();
+                if (max != null && max < value) {
+                    lis.setResult("升高");
+                } else if (min != null && value < min) {
+                    lis.setResult("降低");
+                } else {
+                    lis.setResult("正常");
+                }
+            }
+        }
+    }
+
+    public static void main(String[] args) {
+        List<Lis> lisList = new ArrayList<>();
+        Lis lis1 = new Lis();
+        lis1.setOtherValue("阳性");
+        lisList.add(lis1);
+
+        Lis lis2 = new Lis();
+        lis2.setOtherValue("++");
+        lisList.add(lis2);
+        dealLis(lisList);
+
+        Lis lis3 = new Lis();
+        lis3.setMaxValue(10.0D);
+        lis3.setMinValue(3.0D);
+        lis3.setValue(1D);
+        lisList.add(lis3);
+        dealLis(lisList);
+        System.out.println(lisList);
+    }
+
+}