|
@@ -896,6 +896,11 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
*/
|
|
|
public void addData(String key, Map<String, List<RecordContentDTO>> recMap, List<MedrecVo> medrecVoList) {
|
|
|
List<RecordContentDTO> list = recMap.get(key);
|
|
|
+ if(ListUtil.isNotEmpty(list)){
|
|
|
+ for (RecordContentDTO recordContentDTO : list) {
|
|
|
+ recordContentDTO.setIsParsed(0);
|
|
|
+ }
|
|
|
+ }
|
|
|
if (ListUtil.isNotEmpty(list)) {
|
|
|
MedrecVo medrecVo = new MedrecVo();
|
|
|
String k = key;
|
|
@@ -943,6 +948,17 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
}
|
|
|
List<RecordContentDTO> recordContentDTOS = recMap.get(keyTagert);
|
|
|
List<RecordContentDTO> recordContentList = recMap.get("会诊申请单");
|
|
|
+ if(ListUtil.isNotEmpty(recordContentDTOS)){
|
|
|
+ for (RecordContentDTO recordContentDTO : recordContentDTOS) {
|
|
|
+ recordContentDTO.setIsParsed(0);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if(ListUtil.isNotEmpty(recordContentList)){
|
|
|
+ for (RecordContentDTO recordContentDTO : recordContentList) {
|
|
|
+ recordContentDTO.setIsParsed(0);
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
for (MedrecVo medrec : medrecVoList) {
|
|
|
if (key.equals(medrec.getTitle())) {
|
|
@@ -1056,8 +1072,15 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
EntityUtil.makeEntityListMap(recordContentDTOList, "recTitle");
|
|
|
Set<String> keyList = keyMap.keySet();
|
|
|
for (String k : keyList) {
|
|
|
- if (ListUtil.isNotEmpty(keyMap.get(k))) {
|
|
|
- listMap.put(k, keyMap.get(k));
|
|
|
+ List<RecordContentDTO> recordContentDTOS = keyMap.get(k);
|
|
|
+ if(ListUtil.isNotEmpty(recordContentDTOS)){
|
|
|
+ for (RecordContentDTO recordContentDTO : recordContentDTOS) {
|
|
|
+ recordContentDTO.setIsParsed(0);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ if (ListUtil.isNotEmpty(recordContentDTOS)) {
|
|
|
+ listMap.put(k,recordContentDTOS);
|
|
|
}
|
|
|
}
|
|
|
content.put("content", listMap);
|
|
@@ -1304,6 +1327,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
|
|
|
}
|
|
|
} else {
|
|
|
content.put(map.get(objKey), String.valueOf(objectMap.get(objKey)).replaceAll("null", ""));
|
|
|
+ content.put("isParsed",0);
|
|
|
}
|
|
|
}
|
|
|
}
|