jiangs/lis8.0
2
0
Fork 0
Code Issues 29 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jiangs:b2e3055ae43c95fac4800ce1e4161d6b1a2fc3a7
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test
..
compare: jiangs:8c3e1185660cb18c89cceda6854d400a677635b0
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test

No commits in common. "b2e3055ae43c95fac4800ce1e4161d6b1a2fc3a7" and "8c3e1185660cb18c89cceda6854d400a677635b0" have entirely different histories.
b2e3055ae4 ... 8c3e118566

1 changed files with 6 additions and 1 deletions
Show Stats Expand all files Collapse all files

7
liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkPageInfoServiceImpl.java
View File

@ -3,8 +3,12 @@ package com.czlis.liswork.service.impl;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.lis.*;
import com.czlis.common.utils.file.FileUtils;
import com.czlis.common.utils.file.ImageUtils;
import com.czlis.common.utils.uuid.UUID;
import com.czlis.interfaceCommon.utils.ReportUtil;
import com.czlis.liswork.mapper.LisWorkPageInfoMapper;
import com.czlis.liswork.pojo.DTO.HistoryResultDTO;
@ -15,6 +19,8 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.File;
import java.io.IOException;
import java.util.*;
import java.util.stream.Collectors;
@ -99,7 +105,6 @@ public class LisWorkPageInfoServiceImpl implements LisWorkPageInfoService {
String value = "30";
DateTime dayEnd = DateUtil.offsetDay(DateUtil.date(), Integer.parseInt(value));
LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh);
if(labPatOne == null) return new Result("0","没有查到需要的数据！");
String brdh = labPatOne.getBrdh();
String brxm = labPatOne.getBrxm();
List<Map<String,Object>> queryList = lisWorkPageInfoMapper.getOtherinstr(jyrq,dayEnd,brdh,brxm);