中药饮片改造

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/OperaterEnum.java

@@ -10,7 +10,7 @@ import java.math.BigDecimal;
  * 9：存在于，10：不存在于，11：数组包含，12：数组不包含，13：为空，14：不为空
  */
 public enum OperaterEnum {
-    EQ(1,"=="),NOTEQ(2,"<>"),GT(3,">"),LT(4,"<"),
+    EQ(1,"=="),NOTEQ(2,"!="),GT(3,">"),LT(4,"<"),
     GET(5,">="),LET(6,"<="),MEMBER(7,"isMember"),NOTMEMER(8,"isNotMember"),
     ADD(21, "+"),MULTIPLY(22,"*"),DIVIDE(23,"/"),SUBSTRACT(20,"-");
     private Integer operater;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/SPELUtil.java

@@ -324,7 +324,7 @@ public class SPELUtil {
 
 
     public static void main(String[] args) {
-//        SPELUtil spelUtil = new SPELUtil();
+        SPELUtil spelUtil = new SPELUtil();
 //        Map<String, Object> inMap = new HashMap<>();
 //        inMap.put("1123", "342343");
 //        inMap.put("1124", 2);
@@ -342,19 +342,20 @@ public class SPELUtil {
 //        System.out.println(spelUtil.isMemberLeftLong(3L, lList));
 ////        String condStr = "isMemberLeftObject(#medical_diagnose_code,#medical_ins_medicalDiagnoseCodeList) && #change_class<>#medical_ins_changeClass";
 //        String condStr = "#isMemberListAndList(#medical_diagnose_code,#medical_ins_medicalDiagnoseCodeList) ";
+
+        Map<String, Object> itemMap1 = new HashMap<>();
+        itemMap1.put("medical_diagnose_code", Arrays.asList("1", "2", "3"));
+        itemMap1.put("medical_ins_medicalDiagnoseCodeList", Arrays.asList("3", "5", "6"));
+        String condStr = "'1' != '1'";
+        System.out.println(spelUtil.runSpelExpression(itemMap1, condStr));
+//        String test ="A0123123";
+//        System.out.println(isNumeric(test));
+//        String[] rolesArr = new String []{"correlationMedicalDiagnoseCode","111"};
+//        boolean cMedicalDiagnoseCodeFlag = Arrays.stream(rolesArr).anyMatch(role -> role.equals("correlationMedicalDiagnoseCode"));
+//        System.out.println(cMedicalDiagnoseCodeFlag);
 //
-//        Map<String, Object> itemMap1 = new HashMap<>();
-//        itemMap1.put("medical_diagnose_code", Arrays.asList("1", "2", "3"));
-//        itemMap1.put("medical_ins_medicalDiagnoseCodeList", Arrays.asList("3", "5", "6"));
-//        System.out.println(spelUtil.runSpelExpression(itemMap1, condStr));
-        String test ="A0123123";
-        System.out.println(isNumeric(test));
-        String[] rolesArr = new String []{"correlationMedicalDiagnoseCode","111"};
-        boolean cMedicalDiagnoseCodeFlag = Arrays.stream(rolesArr).anyMatch(role -> role.equals("correlationMedicalDiagnoseCode"));
-        System.out.println(cMedicalDiagnoseCodeFlag);
-
-        String srcStr = "sfdsalfjasldfjsadlfjsald;fj1123";
-        String key = "fdsalf";
-        System.out.println(startWithKey(srcStr, key));
+//        String srcStr = "sfdsalfjasldfjsadlfjsald;fj1123";
+//        String key = "fdsalf";
+//        System.out.println(startWithKey(srcStr, key));
     }
 }