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