|
@@ -994,11 +994,10 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- mapList = JSON.parseObject(JSON.toJSONString(keyContent.get("content")), new TypeReference<List<Map<String, Object>>>() {
|
|
|
+ specialContent = JSON.parseObject(JSON.toJSONString(keyContent.get("content")), new TypeReference<Map<String, Object>>() {
|
|
|
});
|
|
|
if (!specialContent.isEmpty()) {
|
|
|
- mapList.add(specialContent);
|
|
|
- keyContent.put("content", mapList);
|
|
|
+ keyContent.put("content", specialContent);
|
|
|
flag = true;
|
|
|
}
|
|
|
|
|
@@ -1018,8 +1017,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
}
|
|
|
}
|
|
|
if (!specialContent.isEmpty()) {
|
|
|
- returnData.add(specialContent);
|
|
|
- content.put("content", returnData);
|
|
|
+ content.put("content", specialContent);
|
|
|
medrecVo.setTitle(m);
|
|
|
medrecVo.setContent(content);
|
|
|
medrecVoList.add(medrecVo);
|
|
@@ -1189,7 +1187,6 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
Map<String, Object> specialContent = new HashMap<String, Object>();
|
|
|
List<Map<String, Object>> specialFile = new ArrayList<>();
|
|
|
List<RePlaceData> contents = new ArrayList<>();
|
|
|
- List<Map<String, Object>> returnData = new ArrayList<>();
|
|
|
//从结构化表中取出应用数据
|
|
|
for (T bean : list) {
|
|
|
try {
|
|
@@ -1232,12 +1229,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
for (MedrecVo medrec : medrecVoList) {
|
|
|
if (key.equals(medrec.getTitle())) {
|
|
|
Map<String, Object> keyContent = medrec.getContent();
|
|
|
- specialContent.put(keyTagert, specialFile);
|
|
|
try {
|
|
|
- List<Map<String, Object>> mapList = JSON.parseObject(JSON.toJSONString(keyContent.get("content")), new TypeReference<List<Map<String, Object>>>() {
|
|
|
+ specialContent = JSON.parseObject(JSON.toJSONString(keyContent.get("content")), new TypeReference<Map<String, Object>>() {
|
|
|
});
|
|
|
- mapList.add(specialContent);
|
|
|
- keyContent.put("content", mapList);
|
|
|
+ specialContent.put(keyTagert, specialFile);
|
|
|
+ keyContent.put("content", specialContent);
|
|
|
flag = false;
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
@@ -1247,8 +1243,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
if (flag) {
|
|
|
medrecVo.setTitle(key);
|
|
|
specialContent.put(keyTagert, specialFile);
|
|
|
- returnData.add(specialContent);
|
|
|
- content.put("content", returnData);
|
|
|
+ content.put("content", specialContent);
|
|
|
medrecVo.setContent(content);
|
|
|
medrecVoList.add(medrecVo);
|
|
|
}
|