Browse Source

redis修改

rengb 5 years ago
parent
commit
e46500c8aa
19 changed files with 48 additions and 48 deletions
  1. 3 3
      dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/facade/ModelHospitalFacade.java
  2. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/analysis/QCAnalysis.java
  3. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0002.java
  4. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0011.java
  5. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0012.java
  6. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0015.java
  7. 1 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0019.java
  8. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0494.java
  9. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathrecord/DEAR0338.java
  10. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0096.java
  11. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0147.java
  12. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0508.java
  13. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0094.java
  14. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0128.java
  15. 2 2
      kernel/src/main/java/com/lantone/qc/kernel/structure/ai/process/EntityProcess.java
  16. 8 8
      kernel/src/main/java/com/lantone/qc/kernel/util/CacheUtil.java
  17. 4 4
      kernel/src/main/java/com/lantone/qc/kernel/util/CatalogueUtil.java
  18. 3 3
      kernel/src/main/java/com/lantone/qc/kernel/util/DiagEnhancer.java
  19. 2 2
      trans/src/main/java/com/lantone/qc/trans/changx/ChangxThreeLevelWardDocTrans.java

+ 3 - 3
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/facade/ModelHospitalFacade.java

@@ -21,10 +21,10 @@ import java.util.stream.Collectors;
 public class ModelHospitalFacade extends ModelHospitalServiceImpl {
 
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
 
     public List<String> getRecTitles(long hospitalId, long modelId) {
-        List<String> recTitles = redisUtil.getJsonStringValue("recTitles");
+        List<String> recTitles = specialStorageUtil.getJsonStringValue("recTitles");
         if (ListUtil.isEmpty(recTitles)) {
             QueryWrapper<ModelHospital> qcModelHospitalQe = new QueryWrapper<>();
             qcModelHospitalQe.eq("hospital_id", hospitalId);
@@ -36,7 +36,7 @@ public class ModelHospitalFacade extends ModelHospitalServiceImpl {
                     .filter(i -> StringUtil.isNotBlank(i))
                     .distinct()
                     .collect(Collectors.toList());
-            redisUtil.setJsonStringValue("recTitles", recTitles);
+            specialStorageUtil.setJsonStringValue("recTitles", recTitles);
         }
         return recTitles;
     }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/analysis/QCAnalysis.java

@@ -28,12 +28,12 @@ public class QCAnalysis {
     @Autowired
     CRFServiceClient crfServiceClient;
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
     @Autowired
     SimilarityServiceClient similarityServiceClient;
 
     public OutputInfo anlysis(QueryVo queryVo) throws AIException, CatalogueException, Exception {
-        redisUtil.getHospitalIdThreadLocal().set(queryVo.getHospitalId());
+        specialStorageUtil.getHospitalIdThreadLocal().set(queryVo.getHospitalId());
         OutputInfo outputInfo = new OutputInfo();
         InputInfo inputInfo = TransDispatch.trans(queryVo);
         inputInfo.setInputCatalogueMap(queryVo.getInputCatalogueMap());

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

@@ -30,7 +30,7 @@ import java.util.Map;
 @Component
 public class BEH0002 extends QCCatalogue {
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
     @Autowired
     ChiefPresentSimilarityServiceClient chiefPresentSimilarityServiceClient;
 
@@ -69,12 +69,12 @@ public class BEH0002 extends QCCatalogue {
             String firstHDiag = diags.get(0).getHospitalDiagName();
             String mainDiag = StringUtil.isBlank(firstHDiag) ? firstDiag : firstHDiag;
             List<String> symptoms = null;
-            //Map<String, String> hostpital_standDiag = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
+            //Map<String, String> hostpital_standDiag = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
             //if (!hostpital_standDiag.containsKey(mainDiag)) {
             //    status.set("0");
             //    return;
             //}
-            Map<String, Map<String, Object>> diagMap = redisUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
+            Map<String, Map<String, Object>> diagMap = specialStorageUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
             Map<String, Object> map = (Map<String, Object>) diagMap.get(mainDiag);
             if (map != null && map.size() > 0) {
                 symptoms = (List<String>) map.get("symptoms");

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

@@ -25,13 +25,13 @@ import java.util.stream.Collectors;
 @Component
 public class BEH0011 extends QCCatalogue {
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if(inputInfo.getBeHospitalizedDoc() == null){
             status.set("0");
             return;
         }
-        Map<String, Map<String, Object>> diagMap = redisUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
+        Map<String, Map<String, Object>> diagMap = specialStorageUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
         String initDiagText = CatalogueUtil.removeSpecialChar(inputInfo.getBeHospitalizedDoc().getInitialDiagLabel().getText());
         List<Diag> diags = inputInfo.getBeHospitalizedDoc().getPastLabel().getDiags().stream().filter(diag -> diag.getNegative() == null).collect(Collectors.toList());
         if(StringUtils.isNotEmpty(initDiagText)){

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0012.java

@@ -26,7 +26,7 @@ import java.util.Map;
 public class BEH0012 extends QCCatalogue {
     private static String[] strings = { "2型糖尿病" };
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
 
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() == null) {
@@ -34,7 +34,7 @@ public class BEH0012 extends QCCatalogue {
             return;
         }
         List<String> diags_out = new ArrayList<>();
-        Map<String, String> hostpital_standDiag = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
+        Map<String, String> hostpital_standDiag = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
         List<Diag> diags = inputInfo.getBeHospitalizedDoc().getInitialDiagLabel().getDiags();
         if (diags != null && diags.size() > 0) {
             for (Diag diag : diags) {

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0015.java

@@ -22,13 +22,13 @@ import java.util.List;
 @Component
 public class BEH0015 extends QCCatalogue {
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         if(inputInfo.getBeHospitalizedDoc() == null){
             return;
         }
-        List<String> clinicalList = (List<String>) redisUtil.getJsonStringValue(KernelConstants.CONCEPT_CLINIC_BODYPART_PROPERTIES_LIST);
+        List<String> clinicalList = (List<String>) specialStorageUtil.getJsonStringValue(KernelConstants.CONCEPT_CLINIC_BODYPART_PROPERTIES_LIST);
         List<Clinical> clinicals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getClinicals();
         if(clinicals.size()>0){
             Clinical clinical = clinicals.get(0);

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0019.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Component
 public class BEH0019 extends QCCatalogue {
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if(inputInfo.getBeHospitalizedDoc() == null){
             status.set("0");

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0494.java

@@ -29,8 +29,8 @@ public class BEH0494 extends QCCatalogue {
             doctorName = inputInfo.getBeHospitalizedDoc().getStructureMap().get("签名");
         }
         if (StringUtils.isNotEmpty(doctorName)) {
-            SpecialStorageUtil redisUtil = SpringContextUtil.getBean("redisUtil");
-            Map<String, Object> surgeon = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
+            SpecialStorageUtil specialStorageUtil = SpringContextUtil.getBean("specialStorageUtil");
+            Map<String, Object> surgeon = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
             if (surgeon == null) {
                 return;
             }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/deathrecord/DEAR0338.java

@@ -20,7 +20,7 @@ import java.util.Map;
 @Component
 public class DEAR0338 extends QCCatalogue {
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
 
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getDeathRecordDoc() == null) {
@@ -37,7 +37,7 @@ public class DEAR0338 extends QCCatalogue {
     }
 
     private boolean findDirectorDoctor(String recordDoctor) {
-        Map<String, Map<String, Object>> hospitalDoctorMap = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
+        Map<String, Map<String, Object>> hospitalDoctorMap = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
         if (hospitalDoctorMap == null) {
             return false;
         }

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0096.java

@@ -24,14 +24,14 @@ import java.util.Map;
 @Component
 public class FIRC0096 extends QCCatalogue {
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if(inputInfo.getFirstCourseRecordDoc() == null){
             status.set("0");
             return;
         }
         List<String> diags_out = new ArrayList<>();
-        Map<String, String> hostpital_standDiag = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
+        Map<String, String> hostpital_standDiag = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
         if(firstCourseRecordDoc != null){
             DiagLabel initialDiagLabel = firstCourseRecordDoc.getInitialDiagLabel();

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0147.java

@@ -27,7 +27,7 @@ import java.util.Map;
 public class LEA0147 extends QCCatalogue {
 
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
@@ -41,7 +41,7 @@ public class LEA0147 extends QCCatalogue {
             DiagLabel leaveDiagLabel = leaveHospitalDoc.getLeaveDiagLabel();
             if (leaveDiagLabel != null) {
                 List<Diag> diags = leaveDiagLabel.getDiags();
-                Map<String, Map<String, String>> hospitalDiagMap = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
+                Map<String, Map<String, String>> hospitalDiagMap = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_MAP);
                 if (ListUtil.isNotEmpty(diags) && hospitalDiagMap != null) {
                     List<String> diagnames = new ArrayList<>();
                     for (Diag dg : diags) {

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0508.java

@@ -34,8 +34,8 @@ public class LEA0508 extends QCCatalogue {
             status.set("0");
             return;
         }
-        SpecialStorageUtil redisUtil = SpringContextUtil.getBean("redisUtil");
-        Map<String, Object> surgeon = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
+        SpecialStorageUtil specialStorageUtil = SpringContextUtil.getBean("specialStorageUtil");
+        Map<String, Object> surgeon = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
         if (surgeon == null) {
             status.set("0");
             return;

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0094.java

@@ -36,8 +36,8 @@ public class THR0094 extends QCCatalogue {
         }
 
 
-        SpecialStorageUtil redisUtil = SpringContextUtil.getBean("redisUtil");
-        Map<String, Object> surgeon = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
+        SpecialStorageUtil specialStorageUtil = SpringContextUtil.getBean("specialStorageUtil");
+        Map<String, Object> surgeon = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
         if (surgeon == null) {
             status.set("0");
             return;

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0128.java

@@ -29,7 +29,7 @@ import java.util.Map;
 @Component
 public class THR0128 extends QCCatalogue {
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
 
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
@@ -163,7 +163,7 @@ public class THR0128 extends QCCatalogue {
         if (firstCourseRecordDoc == null) {
             return false;
         }
-        Map<String, Map<String, Object>> hospitalDoctorMap = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
+        Map<String, Map<String, Object>> hospitalDoctorMap = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
         String doctorSign = firstCourseRecordDoc.getStructureMap().get("医师签名");
         if (hospitalDoctorMap == null || StringUtil.isBlank(doctorSign)) {
             return false;

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/structure/ai/process/EntityProcess.java

@@ -29,7 +29,7 @@ import java.util.regex.Pattern;
 @Component
 public class EntityProcess {
     @Autowired
-    SpecialStorageUtil redisUtil;
+    SpecialStorageUtil specialStorageUtil;
     /**
      * 树形结构存储三元组关系,返回传入实体类型为节点的所有关联实体对象
      * @param aiOut
@@ -239,7 +239,7 @@ public class EntityProcess {
 //     * @param diag
 //     */
 //    protected void setDiag(Lemma lemma, Diag diag) {
-//        Map<String, String> diagRedisMap = (Map<String, String>)redisUtil.get(KernelConstants.CONCEPT_DIAG_HOSPITAL_REFLECT);
+//        Map<String, String> diagRedisMap = (Map<String, String>)specialStorageUtil.get(KernelConstants.CONCEPT_DIAG_HOSPITAL_REFLECT);
 //        diag.setHospitalDiagName(lemma.getText());
 //        diag.setName(lemma.getText());//存放医院原始疾病名称
 //        diag.setName(diagRedisMap.get(lemma.getText()) == null ? "" : diagRedisMap.get(lemma.getText()));//映射到我们的标准疾病名称

+ 8 - 8
kernel/src/main/java/com/lantone/qc/kernel/util/CacheUtil.java

@@ -30,7 +30,7 @@ import java.util.Map;
 public class CacheUtil implements ApplicationRunner {
     private Configuration configuration = new DefaultConfig();
     @Autowired
-    private SpecialStorageUtil redisUtil;
+    private SpecialStorageUtil specialStorageUtil;
     @Value("${qc.hospital_id}")
     private String hospitalIds;
 
@@ -42,7 +42,7 @@ public class CacheUtil implements ApplicationRunner {
             if (StringUtil.isBlank(i)) {
                 continue;
             }
-            redisUtil.getHospitalCache().put(i, Maps.newHashMap());
+            specialStorageUtil.getHospitalCache().put(i, Maps.newHashMap());
             this.putConceptDiagPropertyMap(i);//疾病相关信息放入缓存 包括疾病是否是慢病、传染病、常见症状、同义词
             this.putHospitalDiagMap(i);//医院疾病信息
             this.putHospitalDiagHuaZMap(i);//医院华卓映射
@@ -85,7 +85,7 @@ public class CacheUtil implements ApplicationRunner {
                     diagMap.put(line_arr[0], map);
                 }
             }
-            redisUtil.setValByHospitalId(hospitalId, KernelConstants.CONCEPT_DIAG_PROPERTY_MAP, diagMap);
+            specialStorageUtil.setValByHospitalId(hospitalId, KernelConstants.CONCEPT_DIAG_PROPERTY_MAP, diagMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -112,7 +112,7 @@ public class CacheUtil implements ApplicationRunner {
                     hospitalDoctorMap.put(line_arr[0], map);
                 }
             }
-            redisUtil.setValByHospitalId(hospitalId, KernelConstants.HOSPITAL_DOCTOR_MAP, hospitalDoctorMap);
+            specialStorageUtil.setValByHospitalId(hospitalId, KernelConstants.HOSPITAL_DOCTOR_MAP, hospitalDoctorMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -133,7 +133,7 @@ public class CacheUtil implements ApplicationRunner {
                 detail.put("icd10", "A001");
                 hospitalDiagMap.put(line, detail);
             }
-            redisUtil.setValByHospitalId(hospitalId, KernelConstants.HOSPITAL_DIAG_MAP, hospitalDiagMap);
+            specialStorageUtil.setValByHospitalId(hospitalId, KernelConstants.HOSPITAL_DIAG_MAP, hospitalDiagMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -154,7 +154,7 @@ public class CacheUtil implements ApplicationRunner {
                 detail.put("icd10", "A001");
                 hospitalDiagMap.put(line, detail);
             }
-            redisUtil.setValByHospitalId(hospitalId, KernelConstants.HOSPITAL_DIAG_HUAZ_MAP, hospitalDiagMap);
+            specialStorageUtil.setValByHospitalId(hospitalId, KernelConstants.HOSPITAL_DIAG_HUAZ_MAP, hospitalDiagMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -175,7 +175,7 @@ public class CacheUtil implements ApplicationRunner {
                 detail.put("icd10", "A001");
                 hospitalDiagMap.put(line, detail);
             }
-            redisUtil.setValByHospitalId(hospitalId, KernelConstants.LANTONE_DIAG_HUAZ_MAP, hospitalDiagMap);
+            specialStorageUtil.setValByHospitalId(hospitalId, KernelConstants.LANTONE_DIAG_HUAZ_MAP, hospitalDiagMap);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
@@ -193,7 +193,7 @@ public class CacheUtil implements ApplicationRunner {
             for (String line : lines) {
                 clinicBodyPartList.add(line);
             }
-            redisUtil.setValByHospitalId(hospitalId, KernelConstants.CONCEPT_CLINIC_BODYPART_PROPERTIES_LIST, clinicBodyPartList);
+            specialStorageUtil.setValByHospitalId(hospitalId, KernelConstants.CONCEPT_CLINIC_BODYPART_PROPERTIES_LIST, clinicBodyPartList);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }

+ 4 - 4
kernel/src/main/java/com/lantone/qc/kernel/util/CatalogueUtil.java

@@ -116,8 +116,8 @@ public class CatalogueUtil {
         if (ListUtil.isEmpty(diags) || StringUtil.isBlank(nature) || StringUtil.isBlank(natureValue)) {
             return null;
         }
-        SpecialStorageUtil redisUtil = SpringContextUtil.getBean("redisUtil");
-        Map<String, Map<String, String>> conceptDiagPropertyMap = redisUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
+        SpecialStorageUtil specialStorageUtil = SpringContextUtil.getBean("specialStorageUtil");
+        Map<String, Map<String, String>> conceptDiagPropertyMap = specialStorageUtil.getJsonStringValue(KernelConstants.CONCEPT_DIAG_PROPERTY_MAP);
         if (conceptDiagPropertyMap == null) {
             return null;
         }
@@ -424,8 +424,8 @@ public class CatalogueUtil {
      */
     public static String getDoctorTitle(List<OperationDoc> operationDocs, Date recordDate, String findTitle) {
         String title = "";
-        SpecialStorageUtil redisUtil = SpringContextUtil.getBean("redisUtil");
-        Map<String, Object> surgeon = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
+        SpecialStorageUtil specialStorageUtil = SpringContextUtil.getBean("specialStorageUtil");
+        Map<String, Object> surgeon = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
         if (surgeon == null) {
             return title;
         }

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/util/DiagEnhancer.java

@@ -18,9 +18,9 @@ public class DiagEnhancer {
     public static Diag create(String hospitalDiagName) {
         Diag diag = new Diag();
         diag.setHospitalDiagName(hospitalDiagName);
-        SpecialStorageUtil redisUtil = SpringContextUtil.getBean("redisUtil");
-        Map<String, Map<String, String>> hospitalDiagHuazMap = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_HUAZ_MAP);
-        Map<String, Map<String, String>> lantoneDiagHuazMap = redisUtil.getJsonStringValue(KernelConstants.LANTONE_DIAG_HUAZ_MAP);
+        SpecialStorageUtil specialStorageUtil = SpringContextUtil.getBean("specialStorageUtil");
+        Map<String, Map<String, String>> hospitalDiagHuazMap = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DIAG_HUAZ_MAP);
+        Map<String, Map<String, String>> lantoneDiagHuazMap = specialStorageUtil.getJsonStringValue(KernelConstants.LANTONE_DIAG_HUAZ_MAP);
         if (hospitalDiagHuazMap != null && lantoneDiagHuazMap != null) {
             Map<String, String> huazDiagMap = hospitalDiagHuazMap.get(hospitalDiagName);
             if (huazDiagMap != null) {

+ 2 - 2
trans/src/main/java/com/lantone/qc/trans/changx/ChangxThreeLevelWardDocTrans.java

@@ -229,8 +229,8 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
      */
     public static String getDoctorTitle(List<OperationDoc> operationDocs, Date recordDate, String findTitle) {
         String title = "";
-        SpecialStorageUtil redisUtil = SpringContextUtil.getBean("redisUtil");
-        Map<String, Object> surgeon = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
+        SpecialStorageUtil specialStorageUtil = SpringContextUtil.getBean("specialStorageUtil");
+        Map<String, Object> surgeon = specialStorageUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
         if (surgeon == null) {
             return title;
         }