zjh
2024-06-13 2488993fc23157fe21f5898173811372c8c835e1
zjh 本地 2024/06/13 --1
2个文件已修改
67 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java 47 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
@@ -85,7 +86,7 @@
    public AjaxResult getDxList() {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if(null !=config && config.equals("N")){
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList();
        }
        if (tjProjects != null) {
@@ -95,14 +96,11 @@
            }
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String,Object> map=new HashMap<>();
        map.put("list",tjProjects);
        map.put("key",key);
        Map<String, Object> map = new HashMap<>();
        map.put("list", tjProjects);
        map.put("key", key);
        return AjaxResult.success(map);
    }
    /**
@@ -140,18 +138,18 @@
     */
    @GetMapping("/getAllChildListById")
    @ApiOperation(value = "查询项目子项")
    public AjaxResult getAllChildListById(@RequestParam(required = false)String proId,
    public AjaxResult getAllChildListById(@RequestParam(required = false) String proId,
                                          @RequestParam(required = false) String proName,
                                          @RequestParam(required = false) String checkType) {
        LambdaQueryWrapper<TjProject> wq=new LambdaQueryWrapper<>();
        if (proId!=null){
            wq.eq(TjProject::getProParentId,proId);
        LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
        if (proId != null) {
            wq.eq(TjProject::getProParentId, proId);
        }
        if (proName!=null){
            wq.like(TjProject::getProName,proName);
        if (proName != null) {
            wq.like(TjProject::getProName, proName);
        }
        if (checkType!=null){
            wq.eq(TjProject::getProCheckType,checkType);
        if (checkType != null) {
            wq.eq(TjProject::getProCheckType, checkType);
        }
        List<TjProject> tjProjects = tjProjectService.list(wq);
//        List<TjProject> tjProjects = tjProjectService.getAllChildListById(proId);
@@ -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);
                }
            }
        }
@@ -544,13 +545,13 @@
    public AjaxResult getProParentIdDxList() {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if(null !=config && config.equals("N")){
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList();
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String,Object> map=new HashMap<>();
        map.put("list",tjProjects);
        map.put("key",key);
        Map<String, Object> map = new HashMap<>();
        map.put("list", tjProjects);
        map.put("key", key);
        return AjaxResult.success(map);
    }
@@ -559,9 +560,9 @@
    public AjaxResult getProSonDxList(@RequestParam String proId) {
        List<TjProject> projectList = tjProjectService.getTjProjectListBySoneId(proId);
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String,Object> map=new HashMap<>();
        map.put("list",projectList);
        map.put("key",key);
        Map<String, Object> map = new HashMap<>();
        map.put("list", projectList);
        map.put("key", key);
        return AjaxResult.success(map);
    }