jiangjiazhi / regional-platform | GitLab

Commit c674418ff93e9e7894b34246d48500831fca778f

Authored by shiyang over 3 years ago

1 parent 2304311f5d

Exists in master and in 6 other branches

update

Showing 3 changed files with 5 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java

...	...	@@ -557,12 +557,12 @@
557	557	@ResponseBody
558	558	@TokenRequired
559	559	public BaseResponse getHighRiskDetail(@RequestParam(required = true)String hospitalId,
560		- @RequestParam(required = true)String riskTyep,
	560	+ @RequestParam(required = true)String riskType,
561	561	@RequestParam(required = true)Date startDate,
562	562	@RequestParam(required = true)Date endDate,
563	563	@RequestParam(required = true)Integer page,
564	564	@RequestParam(required = true)Integer limit) {
565		- return reportService.getHighRiskDetail(hospitalId,riskTyep, startDate, endDate, page, limit);
	565	+ return reportService.getHighRiskDetail(hospitalId,riskType, startDate, endDate, page, limit);
566	566	}
567	567
568	568	}

...	...	@@ -114,6 +114,6 @@
114	114
115	115	BaseResponse getAntExChuDetail(String hospitalId, Date startDate, Date endDate);
116	116
117		- BaseResponse getHighRiskDetail(String hospitalId,String riskTyep, Date startDate, Date endDate,Integer page,Integer limit);
	117	+ BaseResponse getHighRiskDetail(String hospitalId,String riskType, Date startDate, Date endDate,Integer page,Integer limit);
118	118	}

...	...	@@ -4645,7 +4645,7 @@
4645	4645	}
4646	4646
4647	4647	@Override
4648		- public BaseResponse getHighRiskDetail(String hospitalId, String riskTyep, Date startDate, Date endDate,Integer page,Integer limit) {
	4648	+ public BaseResponse getHighRiskDetail(String hospitalId, String riskType, Date startDate, Date endDate,Integer page,Integer limit) {
4649	4649	BaseListResponse br = new BaseListResponse();
4650	4650	List <Map <String, Object>> antExRecordResult=new ArrayList<>();
4651	4651	//初诊
...	...	@@ -4653,7 +4653,7 @@
4653	4653	antExRecordQuery.setCheckTimeStart(startDate);
4654	4654	antExRecordQuery.setCheckTimeEnd(endDate);
4655	4655	antExRecordQuery.setHospitalId(hospitalId);
4656		- switch (riskTyep){
	4656	+ switch (riskType){
4657	4657	case "risk_green":
4658	4658	antExRecordQuery.setLevelId("e637b361-99cf-41eb-84f2-f0dab596e928");
4659	4659	break;