~liusheng/smartor.git

			@@ -4,12 +4,9 @@
			import com.ruoyi.common.annotation.Log;
			import com.ruoyi.common.core.controller.BaseController;
			import com.ruoyi.common.core.domain.AjaxResult;
			import com.ruoyi.common.core.domain.entity.SysUser;
			import com.ruoyi.common.core.domain.model.LoginUser;
			import com.ruoyi.common.core.page.TableDataInfo;
			import com.ruoyi.common.enums.BusinessType;
			import com.ruoyi.common.utils.PageUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.common.utils.poi.ExcelUtil;
			import com.smartor.domain.PatMedInhosp;
			import com.smartor.domain.PatMedInhospVO;
			@@ -18,14 +15,11 @@
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.security.access.prepost.PreAuthorize;
			import org.springframework.util.CollectionUtils;
			import org.springframework.web.bind.annotation.*;

			import javax.servlet.http.HttpServletResponse;
			import java.util.ArrayList;
			import java.util.List;
			import java.util.stream.Collectors;

			/**
			* 患者住院记录Controller
			@@ -110,7 +104,7 @@
			*/
			@ApiOperation("获取患者住院记录详细信息")
			//@PreAuthorize("@ss.hasPermi('smartor:patinhosp:query')")
			@GetMapping(value = "/{inhospid}")
			@GetMapping(value = "/getInfo/{inhospid}")
			public AjaxResult getInfo(@PathVariable("inhospid") Long inhospid) {
			return success(patMedInhospService.selectPatMedInhospByInhospid(inhospid));
			}
			@@ -159,4 +153,16 @@
			return getDataTable(patMedInhospService.getDeptRanking(patMedReq));
			}


			/**
			* 医护与患者关联关系
			*
			* @return
			*/
			@ApiOperation("医护与患者关联关系")
			@PostMapping("/getDocAndPat")
			public TableDataInfo getDocAndPat(@RequestBody PatMedInhosp patMedInhosp) {
			return getDataTable(patMedInhospService.getDocAndPat(patMedInhosp));
			}

			}