Merge remote-tracking branch 'origin/master'

zjh

2025-05-19 7e73e7699d55b4b229bef4dc5d89e01aedef5a19

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProAdvicerulesController.java

@@ -45,7 +45,7 @@
    /**
     * 查询体检项目建议规则新表列表
     */
    @PreAuthorize("@ss.hasPermi('hosp:advicerules:list')")
//    @PreAuthorize("@ss.hasPermi('hosp:advicerules:list')")
    @GetMapping("/list")
    @ApiOperation(value = "查询体检项目建议规则新表列表")
    public TableDataInfo list(TjProAdvicerules tjProAdvicerules) {
@@ -123,8 +123,15 @@
    @Log(title = "体检项目建议规则新表", businessType = BusinessType.INSERT)
    @PostMapping
    @ApiOperation(value = "新增体检项目建议规则新表")
    public AjaxResult add(@RequestBody TjProAdvicerules tjProAdvicerules) {
        return toAjax(tjProAdvicerulesService.insertTjProAdvicerules(tjProAdvicerules));
    public AjaxResult add(@RequestBody TjProAdvicerules advicerules) {
        if(StringUtil.isNotBlank(advicerules.getFwz())){
            if(advicerules.getFwz().contains("-")){
                String[] split = advicerules.getFwz().split("-");
                advicerules.setFwzdz(split[1]);
                advicerules.setFwzxz(split[0]);
            }
        }
        return toAjax(tjProAdvicerulesService.save(advicerules));
    }

    /**
@@ -134,8 +141,15 @@
    @Log(title = "体检项目建议规则新表", businessType = BusinessType.UPDATE)
    @PutMapping
    @ApiOperation(value = "修改体检项目建议规则新表")
    public AjaxResult edit(@RequestBody TjProAdvicerules tjProAdvicerules) {
        return toAjax(tjProAdvicerulesService.updateTjProAdvicerules(tjProAdvicerules));
    public AjaxResult edit(@RequestBody TjProAdvicerules advicerules) {
        if(StringUtil.isNotBlank(advicerules.getFwz())){
            if(advicerules.getFwz().contains("-")){
                String[] split = advicerules.getFwz().split("-");
                advicerules.setFwzdz(split[1]);
                advicerules.setFwzxz(split[0]);
            }
        }
        return toAjax(tjProAdvicerulesService.updateById(advicerules));
    }

    /**
@@ -148,4 +162,16 @@
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(tjProAdvicerulesService.deleteTjProAdvicerulesByIds(ids));
    }



    @GetMapping("/getTjProAdvicerulesKsList")
    @ApiOperation(value = "获取体检诊断建议科室列表接口")
    public AjaxResult getTjProAdvicerulesKsList() {
        List<String> tjProAdvicerulesKsList = tjProAdvicerulesService.getTjProAdvicerulesKsList();
        return AjaxResult.success(tjProAdvicerulesKsList);
    }



}