1、redis修改为静态变量先

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0002.java

@@ -46,7 +46,7 @@ public class BEH0002 extends QCCatalogue {
             List<String> symptoms=null;
             Map<String, Map<String, Object>> diagMap = redisUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
             Map<String, Object> map = (Map<String, Object>) diagMap.get(mainDiag);
-            if(map != null || map.size() >0){
+            if(map != null && map.size() >0){
                 symptoms = (List<String>) map.get("symptoms");
             }
             List<Clinical> clinicals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getClinicals();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0011.java

@@ -34,7 +34,7 @@ public class BEH0011 extends QCCatalogue {
             if(diags.size()>0){
                 for (Diag diag:diags) {
                     Map<String, Object> map = (Map<String, Object>) diagMap.get(diag.getName());
-                    if(map != null || map.size() >0){
+                    if(map != null && map.size() >0){
                         String chronic = (String) map.get("chronic");//1是慢病
                         if("1".equals(chronic) && !initDiags.contains(diag.getName())){
                             if(StringUtils.isEmpty(info.get())){

kernel/src/main/java/com/lantone/qc/kernel/util/RedisUtil.java

@@ -6,6 +6,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -22,6 +23,8 @@ public final class RedisUtil {
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 
+    public static Map<String, Object> static_map = new HashMap<>();
+
     // =============================common============================
 
     /**
@@ -92,7 +95,7 @@ public final class RedisUtil {
      * @param key 键
      * @return 值
      */
-    private Object get(String key) {
+    public Object get(String key) {
         return key == null ? null : redisTemplate.opsForValue().get(key);
     }
 
@@ -103,7 +106,7 @@ public final class RedisUtil {
      * @param value 值
      * @return true成功 false失败
      */
-    private boolean set(String key, Object value) {
+    public boolean set(String key, Object value) {
         try {
             redisTemplate.opsForValue().set(key, value);
             return true;
@@ -122,7 +125,7 @@ public final class RedisUtil {
      * @param time  时间(秒) time要大于0 如果time小于等于0 将设置无限期
      * @return true成功 false 失败
      */
-    private boolean set(String key, Object value, long time) {
+    public boolean set(String key, Object value, long time) {
         try {
             if (time > 0) {
                 redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
@@ -466,7 +469,6 @@ public final class RedisUtil {
      *
      * @param key   键
      * @param value 值
-     * @param time  时间(秒)
      * @return
      */
     private boolean lSet(String key, Object value) {
@@ -505,7 +507,6 @@ public final class RedisUtil {
      *
      * @param key   键
      * @param value 值
-     * @param time  时间(秒)
      * @return
      */
     private boolean lSet(String key, List<Object> value) {
@@ -584,11 +585,12 @@ public final class RedisUtil {
      */
     public <T> T getJsonStringValue(String key) {
         try {
-            Object valObj = get(key);
-            if (valObj != null && valObj.getClass().getName().indexOf("String") > -1) {
-                return (T) FastJsonUtils.getJsonToBean(valObj.toString(), Object.class);
-            }
-            return null;
+//            Object valObj = get(key);
+//            if (valObj != null && valObj.getClass().getName().indexOf("String") > -1) {
+//                return (T) FastJsonUtils.getJsonToBean(valObj.toString(), Object.class);
+//            }
+//            return null;
+            return (T)static_map.get(key);
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -601,9 +603,10 @@ public final class RedisUtil {
      * @param key
      * @param value
      */
-    public void setJsonStringValue(String key, Object value) {
+    public <T> void setJsonStringValue(String key, Object value) {
         try {
-            set(key, FastJsonUtils.getBeanToJson(value));
+            static_map.put(key, value);
+//            set(key, FastJsonUtils.getBeanToJson(value));
         } catch (Exception e) {
             e.printStackTrace();
         }

kernel/src/test/java/com/lantone/qc/kernel/TaizDataImportApiTest.java

@@ -79,7 +79,7 @@ public class TaizDataImportApiTest {
             patientMap.put("hospital_id", hospitalId);
             list.add(patientMap);
         }
-        initMysqlJdbc().insert(list, "qc_cases_number", new String[]{"hospital_id", "case_number"});
+        initMysqlJdbc().insert(list, "qc_cases_number_copy", new String[]{"hospital_id", "case_number"});
     }
 
     private void insertDoctor(List<Doctor> doctors) {
@@ -182,7 +182,7 @@ public class TaizDataImportApiTest {
                 list.add(patientTextMap);
             }
         }
-        initMysqlJdbc().insert(list, "qc_model_mapping", new String[]{"case_number", "case_number_id", "origin_text", "mode_id", "text", "origin_mode"});
+        initMysqlJdbc().insert(list, "qc_model_mapping_add", new String[]{"case_number", "case_number_id", "origin_text", "mode_id", "text", "origin_mode"});
 
         deletePatientInfos(deletePatient);
     }
@@ -362,7 +362,7 @@ public class TaizDataImportApiTest {
         Map<String, String> map = new HashMap<>();
         try {
             st = conn.createStatement();
-            String sql = "select id, case_number from qc_cases_number where hospital_id = " + hospitalId;
+            String sql = "select id, case_number from qc_cases_number_copy where hospital_id = " + hospitalId;
             rs = st.executeQuery(sql);
             while (rs.next()) {
                 r1 = rs.getString(1);
@@ -438,7 +438,7 @@ public class TaizDataImportApiTest {
         try {
             st = conn.createStatement();
             for (String caseNumber : caseNumbers) {
-                String sql = "delete from qc_cases_number where case_number = '" + caseNumber + "'";
+                String sql = "delete from qc_cases_number_copy where case_number = '" + caseNumber + "'";
                 st.execute(sql);
             }
         } catch (SQLException sqle) {