Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -128,6 +128,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/sys/planDetail/revStopPlanDetails").permitAll()
                 .antMatchers("/sys/plan/getDefaultPlans").permitAll()
                 .antMatchers("/sys/dictionaryInfo/getList").permitAll()
+                .antMatchers("/sys/dictionaryInfo/getListBack").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -170,6 +170,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/sys/planDetail/revStopPlanDetails", request)
                 || matchers("/sys/plan/getDefaultPlans", request)
                 || matchers("/sys/dictionaryInfo/getList", request)
+                || matchers("/sys/dictionaryInfo/getListBack", request)
                 || matchers("/", request)) {
             return true;
         }

src/main/java/com/diagbot/facade/ConceptInfoFacade.java

@@ -210,7 +210,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
         conceptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("name", staticKnowledgeVO.getName())
                 .eq("type", typeName);
-        ConceptInfo conceptInfo = this.getOne(conceptInfoQueryWrapper);
+        ConceptInfo conceptInfo = this.getOne(conceptInfoQueryWrapper, false);
 
         if (conceptInfo == null) {
             throw new CommonException(CommonErrorCode.IS_EXISTS, "缺少静态信息");

src/main/java/com/diagbot/facade/DeptConfigFacade.java

@@ -59,7 +59,7 @@ public class DeptConfigFacade {
                     .eq("hospital_id", Long.valueOf(hospitalId))
                     .eq("his_name", deptConfig.getHisName())
                     .eq("unique_name", deptConfig.getUniqueName());
-            oldRecord = deptConfigService.getOne(queryWrapper);
+            oldRecord = deptConfigService.getOne(queryWrapper, false);
             if (oldRecord != null) {
                 return true;
             }

src/main/java/com/diagbot/facade/DictionaryFacade.java

@@ -35,6 +35,21 @@ public class DictionaryFacade extends DictionaryInfoServiceImpl {
         return EntityUtil.makeEntityListMap(listRes, "groupType");
     }
 
+    /**
+     * 返回字典信息
+     *
+     * @return
+     */
+    public Map<Long, List<DictionaryInfoDTO>> getListBack() {
+        List<DictionaryInfo> list = this.list(new QueryWrapper<DictionaryInfo>()
+                .in("return_type", ListUtil.arrayToList(new Long[] { 0L, 1L }))
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .orderByAsc("group_type", "order_no"));
+        List<DictionaryInfoDTO> listRes = BeanUtil.listCopyTo(list, DictionaryInfoDTO.class);
+        return EntityUtil.makeEntityListMap(listRes, "groupType");
+    }
+
+
     /**
      * 返回指定字典信息
      *

src/main/java/com/diagbot/facade/DiseaseConfigFacade.java

@@ -60,7 +60,7 @@ public class DiseaseConfigFacade {
                     .eq("hospital_id", Long.valueOf(hospitalId))
                     .eq("his_name", diseaseConfig.getHisName())
                     .eq("unique_name", diseaseConfig.getUniqueName());
-            oldRecord = diseaseConfigService.getOne(queryWrapper);
+            oldRecord = diseaseConfigService.getOne(queryWrapper, false);
             if (oldRecord != null) {
                 return true;
             }

src/main/java/com/diagbot/facade/DrugConfigFacade.java

@@ -59,7 +59,7 @@ public class DrugConfigFacade {
                     .eq("hospital_id", Long.valueOf(hospitalId))
                     .eq("his_name", drugConfig.getHisName())
                     .eq("unique_name", drugConfig.getUniqueName());
-            oldRecord = drugConfigService.getOne(queryWrapper);
+            oldRecord = drugConfigService.getOne(queryWrapper, false);
             if (oldRecord != null) {
                 return true;
             }

src/main/java/com/diagbot/facade/LisConfigFacade.java

@@ -67,7 +67,7 @@ public class LisConfigFacade{
                 queryWrapper
                         .eq("his_detail_name", lisConfig.getHisDetailName());
             }
-            oldRecord = lisConfigService.getOne(queryWrapper);
+            oldRecord = lisConfigService.getOne(queryWrapper, false);
             if (oldRecord != null) {
                 return true;
             }

src/main/java/com/diagbot/facade/OperationConfigFacade.java

@@ -59,7 +59,7 @@ public class OperationConfigFacade {
                     .eq("hospital_id", Long.valueOf(hospitalId))
                     .eq("his_name", operationConfig.getHisName())
                     .eq("unique_name", operationConfig.getUniqueName());
-            oldRecord = operationConfigService.getOne(queryWrapper);
+            oldRecord = operationConfigService.getOne(queryWrapper, false);
             if (oldRecord != null) {
                 return true;
             }
@@ -251,7 +251,7 @@ public class OperationConfigFacade {
      * @param uniqueNames
      * @return
      */
-    public Map<String,Map<String,Long>> getUniqueNameConfigMap(Long hospitalId, List<String> hisNames, List<String> uniqueNames) {
+    public Map<String, Map<String, Long>> getUniqueNameConfigMap(Long hospitalId, List<String> hisNames, List<String> uniqueNames) {
         Map<String, Map<String, Long>> retMap = new HashMap<>();
         QueryWrapper<OperationConfig> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())

src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -59,7 +59,7 @@ public class PacsConfigFacade {
                     .eq("hospital_id", Long.valueOf(hospitalId))
                     .eq("his_name", pacsConfig.getHisName())
                     .eq("unique_name", pacsConfig.getUniqueName());
-            oldRecord = pacsConfigService.getOne(queryWrapper);
+            oldRecord = pacsConfigService.getOne(queryWrapper, false);
             if (oldRecord != null) {
                 return true;
             }

src/main/java/com/diagbot/web/DictionaryInfoController.java

@@ -29,7 +29,7 @@ public class DictionaryInfoController {
     @Autowired
     DictionaryFacade dictionaryFacade;
 
-    @ApiOperation(value = "返回字典信息[by:gaodm]",
+    @ApiOperation(value = "返回字典信息(界面返回)[by:gaodm]",
             notes = "")
     @PostMapping("/getList")
     @SysLogger("getList")
@@ -37,4 +37,13 @@ public class DictionaryInfoController {
         Map<Long, List<DictionaryInfoDTO>> data = dictionaryFacade.getList();
         return RespDTO.onSuc(data);
     }
+
+    @ApiOperation(value = "返回字典信息(后台维护返回)[by:gaodm]",
+            notes = "")
+    @PostMapping("/getListBack")
+    @SysLogger("getListBack")
+    public RespDTO<Map<Long, List<DictionaryInfoDTO>>> getListBack() {
+        Map<Long, List<DictionaryInfoDTO>> data = dictionaryFacade.getListBack();
+        return RespDTO.onSuc(data);
+    }
 }