diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java index 48ecfd5..780f880 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java @@ -49,13 +49,23 @@ public class LisHandleTask implements Callable { { map.put("hospitalName",hospitalMap.get(lisReportModel.getHospitalId())); } + long start = System.currentTimeMillis(); + List list = new ArrayList<>(); PatientsQuery patientsQuery=new PatientsQuery(); - String[] strs = new String[]{lisReportModel.getPhone(), lisReportModel.getVcCardNo()}; - patientsQuery.setPv(strs); patientsQuery.setYn(YnEnums.YES.getId()); - long start = System.currentTimeMillis(); - List list= patientsService.queryPatient1(patientsQuery, "modified"); + if (StringUtils.isNotEmpty(lisReportModel.getVcCardNo())) + { + patientsQuery.setVcCardNo(lisReportModel.getVcCardNo()); + list.addAll(patientsService.queryPatient1(patientsQuery, "modified")); + } + if (StringUtils.isNotEmpty(lisReportModel.getPhone())) + { + patientsQuery.setVcCardNo(null); + patientsQuery.setPhone(lisReportModel.getPhone()); + list.addAll(patientsService.queryPatient1(patientsQuery, "modified")); + } + long end = System.currentTimeMillis(); System.out.println("patient time "+ (end-start)); if (CollectionUtils.isNotEmpty(list)) @@ -80,10 +90,10 @@ public class LisHandleTask implements Callable { map.put("phone",pat.getPhone()); map.put("checkTime",lisReportModel.getPublishTime() == null ? DateUtil.getyyyy_MM_dd_hms(lisReportModel.getCheckTime()) : DateUtil.getyyyy_MM_dd_hms(lisReportModel.getPublishTime())); - map.put("patientIds",sb.toString()); - map.put("hospitalId",lisReportModel.getHospitalId()); + map.put("patientIds", sb.toString()); + map.put("hospitalId", lisReportModel.getHospitalId()); map.put("title", lisReportModel.getTitle()); - map.put("id",lisReportModel.getId()+""); + map.put("id", lisReportModel.getId() + ""); result.add(map); } }