jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a4379e9681f5c63b9d09fdc2d5675413531430e0

Authored by jiangjiazhi
2 parents d18fa625a9 d243584976
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ a4379e9
... ... @@ -251,23 +251,35 @@
251 251 @RequestMapping(value = "/exportChilds", method = RequestMethod.GET)
252 252 @TokenRequired
253 253 public void exportChilds(HttpServletRequest httpServletRequest,HttpServletResponse httpServletResponse,
254   - @RequestParam(value = "mcardNo", required = false) String mcardNo,
255   - @RequestParam(value = "bcardNo", required = false) String bcardNo,
256   - @RequestParam(value = "mphone", required = false) String mphone,
257   - @RequestParam(value = "startMonthAge", required = false) Integer startMonthAge,
258   - @RequestParam(value = "endMonthAge", required = false) Integer endMonthAge,
259   - @RequestParam(value = "birth", required = false) String birth,
260   - @RequestParam(value = "nextDate", required = false) String nextDate,
261   - @RequestParam(value = "expVip", required = false) Integer expVip,
262   - @RequestParam(value = "serviceType", required = false) Integer serviceType,
263   - @RequestParam(value = "name", required = false) String name,
264   - @RequestParam(value = "highRiskType", required = false) Integer highRiskType,
265   - @RequestParam(value = "diagnose", required = false) String diagnose,
266   - @RequestParam(value = "dateRange", required = false) String dateRange,
267   - @RequestParam("page") Integer page,
268   - @RequestParam("limit") Integer limit){
  254 + @RequestParam(value = "queryNo", required = false) String queryNo,
  255 + @RequestParam(value = "mcardNo", required = false) String mcardNo,
  256 + @RequestParam(value = "bcardNo", required = false) String bcardNo,
  257 + @RequestParam(value = "mphone", required = false) String mphone,
  258 + @RequestParam(value = "startMonthAge", required = false) Integer startMonthAge,
  259 + @RequestParam(value = "endMonthAge", required = false) Integer endMonthAge,
  260 + @RequestParam(value = "birth", required = false) String birth,
  261 + @RequestParam(value = "nextDate", required = false) String nextDate,
  262 + @RequestParam(value = "expVip", required = false) Integer expVip,
  263 + @RequestParam(value = "serviceType", required = false) Integer serviceType,
  264 + @RequestParam(value = "serviceStatus", required = false) Integer serviceStatus,
  265 + @RequestParam(value = "name", required = false) String name,
  266 + @RequestParam(value = "highRiskType", required = false) Integer highRiskType,
  267 + @RequestParam(value = "diagnose", required = false) String diagnose,
  268 + @RequestParam(value = "dateRange", required = false) String dateRange,
  269 + @RequestParam("page") Integer page,
  270 + @RequestParam("limit") Integer limit,
  271 +
  272 + @RequestParam(value = "provinceId",required = false) String provinceId,
  273 + @RequestParam(value = "cityId",required = false) String cityId,
  274 + @RequestParam(value = "areaId",required = false) String areaId,
  275 + @RequestParam(value = "hospitalProvinceId",required = false) String hospitalProvinceId,
  276 + @RequestParam(value = "hospitalCityId",required = false) String hospitalCityId,
  277 + @RequestParam(value = "hospitalAreaId",required = false) String hospitalAreaId,
  278 + @RequestParam(value = "hospitalId",required = false) String hospitalId,
  279 + @RequestParam(value = "isArea",required = false) String isArea){
269 280 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
270 281 BabyManageRequest request = new BabyManageRequest();
  282 + request.setQueryNo(queryNo);
271 283 request.setBcardNo(bcardNo);
272 284 request.setMcardNo(mcardNo);
273 285 request.setMphone(mphone);
274 286  
... ... @@ -282,7 +294,22 @@
282 294 request.setName(name);
283 295 request.setLimit(limit);
284 296 request.setPage(page);
  297 + request.setServiceStatus(serviceStatus);
285 298 request.setDateRange(dateRange);
  299 +
  300 + // 省
  301 + request.setProvinceId(provinceId);
  302 + // 市
  303 + request.setCityId(cityId);
  304 + // 区/县
  305 + request.setAreaId(areaId);
  306 + // 建档医院
  307 + request.setHospitalProvinceId(hospitalProvinceId);
  308 + request.setHospitalCityId(hospitalCityId);
  309 + request.setHospitalAreaId(hospitalAreaId);
  310 + request.setHospitalId(hospitalId);
  311 + // 是否区域
  312 + request.setIsArea(isArea);
286 313  
287 314 babyBookbuildingFacade.exportChilds(request,loginState.getId(),httpServletResponse);
288 315 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ a4379e9
... ... @@ -2029,7 +2029,7 @@
2029 2029 // }
2030 2030  
2031 2031  
2032   - if (request.getServiceType() != null && request.getServiceType() != 100) {
  2032 + if (request.getServiceType() != null && request.getServiceType() != ServiceTypeEnums.ALL_SERVICE.getId()) {
2033 2033 babyQuery.setServiceType(request.getServiceType());
2034 2034 }
2035 2035  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ a4379e9
... ... @@ -424,6 +424,19 @@
424 424 }
425 425 patientsQuery.setNeed(needPage);
426 426  
  427 + //服务类型
  428 + if (riskPatientsQueryRequest.getServiceType() != null && riskPatientsQueryRequest.getServiceType() != ServiceTypeEnums.ALL_SERVICE.getId()) {
  429 + patientsQuery.setServiceType(riskPatientsQueryRequest.getServiceType());
  430 + }
  431 +
  432 + //服务状态
  433 + if (riskPatientsQueryRequest.getServiceStatus() != null) {
  434 + if (!(riskPatientsQueryRequest.getServiceStatus() == ServiceStatusEnums.STANDARD_ALL.getId() || riskPatientsQueryRequest.getServiceStatus() == ServiceStatusEnums.ADD_ALL.getId())) {
  435 + patientsQuery.setServiceStatus(riskPatientsQueryRequest.getServiceStatus());
  436 + }
  437 + }
  438 +
  439 +
427 440 patientsQuery.setQueryNo(riskPatientsQueryRequest.getQueryNo());
428 441  
429 442 return patientsQuery;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ a4379e9
... ... @@ -23,7 +23,7 @@
23 23 private String cardNo;
24 24 //服务类型
25 25 @FormParam
26   - private String serviceType;
  26 + private Integer serviceType;
27 27 //孕周
28 28 @FormParam
29 29 private String startDueWeek;
30 30  
... ... @@ -463,11 +463,11 @@
463 463 this.rLevel = rLevel;
464 464 }
465 465  
466   - public String getServiceType() {
  466 + public Integer getServiceType() {
467 467 return serviceType;
468 468 }
469 469  
470   - public void setServiceType(String serviceType) {
  470 + public void setServiceType(Integer serviceType) {
471 471 this.serviceType = serviceType;
472 472 }
473 473 }