Commit 377811986f4701aada71c20764ecca77ca86bdc6
1 parent
ea39a01664
Exists in
master
and in
6 other branches
产筛
Showing 2 changed files with 18 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
View file @
3778119
| ... | ... | @@ -282,7 +282,7 @@ |
| 282 | 282 | if (end > list.size()) { |
| 283 | 283 | end = list.size(); |
| 284 | 284 | } |
| 285 | - listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService))); | |
| 285 | + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService,applyOrderService))); | |
| 286 | 286 | } |
| 287 | 287 | for (Future f : listFuture) { |
| 288 | 288 | try { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java
View file @
3778119
| 1 | 1 | package com.lyms.platform.operate.web.worker; |
| 2 | 2 | |
| 3 | 3 | import com.lyms.platform.biz.service.AntenatalExaminationService; |
| 4 | +import com.lyms.platform.biz.service.ApplyOrderService; | |
| 4 | 5 | import com.lyms.platform.biz.service.PatientsService; |
| 5 | 6 | import com.lyms.platform.common.enums.YnEnums; |
| 6 | 7 | import com.lyms.platform.common.utils.DateUtil; |
| 7 | 8 | import com.lyms.platform.operate.web.result.SieveListResult; |
| 8 | -import com.lyms.platform.pojo.AntExChuModel; | |
| 9 | -import com.lyms.platform.pojo.AntenatalExaminationModel; | |
| 10 | -import com.lyms.platform.pojo.Patients; | |
| 11 | -import com.lyms.platform.pojo.SieveModel; | |
| 9 | +import com.lyms.platform.pojo.*; | |
| 12 | 10 | import com.lyms.platform.query.AntExChuQuery; |
| 13 | 11 | import com.lyms.platform.query.AntExQuery; |
| 12 | +import com.lyms.platform.query.ReferralApplyOrderQuery; | |
| 14 | 13 | import org.apache.commons.collections.CollectionUtils; |
| 15 | 14 | import org.apache.commons.lang.StringUtils; |
| 16 | 15 | import org.apache.commons.lang.math.NumberUtils; |
| 17 | 16 | |
| 18 | 17 | |
| ... | ... | @@ -32,14 +31,16 @@ |
| 32 | 31 | private List<SieveModel> list; |
| 33 | 32 | |
| 34 | 33 | private AntenatalExaminationService antService; |
| 34 | + private ApplyOrderService applyOrderService; | |
| 35 | 35 | |
| 36 | 36 | private PatientsService patientsService; |
| 37 | 37 | |
| 38 | - public SieveWorker(String hospitalId, List<SieveModel> list, AntenatalExaminationService antService, PatientsService patientsService) { | |
| 38 | + public SieveWorker(String hospitalId, List<SieveModel> list, AntenatalExaminationService antService, PatientsService patientsService,ApplyOrderService applyOrderService) { | |
| 39 | 39 | this.hospitalId = hospitalId; |
| 40 | 40 | this.list = list; |
| 41 | 41 | this.antService = antService; |
| 42 | 42 | this.patientsService = patientsService; |
| 43 | + this.applyOrderService = applyOrderService; | |
| 43 | 44 | } |
| 44 | 45 | |
| 45 | 46 | @Override |
| ... | ... | @@ -80,6 +81,17 @@ |
| 80 | 81 | } |
| 81 | 82 | sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); |
| 82 | 83 | } |
| 84 | + | |
| 85 | +// ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); | |
| 86 | +// referralApplyOrderQuery.setType(2); | |
| 87 | +// referralApplyOrderQuery.setParentId(sieveModel.getParentId()); | |
| 88 | +// List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); | |
| 89 | +// if (CollectionUtils.isNotEmpty(orderModels)) | |
| 90 | +// { | |
| 91 | +// | |
| 92 | +// } | |
| 93 | + | |
| 94 | + | |
| 83 | 95 | results.add(sieveListResult); |
| 84 | 96 | } |
| 85 | 97 | return results; |