|
|
@@ -1896,15 +1896,15 @@ public class MedicalViewApiController {
|
|
|
resultMap.put("resultMessage", "根据时间范围查询号标数据失败,参数为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- String beginTimes=requestParamsVo.get("beginTimes");
|
|
|
- String endTimes=requestParamsVo.get("endTimes");
|
|
|
+ String beginTime=requestParamsVo.get("beginTime");
|
|
|
+ String endTime=requestParamsVo.get("endTime");
|
|
|
String mzClass=requestParamsVo.get("mzClass");
|
|
|
- if (StringUtils.isBlank(beginTimes)) {
|
|
|
+ if (StringUtils.isBlank(beginTime)) {
|
|
|
resultMap.put("resultCode", -1);
|
|
|
resultMap.put("resultMessage", "根据时间范围查询号标数据失败,开始时间为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- if (StringUtils.isBlank(endTimes)) {
|
|
|
+ if (StringUtils.isBlank(endTime)) {
|
|
|
resultMap.put("resultCode", -1);
|
|
|
resultMap.put("resultMessage", "根据时间范围查询号标数据失败,结束时间为空");
|
|
|
return resultMap;
|
|
|
@@ -1914,21 +1914,21 @@ public class MedicalViewApiController {
|
|
|
resultMap.put("resultMessage", "根据时间范围查询号标数据失败,科室分类码为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- Date beginTimesD = DateUtil.pase(beginTimes,"yyyy-MM-dd HH:mm:ss");
|
|
|
- if(beginTimesD==null){
|
|
|
+ Date beginTimeD = DateUtil.pase(beginTime,"yyyy-MM-dd HH:mm:ss");
|
|
|
+ if(beginTimeD==null){
|
|
|
resultMap.put("resultCode", -1);
|
|
|
resultMap.put("resultMessage", "根据时间范围查询号标数据失败,开始时间为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
- Date endTimesD = DateUtil.pase(endTimes,"yyyy-MM-dd HH:mm:ss");
|
|
|
- if(endTimesD==null){
|
|
|
+ Date endTimeD = DateUtil.pase(endTime,"yyyy-MM-dd HH:mm:ss");
|
|
|
+ if(endTimeD==null){
|
|
|
resultMap.put("resultCode", -1);
|
|
|
resultMap.put("resultMessage", "根据时间范围查询号标数据失败,结束时间为空");
|
|
|
return resultMap;
|
|
|
}
|
|
|
resultMap.put("resultCode", 0);
|
|
|
resultMap.put("resultMessage", "根据时间范围查询号标数据成功");
|
|
|
- List<MzyRequest> mzyRequests = mzyRequestService.queryByTimes(beginTimesD, endTimesD, null, Constants.NIGHT);
|
|
|
+ List<MzyRequest> mzyRequests = mzyRequestService.queryByTimes(beginTimeD, endTimeD, null, Constants.NIGHT);
|
|
|
List<ZdUnitCode> zdUnitCodeList = new ArrayList<>();
|
|
|
Set<String> codeSet = new HashSet<>();
|
|
|
if(mzyRequests!=null && mzyRequests.size()>0){
|
hurugang