Commit 3d292ba6f0a6404df93d79f27ec03b87a2ce3cfb
1 parent
a11f3463b5
Exists in
dev
孕妇学校功能开发
Showing 2 changed files with 25 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
View file @
3d292ba
| ... | ... | @@ -110,11 +110,27 @@ |
| 110 | 110 | */ |
| 111 | 111 | @RequestMapping(value = "/allPats", method = RequestMethod.GET) |
| 112 | 112 | @ResponseBody |
| 113 | - @TokenRequired | |
| 113 | +// @TokenRequired | |
| 114 | 114 | public BaseResponse queryAllPatPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { |
| 115 | - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 115 | +// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 116 | 116 | // patientsQueryRequest.setAllPats("allPats"); |
| 117 | - return patientFacade.queryHighRisk1(patientsQueryRequest, null, null, loginState.getId(), patientsQueryRequest.getNeedPage(), Boolean.FALSE); | |
| 117 | + return patientFacade.queryHighRisk1(patientsQueryRequest, null, null, 2100013059, patientsQueryRequest.getNeedPage(), Boolean.FALSE); | |
| 118 | + } | |
| 119 | + | |
| 120 | + | |
| 121 | + /** | |
| 122 | + * 查询所有包括孕妇和产妇 | |
| 123 | + * | |
| 124 | + * @param patientsQueryRequest | |
| 125 | + * @param request | |
| 126 | + * @return | |
| 127 | + */ | |
| 128 | + @RequestMapping(value = "/queryHighRiskStatistics", method = RequestMethod.GET) | |
| 129 | + @ResponseBody | |
| 130 | + @TokenRequired | |
| 131 | + public BaseResponse queryHighRiskStatistics(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) { | |
| 132 | + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); | |
| 133 | + return patientFacade.queryHighRiskStatistics(patientsQueryRequest, null, null, loginState.getId(), patientsQueryRequest.getNeedPage(), Boolean.FALSE); | |
| 118 | 134 | } |
| 119 | 135 | |
| 120 | 136 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
View file @
3d292ba
| ... | ... | @@ -752,7 +752,7 @@ |
| 752 | 752 | String startTime = null; |
| 753 | 753 | String endTime = null; |
| 754 | 754 | //孕妇听课率=总签到人数/建档人数*100 |
| 755 | - if(!Strings.isNullOrEmpty(hospitalId)&&"1000000115".equals(hospitalId)){ | |
| 755 | +/* if(!Strings.isNullOrEmpty(hospitalId)&&"1000000115".equals(hospitalId)){ | |
| 756 | 756 | PatientsQuery patientsQuery = new PatientsQuery(); |
| 757 | 757 | patientsQuery.setHospitalId(hospitalId); |
| 758 | 758 | patientsQuery.setExtEnable(false); |
| ... | ... | @@ -791,7 +791,7 @@ |
| 791 | 791 | |
| 792 | 792 | |
| 793 | 793 | totalData.put("lessonsRate",patientsList!=null ? signsNum+","+patientsList.size(): "0");//听课率 |
| 794 | - } | |
| 794 | + }*/ | |
| 795 | 795 | |
| 796 | 796 | |
| 797 | 797 | |
| 798 | 798 | |
| 799 | 799 | |
| ... | ... | @@ -803,11 +803,13 @@ |
| 803 | 803 | |
| 804 | 804 | |
| 805 | 805 | if (!Strings.isNullOrEmpty(time)) { |
| 806 | + String[] dates = time.split(" - "); | |
| 807 | + startTime = dates[0]; | |
| 806 | 808 | query.setPublishTimeStart(DateUtil.parseYMD(startTime)); |
| 807 | - if (endTime!=null) { | |
| 809 | + if (dates.length == 2) { | |
| 810 | + endTime = dates[1]; | |
| 808 | 811 | query.setPublishTimeEnd(DateUtil.parseYMDHMS(endTime + " 23:59:59")); |
| 809 | 812 | } |
| 810 | - | |
| 811 | 813 | } |
| 812 | 814 | |
| 813 | 815 | List<CourseModel> courseModelList = courseService.queryCourseList(query); |