Merge branch 'feature-cso1tocso2-210706' of googol/YY_BE_2 into develop

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

@@ -24,19 +24,18 @@ 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.entity.SysDept;
+import com.qunzhixinxi.hnqz.admin.api.entity.SysUser;
 import com.qunzhixinxi.hnqz.admin.entity.WmReport;
 import com.qunzhixinxi.hnqz.admin.entity.WmScorePackage;
 import com.qunzhixinxi.hnqz.admin.entity.WmTask;
 import com.qunzhixinxi.hnqz.admin.enums.ReportEnum;
 import com.qunzhixinxi.hnqz.admin.mapper.WmReportMapper;
-import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
-import com.qunzhixinxi.hnqz.admin.service.WmReportService;
-import com.qunzhixinxi.hnqz.admin.service.WmScorePackageService;
-import com.qunzhixinxi.hnqz.admin.service.WmTaskService;
+import com.qunzhixinxi.hnqz.admin.service.*;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.security.service.HnqzUser;
 import com.qunzhixinxi.hnqz.common.security.util.SecurityUtils;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -60,6 +59,7 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 	private final WmTaskService wmTaskService;
 	private final WmReportMapper wmReportMapper;
 	private final SysDeptService sysDeptService;
+	private final SysUserService sysUserService;
 
 	@Override
 	public IPage<WmReport> getReportListPage(Page page, WmReport wmReport, String scoreId, String name){
@@ -293,6 +293,11 @@ public class WmReportServiceImpl extends ServiceImpl<WmReportMapper, WmReport> i
 //					map.put("reportApprovalOpinion",wmtask.getReportSecondApprovalOpinion());
 					map.put("reportApprovalOpinion",wmtask.getReportOneApprovalOpinion());
 				}
+				// 姓名
+				if (StringUtils.isNumeric(wmTask.getTaskUserId())) {
+					SysUser user = sysUserService.getById(Integer.parseInt(wmTask.getTaskUserId()));
+					map.put("taskUsername", user.getRealname());
+				}
 				return map;
 			}).collect(Collectors.toList());
 

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

@@ -18,6 +18,7 @@ package com.qunzhixinxi.hnqz.admin.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Assert;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -1695,8 +1696,8 @@ public class WmTaskServiceImpl extends ServiceImpl<WmTaskMapper, WmTask> impleme
 			taskList.stream().forEach(task -> {
 				WmTaskContent wmTaskContent = task.getWmTaskContent();
 				// 如果是系统对接，则将药品temp10字段格式化
-				if (scorePackage != null && "1".equals(scorePackage.getSourceType()) && StringUtils.isNotBlank(wmTaskContent
-						.getTemp10())) {
+				if (scorePackage != null && "1".equals(scorePackage.getSourceType())
+						&& JSONUtil.isJsonArray(wmTaskContent.getTemp10())) {
 					JSONArray drugJsonArr = JSON.parseArray(wmTaskContent.getTemp10());
 					StringBuilder drugStr = new StringBuilder();
 					drugStr.append("\n");