jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 108755280b901a9c78627bbfa7a106274ad7825a

Authored by wtt
1 parent d88cbafe75
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 14 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ 1087552
... ... @@ -169,7 +169,7 @@
169 169 @TokenRequired
170 170 public BaseResponse queryAbnormalWeight(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) {
171 171 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
172   - return patientFacade.queryAbnormalWeight(patientsQueryRequest, loginState.getId());
  172 + return patientFacade.queryAbnormalWeight(patientsQueryRequest, loginState.getId(),"true");
173 173 }
174 174 /**
175 175 * 巨大儿管理
... ... @@ -181,7 +181,7 @@
181 181 @TokenRequired
182 182 public BaseResponse queryGiantWeight(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) {
183 183 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
184   - return patientFacade.queryGiantWeight(patientsQueryRequest, loginState.getId());
  184 + return patientFacade.queryGiantWeight(patientsQueryRequest, loginState.getId(),"true");
185 185 }
186 186 /**
187 187 * 孕期体重异常管理 导出
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 1087552
... ... @@ -747,9 +747,10 @@
747 747 * @param riskPatientsQueryRequest
748 748 * @return
749 749 */
750   - public BaseResponse queryAbnormalWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer userId) {
  750 + public BaseResponse queryAbnormalWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer userId,String need) {
751 751  
752 752 String hospital = autoMatchFacade.getHospitalId(userId);
  753 + PatientsQuery pq = new PatientsQuery();
753 754 PatientsQuery patientsQuery = new PatientsQuery();
754 755 patientsQuery.setYn(YnEnums.YES.getId());
755 756 patientsQuery.setType(1);
756 757  
757 758  
758 759  
... ... @@ -783,24 +784,26 @@
783 784 }
784 785 if(CollectionUtils.isNotEmpty(ids)) {
785 786 //获取bmi大于 25 &筛选bmi条件
786   - PatientsQuery pq = new PatientsQuery();
787 787 pq.setIds(ids);
788 788 pq.setPage(riskPatientsQueryRequest.getPage());
789 789 pq.setLimit(riskPatientsQueryRequest.getLimit());
  790 + if(StringUtils.isNotEmpty(need)){
  791 + pq.setNeed(need);
  792 + }
790 793 List <Patients> ps = patientsService.queryPatientBySort(pq, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
791 794 if (CollectionUtils.isNotEmpty(ps)) {
792 795 data = convertToQuanWeight(ps,null);
793 796 }
794 797 }
795 798 }
796   - return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(patientsQuery.getPageInfo());
  799 + return new BaseListResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setPageInfo(pq.getPageInfo());
797 800 }
798 801 /**
799 802 * 巨大儿管理
800 803 * @param riskPatientsQueryRequest
801 804 * @return
802 805 */
803   - public BaseResponse queryGiantWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer userId) {
  806 + public BaseResponse queryGiantWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer userId,String need) {
804 807  
805 808 //分娩档案
806 809 String hospital = autoMatchFacade.getHospitalId(userId);
... ... @@ -876,6 +879,9 @@
876 879 pq.setIds(CollectionUtils.isEmpty(idsPW)? idsMd : idsPW);
877 880 pq.setPage(riskPatientsQueryRequest.getPage());
878 881 pq.setLimit(riskPatientsQueryRequest.getLimit());
  882 + if(StringUtils.isNotEmpty(need)){
  883 + pq.setNeed(need);
  884 + }
879 885 List <Patients> ps = patientsService.queryPatientBySort(pq, riskPatientsQueryRequest.getSort(), riskPatientsQueryRequest.getOrder());
880 886 if(CollectionUtils.isNotEmpty(ps)){
881 887 data = convertToQuanWeight(ps,"judaer");//judaer巨大儿管理
... ... @@ -888,7 +894,7 @@
888 894 public void exportQueryAbnormalWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer id, HttpServletResponse response) {
889 895  
890 896 try {
891   - BaseListResponse listResponse = (BaseListResponse) queryAbnormalWeight(riskPatientsQueryRequest, id);
  897 + BaseListResponse listResponse = (BaseListResponse) queryAbnormalWeight(riskPatientsQueryRequest, id,null);
892 898  
893 899 List<Map> list = listResponse.getData();
894 900 List<Map<String, Object>> datas = new ArrayList<>();
... ... @@ -940,7 +946,7 @@
940 946 public void exportQueryGiantWeight(RiskPatientsQueryRequest riskPatientsQueryRequest, Integer id, HttpServletResponse response) {
941 947  
942 948 try {
943   - BaseListResponse listResponse = (BaseListResponse) queryGiantWeight(riskPatientsQueryRequest, id);
  949 + BaseListResponse listResponse = (BaseListResponse) queryGiantWeight(riskPatientsQueryRequest, id,null);
944 950  
945 951 List<Map> list = listResponse.getData();
946 952 List<Map<String, Object>> datas = new ArrayList<>();