~yxh/ecg.git - Gitblit

			@@ -2,15 +2,9 @@

			import cn.hutool.extra.servlet.ServletUtil;
			import cn.lihu.jh.framework.common.pojo.CommonResult;
			import cn.lihu.jh.framework.common.pojo.PageResult;
			import cn.lihu.jh.framework.common.util.object.BeanUtils;
			import cn.lihu.jh.module.ecg.controller.admin.checktype.vo.CheckTypePageReqVO;
			import cn.lihu.jh.module.ecg.dal.dataobject.checktype.CheckTypeDO;
			import cn.lihu.jh.module.ecg.dal.dataobject.queue.QueueDO;
			import cn.lihu.jh.module.ecg.enums.QueueStatusEnum;
			import cn.lihu.jh.module.ecg.service.callingscreen.CallingScreenService;
			import cn.lihu.jh.module.ecg.service.checktype.CheckTypeService;
			import cn.lihu.jh.module.ecg.service.config.EcgConfigService;
			import io.swagger.v3.oas.annotations.Operation;
			import io.swagger.v3.oas.annotations.tags.Tag;
			import lombok.extern.slf4j.Slf4j;
			@@ -20,11 +14,9 @@
			import javax.annotation.Resource;
			import javax.annotation.security.PermitAll;
			import javax.servlet.http.HttpServletRequest;
			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;

			import static cn.lihu.jh.framework.common.pojo.CommonResult.error;
			import static cn.lihu.jh.framework.common.pojo.CommonResult.success;
			@@ -40,7 +32,7 @@
			private CallingScreenService callingScreenService;

			@GetMapping("/display-col-info")
			@Operation(summary = "显示列信息")
			@Operation(summary = "列上显示的检查类型名称")
			@PermitAll
			public CommonResult<Map<Integer, List<String>>> displayColInfo()
			{
			@@ -53,7 +45,7 @@
			@PermitAll
			public CommonResult<Map<Integer, Map<Integer, List<ScreenQueueRespVO>>>> callingData()
			{
			Map<Integer, Map<Integer, List<QueueDO>>> map = callingScreenService.callingData();
			Map<Integer, Map<Integer, List<QueueDO>>> map = callingScreenService.getBigScreenPatient();

			Map<Integer, Map<Integer, List<ScreenQueueRespVO>>> mapVO = new HashMap<>();
			map.keySet().forEach( displayCol -> {