From 7b874cd8d4b35cc884bcb98d6b3c38ed73caca3e Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 24 Mar 2017 14:12:02 +0800 Subject: [PATCH] update code --- .../lyms/platform/data/util/AmsMessageService.java | 4 +- .../web/controller/AreaCountController.java | 36 +++-- .../operate/web/facade/AreaCountFacade.java | 155 ++++++++++++++------- .../operate/web/utils/MessageCenterService.java | 78 +++++++++-- 4 files changed, 200 insertions(+), 73 deletions(-) diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java index 6b86a52..6ed5385 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java @@ -88,7 +88,9 @@ public class AmsMessageService { //调用https用这个 // String str = HttpClientUtil.doGet(AMS_URL, params, "utf-8", AUTHORIZATION); -// System.out.println(str); + + System.out.println("amsurl = "+ AMS_URL); + System.out.println("amscontent = "+ str); ObjectMapper om = new ObjectMapper(); MessageResponseEntity mre = null; Map> map = new HashMap>(); 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 6ebb915..359653a 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 @@ -113,6 +113,7 @@ public class AreaCountController extends BaseController { * @param areaId * @param page * @param limit + * @param ticketOrder 1,'首次产检券',2,'孕中期一券',3,'孕中期二券',4,'孕晚期一券',5,'孕晚期二券' * @return */ @RequestMapping(method = RequestMethod.GET,value = "/getTicketUseDetail") @@ -125,9 +126,10 @@ public class AreaCountController extends BaseController { @RequestParam(required = false)String cityId, @RequestParam(required = false)String areaId, @RequestParam(required = false) Integer page, - @RequestParam(required = false) Integer limit) { + @RequestParam(required = false) Integer limit, + @RequestParam(required = false) Integer ticketOrder) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return areaCountFacade.getTicketUseDetail(time, hospitalId, provinceId, cityId, areaId,page,limit ,loginState.getId()); + return areaCountFacade.getTicketUseDetail(time, hospitalId, provinceId, cityId, areaId,page,limit ,loginState.getId(),ticketOrder); } @@ -141,6 +143,7 @@ public class AreaCountController extends BaseController { * @param areaId * @param page * @param limit + * @param ticketOrder 1,'首次产检券',2,'孕中期一券',3,'孕中期二券',4,'孕晚期一券',5,'孕晚期二券' * @return */ @RequestMapping(method = RequestMethod.GET,value = "/getTicketUseDetailExport") @@ -153,9 +156,11 @@ public class AreaCountController extends BaseController { @RequestParam(required = false)String cityId, @RequestParam(required = false)String areaId, @RequestParam(required = false) Integer page, - @RequestParam(required = false) Integer limit) { + @RequestParam(required = false) Integer limit, + @RequestParam(required = false) Integer ticketOrder) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - areaCountFacade.getTicketUseDetailExport(time, hospitalId, provinceId, cityId, areaId,loginState.getId(),httpServletResponse); + areaCountFacade.getTicketUseDetailExport(time, hospitalId, provinceId, cityId, + areaId,loginState.getId(),httpServletResponse,ticketOrder); } @@ -170,7 +175,7 @@ public class AreaCountController extends BaseController { * @param provinceId 省份 * @param cityId 城市 * @param areaId 区域 - * @param pointType 节点统计范围 1 首次产检 2全部 + * @param nodeType 节点统计范围 1 首次产检 2全部 * @return */ @RequestMapping(method = RequestMethod.GET,value = "/getCheckPointCount") @@ -182,9 +187,9 @@ public class AreaCountController extends BaseController { @RequestParam(required = false)String provinceId, @RequestParam(required = false)String cityId, @RequestParam(required = false)String areaId, - @RequestParam(required = false)Integer pointType) { + @RequestParam(required = false)Integer nodeType) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return areaCountFacade.getCheckPointCount(pointType,time, hospitalId, provinceId, cityId, areaId, loginState.getId()); + return areaCountFacade.getCheckPointCount(nodeType,time, hospitalId, provinceId, cityId, areaId, loginState.getId()); } /** @@ -246,6 +251,8 @@ public class AreaCountController extends BaseController { * @param areaId * @param page * @param limit + * @param nodeType 1 首次 2 全部 + * @param nodeName 0:0～12 孕周 1: 16～20 孕周 2: 21～24 孕周 3:28～36 孕周 4:37～ 分娩 * @return */ @RequestMapping(method = RequestMethod.GET,value = "/getCheckDetail") @@ -259,9 +266,12 @@ public class AreaCountController extends BaseController { @RequestParam(required = false)String areaId, @RequestParam(required = false) Integer page, @RequestParam(required = false) Integer limit, - @RequestParam(required = false)Integer pointType) { + @RequestParam(required = false)Integer nodeType, + @RequestParam(required = false)Integer nodeName + ) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return areaCountFacade.getCheckDetail(pointType,time, hospitalId, provinceId, cityId, areaId, page, limit, loginState.getId()); + return areaCountFacade.getCheckDetail(nodeType,time, hospitalId, provinceId, + cityId, areaId, page, limit, loginState.getId(),nodeName); } @@ -275,6 +285,8 @@ public class AreaCountController extends BaseController { * @param areaId * @param page * @param limit + * @param nodeType 1 首次 2 全部 + * @param nodeName 0:0～12 孕周 1: 16～20 孕周 2: 21～24 孕周 3:28～36 孕周 4:37～ 分娩 * @return */ @RequestMapping(method = RequestMethod.GET,value = "/getCheckDetailExport") @@ -288,9 +300,11 @@ public class AreaCountController extends BaseController { @RequestParam(required = false)String areaId, @RequestParam(required = false) Integer page, @RequestParam(required = false) Integer limit, - @RequestParam(required = false)Integer pointType) { + @RequestParam(required = false)Integer nodeType, + @RequestParam(required = false)Integer nodeName) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - areaCountFacade.getCheckDetailExport(pointType,time, hospitalId, provinceId, cityId, areaId, loginState.getId(), httpServletResponse); + areaCountFacade.getCheckDetailExport(nodeType,time, hospitalId, provinceId, cityId, areaId, loginState.getId(), + httpServletResponse,nodeName); } 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 96c169f..0990f81 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 @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.DataPermissionService; import com.lyms.platform.common.base.PageInfo; import com.lyms.platform.common.constants.ErrorCodeConstants; @@ -18,7 +19,9 @@ import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.OrganizationQuery; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.DataPermissionsModel; +import com.lyms.platform.query.BasicConfigQuery; import com.lyms.platform.query.DataPermissionsModelQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -52,6 +55,10 @@ public class AreaCountFacade { @Autowired private OrganizationService organizationService; + + @Autowired + private BasicConfigService basicConfigService; + public BaseResponse getTicketUsedCount(String time, String hospitalId, String provinceId,String cityId, String areaId, Integer userId) { @@ -447,7 +454,8 @@ public class AreaCountFacade { return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(ticketList).setPageInfo(pageInfo); } - public BaseResponse getTicketUseDetail(String time, String hospitalId, String provinceId, String cityId, String areaId, Integer page, Integer limit, Integer userId) { + public BaseResponse getTicketUseDetail(String time, String hospitalId, String provinceId, + String cityId, String areaId, Integer page, Integer limit, Integer userId,Integer ticketOrder) { @@ -484,6 +492,11 @@ public class AreaCountFacade { " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " + " INNER JOIN ODS_F_EXAMINE_TICKET D ON CC.TICKETS_NO=D.TICKETS_NO " + " WHERE CC.TICKETS_NO IS NOT NULL "; + if (ticketOrder != null) + { + sql+= " AND CC.TICKETS_ORDER= "+ticketOrder; + sqlCount+= " AND CC.TICKETS_ORDER= " +ticketOrder; + } if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; @@ -576,6 +589,20 @@ public class AreaCountFacade { } + private String getBaseconfgIdByCode(String code) + { + BasicConfigQuery query = new BasicConfigQuery(); + query.setYn(YnEnums.YES.getId()); + query.setCode(code); + List configList = basicConfigService.queryBasicConfig(query); + if (CollectionUtils.isNotEmpty(configList)) + { + return configList.get(0).getId(); + } + return ""; + } + + /** * 获取当前用户拥有的医院权限列表并和查询条件取交集 * @param userId @@ -613,11 +640,24 @@ public class AreaCountFacade { if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(provinceId)) { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setYn(YnEnums.YES.getId()); - organizationQuery.setProvinceId(provinceId); + + String id = getBaseconfgIdByCode(provinceId); + if (StringUtils.isNotEmpty(id)) + { + organizationQuery.setProvinceId(id); + } if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(cityId)) { - organizationQuery.setCityId(cityId); + id = getBaseconfgIdByCode(cityId); + if (StringUtils.isNotEmpty(id)) + { + organizationQuery.setCityId(id); + } if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(areaId)) { - organizationQuery.setAreaId(areaId); + id = getBaseconfgIdByCode(areaId); + if (StringUtils.isNotEmpty(id)) + { + organizationQuery.setAreaId(id); + } } } List organizations = organizationService.queryOrganization(organizationQuery); @@ -635,24 +675,25 @@ public class AreaCountFacade { allHospitalList.addAll(hospitalList); return allHospitalList; } - //条件查询未空就返回条件查询的结果 - if (CollectionUtils.isEmpty(orgHospitalList)) - { - return orgHospitalList; - } - - //取所拥有的医院和查询条件查询的医院的交集 - if (CollectionUtils.isNotEmpty(allHospitalList)) - { - for(String hp : allHospitalList) - { - if (orgHospitalList.contains(hp)) - { - hospitalList.add(hp); - } - } - } - return hospitalList; +// //条件查询未空就返回条件查询的结果 +// if (CollectionUtils.isEmpty(orgHospitalList)) +// { +// return orgHospitalList; +// } +// +// //取所拥有的医院和查询条件查询的医院的交集 +// if (CollectionUtils.isNotEmpty(allHospitalList)) +// { +// for(String hp : allHospitalList) +// { +// if (orgHospitalList.contains(hp)) +// { +// hospitalList.add(hp); +// } +// } +// } +// return hospitalList; + return orgHospitalList; } /** @@ -761,7 +802,8 @@ public class AreaCountFacade { * @param httpServletResponse */ public void getTicketUseDetailExport(String time, String hospitalId, String provinceId, String cityId, - String areaId, Integer userId,HttpServletResponse httpServletResponse) { + String areaId, Integer userId,HttpServletResponse httpServletResponse, + Integer ticketOrder) { String sql = " SELECT CC.EXAMINE_DATE, " + " CC.NAME," + @@ -780,6 +822,10 @@ public class AreaCountFacade { " INNER JOIN ODS_F_GRAVIDA_RECORD B ON CC.RECORD_ID=B.RECORD_ID " + " INNER JOIN ODS_F_EXAMINE_TICKET D ON CC.TICKETS_NO=D.TICKETS_NO " + " WHERE CC.TICKETS_NO IS NOT NULL "; + if (ticketOrder != null) + { + sql+= " AND CC.TICKETS_ORDER= "+ticketOrder; + } if (StringUtils.isNotEmpty(time)) { String startTime = time.split(" - ")[0]; @@ -1067,30 +1113,30 @@ public class AreaCountFacade { - String sql = "SELECT AA.PROVINCE,AA.PROVINCE_ID,\n" + - " AA.CITY,AA.CITY_ID,\n" + - " AA.AREA_COUNTY,AA.AREA_COUNTY_ID ,\n" + - " AA.HOSPITAL_NAME,AA.YCY_STSTEM_ID,\n" + - " AA.JD_NUM,\n" + - " CJ_NUM,\n" + - " NUM_12,\n" + - " NUM_16,\n" + - " NUM_24,\n" + - " NUM_36,\n" + - " NUM_40\n" + - " FROM (\n" + - " SELECT A.PROVINCE_ID,\n" + - " A.PROVINCE,\n" + - " A.CITY_ID,\n" + - " A.CITY,\n" + - " A.AREA_COUNTY_ID,\n" + - " A.AREA_COUNTY,\n" + - " A.HOSPITAL_NO,\n" + - " A.HOSPITAL_NAME,\n" + - " A.YCY_STSTEM_ID,\n" + - " COUNT(B.RECORD_ID) AS JD_NUM\n" + - " FROM ODS_D_HOSPITAL A\n" + - " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO\n" + + String sql = "SELECT AA.PROVINCE,AA.PROVINCE_ID," + + " AA.CITY,AA.CITY_ID," + + " AA.AREA_COUNTY,AA.AREA_COUNTY_ID ," + + " AA.HOSPITAL_NAME,AA.YCY_STSTEM_ID," + + " (CASE WHEN AA.JD_NUM IS NULL THEN 0 ELSE AA.JD_NUM END) AS JD_NUM," + + " (CASE WHEN CJ_NUM IS NULL THEN 0 ELSE CJ_NUM END) AS CJ_NUM," + + " (CASE WHEN NUM_12 IS NULL THEN 0 ELSE NUM_12 END) AS NUM_12," + + " (CASE WHEN NUM_16 IS NULL THEN 0 ELSE NUM_16 END) AS NUM_16," + + " (CASE WHEN NUM_24 IS NULL THEN 0 ELSE NUM_24 END) AS NUM_24," + + " (CASE WHEN NUM_36 IS NULL THEN 0 ELSE NUM_36 END) AS NUM_36," + + " (CASE WHEN NUM_40 IS NULL THEN 0 ELSE NUM_40 END) AS NUM_40 " + + " FROM (" + + " SELECT A.PROVINCE_ID," + + " A.PROVINCE," + + " A.CITY_ID," + + " A.CITY," + + " A.AREA_COUNTY_ID," + + " A.AREA_COUNTY," + + " A.HOSPITAL_NO," + + " A.HOSPITAL_NAME," + + " A.YCY_STSTEM_ID," + + " COUNT(B.RECORD_ID) AS JD_NUM" + + " FROM ODS_D_HOSPITAL A" + + " INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.HOSPITAL_NO=B.HOSPITAL_NO " + " WHERE 1=1 " ; if (StringUtils.isNotEmpty(time)) @@ -1347,7 +1393,9 @@ public class AreaCountFacade { return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(checkBuildtList).setPageInfo(pageInfo); } - public BaseResponse getCheckDetail(Integer pointType,String time, String hospitalId, String provinceId, String cityId, String areaId, Integer page, Integer limit, Integer userId) { + public BaseResponse getCheckDetail(Integer pointType,String time, String hospitalId, String provinceId, + String cityId, String areaId, Integer page, Integer limit, Integer userId, + Integer nodeName) { int start = 0; int end = 0; @@ -1380,6 +1428,10 @@ public class AreaCountFacade { sql+=" AND CC.NODE_ID=2 "; countSql+=" AND CC.NODE_ID=2 "; } + if (nodeName != null){ + sql+=" AND CC.NODE_NAME= " + nodeName; + countSql+=" AND CC.NODE_NAME= " + nodeName; + } //" AND CC.NODE_NAME=''\n" + if (StringUtils.isNotEmpty(time)) { @@ -1434,7 +1486,9 @@ public class AreaCountFacade { return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(checkBuildtList).setPageInfo(pageInfo); } - public void getCheckDetailExport(Integer pointType, String time, String hospitalId, String provinceId, String cityId, String areaId, Integer userId, HttpServletResponse httpServletResponse) { + public void getCheckDetailExport(Integer pointType, String time, String hospitalId, + String provinceId, String cityId, String areaId, + Integer userId, HttpServletResponse httpServletResponse,Integer nodeName) { String sql = "SELECT CC.EXAMINE_DATE,\n" + " CC.NAME,\n" + @@ -1453,6 +1507,9 @@ public class AreaCountFacade { if (pointType != null && pointType == 1){ sql+=" AND CC.NODE_ID=2 "; } + if (nodeName != null && nodeName == 1){ + sql+=" AND CC.NODE_NAME= "+nodeName; + } //" AND CC.NODE_NAME=''\n" + if (StringUtils.isNotEmpty(time)) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java index ca4525b..ca2f9f4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -47,6 +47,7 @@ public class MessageCenterService { /** + * 线上环境调用 * 保存到短信中心 短信 * @param list * @return @@ -62,18 +63,6 @@ public class MessageCenterService { Map map = JsonUtil.str2Obj(result, Map.class); if ("0".equals(map.get("errorcode").toString())) { -// List msgs = list.getMessages(); -// if (CollectionUtils.isNotEmpty(msgs)) -// { -// for(MessageRequest messageRequest : msgs) -// { -// messageRequest.setStatus(SmsStatusEnums.YFS.getId()); -// } -// } -// json = JsonUtil.obj2Str(list); -// System.out.println("json========" + json); -// System.out.println("url========" + CENTER_BASE_URL); -// HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN); return true; } } @@ -85,6 +74,71 @@ public class MessageCenterService { return false; } +// /** +// * 演示换调用 +// * @param list +// * @return +// */ +// public static boolean saveSmsCenter(MessageListRequest list) +// { +// String json = ""; +// try{ +// +//// MessageListRequest centerList = new MessageListRequest(); +//// List messageRequestList = new ArrayList<>(); +//// messageRequestList.addAll(list.getMessages()); +//// centerList.setMessages(messageRequestList); +//// centerList.setTypeId(list.getTypeId()); +//// +//// List centerMsgs = centerList.getMessages(); +//// if (CollectionUtils.isNotEmpty(centerMsgs)) +//// { +//// for(MessageRequest messageRequest : centerMsgs) +//// { +//// messageRequest.setExt1("8000000014"); +//// } +//// } +// +// List msgs = list.getMessages(); +// if (CollectionUtils.isNotEmpty(msgs)) +// { +// for(MessageRequest messageRequest : msgs) +// { +// messageRequest.setStatus(SmsStatusEnums.YFS.getId()); +// } +// } +// +// json = JsonUtil.obj2Str(list); +// String result = HttpRequest.sendPost(CENTER_BASE_URL+"saveCreatedSMS", json, CENTER_TOKEN); +// if (StringUtils.isNotEmpty(result)) +// { +// Map map = JsonUtil.str2Obj(result, Map.class); +// if ("0".equals(map.get("errorcode").toString())) +// { +// +// if (CollectionUtils.isNotEmpty(msgs)) +// { +// for(MessageRequest messageRequest : msgs) +// { +// messageRequest.setStatus(SmsStatusEnums.WFS.getId()); +// messageRequest.setExt1("8000000014"); +// } +// } +// json = JsonUtil.obj2Str(list); +// System.out.println("json========" + json); +// System.out.println("url========" + CENTER_BASE_URL); +// HttpRequest.sendPost("http://sms.healthbaby.com.cn/v1/saveCreatedSMS", json, CENTER_TOKEN); +// return true; +// } +// } +// } +// catch (Exception e) +// { +// ExceptionUtils.catchException(e,"保存短信中心异常"+json); +// } +// return false; +// } + public static SmsResult querySmsList(String hospitalId, String phone,Integer smsType,Integer smsStatus,String content,String planTimeStart,String planTimeEnd,String actualTimeStart,String actualTimeEnd,Integer objType ,Integer page, Integer limit) { -- 1.8.3.1