Merge remote-tracking branch 'origin/future-page-ywd' into dev

bsoft-api/src/main/java/com/bsoft/api/controller/BlockValuesController.java

@@ -8,6 +8,7 @@ import com.bsoft.api.model.requmodel.BlockValues;
 import com.bsoft.api.service.BlockValuesService;
 import com.bsoft.api.service.Impl.BlockValuesServiceImpl;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,6 +31,7 @@ public class BlockValuesController {
      */
     @GetMapping("blockValues")
 //    @Token
+    @ApiOperation("根据Page查询板块数值")
     public  Object getBlockValuesByPageID(@RequestBody BlockValues blockValues){
 
         return Result.success(blockValuesService.getBlockValuesByPageID(blockValues.getPageId(),blockValues.getDisease(),

bsoft-api/src/main/java/com/bsoft/api/model/requmodel/BlockValues.java

 package com.bsoft.api.model.requmodel;
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Date;
 
@@ -48,9 +49,16 @@ public class BlockValues {
         this.time = time;
     }
 
+    @ApiModelProperty(value = "pageID",required = true)
     private Integer pageId;
+
+
+    @ApiModelProperty("病组")
     private Integer disease;
+    @ApiModelProperty("科室")
     private Integer department;
+    @ApiModelProperty("医生")
     private Integer doctor;
+    @ApiModelProperty("时间")
     private Integer time;
 }