|
|
@@ -88,7 +88,7 @@ public class LabCheckRecordController extends BaseController {
|
|
|
applyvo.setUserId(sysUser.getUserId());
|
|
|
List<LabSecurityApplyVO> applist = labSecurityApplyService.selectApplyListEffective(applyvo);
|
|
|
//获取实验室集合
|
|
|
- if(applist.size()>0){
|
|
|
+ if(!applist.isEmpty() && applist.size()>0){
|
|
|
List<Long> ids = new ArrayList<>();
|
|
|
for (int i=0;i<applist.size();i++){
|
|
|
ids.add(applist.get(i).getSubjectId());
|
|
|
@@ -342,7 +342,7 @@ public class LabCheckRecordController extends BaseController {
|
|
|
labCheckRecord.setIsFabu(1);//已发布的数据
|
|
|
List<LabCheckRecord> list = labCheckRecordService.selectLabCheckRecordList(labCheckRecord);
|
|
|
|
|
|
- Map<String,Object> maplist = new HashMap<>();
|
|
|
+ //Map<String,Object> maplist = new HashMap<>();
|
|
|
//按照日期对数据分组
|
|
|
if(list!=null){
|
|
|
Map<String, List<LabCheckRecord>> map = new HashMap<>();
|