代码修改

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

@@ -473,6 +473,7 @@ public class DailyReportUploadService {
    @Transactional(rollbackFor = Exception.class)
    public BaseDailyReportUploadDO verifiedItem(String doctorId,String reportId,List<BaseDailyReportDetailDO> detailDOList) throws Exception {
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctorId);
        String nowDate = DateUtil.getStringDateShort();
        if (null==doctorDO){
            throw  new Exception("无权限审核");
        }
@@ -481,10 +482,13 @@ public class DailyReportUploadService {
        if (null==dailyReportUploadDO){
            throw  new Exception("核实记录未查询到");
        }
        if (DateUtil.getDays(nowDate,dailyReportUploadDO.getReportDate())>7){
            throw  new Exception("上传记录已超过7天无法再次操作");
        }
        if(detailDOList.size()>0){//无完成事项内容
            boolean doubt  =false;
            for (BaseDailyReportDetailDO tmp:detailDOList){
                if (1==tmp.getDoubt()){
                if (1==tmp.getDoubt()&&(null==tmp.getDoubtState()||0==tmp.getDoubtState())){
                    doubt = true;
                }
                tmp.setVerificationTime(new Date());
@@ -1192,7 +1196,11 @@ public class DailyReportUploadService {
                doubtSql += " and d.id IN " + deptCondition;
            }
            if (null!=doubtType){
                doubtSql += " and rd.doubt_type='"+doubtType+"' ";
                if (0==doubtType){
                    doubtSql += " and rd.doubt_type is not null ";
                }else{
                    doubtSql += " and rd.doubt_type='"+doubtType+"' ";
                }
            }
            if (StringUtils.isNoneBlank(name)) {
                doubtSql += " and d.name LIKE  '%" + name + "%' ";
@@ -1257,7 +1265,11 @@ public class DailyReportUploadService {
                doubtSql += " and d.id IN " + deptCondition;
            }
            if (null!=doubtType){
                doubtSql += " and rd.doubt_type='"+doubtType+"' ";
                if(0==doubtType){
                    doubtSql += " and rd.doubt_type is not null ";
                }else {
                    doubtSql += " and rd.doubt_type='"+doubtType+"' ";
                }
            }
            if (StringUtils.isNoneBlank(name)) {
                doubtSql += " and d.name LIKE  '%" + name + "%' ";
@@ -1657,6 +1669,7 @@ public class DailyReportUploadService {
        object.put("shangchuanTotal", shangchuanTotal);//上传总次数
        object.put("baoheDoubt", baoheDoubt);//不饱和存疑数量
        object.put("xiaolvDoubt", xiaolvDoubt);//效率存疑数量
        object.put("doubtTotal", baoheDoubt+xiaolvDoubt);//存疑总数
        return object;
    }
@@ -1810,6 +1823,7 @@ public class DailyReportUploadService {
        object.put("shangchuanTotal", shangchuanTotal);//上传总次数
        object.put("baoheDoubt", baoheDoubt);//饱和度存疑次数
        object.put("xiaolvDoubt", xiaolvDoubt);//效率存疑次数
        object.put("doubtTotal", baoheDoubt+xiaolvDoubt);//存疑总数
        return object;
    }

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

@@ -134,10 +134,6 @@ public class BaseDailyReportDetailDO extends UuidIdentityEntityWithOperator {
        this.doubtType = doubtType;
    }
    public boolean isReportItemFlag() {
        return reportItemFlag;
    }
    public Integer getDoubtState() {
        return doubtState;
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/dailyReport/DailyReportUploadPoint.java

@@ -364,7 +364,7 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
                                         @RequestParam(value = "dept", required = false) String dept,
                                         @ApiParam(name = "idType", value = "身份类别")
                                         @RequestParam(value = "idType", required = false) String idType,
                                         @ApiParam(name = "doubtType", value = "存疑类型 存疑类型，1不饱和存疑 2效率存疑")
                                         @ApiParam(name = "doubtType", value = "存疑类型0全部 存疑类型，1不饱和存疑 2效率存疑")
                                         @RequestParam(value = "doubtType", required = false) Integer doubtType,
                                         @ApiParam(name = "startDate", value = "开始时间")
                                         @RequestParam(value = "startDate", required = false) String startDate,
@@ -386,7 +386,7 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
                                             @RequestParam(value = "dept", required = false) String dept,
                                             @ApiParam(name = "idType", value = "身份类别")
                                             @RequestParam(value = "idType", required = false) String idType,
                                             @ApiParam(name = "doubtType", value = "存疑类型 存疑类型，1不饱和存疑 2效率存疑")
                                             @ApiParam(name = "doubtType", value = "存疑类型0全部 存疑类型，1不饱和存疑 2效率存疑")
                                             @RequestParam(value = "doubtType", required = false) Integer doubtType,
                                             @ApiParam(name = "startDate", value = "开始时间")
                                             @RequestParam(value = "startDate", required = false) String startDate,