修改传参类型

src/main/java/com/diagbot/dto/RecordContentDTO.java

@@ -46,4 +46,14 @@ public class RecordContentDTO implements Serializable {
      */
     private String recTitle;
 
+    /**
+     * 病历类别编号
+     */
+    private String recTypeId;
+
+    /**
+     * 模块id
+     */
+    private Long modeId;
+
 }

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -441,7 +441,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             MedrecVo medrecVo = new MedrecVo();
             medrecVo.setTitle(key);
             Map<String, Object> content = new HashMap<>();
-            content.put("content", list.stream().map(r -> r.getXmlText()).collect(Collectors.toList()));
+            content.put("content", list);
             medrecVo.setContent(content);
             medrecVoList.add(medrecVo);
         }
@@ -460,18 +460,18 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         MedrecVo medrecVo = new MedrecVo();
         medrecVo.setTitle(key);
         Map<String, Object> content = new HashMap<>();
-        Map<String, List<String>> listMap = new HashMap<>();
+        Map<String, Object> listMap = new HashMap<>();
         Boolean flag = false;
         for (String k : keyList) {
             if (ListUtil.isNotEmpty(recMap.get(k))) {
-                listMap.put(k, recMap.get(k).stream().map(r -> r.getXmlText()).collect(Collectors.toList()));
+                listMap.put(k, recMap.get(k));
                 flag = true;
             }
         }
         if (flag) {
             // 会诊记录特殊处理，有会诊申请单，没有会诊结果单，复制一份到会诊结果单
-            if ("会诊记录".equals(key) && ListUtil.isNotEmpty(listMap.get("会诊申请单"))
-                    && ListUtil.isEmpty(listMap.get("会诊结果单"))) {
+            if ("会诊记录".equals(key) && listMap.get("会诊申请单") != null
+                    && listMap.get("会诊结果单") == null) {
                 listMap.put("会诊结果单", listMap.get("会诊申请单"));
             }
             content.put("content", listMap);
@@ -492,7 +492,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         MedrecVo medrecVo = new MedrecVo();
         medrecVo.setTitle(key);
         Map<String, Object> content = new HashMap<>();
-        Map<String, List<String>> listMap = new HashMap<>();
+        Map<String, Object> listMap = new HashMap<>();
         List<RecordContentDTO> recordContentDTOList = recMap.get(key);
         if (ListUtil.isNotEmpty(recordContentDTOList)) {
             Map<String, List<RecordContentDTO>> keyMap =
@@ -500,7 +500,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             Set<String> keyList = keyMap.keySet();
             for (String k : keyList) {
                 if (ListUtil.isNotEmpty(keyMap.get(k))) {
-                    listMap.put(k, keyMap.get(k).stream().map(r -> r.getXmlText()).collect(Collectors.toList()));
+                    listMap.put(k, keyMap.get(k));
                 }
             }
             content.put("content", listMap);

src/main/resources/mapper/MedicalRecordMapper.xml

@@ -19,7 +19,7 @@
     </resultMap>
 
     <select id="getRecordContent"  resultType="com.diagbot.dto.RecordContentDTO">
-        select t1.rec_id, t1.rec_title, t2.name stand_model_name, t3.content_text, t3.html_text, t3.xml_text
+        select t1.rec_id, t1.rec_title, t1.rec_type_id, t1.mode_id , t2.name stand_model_name, t3.content_text, t3.html_text, t3.xml_text
         from med_medical_record t1, qc_mode t2, med_medical_record_content t3
         where
              t1.is_deleted = 'N'