Merge branch 'master' into 'master'

优化字典

See merge request lighter/web-server!66

src/main/java/thyyxxk/webserver/service/chronicDisease/ChronicDiseaseService.java

@@ -52,8 +52,6 @@ import java.util.stream.Collectors;
 @Slf4j
 public class ChronicDiseaseService {
 
-    private static Map<String, List<CodeName>> crmDictionary;
-
     private final ChronicDiseaseDao dao;
     private final CrmPatientMiDao cpmDao;
     private final SheetCreatedDao createdDao;
@@ -70,9 +68,6 @@ public class ChronicDiseaseService {
         this.emr = emr;
         this.crmEmrDao = crmEmrDao;
         this.redisLikeService = redisLikeService;
-        if (crmDictionary == null) {
-            crmDictionary = new HashMap<>();
-        }
     }
 
     /**
@@ -211,32 +206,31 @@ public class ChronicDiseaseService {
     }
 
     public ResultVo<Map<String, List<CodeName>>> getCrmDictionary(){
-        if (crmDictionary.isEmpty()) {
-            // 性别字典
-            crmDictionary.put("getSexCode", createdDao.getSexCode());
-            // 婚姻状况字典
-            crmDictionary.put("getMarriageCode", createdDao.getMarriageCode());
-            // 联系人关系字典
-            crmDictionary.put("getRelations", createdDao.getRelations());
-            // 职业字典
-            crmDictionary.put("getOccupation", createdDao.getOccupation());
-            // 国家字典
-            crmDictionary.put("getCountry", createdDao.getCountry());
-            // 民族字典
-            crmDictionary.put("getNation", createdDao.getNation());
-            // 慢特病类型字典
-            crmDictionary.put("getCrmClass", dao.getCrmClass());
+        Map<String, List<CodeName>> crmDictionary = new HashMap<>();
+        // 性别字典
+        crmDictionary.put("getSexCode", createdDao.getSexCode());
+        // 婚姻状况字典
+        crmDictionary.put("getMarriageCode", createdDao.getMarriageCode());
+        // 联系人关系字典
+        crmDictionary.put("getRelations", createdDao.getRelations());
+        // 职业字典
+        crmDictionary.put("getOccupation", createdDao.getOccupation());
+        // 国家字典
+        crmDictionary.put("getCountry", createdDao.getCountry());
+        // 民族字典
+        crmDictionary.put("getNation", createdDao.getNation());
+        // 慢特病类型字典
+        crmDictionary.put("getCrmClass", dao.getCrmClass());
 //            // 省
 //            crmDictionary.put("getProvince", dao.getProvince());
 //            // 市
 //            crmDictionary.put("getCity", dao.getCity(""));
 //            // 区
 //            crmDictionary.put("getArea", dao.getArea(""));
-            // 证件类型字典
-            crmDictionary.put("getPsnCertType", dao.getPsnCertType());
-            // 来源途径
-            crmDictionary.put("getAdmissWay", dao.getAdmissWay());
-        }
+        // 证件类型字典
+        crmDictionary.put("getPsnCertType", dao.getPsnCertType());
+        // 来源途径
+        crmDictionary.put("getAdmissWay", dao.getAdmissWay());
         return ResultVoUtil.success(crmDictionary);
     }