Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis

赵文轩

2024-06-13 443d12b11b02ac27cd459a4c7d441a6e30829c9b

Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java

@@ -63,7 +63,7 @@

    //对接his总接口  注册挂号接诊申请单操作
    @Transactional
    public void HisApiMethods(TjCustomer customer, Long orderId) {
    public AjaxResult HisApiMethods(TjCustomer customer, Long orderId) {

        Date dates = new Date();
        final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
@@ -161,8 +161,10 @@
                        LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                        lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintestapply");
                        HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                        hisApiGetMethodService.save(object4, "Outpintestapply", hisApiConfig);
                        hisApiGetMethodService.save(object4, "Outpintestapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dto)));

                    }else {
                        return AjaxResult.success();
                    }
                    //门诊检查申请
                    OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
@@ -218,8 +220,10 @@
                        LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                        lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinexamapply");
                        HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                        hisApiGetMethodService.save(jsonObject, "Outpinexamapply", hisApiConfig);
                        hisApiGetMethodService.save(jsonObject, "Outpinexamapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinexamapplyDto)));

                    }else {
                        return AjaxResult.success();
                    }

                    //门诊治疗处置申请
@@ -274,15 +278,17 @@
                        map.put("cardId", customer.getCardId());
                        JSONObject jsonObject = JSONUtil.parseObj(map);
                        LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                        lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinmedapply");
                        lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintreatapply");
                        HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                        hisApiGetMethodService.save(jsonObject, "Outpinmedapply", hisApiConfig);

                        hisApiGetMethodService.save(jsonObject, "Outpintreatapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dao)));
                    }else {
                        return AjaxResult.error();
                    }
                    return AjaxResult.success();
                    }
                }
            }
        }

        return AjaxResult.error();
    }



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

@@ -26,6 +26,7 @@
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
@@ -100,9 +101,6 @@
        map.put("key",key);
        return AjaxResult.success(map);
    }





    /**
@@ -211,7 +209,6 @@
        List<TjProject> tjProjects = tjProjectService.list(wq);
        return AjaxResult.success(tjProjects);
    }



    /**
@@ -444,6 +441,7 @@
    @Log(title = "体检项目", businessType = BusinessType.DELETE)
    @DeleteMapping("/{proIds}")
    @ApiOperation(value = "删除体检项目(可删除父项目和子项目)")
    @Transactional
    public AjaxResult remove(@PathVariable Long[] proIds) {
        if (null == proIds || proIds.length <= 0) {
            return AjaxResult.error("请选择要删除的项目");
@@ -475,6 +473,9 @@
                    wq.eq(TjStandard::getProId, proId);
                    tjStandardService.remove(wq);
                    tjProjectService.removeById(project1.getProId());
                    TjProject project = tjProjectService.getById(project1.getProParentId());
                    project.setProPrice(tjProjectService.getMoneys(project1.getProParentId().toString()));
                    tjProjectService.updateById(project);
                }
            }
        }