|
@@ -11,6 +11,7 @@ import com.lantone.qc.pub.model.vo.QueryVo;
|
|
import com.lantone.qc.pub.res.Response;
|
|
import com.lantone.qc.pub.res.Response;
|
|
import com.lantone.qc.pub.util.FastJsonUtils;
|
|
import com.lantone.qc.pub.util.FastJsonUtils;
|
|
import com.lantone.qc.pub.util.PropertiesUtil;
|
|
import com.lantone.qc.pub.util.PropertiesUtil;
|
|
|
|
+import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -201,7 +202,13 @@ public class QCTestController {
|
|
MedrecVo medrecVo = new MedrecVo();
|
|
MedrecVo medrecVo = new MedrecVo();
|
|
medrecVo.setTitle(label);
|
|
medrecVo.setTitle(label);
|
|
String jsonString = details.get(0);
|
|
String jsonString = details.get(0);
|
|
- medrecVo.setContent(FastJsonUtils.getJsonToMap(jsonString));
|
|
|
|
|
|
+ if ("1".equals(hospitalId)) {
|
|
|
|
+ medrecVo.setContent(FastJsonUtils.getJsonToMap(jsonString));
|
|
|
|
+ } else {
|
|
|
|
+ Map<String, Object> m = new HashMap<>();
|
|
|
|
+ m.put("content", details);
|
|
|
|
+ medrecVo.setContent(m);
|
|
|
|
+ }
|
|
medrec.add(medrecVo);
|
|
medrec.add(medrecVo);
|
|
details = new ArrayList<>();
|
|
details = new ArrayList<>();
|
|
} else if (!label.equals(String.valueOf(r3)) && StringUtils.isNotEmpty(label)) {
|
|
} else if (!label.equals(String.valueOf(r3)) && StringUtils.isNotEmpty(label)) {
|