liubing 2 年 前
コミット
3aa85c332e

+ 6 - 2
business/base-service/src/main/java/com/yihu/jw/dailyReport/service/DailyReportUploadService.java

@ -364,10 +364,14 @@ public class DailyReportUploadService {
        }else {
            throw new Exception("您不是部门人员,无法上传日报信息");
        }
        String sql = " select dict_code from wlyy_hospital_sys_dict where dict_name='daily_report_create_item' ";
        List<String> createItemUser = jdbcTemplate.queryForList(sql,String.class);
        for (BaseDailyReportDetailDO tmp :detailDOList){
            tmp.setReportId(dailyReportUploadDO.getId());
            if (tmp.isReportItemFlag()==true){//新则自建关联项目
                if (!createItemUser.contains(doctorId)){
                    throw new Exception("您无权创建自定义项目,请联系管理员");
                }
                String title = tmp.getReportItemTitle();
                BaseDailyReportItemDO reportItemDO = reportItemDao.findByTitleAndDeptAndProjectCode(title,doctorHospitalDOS.get(0).getDeptCode(),tmp.getProjectCode());
                if (null!=reportItemDO){
@ -436,7 +440,7 @@ public class DailyReportUploadService {
        }
        String senderID="";//日报发送对象
        String sql = " select dict_value from wlyy_hospital_sys_dict where dict_name='BOOS_ADMIN_SENDER'  ";
        sql = " select dict_value from wlyy_hospital_sys_dict where dict_name='BOOS_ADMIN_SENDER'  ";
        List<String> boosSenderIds = jdbcTemplate.queryForList(sql,String.class);
        String boosID = "";
        if (boosSenderIds.size()>0){

+ 2 - 2
common/common-entity/src/main/java/com/yihu/jw/entity/dailyReport/BaseDailyReportDetailDO.java

@ -43,8 +43,8 @@ public class BaseDailyReportDetailDO extends UuidIdentityEntityWithOperator {
    /**
     * 非数据库字段
     */
    private boolean reportItemFlag;
    private String reportItemTitle;
    private boolean reportItemFlag;//新增项目标识
    private String reportItemTitle;//新增项目title
    public String getReportId() {
        return reportId;