diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index d33b198..aa05ae0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2085,7 +2085,9 @@ public class MatDeliverFacade { public String getAddressNameById(String id) { if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id)) { BasicConfig oneBasicConfigById = basicConfigService.getOneBasicConfigById(id); - return oneBasicConfigById.getName(); + if (oneBasicConfigById != null) { + return oneBasicConfigById.getName(); + } } return ""; } @@ -2942,7 +2944,7 @@ public class MatDeliverFacade { System.out.println("证件号为空"); continue; } - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pregnantCertificateNum").is(pCardno)), Patients.class); + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(pCardno)), Patients.class); if (patients == null) { System.out.println("没有建档数据"); continue; @@ -2989,6 +2991,7 @@ public class MatDeliverFacade { matDeliverAddRequest.setFmHospital("216"); // TODO 2019/6/9 14:55 dongqing 接生者 matDeliverAddRequest.setDeliverDoctor(""); + matDeliverAddRequest.setDeliveryMode(new HashedMap()); list.add(matDeliverAddRequest); }