Commit f8985f78166298399dec7fb760ac4c709bed6059
1 parent
335c42a251
Exists in
master
and in
6 other branches
数据同步
Showing 1 changed file with 5 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
f8985f7
| ... | ... | @@ -2085,7 +2085,9 @@ |
| 2085 | 2085 | public String getAddressNameById(String id) { |
| 2086 | 2086 | if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id)) { |
| 2087 | 2087 | BasicConfig oneBasicConfigById = basicConfigService.getOneBasicConfigById(id); |
| 2088 | - return oneBasicConfigById.getName(); | |
| 2088 | + if (oneBasicConfigById != null) { | |
| 2089 | + return oneBasicConfigById.getName(); | |
| 2090 | + } | |
| 2089 | 2091 | } |
| 2090 | 2092 | return ""; |
| 2091 | 2093 | } |
| ... | ... | @@ -2942,7 +2944,7 @@ |
| 2942 | 2944 | System.out.println("证件号为空"); |
| 2943 | 2945 | continue; |
| 2944 | 2946 | } |
| 2945 | - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pregnantCertificateNum").is(pCardno)), Patients.class); | |
| 2947 | + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("cardNo").is(pCardno)), Patients.class); | |
| 2946 | 2948 | if (patients == null) { |
| 2947 | 2949 | System.out.println("没有建档数据"); |
| 2948 | 2950 | continue; |
| ... | ... | @@ -2989,6 +2991,7 @@ |
| 2989 | 2991 | matDeliverAddRequest.setFmHospital("216"); |
| 2990 | 2992 | // TODO 2019/6/9 14:55 dongqing 接生者 |
| 2991 | 2993 | matDeliverAddRequest.setDeliverDoctor(""); |
| 2994 | + matDeliverAddRequest.setDeliveryMode(new HashedMap()); | |
| 2992 | 2995 | list.add(matDeliverAddRequest); |
| 2993 | 2996 | } |
| 2994 | 2997 |