diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index ae5666f..8f1e180 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -189,7 +189,14 @@ public class LisServiceImpl implements LisService { patientsQuery.setPhone(model.getPhone()); patientsQuery.setVcCardNo(null); list = patientsService.queryPatient(patientsQuery); - patients = list.get(list.size() - 1); + if(list != null && list.size() > 0){ + patients = list.get(list.size() - 1); + } + + } + if(patients == null){ + System.out.println("lis query patients nulll"); + return; } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhddeyy/QhddeyyFmServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhddeyy/QhddeyyFmServiceImpl.java index 6970519..a112050 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhddeyy/QhddeyyFmServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhddeyy/QhddeyyFmServiceImpl.java @@ -338,19 +338,9 @@ public class QhddeyyFmServiceImpl implements IQhddeyyFmServcie{ patient = patientses.get(0); // System.out.println("4.1----patient.getId()--" +patient.getId()); - } else if (StringUtils.isNotEmpty(allFm.getNAME()) - && StringUtils.isNotEmpty(allFm.getBABY_DELIVERY_TIME()) - && StringUtils.isNotEmpty(allFm.getPHONE()) - && StringUtils.isNotEmpty(allFm.getIDCARD()) - && StringUtils.isNotEmpty(allFm.getNAME()) - && CollectionUtils.isNotEmpty(users) - && CollectionUtils.isEmpty(patientses) - ) { + } else{ System.out.println("no patients in database:"+ allFm.toString()); continue; - //20201230 半年后把这个注释了,不在添加 - //patient = addPatients(users, allFm); -// System.out.println("4.2----patient.getId()--" +patient.getId()); } if (patient != null && StringUtils.isNotEmpty(patient.getId())) {