zjh20250702

zjh

2 天以前 14ecea8537d5b29ca64c75aad4ff49265018415d

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

@@ -18,6 +18,7 @@
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.treeUtil.TreeSelect;
import com.ltkj.mall.service.IMallKeywordService;
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import io.swagger.annotations.Api;
@@ -74,6 +75,8 @@
    private TjProjectXgjlService xgjlService;
    @Autowired
    private TjBzProService bzProService;
    @Autowired
    private IMallKeywordService mallKeywordService;


    @GetMapping("/getTjHyBgList")
@@ -95,7 +98,7 @@
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList(null);
            tjProjects = tjProjectService.getOpenDxTjProjectList(null, null);
        }
        if (tjProjects != null) {
            for (TjProject project : tjProjects) {
@@ -361,10 +364,11 @@
                return AjaxResult.error("该项目正在套餐中使用,暂时不能停用");
            }
            if(tjProject.getProParentId() !=0){
                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                wq.eq(TjProject::getProParentId, tjProject.getProParentId());
                wq.eq(TjProject::getProStatus,0);
                List<TjProject> list = tjProjectService.list(wq);
//                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
//                wq.eq(TjProject::getProParentId, tjProject.getProParentId());
//                wq.eq(TjProject::getProStatus,0);
//                List<TjProject> list = tjProjectService.list(wq);
                List<TjProject> list = tjProjectService.getTjProjectListBySoneId(tjProject.getProParentId().toString());
                if (null != list && !list.isEmpty()) {
                    int i = list.size();
                    if(i<2) return AjaxResult.error("至少保留一个子项目,不可全部停用!!!");
@@ -589,11 +593,11 @@
     */
    @GetMapping("/getProParentIdDxList")
    @ApiOperation(value = "选择体检项目(所有页面项目)选单项时调用的接口")
    public AjaxResult getProParentIdDxList() {
    public AjaxResult getProParentIdDxList(String xb) {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList(null);
            tjProjects = tjProjectService.getOpenDxTjProjectList(null, xb);
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String, Object> map = new HashMap<>();
@@ -606,11 +610,16 @@

    @GetMapping("/getProParentIdDxListByFenYe")
    @ApiOperation(value = "选择体检项目(所有页面项目)选单项时调用的接口(有分页)")
    public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize,String nr) {
    public AjaxResult getProParentIdDxListByFenYe(@RequestParam(defaultValue = "1") int page,@RequestParam(defaultValue = "10") int pageSize,String nr,String xb) {
        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
        String config = configService.selectConfigByKey("tj_dxsxtj");
        if(StringUtil.isNotBlank(xb)){
            if(xb.contains("4"))xb="0";
            if(xb.contains("5"))xb="1";
            if(xb.contains("4") && xb.contains("5"))xb=null;
        }
        if (null != config && config.equals("N")) {
            tjProjects = tjProjectService.getOpenDxTjProjectList(nr);
            tjProjects = tjProjectService.getOpenDxTjProjectList(nr,xb);
        }
        String key = configService.selectConfigByKey("is_open_sfxm");
        Map<String, Object> map = new HashMap<>();