1

lige

2024-03-06 3cc862ededfa98fcd89c7b523f84a1d7d172798f

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

@@ -1070,7 +1070,7 @@

        String format = DateUtil.format(patbirth, "yyyy.MM.dd");

        List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,patage+patagename,format);
        List<Map<String, Object>> tjYxjcList = testMapper.getTjYxjcList(patname,sex,null);
        return AjaxResult.success(tjYxjcList);
    }

@@ -1237,6 +1237,10 @@
        return toAjax(deptService.insertDept(dept));
    }


    @Resource
    private IDictHospService dictHospService;

    /**
     * 修改科室部门
     */
@@ -1255,6 +1259,16 @@
            return error("该部门包含未停用的子部门！");
        }
        dept.setUpdateBy(getUsername());

        //查询院区名字赋值
        if (dept.getHospId()!=null){
            final DictHosp byId = dictHospService.getById(dept.getHospId());
            if (byId!=null){
                dept.setHospName(byId.getHospAreaName());
            }
        }


        return toAjax(deptService.updateDept(dept));
    }

@@ -1352,7 +1366,7 @@
                    if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
                        one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
                    }
                    one.setDeptId(orderRemark.getDeptId());
//                    one.setDeptId(orderRemark.getDeptId());
                    one.setDoctorName(orderRemark.getDoctorName());
                    one.setType(1);
                    remarkService.updateById(one);
@@ -1421,6 +1435,7 @@
            wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
            wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
            wqq.in(TjOrderDetail::getProId, proIdList);
            wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
            List<TjOrderDetail> detailList = detailService.list(wqq);
            if (detailList != null && detailList.size() > 0) {
                List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
@@ -1428,6 +1443,8 @@
                wq.eq("tj_number", tjNumber);
                wq.in("pro_id", collect);
                wq.ne("type", 2);
                wq.ne("dept_id",241);
                wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
                List<TjOrderRemark> list = remarkService.list(wq);
                if (list.size() == 0) {
                    return AjaxResult.success("该科室下无项目！");