浏览代码

添加手术知情同意书到知情同意书

zhoutg 5 年之前
父节点
当前提交
26f4912188
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

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

@@ -402,12 +402,15 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("behospital_code", analyzeVO.getBehospitalCode())
                 .eq("hospital_id", hospitalId)
-                .in("mode_id", Arrays.asList(53, 54))
+                .in("mode_id", Arrays.asList(53, 54, 16))
                 .orderByAsc("rec_date")
         );
         List<MedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(recordList, MedicalRecordDTO.class);
         Map<Long, List<MedicalRecordDTO>> recordMap = EntityUtil.makeEntityListMap(medicalRecordDTOList, "modeId");
-        pageMap.put("知情同意书", recordMap.get(53L));
+        List<MedicalRecordDTO> recordDTOList = new ArrayList<>();
+        recordDTOList.addAll(recordMap.get(53L)); // 知情同意书
+        recordDTOList.addAll(recordMap.get(16L)); // 手术知情同意书
+        pageMap.put("知情同意书", recordDTOList);
         pageMap.put("谈话告知书", recordMap.get(54L));
 
         String pageData = JSON.toJSONString(pageMap);