|
@@ -10,6 +10,7 @@ import com.lantone.qc.pub.model.entity.Lis;
|
|
|
import com.lantone.qc.pub.model.vo.MedrecVo;
|
|
|
import com.lantone.qc.pub.model.vo.QueryVo;
|
|
|
import com.lantone.qc.pub.res.Response;
|
|
|
+import com.lantone.qc.pub.util.FastJsonUtils;
|
|
|
import com.lantone.qc.pub.util.PropertiesUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -166,7 +167,14 @@ public class QCTestController {
|
|
|
medrec = new ArrayList<>();
|
|
|
queryVo = new QueryVo();
|
|
|
}
|
|
|
- if (!label.equals(String.valueOf(r3)) && StringUtils.isNotEmpty(label)) {
|
|
|
+ if (label.equals("病案首页") && !label.equals(String.valueOf(r3)) && StringUtils.isNotEmpty(label)) {
|
|
|
+ MedrecVo medrecVo = new MedrecVo();
|
|
|
+ medrecVo.setTitle(label);
|
|
|
+ String jsonString = details.get(0);
|
|
|
+ medrecVo.setContent(FastJsonUtils.getJsonToMap(jsonString));
|
|
|
+ medrec.add(medrecVo);
|
|
|
+ details = new ArrayList<>();
|
|
|
+ } else if (!label.equals(String.valueOf(r3)) && StringUtils.isNotEmpty(label)) {
|
|
|
MedrecVo medrecVo = new MedrecVo();
|
|
|
medrecVo.setTitle(label);
|
|
|
Map<String, Object> m = new HashMap<>();
|