Commit b254f105ffc341e007277b8ffeb46289ec268072
1 parent
b2f8d2c5b2
Exists in
master
and in
6 other branches
update code
Showing 1 changed file with 17 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java
View file @
b254f10
... | ... | @@ -49,13 +49,23 @@ |
49 | 49 | { |
50 | 50 | map.put("hospitalName",hospitalMap.get(lisReportModel.getHospitalId())); |
51 | 51 | } |
52 | + long start = System.currentTimeMillis(); | |
53 | + List<Patients> list = new ArrayList<>(); | |
52 | 54 | |
53 | 55 | PatientsQuery patientsQuery=new PatientsQuery(); |
54 | - String[] strs = new String[]{lisReportModel.getPhone(), lisReportModel.getVcCardNo()}; | |
55 | - patientsQuery.setPv(strs); | |
56 | 56 | patientsQuery.setYn(YnEnums.YES.getId()); |
57 | - long start = System.currentTimeMillis(); | |
58 | - List<Patients> list= patientsService.queryPatient1(patientsQuery, "modified"); | |
57 | + if (StringUtils.isNotEmpty(lisReportModel.getVcCardNo())) | |
58 | + { | |
59 | + patientsQuery.setVcCardNo(lisReportModel.getVcCardNo()); | |
60 | + list.addAll(patientsService.queryPatient1(patientsQuery, "modified")); | |
61 | + } | |
62 | + if (StringUtils.isNotEmpty(lisReportModel.getPhone())) | |
63 | + { | |
64 | + patientsQuery.setVcCardNo(null); | |
65 | + patientsQuery.setPhone(lisReportModel.getPhone()); | |
66 | + list.addAll(patientsService.queryPatient1(patientsQuery, "modified")); | |
67 | + } | |
68 | + | |
59 | 69 | long end = System.currentTimeMillis(); |
60 | 70 | System.out.println("patient time "+ (end-start)); |
61 | 71 | if (CollectionUtils.isNotEmpty(list)) |
62 | 72 | |
... | ... | @@ -80,10 +90,10 @@ |
80 | 90 | map.put("phone",pat.getPhone()); |
81 | 91 | map.put("checkTime",lisReportModel.getPublishTime() == null ? DateUtil.getyyyy_MM_dd_hms(lisReportModel.getCheckTime()) |
82 | 92 | : DateUtil.getyyyy_MM_dd_hms(lisReportModel.getPublishTime())); |
83 | - map.put("patientIds",sb.toString()); | |
84 | - map.put("hospitalId",lisReportModel.getHospitalId()); | |
93 | + map.put("patientIds", sb.toString()); | |
94 | + map.put("hospitalId", lisReportModel.getHospitalId()); | |
85 | 95 | map.put("title", lisReportModel.getTitle()); |
86 | - map.put("id",lisReportModel.getId()+""); | |
96 | + map.put("id", lisReportModel.getId() + ""); | |
87 | 97 | result.add(map); |
88 | 98 | } |
89 | 99 | } |