配置管理

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/FactorEnchanceController.java

@@ -38,6 +38,7 @@ import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -90,7 +91,15 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
         Page<FactorEnchance> page = new Page<FactorEnchance>(pageNo, pageSize);
         queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0);
         IPage<FactorEnchance> pageList = factorEnchanceService.page(page, queryWrapper);
+//        select id,category,rule_name,description,violation_level,call_scenario from medical_ins_rule_info
+        List<MedicalInsRuleInfo> ruleInfoList = medicalInsRuleInfoService.list();
+
         pageList.getRecords().forEach(it -> {
+            Optional<MedicalInsRuleInfo> first = ruleInfoList.stream().filter(o ->
+                    ObjectUtils.nullSafeEquals(o.getId(), it.getFactorCatalog())).findFirst();
+        if(first.isPresent()){
+            it.setFactorCatalogStr(first.get().getRuleName());
+        }
             if (it.getEnhanceType() == 1) {
                 List<FactorAttrRela> inList = factorAttrRelaService.lambdaQuery().eq(FactorAttrRela::getIoType, Constant.INPUT).eq(FactorAttrRela::getFactorEnhanceId, it.getId()).list();
                 if (inList.size() > 0) {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/RuleFactorRelaController.java

@@ -83,7 +83,6 @@ public class RuleFactorRelaController extends JeecgController<RuleFactorRela, IR
      */
     @AutoLog(value = "rule_factor_rela-添加")
     @ApiOperation(value = "rule_factor_rela-添加", notes = "rule_factor_rela-添加")
-    @RequiresPermissions("medical:rule_factor_rela:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody RuleFactorRela ruleFactorRela) {
         ruleFactorRelaService.save(ruleFactorRela);
@@ -98,7 +97,6 @@ public class RuleFactorRelaController extends JeecgController<RuleFactorRela, IR
      */
     @AutoLog(value = "rule_factor_rela-编辑")
     @ApiOperation(value = "rule_factor_rela-编辑", notes = "rule_factor_rela-编辑")
-    @RequiresPermissions("medical:rule_factor_rela:edit")
     @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
     public Result<String> edit(@RequestBody RuleFactorRela ruleFactorRela) {
         ruleFactorRelaService.updateById(ruleFactorRela);
@@ -147,7 +145,6 @@ public class RuleFactorRelaController extends JeecgController<RuleFactorRela, IR
      */
     @AutoLog(value = "rule_factor_rela-通过id删除")
     @ApiOperation(value = "rule_factor_rela-通过id删除", notes = "rule_factor_rela-通过id删除")
-    @RequiresPermissions("medical:rule_factor_rela:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
         ruleFactorRelaService.removeById(id);
@@ -162,7 +159,6 @@ public class RuleFactorRelaController extends JeecgController<RuleFactorRela, IR
      */
     @AutoLog(value = "rule_factor_rela-批量删除")
     @ApiOperation(value = "rule_factor_rela-批量删除", notes = "rule_factor_rela-批量删除")
-    @RequiresPermissions("medical:rule_factor_rela:deleteBatch")
     @DeleteMapping(value = "/deleteBatch")
     public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
         this.ruleFactorRelaService.removeByIds(Arrays.asList(ids.split(",")));
@@ -192,7 +188,6 @@ public class RuleFactorRelaController extends JeecgController<RuleFactorRela, IR
      * @param request
      * @param ruleFactorRela
      */
-    @RequiresPermissions("medical:rule_factor_rela:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, RuleFactorRela ruleFactorRela) {
         return super.exportXls(request, ruleFactorRela, RuleFactorRela.class, "rule_factor_rela");
@@ -205,7 +200,6 @@ public class RuleFactorRelaController extends JeecgController<RuleFactorRela, IR
      * @param response
      * @return
      */
-    @RequiresPermissions("medical:rule_factor_rela:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
         return super.importExcel(request, response, RuleFactorRela.class);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/FactorEnchance.java

@@ -147,4 +147,6 @@ public class FactorEnchance implements Serializable {
     private List<FactorCondRela> factorCondRelaList;
     @TableField(exist = false)
     private String enhanceTypeStr;
+    @TableField(exist = false)
+    private String factorCatalogStr;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MedicalInsRuleInfo.java

@@ -56,6 +56,7 @@ public class MedicalInsRuleInfo implements Serializable {
     /**类别*/
     @Excel(name = "就诊类别", width = 15)
     @ApiModelProperty(value = "就诊类别")
+    @Dict(dicCode = "consultation_type")
     private java.lang.String treatmentType;
 	/**规则说明*/
 	@Excel(name = "规则说明", width = 15)