Merge remote-tracking branch 'origin/master'

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

@@ -116,6 +116,8 @@ public class LisWorkBase {
      */
     boolean getAlarmFlag(List<LabResult> labResultList) {
         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());
         if (!labResultList0.isEmpty()) {
             wjz = true;

liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkGermController.java

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