init: init project step4: biz code support

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmTaskMapper.java

@@ -1,11 +1,8 @@
-
 package com.qunzhixinxi.hnqz.admin.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmReport;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.api.vo.WmTaskVO;
@@ -26,9 +23,9 @@ import java.util.Map;
  */
 @Mapper
 public interface WmTaskMapper extends DataScopeMapper<WmTask> {
-    IPage<WmTask> selectListByExtEnt(Page page, @Param("query") WmTask wmTask);
+    Page<WmTask> selectListByExtEnt(Page page, @Param("query") WmTask wmTask);
 
-    IPage<WmTask> selectListByRelationScoreId(Page page, @Param("query") WmTask wmTask);
+    Page<WmTask> selectListByRelationScoreId(Page page, @Param("query") WmTask wmTask);
 
     List<WmTask> selectListByExtEntNoPage(@Param("query") WmTask wmTask);
 
@@ -50,9 +47,9 @@ public interface WmTaskMapper extends DataScopeMapper<WmTask> {
 
     List<WmTask> selectListByWmTask(@Param("query") WmScorePackage wmScorePackage);
 
-    IPage<Map<String, Object>> getH5PackageList(Page page, @Param("query") WmTask wmTask);
+    Page<Map<String, Object>> getH5PackageList(Page page, @Param("query") WmTask wmTask);
 
-    IPage<Map<String, Object>> getH5TaskList(Page page, @Param("query") WmTask wmTask);
+    Page<Map<String, Object>> getH5TaskList(Page page, @Param("query") WmTask wmTask);
 
     List<Map<String, Object>> selectByWmTaskOne(@Param("query") WmTask wmTask);
 
@@ -74,8 +71,6 @@ public interface WmTaskMapper extends DataScopeMapper<WmTask> {
 
     WmTask selectWmTaskById(@Param("query") WmTask wmTask);
 
-    List<Map<String, Object>> saveAndUpdateWmTask(@Param("query") WmTask wmTask, WmReport wmReport);
-
     List<WmTask> selectListByIds(@Param("query") WmTask wmTask);
 
     List<WmTask> selectListByScorePackageId(@Param("query") WmTask wmTask);
@@ -105,26 +100,26 @@ public interface WmTaskMapper extends DataScopeMapper<WmTask> {
     /**
      * 根据配置查询任务
      *
-     * @param page
-     * @param wmTask
-     * @return
+     * @param page   分页
+     * @param wmTask 分页条件
+     * @return 分页结果
      */
-    IPage<WmTask> listWmTaskByConfig(Page<WmTask> page, @Param("query") WmTask wmTask);
+    Page<WmTask> listWmTaskByConfig(Page<WmTask> page, @Param("query") WmTask wmTask);
 
     /**
      * 根据配置查询任务
      *
-     * @param page
-     * @param queryWrapper
-     * @return
+     * @param page         分页
+     * @param queryWrapper 查询条件
+     * @return 分页结果
      */
-    IPage<WmTask> listWmTaskByWrapper(Page<WmTask> page, @Param(Constants.WRAPPER) QueryWrapper<WmTask> queryWrapper);
+    Page<WmTask> listWmTaskByWrapper(Page<WmTask> page, @Param(Constants.WRAPPER) QueryWrapper<WmTask> queryWrapper);
 
     List<Map<String, String>> PackageIsFinishByTask(@Param("query") WmTask wmTask);
 
     Map<String, Timestamp> getMaxCreateTime(@Param("query") WmTask wmTask);
 
-    IPage<Map<String, Object>> selectSettleTask(Page page, @Param("query") WmTask wmTask);
+    Page<Map<String, Object>> selectSettleTask(Page page, @Param("query") WmTask wmTask);
 
     /**
      * 查询用户审核中和审核通过的积分
@@ -154,7 +149,7 @@ public interface WmTaskMapper extends DataScopeMapper<WmTask> {
      * @param prescriptionNo 处方单编号
      * @return 处方列表分页
      */
-    IPage<WmTask> listTaskPrescriptionPage(Page page, @Param("scorePackageId") String scorePackageId, @Param("prescriptionNo") String prescriptionNo);
+    Page<WmTask> listTaskPrescriptionPage(Page page, @Param("scorePackageId") String scorePackageId, @Param("prescriptionNo") String prescriptionNo);
 
     /**
      * 患者教育-处方列表
@@ -168,18 +163,18 @@ public interface WmTaskMapper extends DataScopeMapper<WmTask> {
     /**
      * 查询调查信息审核列表
      *
-     * @param wmTask
-     * @param startDate
-     * @param endDate
-     * @return
+     * @param wmTask    条件
+     * @param startDate 开始时间
+     * @param endDate   截止时间
+     * @return 分页结果
      */
-    IPage<WmTask> listInfoAudit(Page page, @Param("query") WmTask wmTask, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
+    Page<WmTask> listInfoAudit(Page page, @Param("query") WmTask wmTask, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
 
     /**
      * 查询同一家医院一个月做的任务
      *
-     * @param hospitalId
-     * @return
+     * @param hospitalId 医院ID
+     * @return 任务列表
      */
     List<WmTask> listCurrentMonthHospitalTask(@Param("hospitalId") String hospitalId);
 
@@ -198,9 +193,9 @@ public interface WmTaskMapper extends DataScopeMapper<WmTask> {
     /**
      * 企业审核查询任务列表
      *
-     * @param page
-     * @param wmReport
-     * @return
+     * @param page     分页
+     * @param wmReport 条件
+     * @return 分页
      */
-    IPage<WmTaskVO> entTaskPageByTaskType(Page<WmTaskVO> page, @Param("query") Map<String, Object> wmReport);
+    Page<WmTaskVO> entTaskPageByTaskType(Page<WmTaskVO> page, @Param("query") Map<String, Object> wmReport);
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmReportServiceImpl.java

@@ -1025,11 +1025,14 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
                 .or().eq(WmTask::getReportOneId, wmReport.getId())
                 .or().eq(WmTask::getReportSecondId, wmReport.getId()));
         // 如果是审批页面，则过滤掉通过和不通过的数据（reportDrugApprovalOpinion或reportOneApprovalOpinion：1通过，2不通过）
-        if (isApprovalPage != null && isApprovalPage.equals(1)) {
+         if (isApprovalPage != null && isApprovalPage.equals(1)) {
             if ("0".equals(scorePackage.getTypeid())) {//药企
                 lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
             } else if ("1".equals(scorePackage.getTypeid())) {//一级代理商类型
-                lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion));
+                lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportDrugApprovalOpinion)
+                        .eq(WmTask::getReportOneApprovalOpinion, "1")
+                        .eq(WmTask::getReportOneApprovalStatus, "2")
+                );
             } else if ("2".equals(scorePackage.getTypeid())) {//二级代理商类型
                 lambdaQueryWrapper.and(wrapper -> wrapper.isNull(WmTask::getReportOneApprovalOpinion));
             }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTaskServiceImpl.java

@@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qunzhixinxi.hnqz.admin.api.dto.SysCheckChainNodeCheckHistoryDTO;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysCheckChainNodeCheckHistory;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysDept;
 import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
@@ -244,7 +243,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     }
 
     @Override
-    public R selectZbCount(WmTask wmTask) {
+    public R<?> selectZbCount(WmTask wmTask) {
         String packageId = wmTask.getScorePackageId();  // 获取积分包ID
         if (null == packageId) {
             packageId = wmTask.getScorePackageDrugId();
@@ -260,10 +259,10 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
         }
         wmTask.setExtIds(strs);
         List<Map<String, Object>> wmTaskList = wmTaskMapper.selectZbCount(wmTask);
-        if (wmTaskList.size() > 0) {
-            Integer total = 0;
-            Integer sum = 0;
-            Integer deptId = 0;
+        if (CollUtil.isNotEmpty(wmTaskList)) {
+            int total = 0;
+            int sum = 0;
+            int deptId = 0;
             Date date = new Date();
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
             String reportId = simpleDateFormat.format(date) + (int) ((Math.random() * 9 + 1) * 1000);
@@ -316,7 +315,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
         WmScorePackage wmScorePackage = wmScorePackageService.getById(packageId);
         String name = wmScorePackage.getScorePackageName();
         SysDept sysDept = sysDeptService.getById(SecurityUtils.getUser().getDeptId());
-        Integer total = 0;
+        int total = 0;
         if (sysDept.getLevel() == 3) {
             // 一级CSO
             if (packageId.contains(",")) {
@@ -336,7 +335,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             for (String id : idList) {
                 List<WmScorePackage> wmScorePackageList1 = wmScorePackageMapper.selectByRelationScoreIdList(id);
-                List<String> idList1 = wmScorePackageList1.stream().map(p -> p.getId()).collect(Collectors.toList());
+                List<String> idList1 = wmScorePackageList1.stream().map(WmScorePackage::getId).collect(Collectors.toList());
                 for (String id1 : idList1) {
                     WmTask wmTask1 = new WmTask();
                     wmTask1.setTaskStatus(String.valueOf(3));
@@ -348,39 +347,49 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
 //			List<WmTask> taskList = wmTaskMapper.selectByWmTaskId(wmTask);
             for (WmTask wmTask1 : taskList) {
-                Integer reportOneApprovalStatus = Integer.valueOf(wmTask1.getReportOneApprovalStatus());
+                int reportOneApprovalStatus = Integer.parseInt(wmTask1.getReportOneApprovalStatus());
                 if (reportOneApprovalStatus == 0) {
                     wmTask1.setExtIds(strs1);
-                    wmTask1.setReportOneApprovalStatus(String.valueOf(0));
-                    wmTask1.setTaskStatus(String.valueOf(3));
-                    List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByReportOneApprovalStatus(wmTask1);
+                    wmTask1.setReportOneApprovalStatus("0");
+                    wmTask1.setReportDrugApprovalOpinion("1");
+                    wmTask1.setTaskStatus("3");
+
+                    //List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByReportOneApprovalStatus(wmTask1);
+
+                    List<WmTask> wmTasks = wmTaskMapper.selectList(Wrappers.<WmTask>lambdaQuery()
+                            .eq(WmTask::getTaskStatus, "3")
+                            .eq(WmTask::getReportOneApprovalOpinion, "1")
+                            .eq(WmTask::getReportOneApprovalStatus, "0"));
+
+
                     SysDept sysDept1 = sysDeptService.getById(wmScorePackage.getSendPackageDeptId());
                     String name1 = sysDept1.getName();
-                    if (wmTaskList.size() > 0) {
-                        Integer sum = 0;
+                    if (CollUtil.isNotEmpty(wmTasks)) {
+                        int sum = 0;
                         Integer deptId = SecurityUtils.getUser().getDeptId();
                         Date date = new Date();
                         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
                         String reportId = simpleDateFormat.format(date) + (int) ((Math.random() * 9 + 1) * 1000);
 
-                        for (Map<String, Object> map :
-                                wmTaskList) {
-                            if (null != map.get("score_count")) {
-                                total += Integer.parseInt(map.get("score_count") + "");
-                            }
-
-                            if (null != map.get("score")) {
-                                sum += Integer.parseInt(map.get("score") + "");
-                            }
-                        }
-                        Map<String, Object> totalMap = new HashMap<>();
-                        totalMap.put("score_count", total);
-                        totalMap.put("score", sum);
+                        //for (Map<String, Object> map : wmTasks) {
+                        //    if (null != map.get("score_count")) {
+                        //        total += Integer.parseInt(map.get("score_count") + "");
+                        //    }
+                        //
+                        //    if (null != map.get("score")) {
+                        //        sum += Integer.parseInt(map.get("score") + "");
+                        //    }
+                        //}
+
+                        int total1 = wmTasks.stream().mapToInt(WmTask::getScore).sum();
+                        Map<String, Object> totalMap = new HashMap<>(6);
+                        totalMap.put("score_count", wmTasks.size());
+                        totalMap.put("score", total1);
                         totalMap.put("score_package_name", name);
                         totalMap.put("dept_id", deptId);
                         totalMap.put("report_id", reportId);
                         totalMap.put("description", name1);
-                        wmTaskList.add(totalMap);
+                        //wmTaskList.add(totalMap);
 
                         return R.ok(totalMap);
                     }
@@ -524,7 +533,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     }
 
     @Override
-    public R selectByWmTaskId(WmTask wmTask) {
+    public R<?> selectByWmTaskId(WmTask wmTask) {
         String packageId = wmTask.getScorePackageId();  // 获取积分包ID
         if (null == packageId) {
             return R.failed("积分包ID不能为空");
@@ -544,7 +553,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 
 
     @Override
-    public R saveAndUpdateWmTask(WmTask wmTask, WmReport wmReport) {
+    public R<?> saveAndUpdateWmTask(WmTask wmTask, WmReport wmReport) {
         String packageId = wmTask.getScorePackageId();  // 获取积分包ID
         List<WmScorePackage> wmScorePackageList = wmScorePackageMapper.selectByRelationScoreIdList(packageId);
         List<String> idList = wmScorePackageList.stream().map(WmScorePackage::getId).collect(Collectors.toList());
@@ -578,7 +587,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             for (String id : idList) {
                 List<WmScorePackage> wmScorePackageList1 = wmScorePackageMapper.selectByRelationScoreIdList(id);
-                List<String> idList1 = wmScorePackageList1.stream().map(p -> p.getId()).collect(Collectors.toList());
+                List<String> idList1 = wmScorePackageList1.stream().map(WmScorePackage::getId).collect(Collectors.toList());
                 for (String id1 : idList1) {
                     WmTask wmTask1 = new WmTask();
                     wmTask1.setTaskStatus(String.valueOf(3));
@@ -590,21 +599,21 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             List<String> ids1 = taskList.stream()
                     .filter(task -> "1".equals(task.getReportOneApprovalStatus()))
-                    .map(p -> p.getId())
+                    .map(WmTask::getId)
                     .collect(Collectors.toList());
             List<String> ids2 = taskList.stream()
                     .filter(task -> "0".equals(task.getReportOneApprovalStatus()))
-                    .map(p -> p.getId())
+                    .map(WmTask::getId)
                     .collect(Collectors.toList());
-            if (ids1.size() > 0) {
+            if (CollUtil.isNotEmpty(ids1)) {
                 for (WmTask wmTask1 : taskList) {
                     if (wmTask1.getReportOneId() == null) {
                         wmTask1.setExtIds(strs1);
                         List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByWmTaskOne(wmTask1);
                         String sendDeptId = wmScorePackage.getSendPackageDeptId();
-                        if (wmTaskList.size() > 0) {
-                            Integer total = 0;
-                            Integer sum = 0;
+                        if (CollUtil.isNotEmpty(wmTaskList)) {
+                            int total = 0;
+                            int sum = 0;
                             Integer deptId = SecurityUtils.getUser().getDeptId();
                             Date date = new Date();
                             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -640,9 +649,9 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                             wmReport.setCreatePeople(SecurityUtils.getUser().getId() + "");
                             wmReport.setPackageScore(wmScorePackage1.getScore() + "");
                             LambdaUpdateWrapper<WmTask> updateWrapper = new LambdaUpdateWrapper<>();
-                            if (!ids1.isEmpty()) {
-                                Integer total1 = 0;
-                                Integer sum1 = 0;
+                            if (CollUtil.isNotEmpty(ids1)) {
+                                int total1 = 0;
+                                int sum1 = 0;
                                 Integer id = Integer.parseInt(ids1.get(0));
                                 WmTask wmTask2 = wmTaskMapper.selectById(id);
                                 Integer id1 = wmTask2.getReportOneId();
@@ -677,9 +686,9 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                         wmTask1.setReportOneApprovalStatus(String.valueOf(0));
                         List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByReportOneApprovalStatus(wmTask1);
                         String sendDeptId = wmScorePackage.getSendPackageDeptId();
-                        if (wmTaskList.size() > 0) {
-                            Integer total = 0;
-                            Integer sum = 0;
+                        if (CollUtil.isNotEmpty(wmTaskList)) {
+                            int total = 0;
+                            int sum = 0;
                             Integer deptId = SecurityUtils.getUser().getDeptId();
                             Date date = new Date();
                             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -757,21 +766,21 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             List<String> ids1 = taskList.stream()
                     .filter(task -> "1".equals(task.getReportSecondApprovalStatus()))
-                    .map(p -> p.getId())
+                    .map(WmTask::getId)
                     .collect(Collectors.toList());
             List<String> ids2 = taskList.stream()
                     .filter(task -> "0".equals(task.getReportSecondApprovalStatus()))
-                    .map(p -> p.getId())
+                    .map(WmTask::getId)
                     .collect(Collectors.toList());
-            if (ids1.size() > 0) {
+            if (CollUtil.isNotEmpty(ids1)) {
                 for (WmTask wmTask1 : taskList) {
                     if (wmTask1.getReportSecondId() == null) {
                         wmTask1.setExtIds(strs1);
                         List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByWmTaskSecond(wmTask1);
                         String sendDeptId = wmScorePackage.getSendPackageDeptId();
-                        if (wmTaskList.size() > 0) {
-                            Integer total = 0;
-                            Integer sum = 0;
+                        if (CollUtil.isNotEmpty(wmTaskList)) {
+                            int total = 0;
+                            int sum = 0;
                             Integer deptId = SecurityUtils.getUser().getDeptId();
 
                             Date date = new Date();
@@ -808,9 +817,9 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                             wmReport.setCreatePeople(SecurityUtils.getUser().getId() + "");
                             wmReport.setPackageScore(wmScorePackage1.getScore() + "");
                             LambdaUpdateWrapper<WmTask> updateWrapper = new LambdaUpdateWrapper<>();
-                            if (!ids1.isEmpty()) {
-                                Integer total1 = 0;
-                                Integer sum1 = 0;
+                            if (CollUtil.isNotEmpty(ids1)) {
+                                int total1 = 0;
+                                int sum1 = 0;
                                 Integer id = Integer.parseInt(ids1.get(0));
                                 WmTask wmTask2 = wmTaskMapper.selectById(id);
                                 Integer id1 = wmTask2.getReportSecondId();
@@ -845,9 +854,9 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                         wmTask1.setReportSecondApprovalStatus(String.valueOf(0));
                         List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByReportSecondApprovalStatus(wmTask1);
                         String sendDeptId = wmScorePackage.getSendPackageDeptId();
-                        if (wmTaskList.size() > 0) {
-                            Integer total = 0;
-                            Integer sum = 0;
+                        if (CollUtil.isNotEmpty(wmTaskList)) {
+                            int total = 0;
+                            int sum = 0;
                             Integer deptId = SecurityUtils.getUser().getDeptId();
                             Date date = new Date();
                             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -913,7 +922,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             for (String id : idList) {
                 List<WmScorePackage> wmScorePackageList1 = wmScorePackageMapper.selectByRelationScoreIdList(id);
-                List<String> idList1 = wmScorePackageList1.stream().map(p -> p.getId()).collect(Collectors.toList());
+                List<String> idList1 = wmScorePackageList1.stream().map(WmScorePackage::getId).collect(Collectors.toList());
                 for (String id1 : idList1) {
                     WmTask wmTask1 = new WmTask();
                     wmTask1.setTaskStatus(String.valueOf(3));
@@ -925,21 +934,21 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             List<String> ids1 = taskList.stream()
                     .filter(task -> "1".equals(task.getReportDrugApprovalStatus()))
-                    .map(p -> p.getId())
+                    .map(WmTask::getId)
                     .collect(Collectors.toList());
             List<String> ids2 = taskList.stream()
                     .filter(task -> "0".equals(task.getReportDrugApprovalStatus()))
-                    .map(p -> p.getId())
+                    .map(WmTask::getId)
                     .collect(Collectors.toList());
-            if (ids1.size() > 0) {
+            if (CollUtil.isNotEmpty(ids1)) {
                 for (WmTask wmTask1 : taskList) {
                     if (wmTask1.getReportDrugId() == null) {
                         wmTask1.setExtIds(strs1);
                         List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByWmTaskDrug(wmTask1);
                         String sendDeptId = wmScorePackage.getSendPackageDeptId();
-                        if (wmTaskList.size() > 0) {
-                            Integer total = 0;
-                            Integer sum = 0;
+                        if (CollUtil.isNotEmpty(wmTaskList)) {
+                            int total = 0;
+                            int sum = 0;
                             Integer deptId = SecurityUtils.getUser().getDeptId();
                             Date date = new Date();
                             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
@@ -1113,7 +1122,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             List<String> ids2 = taskList.stream()
                     .filter(task -> "0".equals(task.getReportOneApprovalStatus()) && !"2".equals(task.getReportDrugApprovalOpinion()))
-                    .map(p -> p.getId())
+                    .map(WmTask::getId)
                     .collect(Collectors.toList());
 
             for (WmTask wmTask1 : taskList) {
@@ -1121,26 +1130,34 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                     wmTask1.setExtIds(strs1);
                     wmTask1.setReportOneApprovalStatus(String.valueOf(0));
                     List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByReportOneApprovalStatus(wmTask1);
+
+
+                    List<WmTask> wmTasks = wmTaskMapper.selectList(Wrappers.<WmTask>lambdaQuery()
+                            .eq(WmTask::getTaskStatus, "3")
+                            .eq(WmTask::getReportOneApprovalOpinion, "1")
+                            .eq(WmTask::getReportOneApprovalStatus, "0"));
+
+
                     String sendDeptId = wmScorePackage.getSendPackageDeptId();
-                    if (wmTaskList.size() > 0) {
-                        Integer total = 0;
-                        Integer sum = 0;
+                    if (CollUtil.isNotEmpty(wmTasks)) {
+                        int total = wmTasks.size();
+                        int sum = wmTasks.stream().mapToInt(WmTask::getScore).sum();
                         Integer deptId = SecurityUtils.getUser().getDeptId();
                         Date date = new Date();
                         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
                         String reportId = simpleDateFormat.format(date) + (int) ((Math.random() * 9 + 1) * 1000);
 
-                        for (Map<String, Object> map :
-                                wmTaskList) {
-                            if (null != map.get("score_count")) {
-                                total += Integer.parseInt(map.get("score_count") + "");
-                            }
-
-                            if (null != map.get("score")) {
-                                sum += Integer.parseInt(map.get("score") + "");
-                            }
-                        }
-                        Map<String, Object> totalMap = new HashMap<>();
+                        //for (Map<String, Object> map : wmTaskList) {
+                        //    if (null != map.get("score_count")) {
+                        //        total += Integer.parseInt(map.get("score_count") + "");
+                        //    }
+                        //
+                        //    if (null != map.get("score")) {
+                        //        sum += Integer.parseInt(map.get("score") + "");
+                        //    }
+                        //}
+
+                        Map<String, Object> totalMap = new HashMap<>(6);
                         totalMap.put("score_count", total);
                         totalMap.put("score", sum);
                         totalMap.put("score_package_name", name);
@@ -1280,7 +1297,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
             for (String id : idList) {
                 List<WmScorePackage> wmScorePackageList1 = wmScorePackageMapper.selectByRelationScoreIdList(id);
-                List<String> idList1 = wmScorePackageList1.stream().map(p -> p.getId()).collect(Collectors.toList());
+                List<String> idList1 = wmScorePackageList1.stream().map(WmScorePackage::getId).collect(Collectors.toList());
                 for (String id1 : idList1) {
                     WmTask wmTask1 = new WmTask();
                     wmTask1.setTaskStatus(String.valueOf(3));
@@ -1296,22 +1313,21 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                     .collect(Collectors.toList());
 
             for (WmTask wmTask1 : taskList) {
-                Integer reportDrugApprovalStatus = Integer.valueOf(wmTask1.getReportDrugApprovalStatus());
+                int reportDrugApprovalStatus = Integer.parseInt(wmTask1.getReportDrugApprovalStatus());
 
                 if (reportDrugApprovalStatus == 0 && wmTask1.getReportOneId() == null) {
                     wmTask1.setExtIds(strs1);
                     List<Map<String, Object>> wmTaskList = wmTaskMapper.selectByWmTaskDrug(wmTask1);
                     String sendDeptId = wmScorePackage.getSendPackageDeptId();
-                    if (wmTaskList.size() > 0) {
-                        Integer total = 0;
-                        Integer sum = 0;
+                    if (CollUtil.isNotEmpty(wmTaskList)) {
+                        int total = 0;
+                        int sum = 0;
                         Integer deptId = SecurityUtils.getUser().getDeptId();
                         Date date = new Date();
                         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
                         String reportId = simpleDateFormat.format(date) + (int) ((Math.random() * 9 + 1) * 1000);
 
-                        for (Map<String, Object> map :
-                                wmTaskList) {
+                        for (Map<String, Object> map : wmTaskList) {
                             if (null != map.get("score_count")) {
                                 total += Integer.parseInt(map.get("score_count") + "");
                             }
@@ -1357,7 +1373,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     }
 
     @Override
-    public R selectList(Page page, WmScorePackage wmScorePackage) {
+    public R<?> selectList(Page page, WmScorePackage wmScorePackage) {
         OrderItem orderItem = new OrderItem();
         orderItem.setColumn("create_time");
         orderItem.setAsc(false);
@@ -1366,7 +1382,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
         wmScorePackage.setRelationScoreId(wmScorePackage.getId());
         List<WmScorePackage> wmScorePackageList = wmScorePackageService.selectLists(wmScorePackage);
         List<WmTask> list = new ArrayList<>();
-        if (wmScorePackageList.size() > 0) {
+        if (CollUtil.isNotEmpty(wmScorePackageList)) {
             List<String> ids2 = wmScorePackageList.stream().map(p -> p.getId()).collect(Collectors.toList());
             for (String id : ids2) {
                 WmScorePackage wmScorePackage1 = new WmScorePackage();
@@ -1375,9 +1391,9 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                 WmTask wmTask1 = new WmTask();
                 wmTask1.setScorePackageId(id);
                 List<WmTask> wmTaskList = wmTaskMapper.selectListByIds(wmTask1);
-                List<String> ids3 = wmTaskList.stream().map(p -> p.getId()).collect(Collectors.toList());
-                List<String> ids4 = wmScorePackageList1.stream().map(p -> p.getId()).collect(Collectors.toList());
-                if (wmScorePackageList1.size() > 0) {
+                List<String> ids3 = wmTaskList.stream().map(WmTask::getId).collect(Collectors.toList());
+                List<String> ids4 = wmScorePackageList1.stream().map(WmScorePackage::getId).collect(Collectors.toList());
+                if (CollUtil.isNotEmpty(wmScorePackageList1)) {
                     for (String id1 : ids4) {
                         WmTask wmTask2 = new WmTask();
                         wmTask2.setScorePackageId(id1);
@@ -1445,7 +1461,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     }
 
     @Override
-    public R getWmTaskList(Page page, WmTask wmTask) {
+    public R<?> getWmTaskList(Page page, WmTask wmTask) {
         WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTask.getScorePackageId());
         if (wmScorePackage1.getTypeid().equals("1")) {//药企给一代发的包
             wmTask.setScorePackageDrugId(wmTask.getScorePackageId());
@@ -1499,7 +1515,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     //  */
     // @Override
     // @Transactional(rollbackFor = Exception.class)
-    // public R approvalTask(WmTask wmTask) {
+    // public R<?>approvalTask(WmTask wmTask) {
     // 	//要循环判断，每一个接单用户，所有用户完成，审核通过，才算是积分包完成
     // 	//有没有什么问题，例如，个人包收回，影响积分包的积分值
     // 	String[] ids = wmTask.getId().split(",");
@@ -1631,12 +1647,13 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     /**
      * 任务审核，要针对每一个接单用户，每一个用户的任务全部审核完毕，才算是积分包完成
      *
-     * @param wmTask
-     * @return
+     * @param wmTask 查询条件
+     * @return 审核结果
      */
     @Override
+    @SuppressWarnings("unchecked")
     @Transactional(rollbackFor = Exception.class)
-    public R approvalTask(WmTask wmTask) {
+    public R<?> approvalTask(WmTask wmTask) {
         //要循环判断，每一个接单用户，所有用户完成，审核通过，才算是积分包完成
         //有没有什么问题，例如，个人包收回，影响积分包的积分值
         String[] ids = wmTask.getId().split(",");
@@ -1647,7 +1664,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
         LocalDateTime now = LocalDateTime.now();
         Integer userId = SecurityUtils.getUser().getId();
 
-        LambdaUpdateWrapper<WmTask> updateWrapper = new LambdaUpdateWrapper();
+        LambdaUpdateWrapper<WmTask> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.in(WmTask::getId, ids);
         List<WmTask> wmTaskList = list(updateWrapper);
         updateWrapper.set(StrUtil.isNotBlank(wmTask.getTaskStatusInfo()), WmTask::getTaskStatusInfo, wmTask.getTaskStatusInfo());
@@ -1790,7 +1807,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     }
 
     @Override
-    public R saveTaskSettle(WmTask wmTask) {
+    public R<?> saveTaskSettle(WmTask wmTask) {
         WmScorePackage wmScorePackage1 = wmScorePackageService.getById(wmTask.getScorePackageId());
         WmTask query = new WmTask();
         query.setScorePackageId(wmScorePackage1.getId());
@@ -1830,7 +1847,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public R saveTaskPrescription(WmTask wmTask) {
+    public R<?> saveTaskPrescription(WmTask wmTask) {
         // 查询对应的积分包
         WmScorePackage scorePackage = wmScorePackageService.getById(wmTask.getScorePackageId());
         // 校验积分包是不是这个部门下的
@@ -1914,7 +1931,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     }
 
     @Override
-    public R updateTaskSettle(WmTask wmTask) {
+    public R<?> updateTaskSettle(WmTask wmTask) {
         WmTask wmTask1 = this.getById(wmTask.getId());
         WmTaskContent taskContent = wmTask.getWmTaskContent();
         if (taskContent != null) {
@@ -1951,7 +1968,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 
 
     @Override
-    public R getTaskInfo(String taskId) {
+    public R<?> getTaskInfo(String taskId) {
         WmTask task = this.getById(taskId);
         if (task == null) {
             return R.failed("未查询到任务信息");
@@ -2132,7 +2149,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
         }
 
         // 上传结果
-        if (errorMap.size() == 0) {
+        if (errorMap.isEmpty()) {
             submitEvidence(currentList);
         }
 
@@ -2177,11 +2194,9 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             }
 
             // 校验证据链信息，并封装正确的
-            List<CommonEvidenceDTO> evidenceDTOS = sourceList;
-            int outCapacity = evidenceDTOS.size() - scorePackage.getTaskNum();
-            ConcurrentHashMap<SysUser, Integer> indexMap = new ConcurrentHashMap(sourceList.size());
-            ConcurrentHashMap<SysUser, BigDecimal> preUserSettleAmountMap = new ConcurrentHashMap(sourceList.size());
-            evidenceDTOS.forEach(commonEvidenceDTO -> {
+            ConcurrentHashMap<SysUser, Integer> indexMap = new ConcurrentHashMap<>(sourceList.size());
+            ConcurrentHashMap<SysUser, BigDecimal> preUserSettleAmountMap = new ConcurrentHashMap<>(sourceList.size());
+            sourceList.forEach(commonEvidenceDTO -> {
                 // 校验结算用户是否存在
                 SysUser user = userService.getOne(Wrappers.<SysUser>lambdaQuery()
                         .eq(SysUser::getUsername, commonEvidenceDTO.getUsername())
@@ -2481,7 +2496,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
      * 查询同一家医院一个月做的任务次数
      *
      * @param hospitalId 医院id
-     * @return
+     * @return 任务列表
      */
     @Override
     public List<WmTask> listCurrentMonthHospitalTask(String hospitalId) {
@@ -2794,6 +2809,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
      * @param taskStatus     审核状态
      * @param taskStatusInfo 审批说明
      */
+    @SuppressWarnings("unchecked")
     public String task15_30_16_18(WmTask task, String taskStatus, String taskStatusInfo) {
 
         String compareResult = null;
@@ -2846,6 +2862,7 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
      * @param taskStatus     审核状态
      * @param taskStatusInfo 审批说明
      */
+    @SuppressWarnings("unchecked")
     public void task15_30_16_18ForManualOperation(WmTask task, String taskStatus, String taskStatusInfo) {
 
         // 调查信息审核（15、30-医院 16-商业公司 18-药店）
@@ -2942,8 +2959,8 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
                         }
                     });
                 }
-            } catch (Exception ignored) {
-                log.error("", ignored);
+            } catch (Exception e) {
+                log.error("移除图片缓存失败", e);
             }
         }
     }