update===>:获取体征检测数据。

xinelu-admin/src/main/java/com/xinelu/web/controller/familydoctor/PhysicalSignController.java

@@ -4,18 +4,29 @@ import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.R;
 import com.xinelu.common.core.domain.SelectVo;
 import com.xinelu.common.core.domain.TimelineVo;
-import com.xinelu.familydoctor.entity.*;
+import com.xinelu.familydoctor.dto.PhysicalSignDto;
+import com.xinelu.familydoctor.entity.DeviceBfRecord;
+import com.xinelu.familydoctor.entity.DeviceBgRecord;
+import com.xinelu.familydoctor.entity.DeviceBmiRecord;
+import com.xinelu.familydoctor.entity.DeviceBoRecord;
+import com.xinelu.familydoctor.entity.DeviceBpRecord;
+import com.xinelu.familydoctor.entity.DeviceHrRecord;
+import com.xinelu.familydoctor.entity.DeviceTempRecord;
 import com.xinelu.familydoctor.service.PhysicalSignService;
 import com.xinelu.familydoctor.vo.PhysicalLastRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
+import javax.annotation.Resource;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author gaoyu
@@ -113,11 +124,9 @@ public class PhysicalSignController extends BaseController {
 	}
 
 	@GetMapping("/getList")
-	@ApiOperation(value = "获取体征检测记录列表", response = TimelineVo.class, notes = "获取体征检测记录列表", httpMethod = "GET")
+	@ApiOperation(value = "分页查询体征检测记录列表", response = TimelineVo.class, notes = "分页查询体征检测记录列表", httpMethod = "GET")
-	@ApiImplicitParams({@ApiImplicitParam(name = "identity", value = "身份证号", required = true),
+	public R<?> getList(PhysicalSignDto physicalSignDto) {
-		@ApiImplicitParam(name = "label", value = "查询标识1：血糖2：血压、心率", required = true)})
+		Map<String, Object> map = physicalSignService.getList(physicalSignDto);
-	public R<?> getList(String identity, String label) {
-		Map<String, Object> map = physicalSignService.getList(identity, label);
 		return R.ok(map);
 	}
 }

xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/dto/PhysicalSignDto.java

@@ -0,0 +1,26 @@
+package com.xinelu.familydoctor.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description: 体征检测查询传输对象
+ * @author: haown
+ * @create: 2024-01-02 16:05
+ **/
+@ApiModel("体征检测查询传输对象")
+@Data
+public class PhysicalSignDto {
+	@ApiModelProperty("身份证号")
+	private String identity;
+
+	@ApiModelProperty("查询标识1：血糖2：血压3：血脂4：bmi5：血氧6：心率7：体温")
+	private String label;
+
+	@ApiModelProperty("页码")
+	private Integer pageNum;
+
+	@ApiModelProperty("每页显示记录数")
+	private Integer pageSize;
+}

xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/service/PhysicalSignService.java

@@ -1,6 +1,7 @@
 package com.xinelu.familydoctor.service;
 
 import com.xinelu.common.core.domain.SelectVo;
+import com.xinelu.familydoctor.dto.PhysicalSignDto;
 import com.xinelu.familydoctor.entity.*;
 import com.xinelu.familydoctor.vo.PhysicalLastRecordVO;
 
@@ -39,5 +40,5 @@ public interface PhysicalSignService {
 
 	Map<String, Object> getById(Integer id, String label);
 
-	Map<String, Object> getList(String identity, String label);
+	Map<String, Object> getList(PhysicalSignDto physicalSignDto);
 }

xinelu-familydoctor/src/main/java/com/xinelu/familydoctor/service/impl/PhysicalSignServiceImpl.java

@@ -1,8 +1,11 @@
 package com.xinelu.familydoctor.service.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.xinelu.common.core.domain.SelectVo;
 import com.xinelu.common.core.domain.TimelineVo;
 import com.xinelu.common.utils.DateUtils;
+import com.xinelu.familydoctor.dto.PhysicalSignDto;
 import com.xinelu.familydoctor.entity.*;
 import com.xinelu.familydoctor.mapper.*;
 import com.xinelu.familydoctor.service.PhysicalSignService;
@@ -194,16 +197,17 @@ public class PhysicalSignServiceImpl implements PhysicalSignService {
 		return map;
 	}
 
-	@Override public Map<String, Object> getList(String identity, String label) {
+	@Override public Map<String, Object> getList(PhysicalSignDto physicalSignDto) {
 		Map<String, Object> map = new HashMap<>();
-		switch (label) {
+		PageHelper.startPage(physicalSignDto.getPageNum(), physicalSignDto.getPageSize());
+		switch (physicalSignDto.getLabel()) {
 			case "1":
-				List<DeviceBgRecord> bgList = deviceBgRecordMapper.getBgList(identity);
+				List<DeviceBgRecord> bgList = deviceBgRecordMapper.getBgList(physicalSignDto.getIdentity());
-				map.put("list", bgList);
+				map.put("list", new PageInfo<>(bgList));
 				break;
 			case "2":
-				List<DeviceBpRecord> bpList = deviceBpRecordMapper.getBpList(identity);
+				List<DeviceBpRecord> bpList = deviceBpRecordMapper.getBpList(physicalSignDto.getIdentity());
-				map.put("list", bpList);
+				map.put("list", new PageInfo<>(bpList));
 				break;
 			default:
 				break;

xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java

@@ -115,7 +115,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/login", "/register", "/captchaImage").anonymous()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
-                .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**", "/nurseApplet/**", "/nurseApp/**", "/specialDisease/getUserInfo", "/monitor/payTask/handCloseOrder", "/newApp/login/**", "/system/hospitalPerson/**", "/evaluate/**", "/webSocket/**", "/nurseApplet/nursingOrder/getConsultationOrder").permitAll()
+                .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**", "/nurseApplet/**", "/nurseApp/**", "/specialDisease/getUserInfo", "/monitor/payTask/handCloseOrder", "/newApp/login/**", "/system/hospitalPerson/**", "/evaluate/**", "/webSocket/**", "/nurseApplet/nursingOrder/getConsultationOrder","/fd/ps/getList/**").permitAll()
                 .antMatchers(antMatchers.split(",")).permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()