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

Compare commits

base: jiangs:b7364665d3244113463a6bffe154fb7f5b613953
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test
..
compare: jiangs:edbbf50ad6cc2c29d2b7420c1812e69e06205ef6
Branches Tags
jiangs:master
jiangs:wy
jiangs:lis8.0_test

No commits in common. "b7364665d3244113463a6bffe154fb7f5b613953" and "edbbf50ad6cc2c29d2b7420c1812e69e06205ef6" have entirely different histories.
b7364665d3 ... edbbf50ad6

2 changed files with 0 additions and 12 deletions
Show Stats Expand all files Collapse all files

2
lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkBase.java
View File

@ -116,8 +116,6 @@ public class LisWorkBase {
*/ */
boolean getAlarmFlag(List<LabResult> labResultList) { boolean getAlarmFlag(List<LabResult> labResultList) {
boolean wjz = false; boolean wjz = false;
if(labResultList==null)return wjz;
if(labResultList.size()==0)return wjz;
List<LabResult> labResultList0 = labResultList.stream().filter(xm ->xm.getAlarm_flag() != null).filter(xm -> !xm.getAlarm_flag().trim().isEmpty()).collect(Collectors.toList()); List<LabResult> labResultList0 = labResultList.stream().filter(xm ->xm.getAlarm_flag() != null).filter(xm -> !xm.getAlarm_flag().trim().isEmpty()).collect(Collectors.toList());
if (!labResultList0.isEmpty()) { if (!labResultList0.isEmpty()) {
wjz = true; wjz = true;

10
liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java
View File

@ -6,11 +6,9 @@ import com.czlis.common.core.domain.Result;
import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.common.core.domain.entity.lis.LabPat;
import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.common.core.domain.entity.lis.LabResult;
import com.czlis.common.core.domain.entity.lis.LabResultMed; import com.czlis.common.core.domain.entity.lis.LabResultMed;
import com.czlis.common.core.domain.entity.lis.XmMed;
import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.page.TableDataInfo;
import com.czlis.common.enums.BusinessType; import com.czlis.common.enums.BusinessType;
import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.interfaceCommon.constants.SysLogConstants;
import com.czlis.liswork.mapper.xtwh.XmMedMapper;
import com.czlis.liswork.service.LisWorkGermService; import com.czlis.liswork.service.LisWorkGermService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -26,16 +24,8 @@ import java.util.List;
@Slf4j @Slf4j
@Api(tags = "主界面-微生物报告输入") @Api(tags = "主界面-微生物报告输入")
public class LisWorkGermController extends BaseController { public class LisWorkGermController extends BaseController {
@Autowired
XmMedMapper xmMedMapper;
@Autowired @Autowired
LisWorkGermService lisWorkGermService; LisWorkGermService lisWorkGermService;
@ApiOperation("获取药敏字典")
@GetMapping("/getmeddict")
public Result getmeddict() {
XmMed xmMed=new XmMed();
return new Result("0","成功",xmMedMapper.queryList(xmMed));
}
@ApiOperation("获取药敏数据") @ApiOperation("获取药敏数据")
@GetMapping("/getresultmedlist") @GetMapping("/getresultmedlist")
public Result getresultmedlist(Date jyrq, String yq, String ybh,String xmdh) { public Result getresultmedlist(Date jyrq, String yq, String ybh,String xmdh) {