日报上传修改

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

@@ -22,7 +22,7 @@ public interface BaseDailyReportUploadDao extends PagingAndSortingRepository<Bas
    @Query("select b from BaseDailyReportUploadDO b where b.doctorId=?1 and b.reportDate=?2")
    BaseDailyReportUploadDO findByDoctorIdAndReportDate(String doctorID,String reportDate);
    @Query("select b from BaseDailyReportUploadDO b where b.doctorId=?1 and b.reportDate=?2 order by b.reportDate desc")
    @Query("select b from BaseDailyReportUploadDO b where b.doctorId=?1 order by b.reportDate desc")
    List<BaseDailyReportUploadDO> findByDoctorIdLastOne(String doctorID);
    @Query("select a from BaseDailyReportUploadDO a where a.doctorId=?1 and a.reportDate>=?2 and a.reportDate<=?3 order by a.reportDate desc")

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

@@ -317,12 +317,19 @@ public class DailyReportUploadService {
     * @throws Exception
     */
    @Transactional(rollbackFor = Exception.class)
    public BaseDailyReportUploadDO createDailyReport(String doctorId,String report_date,String week_name, List<BaseDailyReportDetailDO> detailDOList) throws Exception {
    public BaseDailyReportUploadDO createDailyReport(String doctorId,String report_date,Integer leaveState,String leaveHour,String week_name, List<BaseDailyReportDetailDO> detailDOList) throws Exception {
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctorId);
        List<BaseDoctorHospitalDO> doctorHospitalDOS = baseDoctorHospitalDao.findByDoctorCode(doctorId);
        if (null==doctorDO){
            throw new Exception("上报人不存在");
        }
        if (1==leaveState){
            if (StringUtils.isNotBlank(leaveHour)){
                if (Integer.parseInt(leaveHour)<8&&detailDOList.size()==0){
                    throw new Exception("上传失败，请假未满8小时需要提交完成内容");
                }
            }
        }
        if (StringUtil.isBlank(report_date)){
            report_date = DateUtil.getStringDateShort();
@@ -331,6 +338,7 @@ public class DailyReportUploadService {
        BaseDailyReportUploadDO dailyReportUploadDO = dailyReportUploadDao.findByDoctorIdAndReportDate(doctorId,report_date);
        if (null==dailyReportUploadDO){
            dailyReportUploadDO = new BaseDailyReportUploadDO();
            dailyReportUploadDO.setState(0);
        }else{
            reportDetailDao.deleteByReportIdAndState(dailyReportUploadDO.getId(),0);
        }
@@ -338,55 +346,55 @@ public class DailyReportUploadService {
        dailyReportUploadDO.setDoctorName(doctorDO.getName());
        dailyReportUploadDO.setReportDate(report_date);
        dailyReportUploadDO.setWeekName(week_name);
        dailyReportUploadDao.save(dailyReportUploadDO);
        dailyReportUploadDO = dailyReportUploadDao.save(dailyReportUploadDO);
        for (BaseDailyReportDetailDO tmp :detailDOList){
            tmp.setReportId(dailyReportUploadDO.getId());
        }
        reportDetailDao.save(detailDOList);
        if (detailDOList.size()>0){
            reportDetailDao.save(detailDOList);
        }
        List<BaseDailyReportDetailDO> detailDOS = reportDetailDao.findByReportId(dailyReportUploadDO.getId());
        if (reportDetailDao.findByReportIdAndState(dailyReportUploadDO.getId(),0).size()>0){
            dailyReportUploadDO.setState(0);
            String senderID="";//日报发送对象
            String boosID="0592008";//老板id
            List<BaseDoctorRoleDO> roleDOS = doctorRoleDao.findByDoctorCode(doctorId);
            if (roleDOS.size()==0){//普通员工 需要查询对应上级人员
                if (doctorHospitalDOS != null && doctorHospitalDOS.size() != 0) {
                    BaseDoctorHospitalDO doctorHospitalDO = doctorHospitalDOS.get(0);
                    String sql = " select role.doctor_code from base_doctor_role role INNER JOIN base_doctor_hospital dh  " +
                            "on role.doctor_code = dh.doctor_code and dh.dept_code='"+doctorHospitalDO.getDeptCode()+"'  " +
                            "where role.role_code='deptAdmin' ";
                    List<String> deptAdmins = jdbcTemplate.queryForList(sql,String.class);
                    if (deptAdmins.size()>0){
                        senderID = deptAdmins.get(0);
                    }else {
                        senderID=boosID;
                    }
        }
        String senderID="";//日报发送对象
        String boosID="0592008";//老板id
        List<BaseDoctorRoleDO> roleDOS = doctorRoleDao.findByDoctorCode(doctorId);
        if (roleDOS.size()==0){//普通员工 需要查询对应上级人员
            if (doctorHospitalDOS != null && doctorHospitalDOS.size() != 0) {
                BaseDoctorHospitalDO doctorHospitalDO = doctorHospitalDOS.get(0);
                String sql = " select role.doctor_code from base_doctor_role role INNER JOIN base_doctor_hospital dh  " +
                        "on role.doctor_code = dh.doctor_code and dh.dept_code='"+doctorHospitalDO.getDeptCode()+"'  " +
                        "where role.role_code='deptAdmin' ";
                List<String> deptAdmins = jdbcTemplate.queryForList(sql,String.class);
                if (deptAdmins.size()>0){
                    senderID = deptAdmins.get(0);
                }else {
                    senderID=boosID;
                }
            }else {//部门管理员 发送对象为老板
                senderID = boosID;
            }
            if (StringUtils.isNotBlank(senderID)){
                BaseDoctorDO remindDoctorDO = baseDoctorDao.findById(senderID);
                if (remindDoctorDO != null) {
                    try {
                        WxEnterpriseUserDO enterpriseUserDO = wxEnterpriseUserDao.findByEnterpriseIdAndMobile(wechatId,remindDoctorDO.getMobile());
                        if(enterpriseUserDO==null){
                            logger.info("该用户"+doctorDO.getName()+"没有企业微信手机号,无法推送模版消息，用户ID："+doctorDO.getId()+"wechatId:"+wechatId);
                        }else{
                            String title = "待办事项";
                            String des = "您好，"+doctorDO.getName()+"已提交每日日报，请点击前往审核。";
                            String url = "https://ehr.yihu.com/hlwyy/zjxl/healthMonitoring/#/workSummary/commit?mode=verify&docId="+doctorId;
                            String res = enterpriseService.sendTWMesByDoctor(wechatId,remindDoctorDO.getId(),title,des,url);
                        }
                    }catch (Exception e){
                        e.printStackTrace();
        }else {//部门管理员 发送对象为老板
            senderID = boosID;
        }
        if (StringUtils.isNotBlank(senderID)){
            BaseDoctorDO remindDoctorDO = baseDoctorDao.findById(senderID);
            if (remindDoctorDO != null) {
                try {
                    WxEnterpriseUserDO enterpriseUserDO = wxEnterpriseUserDao.findByEnterpriseIdAndMobile(wechatId,remindDoctorDO.getMobile());
                    if(enterpriseUserDO==null){
                        logger.info("该用户"+doctorDO.getName()+"没有企业微信手机号,无法推送模版消息，用户ID："+doctorDO.getId()+"wechatId:"+wechatId);
                    }else{
                        String title = "待办事项";
                        String des = "您好，"+doctorDO.getName()+"已提交每日日报，请点击前往审核。";
                        String url = "https://ehr.yihu.com/hlwyy/zjxl/dailyReport/#/workSummary/commit?mode=verify&id="+dailyReportUploadDO.getId();
                        String res = enterpriseService.sendTWMesByDoctor(wechatId,remindDoctorDO.getId(),title,des,url);
                    }
                }catch (Exception e){
                    e.printStackTrace();
                }
            }
        }else {
            dailyReportUploadDO.setState(1);
        }
        dailyReportUploadDao.save(dailyReportUploadDO);
        dailyReportUploadDO.setDetailDOList(detailDOS);
@@ -398,20 +406,23 @@ public class DailyReportUploadService {
     * 核实审核信息
     * @return
     */
    @Transactional
    public BaseDailyReportUploadDO verifiedItem(String doctorId,List<BaseDailyReportDetailDO> detailDOList) throws Exception {
    @Transactional(rollbackFor = Exception.class)
    public BaseDailyReportUploadDO verifiedItem(String doctorId,String reportId,List<BaseDailyReportDetailDO> detailDOList) throws Exception {
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctorId);
        if (null==doctorDO){
            throw  new Exception("无权限审核");
        }
        BaseDailyReportUploadDO dailyReportUploadDO = new BaseDailyReportUploadDO();
        if(detailDOList.size()>0){
            dailyReportUploadDO = dailyReportUploadDao.findOne(detailDOList.get(0).getReportId());
            if (null==dailyReportUploadDO){
                throw  new Exception("核实记录未查询到");
            }
        BaseDailyReportUploadDO dailyReportUploadDO = null;
        dailyReportUploadDO = dailyReportUploadDao.findOne(reportId);
        if (null==dailyReportUploadDO){
            throw  new Exception("核实记录未查询到");
        }
        if(detailDOList.size()>0){//无完成事项内容
            boolean doubt  =false;
            for (BaseDailyReportDetailDO tmp:detailDOList){
                if (1==tmp.getDoubt()){
                    doubt = true;
                }
                tmp.setVerificationTime(new Date());
            }
            reportDetailDao.save(detailDOList);
@@ -421,11 +432,66 @@ public class DailyReportUploadService {
                dailyReportUploadDO.setState(1);
                dailyReportUploadDao.save(dailyReportUploadDO);
            }
            if (doubt==true){//有疑惑，推送给总经办"0592181"和老板"0592008";//老板id
                String sql = " select dict_value from wlyy_hospital_sys_dict where dict_name='MRRB_DOUBT_SENDER'  ";
                List<String> doubtSendUser = jdbcTemplate.queryForList(sql,String.class);
                for (String senderUser:doubtSendUser){
                    try {
                        BaseDoctorDO remindDoctorDO = baseDoctorDao.findById(senderUser);
                        if (remindDoctorDO != null) {
                            try {
                                WxEnterpriseUserDO enterpriseUserDO = wxEnterpriseUserDao.findByEnterpriseIdAndMobile(wechatId,remindDoctorDO.getMobile());
                                if(enterpriseUserDO==null){
                                    logger.info("该用户"+doctorDO.getName()+"没有企业微信手机号,无法推送模版消息，用户ID："+doctorDO.getId()+"wechatId:"+wechatId);
                                }else{
                                    String title = "待办事项";
                                    String des = "您好，"+doctorDO.getName()+"对"+dailyReportUploadDO.getDoctorName()+"已提交的每日日报有存疑，请点击前往审核。";
                                    String url = "https://ehr.yihu.com/hlwyy/zjxl/dailyReport/#/workSummary/commit?mode=verify&id="+dailyReportUploadDO.getId();
                                    String res = enterpriseService.sendTWMesByDoctor(wechatId,remindDoctorDO.getId(),title,des,url);
                                }
                            }catch (Exception e){
                                e.printStackTrace();
                            }
                        }
                    }catch (Exception e){
                        e.printStackTrace();
                    }
                }
            }
        }else {
            dailyReportUploadDO.setState(1);
            dailyReportUploadDao.save(dailyReportUploadDO);
        }
        return dailyReportUploadDO;
    }
    /**
     *核实每日报表疑惑
     */
    @Transactional(rollbackFor = Exception.class)
    public  BaseDailyReportUploadDO verifiedDoubtItem(String doctorId,List<BaseDailyReportDetailDO> detailDOList) throws Exception {
        BaseDoctorDO doctorDO = baseDoctorDao.findById(doctorId);
        if (null==doctorDO){
            throw new Exception("无权限审核");
        }
        String sql = " select dict_value from wlyy_hospital_sys_dict where dict_name='MRRB_DOUBT_SENDER'  ";
        List<String> doubtSendUser = jdbcTemplate.queryForList(sql,String.class);
        if (!doubtSendUser.contains(doctorId)){
            throw new Exception("无权限审核");
        }
        BaseDailyReportUploadDO dailyReportUploadDO = new BaseDailyReportUploadDO();
        if(detailDOList.size()>0) {
            dailyReportUploadDO = dailyReportUploadDao.findOne(detailDOList.get(0).getReportId());
            if (null == dailyReportUploadDO) {
                throw new Exception("核实记录未查询到");
            }
            reportDetailDao.save(detailDOList);
        }
        return dailyReportUploadDO;
    }
    /**
     * 获取当天日报上传记录
     * @param doctor

common/common-entity/sql记录

@@ -1999,4 +1999,12 @@ CREATE TABLE `base_child_manage` (
  `del` tinyint(1) NOT NULL DEFAULT '1' COMMENT '1可用，0禁用',
  `click` int(5) DEFAULT '0' COMMENT '视频点击播放量',
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='幼儿管理\r\n';
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='幼儿管理\r\n';
-- 2022-07-27
alter table base_daily_report_detail add column doubt TINYINT(2) default null COMMENT '疑惑0无疑惑1存疑';
alter table base_daily_report_detail add column doubt_state TINYINT(2) default null COMMENT '疑惑核实状态0未核实1已核实';
alter table base_daily_report_detail add column doubt_remark varchar(255) default null COMMENT '疑惑核实备注';
alter table base_daily_report_detail add column `actual_completion_hour` varchar(50) DEFAULT NULL COMMENT '实际完成时长';
alter table base_doctor_daily_report_upload add column `leave_state` tinyint(4) DEFAULT NULL COMMENT '请假状态0未请假1请假';
alter table base_doctor_daily_report_upload add column `leave_hour` varchar(50) DEFAULT NULL COMMENT '请假时长';

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

@@ -23,6 +23,10 @@ public class BaseDailyReportDetailDO extends UuidIdentityEntityWithOperator {
    private Integer state;//是否核实 0未核实1已核实
    private Date verificationTime;//核实时间
    private String remark; //备注内容
    private Integer doubt; //疑惑0无疑惑1存疑
    private Integer doubtState; //疑惑核实状态0未核实1已核实
    private String doubtRemark; //疑惑核实备注
    private String actualCompletionHour; //实际完成时长
    public String getReportId() {
        return reportId;
@@ -88,4 +92,36 @@ public class BaseDailyReportDetailDO extends UuidIdentityEntityWithOperator {
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public Integer getDoubt() {
        return doubt;
    }
    public void setDoubt(Integer doubt) {
        this.doubt = doubt;
    }
    public Integer getDoubtState() {
        return doubtState;
    }
    public void setDoubtState(Integer doubtState) {
        this.doubtState = doubtState;
    }
    public String getDoubtRemark() {
        return doubtRemark;
    }
    public void setDoubtRemark(String doubtRemark) {
        this.doubtRemark = doubtRemark;
    }
    public String getActualCompletionHour() {
        return actualCompletionHour;
    }
    public void setActualCompletionHour(String actualCompletionHour) {
        this.actualCompletionHour = actualCompletionHour;
    }
}

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

@@ -1,12 +1,10 @@
package com.yihu.jw.entity.dailyReport;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
import java.util.List;
/**
@@ -21,6 +19,8 @@ public class BaseDailyReportUploadDO extends UuidIdentityEntityWithOperator {
    private String doctorName;
    private String weekName;
    private Integer state;//是否全部核实 0未核实1已核实
    private Integer leaveState;//请假状态0未请假1请假
    private String leaveHour;//请假时长
    private String reportDate; //上报日期
    private List<BaseDailyReportDetailDO> detailDOList;
@@ -73,4 +73,20 @@ public class BaseDailyReportUploadDO extends UuidIdentityEntityWithOperator {
    public void setDetailDOList(List<BaseDailyReportDetailDO> detailDOList) {
        this.detailDOList = detailDOList;
    }
    public Integer getLeaveState() {
        return leaveState;
    }
    public void setLeaveState(Integer leaveState) {
        this.leaveState = leaveState;
    }
    public String getLeaveHour() {
        return leaveHour;
    }
    public void setLeaveHour(String leaveHour) {
        this.leaveHour = leaveHour;
    }
}

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/DailyReportService.java

@@ -86,7 +86,7 @@ public class DailyReportService {
                }else{
                    String title = "待办事项";
                    String des = "您好，系统检测到您今日尚未提交日报信息，请及时提交！";
                    String url = "https://ehr.yihu.com/hlwyy/zjxl/healthMonitoring/#/workSummary/commit";
                    String url = "https://ehr.yihu.com/hlwyy/zjxl/dailyReport/#/workSummary/commit";
                    String res = enterpriseService.sendTWMesByDoctor(wechatId,doctorDO.getId(),title,des,url);
                }
            }
@@ -129,7 +129,7 @@ public class DailyReportService {
                    Integer weishangbaoTotal = doctorTotal - sqlTotal;
                    String title = "每日日报未上报汇总";
                    String des = "今日还有" + weishangbaoTotal + "人未提交健康信息，点击查看。";
                    String url = "https://ehr.yihu.com/hlwyy/zjxl/healthMonitoring/#/home/index";
                    String url = "https://ehr.yihu.com/hlwyy/zjxl/dailyReport/#/home/index";
                    String res = enterpriseService.sendTWMesByDoctor(wechatId, doctorDO.getId(), title, des, url);
                }
            }
@@ -153,7 +153,7 @@ public class DailyReportService {
                    Integer weishangbaoTotal = doctorTotal - sqlTotal;
                    String title = "每日日报未上报汇总";
                    String des = "今日还有" + weishangbaoTotal + "人未提交健康信息，点击查看。";
                    String url = "https://ehr.yihu.com/hlwyy/zjxl/healthMonitoring/#/home/index";
                    String url = "https://ehr.yihu.com/hlwyy/zjxl/dailyReport/#/home/index";
                    String res = enterpriseService.sendTWMesByDoctor(wechatId, doctorDO.getId(), title, des, url);
                }
            }
@@ -207,8 +207,8 @@ public class DailyReportService {
                            "where d.del=1 and dh.del=1 and dh.dept_code='" + dept_code + "' )  ";
                    Integer notVerifiedTotal = jdbcTemplate.queryForObject(notVerifiedTotalSql,Integer.class);
                    String title = "每日日报上报汇总";
                    String des = "今日上报情况：已上报："+yishangbaoTotal+" 未上报："+weishangbaoTotal+"已核实："+verifiedTotal+"未核实：" + notVerifiedTotal + ";点击查看；";
                    String url = "https://ehr.yihu.com/hlwyy/zjxl/healthMonitoring/#/home/index";
                    String des = "今日上报情况：已上报："+yishangbaoTotal+" 未上报："+weishangbaoTotal+" 已核实："+verifiedTotal+" 未核实：" + notVerifiedTotal + ";点击查看；";
                    String url = "https://ehr.yihu.com/hlwyy/zjxl/dailyReport/#/home/index";
                    String res = enterpriseService.sendTWMesByDoctor(wechatId, doctorDO.getId(), title, des, url);
                }
            }
@@ -240,7 +240,7 @@ public class DailyReportService {
                    Integer notVerifiedTotal = jdbcTemplate.queryForObject(notVerifiedTotalSql,Integer.class);
                    String title = "每日日报上报汇总";
                    String des = "今日上报情况：已上报："+yishangbaoTotal+" 未上报："+weishangbaoTotal+"已核实："+verifiedTotal+"未核实：" + notVerifiedTotal + ";点击查看；";
                    String url = "https://ehr.yihu.com/hlwyy/zjxl/healthMonitoring/#/home/index";
                    String url = "https://ehr.yihu.com/hlwyy/zjxl/dailyReport/#/home/index";
                    String res = enterpriseService.sendTWMesByDoctor(wechatId, doctorDO.getId(), title, des, url);
                }
            }

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

@@ -13,9 +13,11 @@ import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.utils.StringUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.List;
/**
@@ -105,13 +108,20 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
                                        @RequestParam(value = "doctorId", required = true) String doctorId,
                                        @ApiParam(name = "report_date", value = "上报日期yyyy-MM-dd")
                                        @RequestParam(value = "report_date", required = true) String report_date,
                                        @ApiParam(name = "leaveState", value = "请假状态 0未请假1已请假 默认0")
                                        @RequestParam(value = "leaveState", required = false,defaultValue = "0") Integer leaveState,
                                        @ApiParam(name = "leaveHour", value = "请假时长默认0")
                                        @RequestParam(value = "leaveHour", required = false,defaultValue = "0") String leaveHour,
                                        @ApiParam(name = "week_name", value = "星期一...")
                                        @RequestParam(value = "week_name", required = true) String week_name,
                                        @ApiParam(name = "jsonData", value = "事项信息实体")
                                        @RequestParam(value = "jsonData", required = true) String jsonData) {
        try {
            List<BaseDailyReportDetailDO> healthUploadDOs = JSONArray.parseArray(jsonData,BaseDailyReportDetailDO.class);
            BaseDailyReportUploadDO dailyReport = dailyReportUploadService.createDailyReport(doctorId,report_date,week_name,healthUploadDOs);
            List<BaseDailyReportDetailDO> healthUploadDOs = new ArrayList<>();
            if (StringUtils.isNoneBlank(jsonData)){
                healthUploadDOs = JSONArray.parseArray(jsonData,BaseDailyReportDetailDO.class);
            }
            BaseDailyReportUploadDO dailyReport = dailyReportUploadService.createDailyReport(doctorId,report_date,leaveState,leaveHour,week_name,healthUploadDOs);
            return success(dailyReport);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
@@ -122,11 +132,34 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "核实每日报表")
    public ObjEnvelop verifiedItem(@ApiParam(name = "doctorId", value = "doctorId")
                                   @RequestParam(value = "doctorId", required = true) String doctorId,
                                   @ApiParam(name = "reportID", value = "reportID")
                                   @RequestParam(value = "reportID", required = true) String reportID,
                                   @ApiParam(name = "jsonData", value = "事项信息实体")
                                   @RequestParam(value = "jsonData", required = true) String jsonData) {
                                   @RequestParam(value = "jsonData", required = false) String jsonData) {
        try {
            List<BaseDailyReportDetailDO> healthUploadDOs = JSONArray.parseArray(jsonData,BaseDailyReportDetailDO.class);
            BaseDailyReportUploadDO dailyReport = dailyReportUploadService.verifiedItem(doctorId,healthUploadDOs);
            List<BaseDailyReportDetailDO> healthUploadDOs = new ArrayList<>();
            if (StringUtils.isNoneBlank(jsonData)){
                healthUploadDOs = JSONArray.parseArray(jsonData,BaseDailyReportDetailDO.class);
            }
            BaseDailyReportUploadDO dailyReport = dailyReportUploadService.verifiedItem(doctorId,reportID,healthUploadDOs);
            return success(dailyReport);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }
    }
    @PostMapping(value = "verifiedDoubtItem")
    @ApiOperation(value = "核实每日报表疑虑")
    public ObjEnvelop verifiedDoubtItem(@ApiParam(name = "doctorId", value = "doctorId")
                                   @RequestParam(value = "doctorId", required = true) String doctorId,
                                   @ApiParam(name = "jsonData", value = "事项信息实体")
                                   @RequestParam(value = "jsonData", required = false) String jsonData) {
        try {
            List<BaseDailyReportDetailDO> healthUploadDOs = new ArrayList<>();
            if (StringUtils.isNoneBlank(jsonData)){
                healthUploadDOs = JSONArray.parseArray(jsonData,BaseDailyReportDetailDO.class);
            }
            BaseDailyReportUploadDO dailyReport = dailyReportUploadService.verifiedDoubtItem(doctorId,healthUploadDOs);
            return success(dailyReport);
        } catch (Exception e) {
            return failedObjEnvelopException(e);
@@ -323,10 +356,10 @@ public class DailyReportUploadPoint extends EnvelopRestEndpoint {
    @GetMapping(value = "selectRecordByDoctorIdAndConsumer")
    @ApiOperation(value = "查下上报最新一次记录", notes = "查下上报最新一次记录")
    public Envelop selectRecordByDoctorIdAndConsumer(@ApiParam(name = "doctdorId", value = "医生id")
                                                     @RequestParam(value = "doctorId", required = false) String doctdorId) throws Exception {
    public Envelop selectRecordByDoctorIdAndConsumer(@ApiParam(name = "doctorId", value = "医生id")
                                                     @RequestParam(value = "doctorId", required = false) String doctorId) {
        try{
            return success(dailyReportUploadService.selectRecordByDoctorIdAndConsumer(doctdorId));
            return success(dailyReportUploadService.selectRecordByDoctorIdAndConsumer(doctorId));
        }catch (Exception e) {
            return failedMixEnvelopException(e);
        }