配置管理

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

@@ -6,7 +6,7 @@ import java.util.Map;
 
 /**
  * 字段类型
- * 显示类型。1：文本输入，2：整型输入，3：浮点输入，4：日期，5：时间，6：日期时间，7：数组，8:对象,9：布尔值
+ * 显示类型。1：文本输入，2：整型输入，3：浮点输入，4：日期，5：时间，6：日期时间，7：数组，8:对象,9：布尔值,10:对象数组
  */
 public enum ColumnTypeEnum {
     STRING(1,String.class),INTEGER(2,Integer.class),FLOAT(3,Float.class),DATE(4, Date.class),

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.medical;
 
+import org.apache.tomcat.util.digester.Rules;
+
 /**
  * 常量类
  */
@@ -7,6 +9,7 @@ public class Constant {
 
     public static final String EFF_STATE = "00A";
     public static final String EXP_STATE = "00X";
+    public static final String SHARE_RULES = "共享规则";
 
     public static final String MODULE_RULEENGINE_NAME = "ruleEngine";
     /**

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

@@ -8,16 +8,18 @@ import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import lombok.RequiredArgsConstructor;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.Dict;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.DictDto;
-import org.jeecg.common.system.vo.DictModel;
-import org.jeecg.common.system.vo.DictModelMany;
-import org.jeecg.common.system.vo.SysCategoryModel;
+import org.jeecg.common.system.vo.*;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.medical.Constant;
+import org.jeecg.modules.medical.entity.FactorEnchance;
 import org.jeecg.modules.medical.entity.MedicalInsRuleInfo;
 import org.jeecg.modules.medical.entity.MedicalInsRuleProject;
+import org.jeecg.modules.medical.service.IFactorEnchanceService;
 import org.jeecg.modules.medical.service.IMedicalInsRuleInfoService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -58,15 +60,13 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
 @RestController
 @RequestMapping("/medical/medicalInsRuleInfo")
 @Slf4j
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRuleInfo, IMedicalInsRuleInfoService> {
-    @Autowired
-    private IMedicalInsRuleInfoService medicalInsRuleInfoService;
-    @Autowired
-    private ISysCategoryService sysCategoryService;
-    @Autowired
-    private ISysDictService sysDictService;
-    @Autowired
-    private IMedicalInsRuleProjectService projectService;
+    private final IMedicalInsRuleInfoService medicalInsRuleInfoService;
+    private final ISysCategoryService sysCategoryService;
+    private final ISysDictService sysDictService;
+    private final IMedicalInsRuleProjectService projectService;
+    private final IFactorEnchanceService enchanceService;
 
     /**
      * 分页列表查询
@@ -86,6 +86,7 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
                                                            HttpServletRequest req) {
         QueryWrapper<MedicalInsRuleInfo> queryWrapper = QueryGenerator.initQueryWrapper(medicalInsRuleInfo, req.getParameterMap());
         Page<MedicalInsRuleInfo> page = new Page<MedicalInsRuleInfo>(pageNo, pageSize);
+        queryWrapper.ne("rule_name", Constant.SHARE_RULES);
         IPage<MedicalInsRuleInfo> pageList = medicalInsRuleInfoService.page(page, queryWrapper);
         return Result.OK(pageList);
     }
@@ -110,10 +111,25 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         return Result.OK(responses);
     }
 
+
+    @ApiOperation(value = "配置规则类别对应数据", notes = "配置规则类别对应数据")
+    @GetMapping(value = "/relaChildrenList")
+    public Result<List<CommonResponse>> relaChildrenList(@RequestParam(name = "category") String category, HttpServletRequest req) {
+        List<MedicalInsRuleInfo> list = medicalInsRuleInfoService.lambdaQuery().eq(MedicalInsRuleInfo::getCategory, category).list();
+        List<CommonResponse> responses = new ArrayList<>();
+        for (MedicalInsRuleInfo info : list) {
+            CommonResponse response = new CommonResponse();
+            response.setId(info.getId());
+            response.setName(info.getRuleName());
+            responses.add(response);
+        }
+        return Result.OK(responses);
+    }
+
     @ApiOperation(value = "通过医保规则ID获取规则项目分页", notes = "通过医保规则ID获取规则项目分页")
     @GetMapping(value = "/projectPage")
     public Result<?> projectPage(@RequestParam(name = "id") Integer id,
-                                 @RequestParam(name = "projectName",required = false) String projectName,
+                                 @RequestParam(name = "projectName", required = false) String projectName,
                                  @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                  @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                  HttpServletRequest req) {
@@ -124,7 +140,7 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         List<DictDto> dictDtos = sysDictService.queryDictByKeys(Arrays.asList(medicalInsRuleInfo.getSelectedRoles().split(",")));
         MedicalInsRuleProject medicalInsRuleProject = new MedicalInsRuleProject();
         medicalInsRuleProject.setMedicalInsRuleInfoId(id);
-        if(StringUtils.hasText(projectName)){
+        if (StringUtils.hasText(projectName)) {
             medicalInsRuleProject.setProjectName(projectName);
         }
         QueryWrapper<MedicalInsRuleProject> queryWrapper = QueryGenerator.initQueryWrapper(medicalInsRuleProject, req.getParameterMap());
@@ -137,6 +153,16 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
     }
 
 
+    /**
+     * 规则配置
+     */
+
+
+    /**
+     * 获取配置规则共享规则数据
+     */
+
+
     /**
      * 添加
      *
@@ -152,6 +178,9 @@ public class MedicalInsRuleInfoController extends JeecgController<MedicalInsRule
         if (list.size() > 0) {
             return Result.error("规则名称已存在！");
         }
+        if (medicalInsRuleInfo.getRuleName().equals(Constant.SHARE_RULES)) {
+            medicalInsRuleInfo.setCategory(null);
+        }
         medicalInsRuleInfoService.save(medicalInsRuleInfo);
         return Result.OK("添加成功！");
     }

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

@@ -43,7 +43,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
  * @Date:   2023-04-23
  * @Version: V1.0
  */
-@Api(tags="rule_factor_rela")
+@Api(tags="配置规则关联")
 @RestController
 @RequestMapping("/medical/ruleFactorRela")
 @Slf4j

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

@@ -91,6 +91,11 @@ public class AfterwardsAudit implements Serializable {
     @ApiModelProperty(value = "上个审核人员")
     private java.lang.String preCheckBy;
 
+	/**床号*/
+	@Excel(name = "床号", width = 15)
+    @ApiModelProperty(value = "床号")
+    private java.lang.String bedNumber;
+
     @ApiModelProperty(value = "上个审核时间")
     private Date preAuditTime;
 	/**审核人*/