feat: update something

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

@@ -12,7 +12,6 @@ import com.qunzhixinxi.hnqz.admin.api.entity.WmReportOpt;
 import com.qunzhixinxi.hnqz.admin.api.vo.WmScorePackageVO;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmDaDrugEntDrugtable;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageSettleNote;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageStatus;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmScoreTaskType;
 import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
@@ -50,7 +49,6 @@ public interface WmScorePackageService extends IService<WmScorePackage> {
 
     List<WmScorePackage> listWmScorePackageAndTaskExt2Old(WmScorePackage wmScorePackage);
 
-
     List<WmScorePackage> listWmScorePackageAndTaskLevel1(WmScorePackage wmScorePackage);
 
     List<WmScorePackage> listWmScorePackageAndTaskLevel3(WmScorePackage wmScorePackage);
@@ -98,15 +96,15 @@ public interface WmScorePackageService extends IService<WmScorePackage> {
 
     List<WmScorePackage> selectByReRelatedService(WmScorePackage wmScorePackage);
 
-    R getRelationScoreList(WmScorePackage wmScorePackage);
+    R<?> getRelationScoreList(WmScorePackage wmScorePackage);
 
-    R addWmScorePackage(WmScorePackage wmScorePackage);
+    R<?> addWmScorePackage(WmScorePackage wmScorePackage);
 
-    R getScorePackagePage(Page page, WmScorePackage wmScorePackage);
+    R<?> getScorePackagePage(Page page, WmScorePackage wmScorePackage);
 
-    R updateEnable(WmScorePackage wmScorePackage);
+    R<?> updateEnable(WmScorePackage wmScorePackage);
 
-    R getScorePackagePageById(WmScorePackage wmScorePackage);
+    R<?> getScorePackagePageById(WmScorePackage wmScorePackage);
 
     R<?> updateEasy(WmScorePackage wmScorePackage);
 
@@ -138,8 +136,8 @@ public interface WmScorePackageService extends IService<WmScorePackage> {
     /**
      * 获取当前部门的基于所有积分包的相关信息
      *
-     * @param deptId
-     * @return
+     * @param deptId 部门ID
+     * @return 部门积分包信息
      */
     Map<String, Object> getDeptScorePackageInfo(Integer deptId);
 
@@ -158,8 +156,8 @@ public interface WmScorePackageService extends IService<WmScorePackage> {
 
     Future<WmScorePackage> finishRate(WmScorePackage wmScorePackage);
 
-    R getScorePackagePage(Page<WmScorePackage> page, Integer packageType1, Integer packageType2,
-                          String scorePackageName, Integer scorePackageStatus, String typeId);
+    R<?> getScorePackagePage(Page<WmScorePackage> page, Integer packageType1, Integer packageType2,
+                             String scorePackageName, Integer scorePackageStatus, String typeId);
 
 
     Future<WmScorePackage> buildScorePackage(WmScorePackage wmScorePackage, Integer packageType1, Integer packageType2);

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

@@ -543,7 +543,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
         // 获取关联信息
         String relatedService = wmScorePackage.getRelatedService();
-        if (StrUtil.isNotBlank(relatedService)){
+        if (StrUtil.isNotBlank(relatedService)) {
             SysDept sysDept = sysDeptMapper.selectById(relatedService);
             wmScorePackage.setRelatedServiceName(sysDept.getName());
         }
@@ -551,7 +551,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         // 服务计划
         SysPlanPkg planPkg = sysPlanPkgMapper.selectOne(Wrappers.<SysPlanPkg>lambdaQuery().eq(SysPlanPkg::getPkgId, wmScorePackage.getId()));
 
-        if (Objects.nonNull(planPkg)){
+        if (Objects.nonNull(planPkg)) {
             SysImplementPlan plan = implementPlanService.getById(planPkg.getPlanId());
             wmScorePackage.setPlan(plan);
             wmScorePackage.setPlanId(planPkg.getPlanId());
@@ -559,9 +559,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
         // 承接对象
         String agentId = wmScorePackage.getAcceptSug();
-        if (StrUtil.isNotBlank(agentId)){
+        if (StrUtil.isNotBlank(agentId)) {
             WmDaAgent agent = wmDaAgentService.getById(agentId);
-            if (Objects.nonNull(agent)){
+            if (Objects.nonNull(agent)) {
                 wmScorePackage.setAcceptSugName(agent.getGsmc());
             }
 
@@ -569,9 +569,9 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 
         // 药品名称
         String[] drugtable = wmScorePackage.getDrugtable();
-        if (ArrayUtil.isNotEmpty(drugtable)){
+        if (ArrayUtil.isNotEmpty(drugtable)) {
             List<Map<String, String>> maps = drugEntDrugtableService.listDrugs(Arrays.stream(drugtable).map(Integer::valueOf).collect(Collectors.toSet()));
-            if (CollUtil.isNotEmpty(maps)){
+            if (CollUtil.isNotEmpty(maps)) {
                 String[] drugNames = maps.stream().map(d -> d.get("drug_name")).toArray(String[]::new);
                 wmScorePackage.setDrugtableName(drugNames);
             }
@@ -620,11 +620,12 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
     /**
      * 查询关联积分包列表
      *
-     * @param wmScorePackage
-     * @return
+     * @param wmScorePackage 积分包信息
+     * @return 关联积分包列表
      */
     @Override
     public R<?> getRelationScoreList(WmScorePackage wmScorePackage) {
+
         long start = System.currentTimeMillis();
         SysDept relatedService = new SysDept();
         if (null != wmScorePackage.getRelatedService()) {
@@ -632,8 +633,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
         }
         //查询分配给当前用户机构的积分包，deptid为当前用户，而且typeid=1或2
         Integer deptId = SecurityUtils.getUser().getDeptId();
-        Integer superDeptId = StrUtil.isNotBlank(wmScorePackage.getRelatedService()) ?
-                Integer.valueOf(wmScorePackage.getRelatedService()) : null;
+        Integer superDeptId = StrUtil.isNotBlank(wmScorePackage.getRelatedService()) ? Integer.valueOf(wmScorePackage.getRelatedService()) : null;
         List<WmScorePackage> pkgList =
                 this.getScorePackagekfpjf(superDeptId, deptId,
                         new String[]{"0", "1", "2"}, StrUtil.isNotBlank(wmScorePackage.getId()) ?
@@ -655,7 +655,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
 //			List<WmScoreTaskType> taskTypelist = wmScoreTaskTypeMapper.getScoreTaskTypeByScoreId(wmScorePackage1.getId());
                 List<WmScoreTaskType> taskTypelist = scoreTaskTypeMap.get(wmScorePackage1.getId());
                 wmScorePackage1.setTaskTypeList1(taskTypelist);
-                Set taskTypeSet = taskTypelist.stream().map(WmScoreTaskType::getTaskTypeId).collect(Collectors.toSet());
+                Set<String> taskTypeSet = taskTypelist.stream().map(WmScoreTaskType::getTaskTypeId).collect(Collectors.toSet());
                 wmScorePackage1.setTaskTypeSet(taskTypeSet);
 
                 String[] drugtable = wmScorePackage1.getDrugtable();
@@ -1221,7 +1221,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public R updateEnable(WmScorePackage wmScorePackage) {
+    public R<?> updateEnable(WmScorePackage wmScorePackage) {
         String enableType = wmScorePackage.getEnableType();
         wmScorePackage = this.getById(wmScorePackage.getId());
         if (null == wmScorePackage) {

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

@@ -20,18 +20,8 @@ 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.SysDept;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
+import com.qunzhixinxi.hnqz.admin.api.entity.*;
 import com.qunzhixinxi.hnqz.admin.config.UpmsConfig;
-import com.qunzhixinxi.hnqz.admin.api.entity.SysDeptSub;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmDaPharmacy;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmReport;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackage;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageSettleNote;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScorePackageStatus;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmScoreTaskType;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTask;
-import com.qunzhixinxi.hnqz.admin.api.entity.WmTaskContent;
 import com.qunzhixinxi.hnqz.admin.api.dto.CommonEvidenceDTO;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.ChannelEnum;
 import com.qunzhixinxi.hnqz.admin.api.constant.enums.DelEnum;
@@ -47,18 +37,9 @@ import com.qunzhixinxi.hnqz.admin.mapper.WmReportMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmScorePackageMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskContentMapper;
 import com.qunzhixinxi.hnqz.admin.mapper.WmTaskMapper;
-import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
-import com.qunzhixinxi.hnqz.admin.service.SysDeptSubService;
-import com.qunzhixinxi.hnqz.admin.service.SysPublicParamService;
-import com.qunzhixinxi.hnqz.admin.service.SysUserService;
-import com.qunzhixinxi.hnqz.admin.service.WmDaDistributionService;
-import com.qunzhixinxi.hnqz.admin.service.WmDaHospitalService;
-import com.qunzhixinxi.hnqz.admin.service.WmDaPharmacyService;
-import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
-import com.qunzhixinxi.hnqz.admin.service.WmScorePackageStatusService;
-import com.qunzhixinxi.hnqz.admin.service.WmScoreTaskTypeService;
-import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
+import com.qunzhixinxi.hnqz.admin.service.*;
 import com.qunzhixinxi.hnqz.admin.util.RegUtils;
+import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.exception.BizException;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.data.datascope.DataScope;
@@ -124,10 +105,11 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
     private final WmScorePackageStatusService wmScorePackageStatusService;
     private final SysPublicParamService sysPublicParamService;
     private final WmScoreTaskTypeService wmScoreTaskTypeService;
+    private final WmTaskTypeService taskTypeService;
     private final SysUserService userService;
-    private WmDaHospitalService wmDaHospitalService;
-    private WmDaPharmacyService wmDaPharmacyService;
-    private WmDaDistributionService wmDaDistributionService;
+    private final WmDaHospitalService wmDaHospitalService;
+    private final WmDaPharmacyService wmDaPharmacyService;
+    private final WmDaDistributionService wmDaDistributionService;
     private final RedisTemplate<String, Object> redisTemplate;
     private final UpmsConfig upmsConfig;
     private final SysCheckChainManager checkChainManager;
@@ -1470,8 +1452,8 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             wmTask.setScorePackageLevel1Id(wmTask.getScorePackageId());
             wmTask.setScorePackageId(null);
         }
-        wmTask.setDelFlag("0");
-        wmTask.setRealFlag("0");
+        wmTask.setDelFlag(CommonConstants.STATUS_NORMAL);
+        wmTask.setRealFlag(CommonConstants.STATUS_NORMAL);
 
         IPage<WmTask> taskPage = wmTaskMapper.getWmTaskList(page, wmTask);
         if (CollUtil.isNotEmpty(taskPage.getRecords())) {
@@ -1487,21 +1469,21 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
             if (CollUtil.isNotEmpty(approvalUserIds)) {
                 List<SysUser> users = userService.listByIds(approvalUserIds);
                 userMap = users.stream().collect(Collectors.toMap(SysUser::getUserId, SysUser::getRealname));
-
-                //taskPage.getRecords().stream()
-                //        .filter(r -> r.getApprovalUserId() != null)
-                //        .forEach(r -> r.setApprovalUserName(userMap.get(r.getApprovalUserId())));
-
             }
 
             for (WmTask task : taskPage.getRecords()) {
                 if (task.getApprovalUserId() != null && CollUtil.isNotEmpty(userMap)) {
                     task.setApprovalUserName(userMap.get(task.getApprovalUserId()));
                 }
-
                 task.setCheckState(targetLatestCheckState.get(Integer.parseInt(task.getId())));
-            }
 
+                // 任务类型的名称
+                String taskTypeId = task.getTaskTypeId();
+                WmTaskType taskType = taskTypeService.getById(taskTypeId);
+                if (Objects.nonNull(taskType)){
+                    task.setTaskTypeName(taskType.getTaskTypeName());
+                }
+            }
         }
 
         return R.ok(taskPage);