From 2b1e6c39364fc3aafaca899dbf1de4a175f61716 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 17 Aug 2017 20:29:55 +0800 Subject: [PATCH] update code --- .../web/controller/SmsConfigController.java | 16 ++++++++ .../operate/web/facade/RiskReportFacade.java | 48 +++++++++++----------- .../src/main/resources/config.properties | 2 +- 3 files changed, 42 insertions(+), 24 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java index 6cbf4b4..ca248a2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.biz.service.BabyBookbuildingService; import com.lyms.platform.biz.service.SmsTemplateService; +import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; @@ -57,6 +58,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(method = RequestMethod.POST, value = "/addOrUpSmsConfig") @ResponseBody + @TokenRequired public BaseResponse addOrUpSmsConfig(@Valid @RequestBody SmsConfigRequest request) { if (!StringUtils.isEmpty(request.getId())) { @@ -74,6 +76,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(method = RequestMethod.PUT, value = "/updateDeptPrefix") @ResponseBody + @TokenRequired public BaseObjectResponse updateDeptPrefix(@RequestParam() String hid,@RequestParam()Integer deptId,@RequestParam() String deptPrefix) { return smsConfigFacade.updateDeptPrefix(hid, deptId, deptPrefix); } @@ -88,6 +91,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/queryDeptByHid/{hid}") @ResponseBody + @TokenRequired public BaseResponse queryDeptByHid(@PathVariable("hid") Integer hid) { return smsConfigFacade.queryDeptByHid(hid); } @@ -99,6 +103,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/querySmsConfigByHid/{hid}") @ResponseBody + @TokenRequired public BaseResponse querySmsConfigByHid(@PathVariable("hid") String hid) { return smsConfigFacade.querySmsConfigByHid(hid); } @@ -110,6 +115,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(method = RequestMethod.GET, value = "/getDeptPrefix/{hid}") @ResponseBody + @TokenRequired public BaseResponse getDeptPrefix(@PathVariable("hid") String hid) { return smsConfigFacade.getDeptPrefix(hid); } @@ -120,6 +126,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(value = "/getServiceTreeData", method = RequestMethod.GET) @ResponseBody + @TokenRequired public List getServiceTreeData() { List list = SmsServiceEnums.getSmsServiceTree(-1); return list; @@ -132,6 +139,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(value = "/queryHospitalConfig/{hid}", method = RequestMethod.GET) @ResponseBody + @TokenRequired public BaseResponse queryHospitalConfig(@PathVariable("hid") String hid) { return smsConfigFacade.queryHospitalConfig(hid); } @@ -142,6 +150,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(value = "/addOrUpdateHospitalConfig", method = RequestMethod.PUT) @ResponseBody + @TokenRequired public BaseResponse addOrUpdateHospitalConfig( @RequestParam(required = true) String hospitalName, @RequestParam(required = false) String shortCode, @@ -163,6 +172,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(value = "/queryHighConfigLib", method = RequestMethod.GET) @ResponseBody + @TokenRequired public BaseResponse updateHospitalConfig() { List highLibs = new ArrayList(); @@ -184,6 +194,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(value = "/queryConfigHospitals", method = RequestMethod.GET) @ResponseBody + @TokenRequired public BaseResponse queryConfigHospitals(@RequestParam(required = false) String provinceId, @RequestParam(required = false) String cityId, @RequestParam(required = false) String areaId, @@ -212,6 +223,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(value = "/querySmsList", method = RequestMethod.GET) @ResponseBody + @TokenRequired public BaseResponse querySmsList(@RequestParam(required = false) String hospitalName, @RequestParam(required = false) String phone, @RequestParam(required = false) Integer smsType, @@ -238,6 +250,7 @@ public class SmsConfigController extends BaseController { * @param actualTime */ @RequestMapping(value = "/exportSmsList", method = RequestMethod.GET) + @TokenRequired public void exportSmsList(HttpServletResponse httpServletResponse,@RequestParam(required = false) String hospitalName, @RequestParam(required = false) String phone, @RequestParam(required = false) Integer smsType, @@ -265,6 +278,7 @@ public class SmsConfigController extends BaseController { */ @RequestMapping(value = "/queryMsgList", method = RequestMethod.GET) @ResponseBody + @TokenRequired public BaseResponse queryMsgList(@RequestParam(required = false) String hospitalId, @RequestParam(required = false) String phone, @RequestParam(required = false) Integer smsType, @@ -289,6 +303,7 @@ public class SmsConfigController extends BaseController { * @param actualTime */ @RequestMapping(value = "/exportMsgList", method = RequestMethod.GET) + @TokenRequired public void exportMsgList(HttpServletResponse httpServletResponse,@RequestParam(required = false) String hospitalId, @RequestParam(required = false) String phone, @RequestParam(required = false) Integer smsType, @@ -306,6 +321,7 @@ public class SmsConfigController extends BaseController { @RequestMapping(value = "/sendBabyBuildSms", method = RequestMethod.GET) @ResponseBody + @TokenRequired public String sendBabyBuildSms() { BabyModelQuery babyModelQuery = new BabyModelQuery(); List hospitalIds = new ArrayList<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index f2c8a51..64f9fe3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -114,8 +114,31 @@ public class RiskReportFacade { patientsQuery.setNorFactor(Boolean.TRUE); + + PatientsQuery query = new PatientsQuery(); + query.setYn(YnEnums.YES.getId()); + query.setBuildTypeList(patientsQuery.getBuildTypeList()); + query.setHospitalId(patientsQuery.getHospitalId()); + query.setDueStatus(patientsQuery.getDueStatus()); + //高危等级 + query.setrLevel(patientsQuery.getrLevel()); + //产检医生 + query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId()); + query.setDueDateStart(patientsQuery.getDueDateStart()); + query.setDueDateEnd(patientsQuery.getDueDateEnd()); + + query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart()); + query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd()); + query.setoRiskFactor("true"); + + query.setType(patientsQuery.getType()); + + //单个高危因素孕产妇条数 + int riskPatientCount = patientsService.queryPatientCount(query); + //总的孕妇条数 int allPatientCount = patientsService.queryPatientCount(patientsQuery); + allPatientCount+=allPatientCount; List results = new ArrayList<>(); @@ -159,7 +182,7 @@ public class RiskReportFacade { } } - results.addAll(getOtherRiskCount(allPatientCount,patientsQuery)); + results.addAll(getOtherRiskCount(riskPatientCount,allPatientCount,patientsQuery)); Collections.sort(results,new RiskReportResult()); @@ -172,30 +195,9 @@ public class RiskReportFacade { * 自定义高危因素统计 * @return */ - private List getOtherRiskCount( int allPatientCount,PatientsQuery patientsQuery) + private List getOtherRiskCount(int riskPatientCount, int allPatientCount,PatientsQuery patientsQuery) { List results = new ArrayList<>(); - - PatientsQuery query = new PatientsQuery(); - query.setYn(YnEnums.YES.getId()); - query.setBuildTypeList(patientsQuery.getBuildTypeList()); - query.setHospitalId(patientsQuery.getHospitalId()); - query.setDueStatus(patientsQuery.getDueStatus()); - //高危等级 - query.setrLevel(patientsQuery.getrLevel()); - //产检医生 - query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId()); - query.setDueDateStart(patientsQuery.getDueDateStart()); - query.setDueDateEnd(patientsQuery.getDueDateEnd()); - - query.setBookbuildingDateStart(patientsQuery.getBookbuildingDateStart()); - query.setBookbuildingDateEnd(patientsQuery.getBookbuildingDateEnd()); - query.setoRiskFactor("true"); - - query.setType(patientsQuery.getType()); - - //单个高危因素孕产妇条数 - int riskPatientCount = patientsService.queryPatientCount(query); if (riskPatientCount > 0) { RiskReportResult risk = new RiskReportResult(); diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index f6c15a2..6837cb4 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -1,5 +1,5 @@ #短信中心url -#center_base_url=http://sms.healthbaby.com.cn/v1/ +#center_base_url=https://weixin-push-save.healthbaby.com.cn center_base_url=https://push.stage.platform.healthbaby.com.cn #区域平台访问短信中心的token -- 1.8.3.1