zhoutg 5 năm trước cách đây
mục cha
commit
4f771292f8

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

@@ -408,8 +408,12 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<MedicalRecordDTO> medicalRecordDTOList = BeanUtil.listCopyTo(recordList, MedicalRecordDTO.class);
         Map<Long, List<MedicalRecordDTO>> recordMap = EntityUtil.makeEntityListMap(medicalRecordDTOList, "modeId");
         List<MedicalRecordDTO> recordDTOList = new ArrayList<>();
-        recordDTOList.addAll(recordMap.get(53L)); // 知情同意书
-        recordDTOList.addAll(recordMap.get(16L)); // 手术知情同意书
+        if (recordMap.get(53L) != null) {
+            recordDTOList.addAll(recordMap.get(53L)); // 知情同意书
+        }
+        if (recordMap.get(16L) != null) {
+            recordDTOList.addAll(recordMap.get(16L)); // 知情同意书
+        }
         pageMap.put("知情同意书", recordDTOList);
         pageMap.put("谈话告知书", recordMap.get(54L));