From e547aa8cd54480a68dc9c5030794ea9af2de439e Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Sat, 18 May 2019 18:44:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A2=9E=E5=80=BC=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=BB=9F=E8=AE=A1=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/master/PatientServiceMapper.java | 2 +- .../permission/service/PatientServiceService.java | 2 +- .../service/impl/PatientServiceServiceImpl.java | 4 +- .../resources/mainOrm/master/PatientService.xml | 91 ++++++++++------------ .../web/controller/AreaCountController.java | 4 +- .../operate/web/facade/AreaCountFacade.java | 22 ++---- .../operate/web/worker/ServiceListWorker.java | 1 + 7 files changed, 51 insertions(+), 75 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java index bd03490..1c171a4 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientServiceMapper.java @@ -65,5 +65,5 @@ public interface PatientServiceMapper { */ List> getServeDetailList(@Param("param") ServiceListQuery param); - List getHospitalIds(@Param("param") ServiceListQuery param); + List getHospitalIds(@Param("param") ServiceListQuery param, @Param("ids") List ids); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java index f741449..c7bd4a8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientServiceService.java @@ -29,5 +29,5 @@ public interface PatientServiceService { List> getServeDetailList(ServiceListQuery param); - List getHospitalIds(ServiceListQuery param); + List getHospitalIds(ServiceListQuery param, List ids); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java index 56b746a..9c01029 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientServiceServiceImpl.java @@ -77,7 +77,7 @@ public class PatientServiceServiceImpl implements PatientServiceService { } @Override - public List getHospitalIds(ServiceListQuery param) { - return patientServiceMapper.getHospitalIds(param); + public List getHospitalIds(ServiceListQuery param, List hospitalIds) { + return patientServiceMapper.getHospitalIds(param, hospitalIds); } } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml index 07f15ec..e13e3aa 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml @@ -411,13 +411,13 @@ AND ps.create_date <= #{query.endTime} - + and o.province_id = #{query.provinceId} - + and o.city_id = #{query.cityId} - + and o.area_id = #{query.areaId} ) as "open", @@ -432,13 +432,13 @@ AND ps.create_date <= #{query.endTime} - + and o.province_id = #{query.provinceId} - + and o.city_id = #{query.cityId} - + and o.area_id = #{query.areaId} ) as "unsubscribe", @@ -453,13 +453,13 @@ AND ps.create_date <= #{query.endTime} - + and o.province_id = #{query.provinceId} - + and o.city_id = #{query.cityId} - + and o.area_id = #{query.areaId} ) as "expire", @@ -474,62 +474,54 @@ AND ps.create_date <= #{query.endTime} - + and o.province_id = #{query.provinceId} - + and o.city_id = #{query.cityId} - + and o.area_id = #{query.areaId} ) as "suspend" - /*FROM patient_service ps*/ - /* JOIN organization o - ON o.id = ps.hospital_id*/ - - FROM organization o - WHERE o.id = #{query.hospitalId} - GROUP BY o.name,o.province_id, - o.city_id, - o.area_id + o.area_id - SELECT o.id as "hospitalId" @@ -627,7 +614,7 @@ JOIN organization o ON o.id = ps.hospital_id WHERE ps.hospital_id in - + #{item} @@ -636,13 +623,13 @@ AND ps.create_date <= #{param.endTime} - + and o.province_id = #{param.provinceId} - + and o.city_id = #{param.cityId} - + and o.area_id = #{param.areaId} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java index eb180a3..cd39e1d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AreaCountController.java @@ -234,9 +234,9 @@ public class AreaCountController extends BaseController { * @param param */ @RequestMapping(value = "/getServiceDetail/export",method = RequestMethod.GET) - @ResponseBody + //@ResponseBody @TokenRequired - public void getServiceDetailExport(@RequestBody ServiceListQuery param, HttpServletRequest request, HttpServletResponse response){ + public void getServiceDetailExport(ServiceListQuery param, HttpServletRequest request, HttpServletResponse response){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); param.setUserId(loginState.getId()); areaCountFacade.getServiceDetailExport(param, response); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java index c626e6d..1aeb3f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java @@ -1054,8 +1054,8 @@ public class AreaCountFacade { hospitalIds.add(hospitalId); } ExecutorService threadPool = Executors.newFixedThreadPool(5); - param.setHospitalIds(hospitalIds); - List ids = patientServiceService.getHospitalIds(param); + //param.setHospitalIds(hospitalIds); + //List ids = patientServiceService.getHospitalIds(param, hospitalIds); int size = hospitalIds.size(); int batchSize = 2; int end = 0; @@ -1080,8 +1080,8 @@ public class AreaCountFacade { CopyOnWriteArrayList statusValList = new CopyOnWriteArrayList(); param.setHospitalIds(hospitalIds); - CountDownLatch cdl=new CountDownLatch(4); - ExecutorService service= new ThreadPoolExecutor(5, 10, 3000, TimeUnit.MILLISECONDS, + CountDownLatch cdl = new CountDownLatch(4); + ExecutorService service = new ThreadPoolExecutor(5, 10, 3000, TimeUnit.MILLISECONDS, new ArrayBlockingQueue(10), new RejectedExecutionHandler() { @Override @@ -1093,6 +1093,7 @@ public class AreaCountFacade { for (int i =1; i < 5; i ++){ String serStatus = i + "" ; service.execute(new ServiceListBySerStatusWorker(cdl, param, statusValList, serStatus, patientServiceService )); + Thread.sleep(300); } cdl.await(); service.shutdown(); @@ -1187,19 +1188,6 @@ public class AreaCountFacade { public void getServiceDetailExport(ServiceListQuery param, HttpServletResponse response) { setDefaultTime(param); List> serviceDetailListMap = getServiceDetailListMap(param); - /*for (Map map : serviceDetailListMap){ - HashMap result = new HashMap<>(16); - *//** - * "patientName": "王静洁", - * "serTypeName": "精准指导", - * "doctorName": "", - * "opnYumSize": "", - * "serviceWeek": "", - * "createDate": 1480953600000, - * "serStatus": "开通中" - *//* - result.put("createDate",map.get("createDate")); - }*/ Map names = new LinkedHashMap<>(); names.put("createDate","购买日期"); names.put("patientName", "姓名"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ServiceListWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ServiceListWorker.java index 30bec77..7cac195 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ServiceListWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/ServiceListWorker.java @@ -38,6 +38,7 @@ public class ServiceListWorker implements Callable { public String call() throws Exception { for (String hospital : hospitals){ param.setHospitalId(hospital); + Map map = patientServiceService.getServiceList(param); if (map != null){ HashMap hashMap = new HashMap<>(16); -- 1.8.3.1