Browse Source

数据查询文书/结构化表标示添加

chengyao 4 years ago
parent
commit
d3d0ac5946

+ 1 - 1
src/main/java/com/diagbot/dto/RecordContentDTO.java

@@ -69,5 +69,5 @@ public class RecordContentDTO implements Serializable {
     /**
     /**
      *是否从结构化表中取数据(0-从文文书取 1-从结构化取)
      *是否从结构化表中取数据(0-从文文书取 1-从结构化取)
      */
      */
-    private int isParsed;
+    private int isParsed = 0;
 }
 }

+ 26 - 2
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

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