Commit 7a04041abd1634a28b991eba5bd7c5058623ab6c
1 parent
3f8e773aa7
Exists in
master
and in
2 other branches
分娩和lis数据接收优化
Showing 2 changed files with 9 additions and 12 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
View file @
7a04041
| ... | ... | @@ -189,7 +189,14 @@ |
| 189 | 189 | patientsQuery.setPhone(model.getPhone()); |
| 190 | 190 | patientsQuery.setVcCardNo(null); |
| 191 | 191 | list = patientsService.queryPatient(patientsQuery); |
| 192 | - patients = list.get(list.size() - 1); | |
| 192 | + if(list != null && list.size() > 0){ | |
| 193 | + patients = list.get(list.size() - 1); | |
| 194 | + } | |
| 195 | + | |
| 196 | + } | |
| 197 | + if(patients == null){ | |
| 198 | + System.out.println("lis query patients nulll"); | |
| 199 | + return; | |
| 193 | 200 | } |
| 194 | 201 | |
| 195 | 202 |
platform-operate-api/src/main/java/com/lyms/hospitalapi/qhddeyy/QhddeyyFmServiceImpl.java
View file @
7a04041
| ... | ... | @@ -338,19 +338,9 @@ |
| 338 | 338 | patient = patientses.get(0); |
| 339 | 339 | // System.out.println("4.1----patient.getId()--" +patient.getId()); |
| 340 | 340 | |
| 341 | - } else if (StringUtils.isNotEmpty(allFm.getNAME()) | |
| 342 | - && StringUtils.isNotEmpty(allFm.getBABY_DELIVERY_TIME()) | |
| 343 | - && StringUtils.isNotEmpty(allFm.getPHONE()) | |
| 344 | - && StringUtils.isNotEmpty(allFm.getIDCARD()) | |
| 345 | - && StringUtils.isNotEmpty(allFm.getNAME()) | |
| 346 | - && CollectionUtils.isNotEmpty(users) | |
| 347 | - && CollectionUtils.isEmpty(patientses) | |
| 348 | - ) { | |
| 341 | + } else{ | |
| 349 | 342 | System.out.println("no patients in database："+ allFm.toString()); |
| 350 | 343 | continue; |
| 351 | - //20201230 半年后把这个注释了，不在添加 | |
| 352 | - //patient = addPatients(users, allFm); | |
| 353 | -// System.out.println("4.2----patient.getId()--" +patient.getId()); | |
| 354 | 344 | } |
| 355 | 345 | |
| 356 | 346 | if (patient != null && StringUtils.isNotEmpty(patient.getId())) { |