dev

src/main/java/com/syjiaer/clinic/server/common/api/output/OM1101.java

@@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.common.api.output;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.syjiaer.clinic.server.common.api.annotations.OMField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -20,66 +21,91 @@ public class OM1101 extends BaseOutputModel{
     //social_user表id
     private Integer id;
     @OMField(key="baseinfo",name = "基本信息")
+    @ApiModelProperty(value = "基本信息")
     private Baseinfo baseinfo;
     @OMField(key="insuinfo",name = "参保信息")
+    @ApiModelProperty(value = "参保信息")
     private List<Insuinfo> insuinfo;
+    @ApiModelProperty(value = "身份信息")
     @OMField(key="idetinfo",name = "身份信息")
     private List<Idetinfo> iDetinfo;
     @Getter
     @Setter
     public class Baseinfo{
         @OMField(key="psn_no",name = "人员编号")
+        @ApiModelProperty(value = "人员编号")
         private String psn_no;
         @OMField(key="psn_cert_type",name = "人员证件类型")
+        @ApiModelProperty(value = "人员证件类型")
         private String psn_cert_type;
         @OMField(key="certno",name = "证件号码")
+        @ApiModelProperty(value = "证件号码")
         private String certno;
         @OMField(key="psn_name",name = "人员姓名")
+        @ApiModelProperty(value = "人员姓名")
         private String psn_name;
         @OMField(key="gend",name = "性别")
+        @ApiModelProperty(value = "性别")
         private String gend;
         @OMField(key="naty",name = "民族")
+        @ApiModelProperty(value = "民族")
         private String naty;
         @OMField(key="brdy",name = "出生日期")
         @JsonFormat(pattern = "yyyy-MM-dd")
+        @ApiModelProperty(value = "出生日期")
         private LocalDate brdy;
         @OMField(key="age",name = "年龄")
+        @ApiModelProperty(value = "年龄")
         private BigDecimal age;
     }
     @Getter
     @Setter
     public class Insuinfo{
         @OMField(key = "balc", name = "余额")
+        @ApiModelProperty(value = "余额")
         private BigDecimal balc;
         @OMField(key = "insutype", name = "险种类型")
+        @ApiModelProperty(value = "险种类型")
         private String insutype;
         @OMField(key = "psn_type", name = "人员类别")
+        @ApiModelProperty(value = "人员类别")
         private String psn_type;
         @OMField(key = "psn_insu_stas", name = "人员参保状态")
+        @ApiModelProperty(value = "人员参保状态")
         private String psn_insu_stas;
         @OMField(key = "psn_insu_date", name = "个人参保日期")
+        @ApiModelProperty(value = "个人参保日期")
         private LocalDate psn_insu_date;
         @OMField(key = "paus_insu_date", name = "暂停参保日期")
+        @ApiModelProperty(value = "暂停参保日期")
         private LocalDate paus_insu_date;
         @OMField(key = "cvlserv_flag", name = "公务员标志")
+        @ApiModelProperty(value = "公务员标志")
         private String cvlserv_flag;
         @OMField(key = "insuplc_admdvs", name = "参保地医保区划")
+        @ApiModelProperty(value = "参保地医保区划")
         private String insuplc_admdvs;
         @OMField(key = "emp_name", name = "单位名称")
+        @ApiModelProperty(value = "单位名称")
         private String emp_name;
     }
     @Getter
     @Setter
     public static class Idetinfo{
         @OMField(key = "psn_idet_type", name = "人员身份类别")
+        @ApiModelProperty(value = "人员身份类别")
         private String psn_idet_type;
         @OMField(key = "psn_type_lv", name = "人员类别等级")
+        @ApiModelProperty(value = "人员类别等级")
         private String psn_type_lv;
         @OMField(key = "memo", name = "备注")
+        @ApiModelProperty(value = "备注")
         private String memo;
         @OMField(key = "begntime", name = "开始时间")
+        @ApiModelProperty(value = "开始时间")
         private LocalDateTime begntime;
         @OMField(key = "endtime", name = "结束时间")
+        @ApiModelProperty(value = "结束时间")
         private LocalDateTime endtime;
     }
 }

src/main/java/com/syjiaer/clinic/server/common/api/output/OM5267.java

@@ -1,6 +1,7 @@
 package com.syjiaer.clinic.server.common.api.output;
 
 import com.syjiaer.clinic.server.common.api.annotations.OMField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -12,21 +13,30 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class OM5267 extends BaseOutputModel{
     @OMField(key = "blo_type", name = "封锁种类")
+    @ApiModelProperty(value = "封锁种类")
     private String blo_type;
     @OMField(key = "insutype", name = "险种类型")
+    @ApiModelProperty(value = "险种类型")
     private String insutype;
     @OMField(key = "blo_rea", name = "变更原因描述")
+    @ApiModelProperty(value = "变更原因描述")
     private String blo_rea;
     @OMField(key = "psn_emp_no", name = "个人编号/单位编号")
+    @ApiModelProperty(value = "个人编号/单位编号")
     private String psn_emp_no;
     @OMField(key = "pausType", name = "暂停类别")
+    @ApiModelProperty(value = "暂停类别")
     private String pausType;
     @OMField(key = "begndate", name = "开始日期")
+    @ApiModelProperty(value = "开始日期")
     private String begndate;
     @OMField(key = "enddate", name = "终止日期")
+    @ApiModelProperty(value = "终止日期")
     private String enddate;
     @OMField(key = "opter", name = "经办人")
+    @ApiModelProperty(value = "经办人")
     private String opter;
     @OMField(key = "opt_date", name = "经办日期")
+    @ApiModelProperty(value = "经办日期")
     private String opt_date;
 }

src/main/java/com/syjiaer/clinic/server/common/api/output/OM5283.java

@@ -1,6 +1,7 @@
 package com.syjiaer.clinic.server.common.api.output;
 
 import com.syjiaer.clinic.server.common.api.annotations.OMField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -12,13 +13,17 @@ import java.time.LocalDate;
 @Setter
 @ToString
 @Accessors(chain = true)
-public class OM5283 extends BaseOutputModel{
+public class OM5283 extends BaseOutputModel {
     @OMField(key = "fixmedins_code", name = "定点医药机构编号")
+    @ApiModelProperty(value = "定点医药机构编号")
     private String fixmedins_code;
     @OMField(key = "fixmedins_name", name = "定点医药机构名称")
+    @ApiModelProperty(value = "定点医药机构名称")
     private String fixmedins_name;
     @OMField(key = "begndate", name = "入院时间")
+    @ApiModelProperty(value = "入院时间")
     private LocalDate begndate;
     @OMField(key = "enddate", name = "出院时间")
+    @ApiModelProperty(value = "出院时间")
     private LocalDate enddate;
 }

src/main/java/com/syjiaer/clinic/server/common/doc/util/ScanUtil.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
 import java.util.*;
 
 public class ScanUtil {
@@ -199,13 +200,22 @@ public class ScanUtil {
     }
 
 
-    // 递归扫描类的属性
     private static List<ApiInfo.BaseProperty> scanClassProperties(Class<?> clazz) {
+        return scanClassProperties(clazz, new HashSet<>());
+    }
+
+    private static List<ApiInfo.BaseProperty> scanClassProperties(Class<?> clazz, Set<Class<?>> scannedClasses) {
         List<ApiInfo.BaseProperty> properties = new ArrayList<>();
 
+        // 防止循环引用导致的无限递归
+        if (scannedClasses.contains(clazz)) {
+            return properties;
+        }
+        scannedClasses.add(clazz);
+
         // 处理父类属性
         if (clazz.getSuperclass() != null && isComplexType(clazz.getSuperclass())) {
-            properties.addAll(scanClassProperties(clazz.getSuperclass()));
+            properties.addAll(scanClassProperties(clazz.getSuperclass(), scannedClasses));
         }
 
         // 处理当前类属性
@@ -222,18 +232,36 @@ public class ScanUtil {
             Class<?> fieldType = field.getType();
             fieldParam.setType(fieldType.getSimpleName());
 
-            // 递归处理复杂类型
+            // 处理List类型
-            if (isComplexType(fieldType)) {
+            if (fieldType.equals(List.class)) {
-                fieldParam.setChildren(scanClassProperties(fieldType));
+                java.lang.reflect.Type genericType = field.getGenericType();
+                if (genericType instanceof ParameterizedType) {
+                    ParameterizedType pt = (ParameterizedType) genericType;
+                    java.lang.reflect.Type[] typeArgs = pt.getActualTypeArguments();
+                    if (typeArgs.length > 0 && typeArgs[0] instanceof Class) {
+                        Class<?> genericClass = (Class<?>) typeArgs[0];
+                        // 如果是复杂类型则递归处理
+                        if (isComplexType(genericClass)) {
+                            fieldParam.setChildren(scanClassProperties(genericClass, scannedClasses));
+                        }
+                        // 设置泛型类型名称
+                        fieldParam.setType("List<" + genericClass.getSimpleName() + ">");
+                    }
+                }
+            }
+            // 处理其他复杂类型
+            else if (isComplexType(fieldType)) {
+                fieldParam.setChildren(scanClassProperties(fieldType, scannedClasses));
             }
 
             properties.add(fieldParam);
         }
+
+        scannedClasses.remove(clazz); // 扫描完成后移除标记
         return properties;
     }
 
 
-
     private static String cleanPath(String originalPath) {
         // 1. 移除路径参数
         String pathWithoutParams = originalPath.replaceAll("/\\{[^/]+}", "");

src/main/java/com/syjiaer/clinic/server/controller/common/CommonConfigController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.common;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.config.Config;
 import com.syjiaer.clinic.server.common.vo.Result;
@@ -34,12 +37,14 @@ public class CommonConfigController extends BaseController {
 
     @RequestMapping("list")
     @ApiOperation("查询配置信息")
-    public Result<Object> list() {
+    @ApiReturn(type = CommonConfig.class, isArray = true)
+    public Result<List<CommonConfig>> list() {
         return success(commonConfigService.list());
     }
 
     @RequestMapping("getAll")
-    @ApiOperation("查询所有配置信息")
+    @ApiOperation("key-value形式配置信息")
+    @ApiReturn(type = CommonConfig.class)
     public Result<Object> getAll() {
         List<CommonConfig> list = commonConfigService.list();
         Map<String, String> map = new HashMap<>();
@@ -51,6 +56,7 @@ public class CommonConfigController extends BaseController {
     @RecordCommonLog(operation = "修改配置信息")
     @RequestMapping("edit")
     @ApiOperation("修改配置信息")
+
     public Result<Object> edit() {
         Map<String, Object> parms = getParms();
         for (String key : parms.keySet()) {

src/main/java/com/syjiaer/clinic/server/controller/common/CommonLogController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.common;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
@@ -20,6 +23,10 @@ public class CommonLogController extends BaseController {
 
     @RequestMapping("list")
     @ApiOperation("查询操作日志")
+    @ApiParams({
+            @ApiParam(name = "query", value = "查询条件", type = CommonLogQuery.class, required = true)
+    })
+    @ApiReturn(type = CommonLog.class, isArray = true)
     public Result<Page<CommonLog>> list() {
         CommonLogQuery query = parmsUtil.getObject("query", CommonLogQuery.class);
         return success(commonLogService.pageList(query));

src/main/java/com/syjiaer/clinic/server/controller/common/FileController.java

@@ -1,6 +1,9 @@
 package com.syjiaer.clinic.server.controller.common;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.NoAuthCheck;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.util.CacheUtil;
@@ -47,6 +50,10 @@ public class FileController extends BaseController {
     @RequestMapping("/getImage/{fileName}")
     @ApiOperation("获取图片")
     @NoAuthCheck
+    @ApiParams({
+            @ApiParam(name = "fileName", value = "文件名", required = true)
+    })
+    @ApiReturn("资源文件")
     public  ResponseEntity<Resource> getImage(@PathVariable String fileName) {
         try  {
             return  fileService.getImage(fileName);
@@ -60,6 +67,10 @@ public class FileController extends BaseController {
     @RequestMapping("/download/{token}")
     @ApiOperation("下载文件")
     @NoAuthCheck
+    @ApiParams({
+            @ApiParam(name = "token", value = "临时令牌", required = true)
+    })
+    @ApiReturn("资源文件")
     public ResponseEntity<Resource> download(@PathVariable String token){
 
         try {
@@ -82,6 +93,10 @@ public class FileController extends BaseController {
     @RequestMapping("/uploadToTemp")
     @ApiOperation("上传临时文件")
     @NoAuthCheck
+    @ApiParams({
+            @ApiParam(name = "file", value = "文件", required = true)
+    })
+    @ApiReturn(name ="",value = "临时令牌")
     public String uploadToTemp(MultipartFile file) {
         try {
             // 获取文件的后缀名

src/main/java/com/syjiaer/clinic/server/controller/common/ManagerUserController.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.controller.common;
 
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.NoAuthCheck;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
@@ -32,6 +33,7 @@ public class ManagerUserController extends BaseController {
     @RequestMapping("login")
     @ApiOperation("登录")
     @NoAuthCheck
+    @ApiReturn(value = "登录令牌",typeName="String")
     public Result<String> login() {
         Map<String, Object> parms = getParms();
         String username = (String) parms.get("username");
@@ -43,6 +45,8 @@ public class ManagerUserController extends BaseController {
     //验证token
     @ApiOperation("验证token")
     @RequestMapping("verify")
+    @ApiReturn(type = ManagerUser.class)
+
     public Result<ManagerUser> verify() {
         return success(managerUserService.verify());
     }
@@ -53,6 +57,7 @@ public class ManagerUserController extends BaseController {
      */
     @ApiOperation("所有人员信息")
     @RequestMapping("list")
+    @ApiReturn(type = ManagerUser.class,isArray = true)
     public Result<List<ManagerUser>> list(){
         return success(managerUserService.list());
     }

src/main/java/com/syjiaer/clinic/server/controller/common/SignController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.common;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
@@ -20,6 +23,11 @@ public class SignController extends BaseController {
     @RecordCommonLog(operation = "医保签到")
     @ApiOperation("医保签到")
     @RequestMapping("/in")
+    @ApiParams({
+            @ApiParam(name = "mac", value = "mac地址", required = true),
+            @ApiParam(name = "ip", value = "ip地址", required = true)
+    })
+    @ApiReturn(type = ManagerUserSign.class)
     public Result<ManagerUserSign> in() {
         String mac = parmsUtil.getString("mac", "请输入mac地址");
         String ip = parmsUtil.getString("ip", "请输入ip地址");
@@ -29,6 +37,7 @@ public class SignController extends BaseController {
     @RecordCommonLog(operation = "医保签退")
     @ApiOperation("医保签退")
     @RequestMapping("/out")
+    @ApiReturn(isNull = true)
     public Result<String> out() {
         signService.out();
         return success("签退成功");

src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java

@@ -3,6 +3,7 @@ package com.syjiaer.clinic.server.controller.goods;
 import com.alibaba.fastjson.JSONObject;
 import com.syjiaer.clinic.server.common.annotations.ApiParam;
 import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.enums.GoodsPricingModelEnum;
 import com.syjiaer.clinic.server.common.util.ParmsUtil;
@@ -48,7 +49,8 @@ public class GoodsController extends BaseController {
     @ApiParams({
             @ApiParam(name = "data", value = "商品信息", required = true, type = Goods.class)
     })
-    public Result<Object> save() {
+    @ApiReturn(type = Goods.class)
+    public Result<Goods> save() {
         Goods goods=parmsUtil.getObject("data", Goods.class);
         if (goods.getPurchaseUnitPrice()==null) {
             return error("请输入参考进价");
@@ -88,6 +90,10 @@ public class GoodsController extends BaseController {
     @RecordCommonLog(operation = "商品重新初始化医保库存")
     @ApiOperation("商品重新初始化医保库存")
     @RequestMapping("returnInit")
+    @ApiParams({
+            @ApiParam(name = "id", value = "商品id", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<Object> returnInit() {
         Integer goodId = parmsUtil.getInteger("id");
         goodsService.returnInit(goodId);
@@ -99,6 +105,10 @@ public class GoodsController extends BaseController {
      */
     @ApiOperation("商品搜索")
     @RequestMapping("DetailWithSearch")
+    @ApiParams({
+            @ApiParam(name = "query", value = "查询参数", required = true, type = GoodsQuery.class)
+    })
+    @ApiReturn(type = GoodsDetailVo.class)
     public Result<Page<GoodsDetailVo>> DetailWithSearch() {
         GoodsQuery goodsQuery = parmsUtil.getObject("query", GoodsQuery.class);
         Page<GoodsDetailVo> result = goodsService.searchGoodeDetail(goodsQuery);
@@ -110,6 +120,10 @@ public class GoodsController extends BaseController {
      */
     @ApiOperation("商品搜索 下单时的搜索")
     @RequestMapping("search")
+    @ApiParams({
+            @ApiParam(name = "keyword", value = "关键字", required = true)
+    })
+    @ApiReturn(type = GoodsSearchVo.class)
     public Result<List<GoodsSearchVo>> search() {
         Map<String, Object> parms = getParms();
         String keyword = (String) parms.get("keyword");
@@ -123,6 +137,10 @@ public class GoodsController extends BaseController {
      */
     @ApiOperation("根据商品id获取商品")
     @RequestMapping("get")
+    @ApiParams({
+            @ApiParam(name = "id", value = "商品id", required = true)
+    })
+    @ApiReturn(type = Goods.class)
     public Result<Object> get() {
         int id = parmsUtil.getInteger("id", "请输入ID");
         return success(goodsService.getById(id));
@@ -135,6 +153,11 @@ public class GoodsController extends BaseController {
     @ApiOperation("商品添加标识码")
     @RecordCommonLog(operation = "商品添加标识码")
     @RequestMapping("addIdCode")
+    @ApiParams({
+            @ApiParam(name = "goodsId", value = "商品id", required = true),
+            @ApiParam(name = "idCode", value = "标识码", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<Object> addIdCode(){
         Integer goodsId = parmsUtil.getInteger("goodsId","商品id为空");
         String idCode = parmsUtil.getString("idCode","标识码为空");
@@ -148,6 +171,10 @@ public class GoodsController extends BaseController {
      */
     @ApiOperation("获取二级分类绑定的商品数量")
     @RequestMapping("getByCateId")
+    @ApiParams({
+            @ApiParam(name = "cateId", value = "二级分类ID", required = true)
+    })
+    @ApiReturn(name = "数量", typeName = "Long")
     public Result<Long> getCountByCateId() {
         Integer cateId = parmsUtil.getInteger("cateId", "请输入分类ID");
         return success(goodsService.getByCateId(cateId));
@@ -159,6 +186,10 @@ public class GoodsController extends BaseController {
     @ApiOperation("停售商品")
     @RecordCommonLog(operation = "停售商品")
     @RequestMapping("disableSale")
+    @ApiParams({
+            @ApiParam(name = "id", value = "商品id", required = true)
+    })
+    @ApiReturn(type = Goods.class)
     public Result<Goods> disableSale() {
         Integer id = parmsUtil.getInteger("id", "id不存在");
         return success(goodsService.disableSale(id));
@@ -169,6 +200,10 @@ public class GoodsController extends BaseController {
     @ApiOperation("起售商品")
     @RecordCommonLog(operation = "启售商品")
     @RequestMapping("enableSale")
+    @ApiParams({
+            @ApiParam(name = "id", value = "商品id", required = true)
+    })
+    @ApiReturn(type = Goods.class)
     public Result<Goods> enableSale() {
         Integer id = parmsUtil.getInteger("id", "id不存在");
         return success(goodsService.enableSale(id));

src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryApplyController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
@@ -30,6 +33,11 @@ public class InventoryApplyController extends BaseController {
     @RecordCommonLog(operation = "创建领用单并领用")
     @ApiOperation("创建领用单并领用")
     @RequestMapping("/create")
+    @ApiParams({
+            @ApiParam(name = "data", value = "领用单商品信息", required = true, type = Map.class,isArray = true),
+            @ApiParam(name = "useInfo", value = "领用单信息", required = true, type = InventoryApply.class)
+    })
+    @ApiReturn(isNull = true)
     public Result create() {
         List<Map> mapList = parmsUtil.getList("data",Map.class);
         InventoryApply useInfo = parmsUtil.getObject("useInfo", InventoryApply.class);
@@ -43,6 +51,10 @@ public class InventoryApplyController extends BaseController {
      */
     @ApiOperation("分页查询领用单")
     @RequestMapping("/list")
+    @ApiParams({
+            @ApiParam(name = "query", value = "查询参数", required = true, type = ApplyOrderQuery.class)
+    })
+    @ApiReturn(type = InventoryApply.class)
     public Result<Page> list() {
         ApplyOrderQuery query = parmsUtil.getObject("query", ApplyOrderQuery.class);
 
@@ -55,6 +67,10 @@ public class InventoryApplyController extends BaseController {
      */
     @ApiOperation("获取领用单详情")
     @RequestMapping("/getDetail")
+    @ApiParams({
+            @ApiParam(name = "id", value = "领用单id", required = true)
+    })
+    @ApiReturn(name = "详情JSON字符串", typeName = "String")
     public Result<String> getDetail(){
         Integer applyId = parmsUtil.getInteger("id", "id不能为空");
         return success(inventoryApplyService.getCheckDetail(applyId));

src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryCheckController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
@@ -26,6 +29,10 @@ public class InventoryCheckController extends BaseController {
      */
     @ApiOperation("盘点列表分页查询")
     @RequestMapping("/list")
+    @ApiParams({
+            @ApiParam(name = "query", value = "查询参数", required = true, type = CheckQuery.class)
+    })
+    @ApiReturn(type = InventoryCheck.class)
     public Result<Page<InventoryCheck>> list() {
         CheckQuery query= parmsUtil.getObject("query", CheckQuery.class);
 
@@ -39,6 +46,12 @@ public class InventoryCheckController extends BaseController {
     @ApiOperation("保存盘点记录")
     @RecordCommonLog(operation = "完成盘点")
     @RequestMapping("/save")
+    @ApiParams({
+            @ApiParam(name = "list", value = "盘点列表", required = true, type = Map.class,isArray = true),
+            @ApiParam(name = "remark", value = "盘点备注", required = true),
+            @ApiParam(name = "checkUserId", value = "盘点人id", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result save() {
         List<Map> list = parmsUtil.getList("list", Map.class);
         String remark = parmsUtil.getString("remark");
@@ -52,6 +65,10 @@ public class InventoryCheckController extends BaseController {
      */
     @ApiOperation("获取盘点单详情")
     @RequestMapping("/getDetail")
+    @ApiParams({
+            @ApiParam(name = "id", value = "盘点单id", required = true)
+    })
+    @ApiReturn(name = "详情JSON字符串", typeName = "String")
     public Result<String> getDetail(){
         Integer checkId = parmsUtil.getInteger("id", "id不能为空");
         return success(inventoryCheckService.getCheckDetail(checkId));

src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryController.java

@@ -1,12 +1,17 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
 import com.alibaba.fastjson.JSON;
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.util.DateUtil;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.goods.Goods;
 import com.syjiaer.clinic.server.entity.inventory.Inventory;
+import com.syjiaer.clinic.server.entity.inventory.InventoryLog;
+import com.syjiaer.clinic.server.entity.inventory.vo.InventoryGoodsTotalVo;
 import com.syjiaer.clinic.server.service.goods.GoodsService;
 import com.syjiaer.clinic.server.service.inventory.InventoryPurchaseService;
 import com.syjiaer.clinic.server.service.inventory.InventoryService;
@@ -38,6 +43,10 @@ public class InventoryController extends BaseController {
      */
     @ApiOperation("获取采购单信息 根据code")
     @RequestMapping("/listByOrderCode")
+    @ApiParams({
+            @ApiParam(name = "orderCode", value = "采购单code", required = true)
+    })
+    @ApiReturn(type = Inventory.class)
     public Result<List<Inventory>> listByOrderCode() {
         String purchaseCode = parmsUtil.getString("orderCode", "请输入订单号");
         return success(inventoryService.listByPurchaseCode(purchaseCode));
@@ -47,9 +56,13 @@ public class InventoryController extends BaseController {
     /**
      * 根据goodsId 获取该goods的所有库存信息 带库存总量
      */
-    @ApiOperation("获取商品库存信息 根据goodsId")
+    @ApiOperation("根据goodsId获取商品库存信息")
     @RequestMapping("/getByGoodsId")
-    public Result<Map<String, Object>> getByGoodsId() {
+    @ApiParams({
+            @ApiParam(name = "goodsId", value = "商品ID", required = true)
+    })
+    @ApiReturn(type = InventoryGoodsTotalVo.class)
+    public Result<InventoryGoodsTotalVo> getByGoodsId() {
         int goodsId = parmsUtil.getInteger("goodsId", "请输入商品ID");
         Boolean isZero = parmsUtil.getObject("isZero", Boolean.class);
 
@@ -57,32 +70,31 @@ public class InventoryController extends BaseController {
         if (goods == null) {
             return error("商品不存在");
         }
-        Map<String, Object> goodsMap = JSON.parseObject(JSON.toJSONString(goods), Map.class);
         List<Inventory> list = inventoryService.getListByGoodsId(goodsId, isZero);
-        List<Map<String, Object>> listMap = new ArrayList<>();
+        List<Inventory> listMap = new ArrayList<>();
         for (Inventory inventory : list) {
-            Map<String, Object> map = new HashMap<>();
+            listMap.add(inventory);
-            map.put("id", inventory.getId());
-            map.put("wholeNumber", inventory.getWholeNumber());
-            map.put("fragmentNumber", inventory.getFragmentNumber());
-            map.put("productionBatchCode", inventory.getProductionBatchCode());
-            map.put("productionDate", inventory.getProductionDate());
-            map.put("expiryDate", inventory.getExpiryDate());
-            map.put("purchaseUnitPrice", inventory.getPurchaseUnitPrice());
-            listMap.add(map);
         }
-        goodsMap.put("inventoryGoodsList", listMap);
+        InventoryGoodsTotalVo inventoryGoodsTotalVo = new InventoryGoodsTotalVo();
+        inventoryGoodsTotalVo.setInventoryGoodsList(listMap);
         Map<String, Integer> map = inventoryService.totalNumber(goodsId);
-        goodsMap.putAll(map);
+        inventoryGoodsTotalVo.setWholeNumber(map.get("wholeNumber"));
-        return success(goodsMap);
+        inventoryGoodsTotalVo.setFragmentNumber(map.get("fragmentNumber"));
+        inventoryGoodsTotalVo.setTotalFragment(map.get("totalFragment"));
+        inventoryGoodsTotalVo.setListSize(map.get("listSize"));
+        return success(inventoryGoodsTotalVo);
     }
 
 
     /**
      * 根据goodsId 获取该goods的所有库存信息
      */
-    @ApiOperation("获取商品库存信息 根据goodsId")
+    @ApiOperation("根据goodsId获取商品库存信息(已作废)")
     @RequestMapping("/listByGoodsId")
+    @ApiParams({
+            @ApiParam(name = "goodsId", value = "商品ID", required = true)
+    })
+    @ApiReturn(type = Inventory.class, isArray = true)
     public Result<List<Inventory>> listByGoodsId() {
         int goodsId = parmsUtil.getInteger("goodsId", "请输入商品ID");
         Goods goods = goodsService.getById(goodsId);
@@ -98,6 +110,10 @@ public class InventoryController extends BaseController {
      */
     @ApiOperation("根据库存id集合获取库存信息")
     @RequestMapping("/listByIds")
+    @ApiParams({
+            @ApiParam(name = "idList", value = "库存id集合", required = true, type = Integer.class,isArray = true)
+    })
+    @ApiReturn(type = Inventory.class, isArray = true)
     public Result<List<Inventory>> listByIds() {
         List<Integer> ids = parmsUtil.getIntList("idList");
         if (ids == null || ids.isEmpty()) {
@@ -112,6 +128,12 @@ public class InventoryController extends BaseController {
      */
     @ApiOperation("库存统计")
     @RequestMapping("/statistics")
+    @ApiParams({
+            @ApiParam(name = "goodsId", value = "商品ID", required = true),
+            @ApiParam(name = "startDate", value = "开始时间", required = true),
+            @ApiParam(name = "endDate", value = "结束时间", required = true)
+    })
+    @ApiReturn(type = InventoryService.LineModel.class, isArray = true)
     public Result<List<InventoryService.LineModel>> statistics() {
         int goodsId = parmsUtil.getInteger("goodsId", "请选择商品id");
         String startDateStr = parmsUtil.getString("startDate", "请选择开始时间");
@@ -127,13 +149,19 @@ public class InventoryController extends BaseController {
     //todo getInventoryLog
     @ApiOperation("获取库存日志")
     @RequestMapping("/log")
-    public Result<List<Map<String, Object>>> log() {
+    @ApiParams({
+            @ApiParam(name = "goodsId", value = "商品ID", required = true),
+            @ApiParam(name = "startDate", value = "开始时间", required = true),
+            @ApiParam(name = "endDate", value = "结束时间", required = true)
+    })
+    @ApiReturn(type = InventoryLog.class, isArray = true)
+    public Result<List<InventoryLog>> log() {
         int goodsId = parmsUtil.getInteger("goodsId", "请选择商品id");
         String startDateStr = parmsUtil.getString("startDate", "请选择开始时间");
         String endDateStr = parmsUtil.getString("endDate", "请选择结束时间");
         LocalDateTime startDateTime = DateUtil.getDateTime(startDateStr);
         LocalDateTime endDateTime = DateUtil.getDateTime(endDateStr).plusDays(1);
-        List<Map<String, Object>> inventoryStatistics = inventoryService.getInventoryLogByGoodsId(goodsId, startDateTime, endDateTime);
+        List<InventoryLog> inventoryStatistics = inventoryService.getInventoryLogByGoodsId(goodsId, startDateTime, endDateTime);
         return success(inventoryStatistics);
     }
 
@@ -145,6 +173,10 @@ public class InventoryController extends BaseController {
     @ApiOperation("修改库存采购信息")
     @RecordCommonLog(operation = "更改采购单商品信息")
     @RequestMapping("/update")
+    @ApiParams({
+            @ApiParam(name = "list", value = "库存商品列表", required = true, type = Inventory.class,isArray = true)
+    })
+    @ApiReturn(isNull = true)
     public Result update() {
         List<Inventory> list = parmsUtil.getList("list", Inventory.class);
         inventoryService.updatePurchaseItem(list);

src/main/java/com/syjiaer/clinic/server/controller/inventory/InventoryPurchaseController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.util.CacheUtil;
 import com.syjiaer.clinic.server.common.util.StringUtil;
@@ -9,6 +12,7 @@ import com.syjiaer.clinic.server.controller.BaseController;
 import com.syjiaer.clinic.server.entity.inventory.Inventory;
 import com.syjiaer.clinic.server.entity.inventory.InventoryPurchase;
 import com.syjiaer.clinic.server.entity.inventory.dto.PurchaseOrderQuery;
+import com.syjiaer.clinic.server.entity.inventory.vo.InventoryOrderVo;
 import com.syjiaer.clinic.server.entity.inventory.vo.InventoryPurchaseVo;
 import com.syjiaer.clinic.server.service.inventory.InventoryPurchaseService;
 import io.swagger.annotations.ApiOperation;
@@ -42,6 +46,11 @@ public class InventoryPurchaseController extends BaseController {
     @ApiOperation("创建采购单")
     @RecordCommonLog(operation = "创建采购单")
     @RequestMapping("/create")
+    @ApiParams({
+            @ApiParam(name = "inventoryOrder", value = "采购单信息", required = true),
+            @ApiParam(name = "inventoryOrderGoodsList", value = "采购单商品列表", required = true, type = Inventory.class,isArray = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<Object> create() {
         InventoryPurchase purchase_order = parmsUtil.getObject("inventoryOrder", InventoryPurchase.class);
         List<Inventory> list = parmsUtil.getList("inventoryOrderGoodsList", Inventory.class, "请至少采购一件商品");
@@ -57,6 +66,10 @@ public class InventoryPurchaseController extends BaseController {
      */
     @ApiOperation("分页查询采购单")
     @RequestMapping("/list")
+    @ApiParams({
+            @ApiParam(name = "query", value = "查询条件",type = PurchaseOrderQuery.class, required = true)
+    })
+    @ApiReturn(type = InventoryPurchaseVo.class,isPage = true)
     public Result<Page<InventoryPurchaseVo>> list() {
         PurchaseOrderQuery query = parmsUtil.getObject("query", PurchaseOrderQuery.class);
 
@@ -68,10 +81,14 @@ public class InventoryPurchaseController extends BaseController {
      */
     @ApiOperation("获取采购单详情")
     @RequestMapping("/detail")
-    public Result<Map<String, Object>> detail() {
+    @ApiParams({
+            @ApiParam(name = "code", value = "采购单号", required = true)
+    })
+    @ApiReturn(type = InventoryPurchaseVo.class)
+    public Result<InventoryOrderVo> detail() {
         String code = parmsUtil.getString("code","采购单号不能为空");
-        Map<String, Object> byCode = inventoryPurchaseService.getByCode(code);
+        InventoryOrderVo inventoryOrderVo = inventoryPurchaseService.getByCode(code);
-        return success(byCode);
+        return success(inventoryOrderVo);
     }
 
     /**
@@ -81,6 +98,10 @@ public class InventoryPurchaseController extends BaseController {
     @ApiOperation("更新采购单基本信息")
     @RecordCommonLog(operation = "更新采购单基本信息")
     @RequestMapping("/update")
+    @ApiParams({
+            @ApiParam(name = "inventoryOrder", value = "采购单信息", type = InventoryPurchase.class, required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result update() {
         InventoryPurchase inventoryOrder = parmsUtil.getObject("inventoryOrder", InventoryPurchase.class);
         if (inventoryOrder.getInvoiceCode() == null || inventoryOrder.getInvoiceCode().isEmpty()) {
@@ -97,6 +118,10 @@ public class InventoryPurchaseController extends BaseController {
     @ApiOperation("采购单修改时 添加采购的商品")
     @RecordCommonLog(operation = "已有的采购单中添加商品")
     @RequestMapping("/addGoods")
+    @ApiParams({
+            @ApiParam(name = "data", value = "采购商品", type = Inventory.class, required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result addGoods() {
         Inventory inventory = parmsUtil.getObject("data", Inventory.class);
         if (inventory == null) {
@@ -117,6 +142,10 @@ public class InventoryPurchaseController extends BaseController {
     @ApiOperation("采购单退货")
     @RecordCommonLog(operation = "采购单退货")
     @RequestMapping("/refund")
+    @ApiParams({
+            @ApiParam(name = "idList", value = "退货商品id列表", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result refund() {
         List<Integer> list = parmsUtil.getIntList("idList");
         if (list == null || list.isEmpty()) {
@@ -133,6 +162,7 @@ public class InventoryPurchaseController extends BaseController {
     @ApiOperation("采购一键导入，生成excel")
 
     @RequestMapping("/toExcel")
+    @ApiReturn(name ="",value = "文件临时下载令牌")
     public Result toExcel() {
         List<Integer> cateIdList = parmsUtil.getIntList("cateIdList");
         String excelFilePath = inventoryPurchaseService.toExcel(cateIdList);
@@ -148,6 +178,10 @@ public class InventoryPurchaseController extends BaseController {
      */
     @ApiOperation("采购一键导入，解析excel")
     @RequestMapping("/fromExcel")
+    @ApiParams({
+            @ApiParam(name = "token", value = "文件临时下载令牌", required = true)
+    })
+    @ApiReturn(name ="",value = "文件解析结果")
     public Result fromExcel() {
         String file_token = parmsUtil.getString("token");
         Map<String,Object> map=cacheUtil.get(file_token);

src/main/java/com/syjiaer/clinic/server/controller/inventory/InventorySupplierController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.inventory;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
@@ -24,6 +27,10 @@ public class InventorySupplierController extends BaseController {
      */
     @ApiOperation("分页查询供货商")
     @RequestMapping("/list")
+    @ApiParams({
+            @ApiParam(name = "query", value = "查询条件", type = SupplierQuery.class, required = true)
+    })
+    @ApiReturn(type = InventorySupplier.class, isPage = true)
     public Result<Page> list() {
         SupplierQuery query= parmsUtil.getObject("query", SupplierQuery.class);
 
@@ -37,6 +44,10 @@ public class InventorySupplierController extends BaseController {
     @ApiOperation("保存供货商")
     @RecordCommonLog(operation = "保存供货商")
     @RequestMapping("/save")
+    @ApiParams({
+            @ApiParam(type = InventorySupplier.class,name="inventorySupplier", value = "供货商信息", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result save() {
         InventorySupplier inventorySupplier = parmsUtil.getObject("inventorySupplier", InventorySupplier.class);
         inventorySupplierService.saveOrUpdate(inventorySupplier);

src/main/java/com/syjiaer/clinic/server/controller/item/ItemController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.item;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
@@ -28,6 +31,13 @@ public class ItemController extends BaseController {
      */
     @ApiOperation("获取非组套列表")
     @RequestMapping("/list")
+    @ApiParams({
+            @ApiParam(name = "pageNum", value = "页码", required = true),
+            @ApiParam(name = "pageSize", value = "页容量", required = true),
+            @ApiParam(name = "name", value = "名称"),
+            @ApiParam(name = "tel", value = "电话")
+    })
+    @ApiReturn(type = Item.class,isPage = true)
     public Result<Page<Item>> getAllItems() {
         int page = parmsUtil.getInteger("pageNum", "页码不能为空");
         int size = parmsUtil.getInteger("pageSize", "页容量不能为空");
@@ -41,6 +51,11 @@ public class ItemController extends BaseController {
      */
     @ApiOperation("获取组套列表")
     @RequestMapping("/groupList")
+    @ApiParams({
+            @ApiParam(name = "page", value = "页码", required = true),
+            @ApiParam(name = "size", value = "页容量", required = true)
+    })
+    @ApiReturn(type = Item.class,isPage = true)
     public Result<Page<Item>> groupList() {
         int page = parmsUtil.getInteger("page", "页码不能为空");
         int size = parmsUtil.getInteger("size", "页容量不能为空");
@@ -53,6 +68,10 @@ public class ItemController extends BaseController {
      */
     @ApiOperation("获取项目详情")
     @RequestMapping("/get")
+    @ApiParams({
+            @ApiParam(name = "id", value = "项目id", required = true)
+    })
+    @ApiReturn(type = Item.class)
     public Result<Item> get() {
         Integer id = parmsUtil.getInteger("id");
         if (id == null) {
@@ -66,6 +85,10 @@ public class ItemController extends BaseController {
     @ApiOperation("添加项目")
     @RecordCommonLog(operation = "保存服务项目")
     @RequestMapping("/add")
+    @ApiParams({
+            @ApiParam(name = "data", value = "模型", required = true, type = Item.class)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> createItem() {
         Item item = parmsUtil.getObject("data", Item.class);
         itemService.save(item);
@@ -77,6 +100,10 @@ public class ItemController extends BaseController {
     @ApiOperation("修改项目")
     @RecordCommonLog(operation = "编辑服务项目")
     @RequestMapping("/edit")
+    @ApiParams({
+            @ApiParam(name = "data", value = "模型", required = true, type = Item.class)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> updateItem() {
         Item item = parmsUtil.getObject("data", Item.class);
         itemService.updateItem(item);
@@ -88,6 +115,10 @@ public class ItemController extends BaseController {
      */
     @ApiOperation("删除项目")
     @RequestMapping("/del")
+    @ApiParams({
+            @ApiParam(name = "id", value = "项目id", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> del() {
         Integer id = parmsUtil.getInteger("id");
         itemService.delete(id);
@@ -98,6 +129,10 @@ public class ItemController extends BaseController {
      */
     @ApiOperation("搜索项目")
     @RequestMapping("/search")
+    @ApiParams({
+            @ApiParam(name = "keyword", value = "关键字", required = true)
+    })
+    @ApiReturn(type = ItemSearchVo.class,isArray = true)
     public Result<List<ItemSearchVo>> search() {
         String keyword = parmsUtil.getString("keyword");
 
@@ -108,6 +143,11 @@ public class ItemController extends BaseController {
      */
     @ApiOperation("保存组套")
     @RequestMapping("/saveGroup")
+    @ApiParams({
+            @ApiParam(name = "list", value = "组套", required = true),
+            @ApiParam(name = "info", value = "组套信息", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> saveGroup() {
         List<ItemGroupList> itemGroupList = parmsUtil.getList("list", ItemGroupList.class,"请求参数list不能为空");
 
@@ -122,6 +162,9 @@ public class ItemController extends BaseController {
      */
     @ApiOperation("获取组套")
     @RequestMapping("/getGroup")
+    @ApiParams({
+            @ApiParam(name = "id", value = "项目id", required = true)
+    })
     public Result<?> getGroup() {
         Integer itemId = parmsUtil.getInteger("id","item_id为空");
         return success(itemService.getGroup(itemId));
@@ -131,6 +174,10 @@ public class ItemController extends BaseController {
      */
     @ApiOperation("删除组套")
     @RequestMapping("/deleteGroup")
+    @ApiParams({
+            @ApiParam(name = "id", value = "项目id", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> deleteGroup() {
         Integer itemId = parmsUtil.getInteger("id","item_id为空");
 

src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationMemberController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.organization;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
@@ -24,6 +27,13 @@ public class OrganizationMemberController extends BaseController {
 
     @ApiOperation("分页查询成员列表")
     @RequestMapping("/list")
+    @ApiParams({
+            @ApiParam(name = "page", value = "页码", required = true),
+            @ApiParam(name = "size", value = "页容量", required = true),
+            @ApiParam(name = "name", value = "名称"),
+            @ApiParam(name = "tel", value = "电话")
+    })
+    @ApiReturn(type = OrganizationMemberSaveDto.class,isPage = true)
     public Result<Page<OrganizationMemberSaveDto>> list() {
         int page = parmsUtil.getInteger("page","页码不能为空");
         int size = parmsUtil.getInteger("size", "页容量不能为空");
@@ -34,6 +44,10 @@ public class OrganizationMemberController extends BaseController {
 
     @ApiOperation("保存成员信息")
     @RequestMapping("/save")
+    @ApiParams({
+            @ApiParam(name = "data", value = "模型", required = true, type = OrganizationMemberSaveDto.class)
+    })
+    @ApiReturn(isNull = true)
     @RecordCommonLog(operation = "保存成员信息")
     public Result<?> save() {
         OrganizationMemberSaveDto dto = parmsUtil.getObject("data", OrganizationMemberSaveDto.class);
@@ -47,6 +61,10 @@ public class OrganizationMemberController extends BaseController {
     @ApiOperation("删除成员")
     @RequestMapping("/del")
     @RecordCommonLog(operation = "删除成员")
+    @ApiParams({
+            @ApiParam(name = "id", value = "成员id", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> del() {
         Integer id = parmsUtil.getInteger("id");
         if(id == null){
@@ -58,6 +76,10 @@ public class OrganizationMemberController extends BaseController {
 
     @ApiOperation("获取成员信息")
     @RequestMapping("/get")
+    @ApiParams({
+            @ApiParam(name = "id", value = "成员id", required = true)
+    })
+    @ApiReturn(type = OrganizationMemberSaveDto.class)
     public Result<OrganizationMemberSaveDto> get() {
         Integer id = parmsUtil.getInteger("id","id不能为空");
         return success(organizationMemberService.get(id));
@@ -66,6 +88,10 @@ public class OrganizationMemberController extends BaseController {
 
     @ApiOperation("搜索成员")
     @RequestMapping("/search")
+    @ApiParams({
+            @ApiParam(name = "query", value = "查询参数", required = true, type = DockerSearchQuery.class)
+    })
+    @ApiReturn(type = OrganizationMember.class,isArray = true)
     public Result<List<OrganizationMember>> search() {
         DockerSearchQuery dockerSearchQuery = parmsUtil.getObject("query", DockerSearchQuery.class);
         return success(organizationMemberService.doctorList(dockerSearchQuery));
@@ -77,6 +103,10 @@ public class OrganizationMemberController extends BaseController {
      */
     @ApiOperation("获取当前科室的所有医生")
     @RequestMapping("/listBySectionId")
+    @ApiParams({
+            @ApiParam(name = "sectionId", value = "科室id", required = true)
+    })
+    @ApiReturn(type = OrganizationMember.class,isArray = true)
     public Result<List<OrganizationMember>> listBySectionId() {
         Integer sectionId = parmsUtil.getInteger("sectionId");
         if(sectionId == null){

src/main/java/com/syjiaer/clinic/server/controller/organization/OrganizationSectionController.java

@@ -1,6 +1,9 @@
 package com.syjiaer.clinic.server.controller.organization;
 
 import com.alibaba.fastjson.JSONObject;
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.util.StringUtil;
@@ -22,8 +25,17 @@ public class OrganizationSectionController extends BaseController {
     @Autowired
     private OrganizationSectionService organizationSectionService;
 
-    @RecordCommonLog(operation = "分页查询科室列表")
+    @ApiOperation("分页查询科室列表")
     @RequestMapping("/list")
+    @ApiParams({
+            @ApiParam(name = "page", value = "页码", required = true),
+            @ApiParam(name = "size", value = "页容量", required = true),
+            @ApiParam(name = "name", value = "名称"),
+            @ApiParam(name = "caty", value = "科别"),
+            @ApiParam(name = "resperName", value = "负责人姓名"),
+            @ApiParam(name = "resperTel", value = "负责人电话")
+    })
+    @ApiReturn(type = OrganizationSection.class,isPage = true)
     public Result<Page<OrganizationSection>> list() {
         int page = parmsUtil.getInteger("page","页码不能为空");
         int size = parmsUtil.getInteger("size", "页容量不能为空");
@@ -37,6 +49,10 @@ public class OrganizationSectionController extends BaseController {
     @ApiOperation("添加科室")
     @RecordCommonLog(operation = "添加科室")
     @RequestMapping("/add")
+    @ApiParams({
+            @ApiParam(name = "data", value = "模型", required = true, type = OrganizationSection.class)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> add() {
         OrganizationSection organizationSection = parmsUtil.getObjectWithCheck("data", OrganizationSection.class);
 
@@ -49,6 +65,10 @@ public class OrganizationSectionController extends BaseController {
     @ApiOperation("修改科室信息")
     @RecordCommonLog(operation = "修改科室信息")
     @RequestMapping("/edit")
+    @ApiParams({
+            @ApiParam(name = "data", value = "模型", required = true, type = OrganizationSection.class)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> edit() {
         OrganizationSection organizationSection = parmsUtil.getObjectWithCheck("data", OrganizationSection.class);
         if(organizationSection ==null){
@@ -61,6 +81,10 @@ public class OrganizationSectionController extends BaseController {
     @ApiOperation("删除科室")
     @RecordCommonLog(operation = "删除科室")
     @RequestMapping("/del")
+    @ApiParams({
+            @ApiParam(name = "id", value = "科室id", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> del() {
         Integer id = parmsUtil.getInteger("id");
         if(id == null){
@@ -73,6 +97,10 @@ public class OrganizationSectionController extends BaseController {
 
     @ApiOperation("获取科室信息")
     @RequestMapping("/get")
+    @ApiParams({
+            @ApiParam(name = "id", value = "科室id", required = true)
+    })
+    @ApiReturn(type = OrganizationSection.class)
     public Result<OrganizationSection> get() {
         Integer id = parmsUtil.getInteger("id");
         if(id == null){

src/main/java/com/syjiaer/clinic/server/controller/patient/PatientController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.patient;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
@@ -32,6 +35,10 @@ public class PatientController extends BaseController {
     @ApiOperation("创建患者")
     @RequestMapping("/create")
     @RecordCommonLog(operation = "创建患者")
+    @ApiParams({
+            @ApiParam(name = "data", value = "模型", required = true, type = PatientInfo.class)
+    })
+    @ApiReturn(isNull = true)
     public Result<Object> create() {
         PatientInfo patientInfo = parmsUtil.getObject("vipInfo", PatientInfo.class);
         patientInfoService.create(patientInfo);
@@ -42,6 +49,10 @@ public class PatientController extends BaseController {
     @ApiOperation("修改患者信息")
     @RecordCommonLog(operation = "修改患者信息")
     @RequestMapping("/update")
+    @ApiParams({
+            @ApiParam(name = "vipInfo", value = "患者信息", required = true, type = PatientInfo.class)
+    })
+    @ApiReturn(isNull = true)
     public Result<Object> update() {
         PatientInfo patientInfo = parmsUtil.getObject("vipInfo", PatientInfo.class);
         patientInfoService.update(patientInfo);
@@ -52,6 +63,10 @@ public class PatientController extends BaseController {
     @ApiOperation("删除患者")
     @RequestMapping("/del")
     @RecordCommonLog(operation = "删除患者")
+    @ApiParams({
+            @ApiParam(name = "id", value = "患者ID", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<Integer> del() {
         int patientId = parmsUtil.getInteger("id", "ID不能为空");
         return success(patientInfoService.removeById(patientId));
@@ -60,6 +75,12 @@ public class PatientController extends BaseController {
 
     @ApiOperation("分页查询患者列表")
     @RequestMapping("/list")
+    @ApiParams({
+            @ApiParam(name = "keyword", value = "关键字"),
+            @ApiParam(name = "pageNum", value = "页码", required = true),
+            @ApiParam(name = "pageSize", value = "页容量", required = true)
+    })
+    @ApiReturn(type = PatientInfo.class,isArray = true)
     public Result<Page<PatientInfo>> selectList() {
         String keyword = parmsUtil.getString("keyword");
         int page = parmsUtil.getInteger("page", "请输入页码");
@@ -70,6 +91,10 @@ public class PatientController extends BaseController {
 
     @ApiOperation("获取患者信息")
     @RequestMapping("/get")
+    @ApiParams({
+            @ApiParam(name = "id", value = "患者id", required = true, type = Integer.class)
+    })
+    @ApiReturn(type = PatientInfo.class)
     public Result<PatientInfo> get() {
         int id = parmsUtil.getInteger("id", "ID不能为空");
         PatientInfo patientInfo = patientInfoService.getById(id);
@@ -78,6 +103,12 @@ public class PatientController extends BaseController {
 
     @ApiOperation("搜索患者")
     @RequestMapping("/search")
+    @ApiParams({
+            @ApiParam(name = "keyword", value = "关键字", required = true),
+            @ApiParam(name = "pageNum", value = "页码", required = true),
+            @ApiParam(name = "pageSize", value = "页容量", required = true),
+    })
+    @ApiReturn(type = PatientInfo.class,isArray = true)
     public Result<List<PatientInfo>> search() {
         String keyword = parmsUtil.getString("keyword", "关键字不能为空");
         List<PatientInfo> list = patientInfoService.search(keyword);
@@ -88,6 +119,11 @@ public class PatientController extends BaseController {
     @ApiOperation("改变会员等级")
     @RecordCommonLog(operation = "改变会员等级")
     @RequestMapping("/changeLevel")
+    @ApiParams({
+            @ApiParam(name = "vipId", value = "会员ID", required = true),
+            @ApiParam(name = "levelId", value = "会员等级ID", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<Object> changeLevel() {
         int vipId = parmsUtil.getInteger("vipId", "会员ID不能为空");
         int levelId = parmsUtil.getInteger("levelId", "等级id不能为空");

src/main/java/com/syjiaer/clinic/server/controller/patient/PatientIntegralController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.patient;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.vo.Page;
 import com.syjiaer.clinic.server.common.vo.Result;
@@ -25,6 +28,12 @@ public class PatientIntegralController extends BaseController {
     @ApiOperation("添加会员积分")
     @RecordCommonLog(operation = "添加会员积分")
     @RequestMapping("/add")
+    @ApiParams({
+            @ApiParam(name = "patientId", value = "会员ID", required = true),
+            @ApiParam(name = "integral", value = "积分", required = true),
+            @ApiParam(name = "remark", value = "备注")
+    })
+    @ApiReturn(isNull = true)
     public Result add(){
         Integer vipId = parmsUtil.getInteger("vipId","请输入会员id");
         Integer Integral = parmsUtil.getInteger("integral","请输入积分");
@@ -35,6 +44,12 @@ public class PatientIntegralController extends BaseController {
 
     @ApiOperation("分页查询会员积分记录")
     @RequestMapping("/list")
+    @ApiParams({
+        @ApiParam(name = "vipId", value = "会员id", required = true),
+        @ApiParam(name = "pageNum", value = "页码", required = true),
+        @ApiParam(name = "pageSize", value = "每页数量", required = true)
+    })
+    @ApiReturn(type = VipIntegralLog.class,isArray = true)
     public Result<Page<VipIntegralLog>> listByVipId(){
         VipIntegralLogQuery query = parmsUtil.getObject("query", VipIntegralLogQuery.class);
         Page<VipIntegralLog> page = vipIntegralLogService.pageList(query);

src/main/java/com/syjiaer/clinic/server/controller/patient/PatientLevelConfigController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.patient;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
@@ -30,6 +33,10 @@ public class PatientLevelConfigController extends BaseController {
     @ApiOperation("新增会员等级配置")
     @RecordCommonLog(operation = "创建会员等级配置")
     @RequestMapping("/create")
+    @ApiParams({
+            @ApiParam(name = "vipLevelConfig", value = "会员等级配置", required = true, type = VipLevelConfig.class)
+    })
+    @ApiReturn(isNull = true)
     public Result<Object> create() {
         VipLevelConfig levelConfig = parmsUtil.getObject("vipLevelConfig", VipLevelConfig.class);
         vipLevelConfigService.create(levelConfig);
@@ -39,6 +46,10 @@ public class PatientLevelConfigController extends BaseController {
     @ApiOperation("修改会员等级配置")
     @RecordCommonLog(operation = "修改会员等级配置")
     @RequestMapping("/edit")
+    @ApiParams({
+            @ApiParam(name = "vipLevelConfig", value = "会员等级配置", required = true, type = VipLevelConfig.class)
+    })
+    @ApiReturn(isNull = true)
     public Result<Object> edit() {
         VipLevelConfig levelConfig = parmsUtil.getObject("vipLevelConfig", VipLevelConfig.class);
 
@@ -51,6 +62,10 @@ public class PatientLevelConfigController extends BaseController {
     @ApiOperation("保存会员等级配置")
     @RecordCommonLog(operation = "保存会员等级配置")
     @RequestMapping("/save")
+    @ApiParams({
+            @ApiParam(name = "vipLevelConfig", value = "会员等级配置", required = true, type = VipLevelConfig.class)
+    })
+    @ApiReturn(isNull = true)
     public Result<Object> save() {
         List<VipLevelConfig> levelConfigList = parmsUtil.getList("vipLevelConfig", VipLevelConfig.class);
         vipLevelConfigService.save(levelConfigList);
@@ -61,6 +76,10 @@ public class PatientLevelConfigController extends BaseController {
     @ApiOperation("删除一个会员等级配置")
     @RecordCommonLog(operation = "删除一个会员等级配置")
     @RequestMapping("/del")
+    @ApiParams({
+            @ApiParam(name = "id", value = "会员等级配置ID", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<Object> del() {
         int id = parmsUtil.getInteger("id", "ID不能为空");
         vipLevelConfigService.delete(id);
@@ -70,6 +89,7 @@ public class PatientLevelConfigController extends BaseController {
 
     @ApiOperation("分页查询会员等级配置")
     @RequestMapping("/list")
+    @ApiReturn(type = VipLevelConfig.class,isArray = true)
     public Result<List<VipLevelConfig>> selectList() {
 
         List<VipLevelConfig> list = vipLevelConfigService.list();

src/main/java/com/syjiaer/clinic/server/controller/patient/RegistrationController.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.controller.patient;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.annotations.RecordCommonLog;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.common.vo.Page;
@@ -34,6 +37,12 @@ public class RegistrationController extends BaseController {
     @RecordCommonLog(operation = "挂号")
     @RequestMapping("/add")
     @ApiOperation("挂号")
+    @ApiParams({
+            @ApiParam(name = "registrationParam", value = "挂号参数", required = true, type = RegistrationSaveDto.class),
+            @ApiParam(name = "mdtrtCertType", value = "证件类型", required = true),
+            @ApiParam(name = "mdtrtCertNo", value = "证件号码", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> add() {
 
         RegistrationSaveDto registrationParam = parmsUtil.getObjectWithCheck("data", RegistrationSaveDto.class);
@@ -49,6 +58,13 @@ public class RegistrationController extends BaseController {
      */
     @ApiOperation("分页查询挂号列表")
     @RequestMapping("/list")
+    @ApiParams({
+            @ApiParam(name = "pageNum", value = "页码", required = true),
+            @ApiParam(name = "pageSize", value = "每页数量", required = true),
+            @ApiParam(name = "doctorId", value = "医生id"),
+            @ApiParam(name = "startDate", value = "开始时间"),
+            @ApiParam(name = "endDate", value = "结束时间"),
+    })
     public Result<Page<PatientRegistration>> list() {
         int page = parmsUtil.getInteger("page", "页码不能为空");
         int size = parmsUtil.getInteger("size", "页容量不能为空");
@@ -64,6 +80,10 @@ public class RegistrationController extends BaseController {
     @ApiOperation("取消挂号")
     @RecordCommonLog(operation = "取消挂号")
     @RequestMapping("/cancel")
+    @ApiParams({
+            @ApiParam(name = "id", value = "挂号id", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> cancel() {
         Integer id = parmsUtil.getInteger("id");
         patientRegistrationService.cancel(id);
@@ -77,6 +97,10 @@ public class RegistrationController extends BaseController {
     @ApiOperation("修改挂号信息")
     @RecordCommonLog(operation = "修改挂号信息")
     @RequestMapping("/edit")
+    @ApiParams({
+            @ApiParam(name = "data", value = "挂号信息", required = true, type = PatientRegistration.class)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> edit() {
         PatientRegistration registration = parmsUtil.getObjectWithCheck("data", PatientRegistration.class);
         if (registration == null) {
@@ -94,6 +118,10 @@ public class RegistrationController extends BaseController {
     @ApiOperation("删除挂号信息")
     @RecordCommonLog(operation = "删除挂号信息")
     @RequestMapping("/del")
+    @ApiParams({
+            @ApiParam(name = "id", value = "挂号id", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<?> del() {
         Integer id = parmsUtil.getInteger("id");
         if (id == null) {
@@ -109,6 +137,10 @@ public class RegistrationController extends BaseController {
      */
     @ApiOperation("获取挂号信息 根据挂号id")
     @RequestMapping("/get")
+    @ApiParams({
+            @ApiParam(name = "id", value = "挂号id", required = true)
+    })
+    @ApiReturn(type = PatientRegistrationVo.class)
     public Result<PatientRegistrationVo> get() {
         Integer id = parmsUtil.getInteger("id");
         if (id == null) {
@@ -120,6 +152,7 @@ public class RegistrationController extends BaseController {
 
     @ApiOperation("获取挂号信息列表")
     @RequestMapping("/allList")
+    @ApiReturn(type = PatientRegistration.class, isArray = true)
     public Result<List<PatientRegistration>> allList() {
         List<PatientRegistration> list = patientRegistrationService.listAll();
         return success(list);
@@ -131,6 +164,9 @@ public class RegistrationController extends BaseController {
      */
     @ApiOperation("挂号信息分页搜索")
     @RequestMapping("/listByType")
+    @ApiParams({
+            @ApiParam(name = "query", value = "挂号信息",  type = RegistrationQuery.class, required = true)
+    })
     public Result<Page<PatientRegistration>> listByType() {
         RegistrationQuery query = parmsUtil.getObject("query", RegistrationQuery.class);
         return success(patientRegistrationService.getListByType(query));
@@ -155,6 +191,11 @@ public class RegistrationController extends BaseController {
     @ApiOperation("更改挂号单状态")
     @RecordCommonLog(operation = "更改挂号单状态")
     @RequestMapping("/changeStatus")
+    @ApiParams({
+            @ApiParam(name = "id", value = "挂号单id", required = true),
+            @ApiParam(name = "status", value = "挂号单状态", required = true)
+    })
+    @ApiReturn(isNull = true)
     public Result<PatientRegistration> changeStatus(){
         Integer regisId= parmsUtil.getInteger("id","挂号单不能为空");
         Integer status= parmsUtil.getInteger("status","目标状态");

src/main/java/com/syjiaer/clinic/server/controller/social/SocialChineseMedicinalGranulaController.java

@@ -1,7 +1,11 @@
 package com.syjiaer.clinic.server.controller.social;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.exception.MessageException;
 import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.patient.dto.RegistrationSaveDto;
 import com.syjiaer.clinic.server.service.social.SocialChineseMedicinalGranulaService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +19,10 @@ public class SocialChineseMedicinalGranulaController extends BaseController {
     private SocialChineseMedicinalGranulaService socialChineseMedicinalGranulaService;
     @RequestMapping("download")
     @ApiOperation("下载中药颗粒")
+    @ApiParams({
+            @ApiParam(name = "version", value = "版本号", required = true, type = RegistrationSaveDto.class),
+    })
+    @ApiReturn(name = "版本号",value = "version",  type = String.class)
     public String download() {
         String version = parmsUtil.getString("version");
         if (version == null || version.isEmpty()) {

src/main/java/com/syjiaer/clinic/server/controller/social/SocialChronicDiseaseController.java

@@ -1,7 +1,11 @@
 package com.syjiaer.clinic.server.controller.social;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
 import com.syjiaer.clinic.server.common.vo.Result;
+import com.syjiaer.clinic.server.entity.patient.dto.RegistrationSaveDto;
 import com.syjiaer.clinic.server.service.social.SocialChronicDiseaseService;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -12,6 +16,7 @@ public class SocialChronicDiseaseController {
     @Autowired
     private SocialChronicDiseaseService socialChronicDiseaseService;
     @RequestMapping("download")
+    @ApiOperation("下载中医疾病(没有用)")
     public Result download() {
 //        return socialChronicDiseaseService.download();
         return null;

src/main/java/com/syjiaer/clinic/server/controller/social/SocialDiagnoseController.java

@@ -1,7 +1,11 @@
 package com.syjiaer.clinic.server.controller.social;
 
+import com.syjiaer.clinic.server.common.annotations.ApiParam;
+import com.syjiaer.clinic.server.common.annotations.ApiParams;
+import com.syjiaer.clinic.server.common.annotations.ApiReturn;
 import com.syjiaer.clinic.server.common.vo.Result;
 import com.syjiaer.clinic.server.controller.BaseController;
+import com.syjiaer.clinic.server.entity.patient.dto.RegistrationSaveDto;
 import com.syjiaer.clinic.server.entity.social.SocialDiagnose;
 import com.syjiaer.clinic.server.service.social.SocialDiagnoseService;
 import io.swagger.annotations.ApiOperation;
@@ -19,6 +23,10 @@ public class SocialDiagnoseController extends BaseController {
 
     @ApiOperation("诊断搜索")
     @RequestMapping("search")
+    @ApiParams({
+            @ApiParam(name = "keyword", value = "关键字", required = true, type = String.class),
+    })
+    @ApiReturn(name = "诊断列表",value = "diagnosis",  isArray = true ,type = SocialDiagnose.class)
     public Result<List<SocialDiagnose>> getDiagnosis() {
         String keyword = parmsUtil.getString("keyword");
         List<SocialDiagnose> diagnosis = socialDiagnoseService.getDiagnosis(keyword);

src/main/java/com/syjiaer/clinic/server/entity/inventory/vo/InventoryGoodsTotalVo.java

@@ -0,0 +1,45 @@
+package com.syjiaer.clinic.server.entity.inventory.vo;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.syjiaer.clinic.server.entity.inventory.Inventory;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author NiuZiYuan
+ * @since 2025-03-10
+ */
+@Getter
+@Setter
+@ToString
+@Accessors(chain = true)
+@TableName("inventory_goods_view")
+@ApiModel(value = "库存信息", description = "")
+public class InventoryGoodsTotalVo implements Serializable {
+    @ApiModelProperty("库存商品列表")
+    List<Inventory> inventoryGoodsList;
+    @ApiModelProperty("库存商品总数量")
+    private int wholeNumber;
+    @ApiModelProperty("库存商品总分数")
+    private int fragmentNumber;
+    @ApiModelProperty("库存商品总分数")
+    private int totalFragment;
+    @ApiModelProperty("库存商品列表大小")
+    private int listSize;
+
+
+}

src/main/java/com/syjiaer/clinic/server/entity/inventory/vo/InventoryOrderVo.java

@@ -0,0 +1,14 @@
+package com.syjiaer.clinic.server.entity.inventory.vo;
+
+import com.syjiaer.clinic.server.entity.inventory.Inventory;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+@Data
+public class InventoryOrderVo {
+    @ApiModelProperty("采购单信息")
+    private InventoryPurchaseVo inventoryOrder;
+    @ApiModelProperty("采购单商品列表")
+    private List<InventoryGoodsVo> inventoryOrderGoodsList;
+}

src/main/java/com/syjiaer/clinic/server/entity/inventory/vo/InventoryPurchaseVo.java

@@ -2,7 +2,9 @@ package com.syjiaer.clinic.server.entity.inventory.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.syjiaer.clinic.server.entity.inventory.InventoryPurchase;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -26,31 +28,10 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 @TableName("inventory_purchase_view")
 @ApiModel(value = "InventoryPurchaseView对象", description = "")
-public class InventoryPurchaseVo implements Serializable {
+public class InventoryPurchaseVo extends InventoryPurchase {
-
-    private static final long serialVersionUID = 1L;
-
-    private String code;
-
-    private Integer managerUserId;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime purchaseDate;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime createDatetime;
-
-    private Integer supplierId;
-
-    private String remark;
-
-    private String shippingCode;
-
-    private String invoiceCode;
-
-    private Integer kindCount;
-
-    private BigDecimal totalPrice;
 
+    @ApiModelProperty("管理员名称")
     private String managerUserName;
-
+    @ApiModelProperty("供应商名称")
     private String supplierName;
 }

src/main/java/com/syjiaer/clinic/server/entity/item/param/ItemParam.java

@@ -1,10 +1,14 @@
 package com.syjiaer.clinic.server.entity.item.param;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class ItemParam {
+    @ApiModelProperty("项目id")
     private Integer id;
+    @ApiModelProperty("项目名称")
     private String name;
+    @ApiModelProperty("项目单位")
     private String unit;
 }

src/main/java/com/syjiaer/clinic/server/entity/item/vo/ItemSearchVo.java

@@ -1,54 +1,14 @@
 package com.syjiaer.clinic.server.entity.item.vo;
 
+import com.syjiaer.clinic.server.entity.item.Item;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 @Data
-public class ItemSearchVo {
+public class ItemSearchVo  extends Item {
 
-    @ApiModelProperty("自增主键")
-    private Integer id;
-
-    @ApiModelProperty("项目创建时间")
-    private LocalDateTime createDatetime;
-
-    @ApiModelProperty("项目创建人")
-    private String createBy;
-
-    @ApiModelProperty("项目修改时间")
-    private LocalDateTime updateDatetime;
-
-    @ApiModelProperty("项目修改人")
-    private String updateBy;
-
-    @ApiModelProperty("项目名称")
-    private String name;
-
-    @ApiModelProperty("项目医保目录编码")
-    private String socialCode;
-
-    @ApiModelProperty("单位")
-    private String unit;
-
-    @ApiModelProperty("售价")
-    private BigDecimal unitPrice;
-
-    @ApiModelProperty("进货价")
-    private BigDecimal purchaseUnitPrice;
-
-    @ApiModelProperty("逻辑删除")
-    private Integer delFlag;
-
-    @ApiModelProperty("使用次数")
-    private Integer useNum;
-
-    @ApiModelProperty("全拼")
-    private String pinyinFull;
-
-    @ApiModelProperty("拼音首字母")
-    private String pinyinFirst;
 
     @ApiModelProperty("甲乙丙类")
     private String chrgitmLv;

src/main/java/com/syjiaer/clinic/server/entity/organization/dto/DockerSearchQuery.java

@@ -1,12 +1,14 @@
 package com.syjiaer.clinic.server.entity.organization.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
-public class DockerSearchQuery {
+public class DockerSearchQuery extends PageQuery {
-    private Integer pageNum;
+    @ApiModelProperty("关键字")
-    private Integer pageSize;
     private String keyword;
+    @ApiModelProperty("角色")
     private Integer role;
 
 

src/main/java/com/syjiaer/clinic/server/entity/organization/dto/OrganizationMemberSaveDto.java

@@ -2,13 +2,17 @@ package com.syjiaer.clinic.server.entity.organization.dto;
 
 import com.syjiaer.clinic.server.entity.manager.ManagerUser;
 import com.syjiaer.clinic.server.entity.organization.OrganizationMember;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class OrganizationMemberSaveDto {
+    @ApiModelProperty("成员信息")
     private OrganizationMember memberInfo;
+    @ApiModelProperty("科室ids")
     private List<Integer> sectionIds;
+    @ApiModelProperty("用户信息")
     private ManagerUser userInfo;
 }

src/main/java/com/syjiaer/clinic/server/entity/organization/vo/MemberVo.java

@@ -1,54 +0,0 @@
-package com.syjiaer.clinic.server.entity.organization.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-@Data
-public class MemberVo {
-    @ApiModelProperty("自增主键")
-    private Integer id;
-
-    @ApiModelProperty("成员电话")
-    private String tel;
-
-    @ApiModelProperty("医保人员代码")
-    private String socialMemberCode;
-
-    @ApiModelProperty("电子签名")
-    private String electronicSignature;
-
-    @ApiModelProperty("性别")
-    private String gender;
-
-    @ApiModelProperty("年龄")
-    private String age;
-
-    @ApiModelProperty("创建时间")
-    private LocalDateTime createDatetime;
-
-    @ApiModelProperty("身份证号")
-    private String idCardNumber;
-
-    @ApiModelProperty("所属科室")
-    private Integer sectionId;
-
-    @ApiModelProperty("备注")
-    private String memo;
-
-    @ApiModelProperty("管理员id")
-    private Integer managerUserId;
-
-    @ApiModelProperty("成员名")
-    private String name;
-
-    @ApiModelProperty("角色")
-    private Integer role;
-
-    @ApiModelProperty("删除标记")
-    private Boolean delFlag;
-
-    @ApiModelProperty("科室名称")
-    private String sectionName;
-
-}

src/main/java/com/syjiaer/clinic/server/entity/patient/dto/RegistrationQuery.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.patient.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,11 +9,13 @@ import java.time.LocalDateTime;
 
 @Getter
 @Setter
-public class RegistrationQuery {
+public class RegistrationQuery extends PageQuery {
+    @ApiModelProperty("挂号状态 1候诊 2在诊 3已诊 0取消")
     private Integer status;
-    private Integer pageNum ;
+    @ApiModelProperty("关键字")
-    private Integer pageSize ;
     private String keyword;
+    @ApiModelProperty("开始时间")
     private LocalDateTime beginTime;
+    @ApiModelProperty("结束时间")
     private LocalDateTime endTime;
 }

src/main/java/com/syjiaer/clinic/server/entity/patient/vo/PatientAndRegistrationInfoVo.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.patient.vo;
 
+import com.syjiaer.clinic.server.entity.patient.PatientInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -8,29 +9,9 @@ import java.time.LocalDateTime;
 
 @Getter
 @Setter
-public class PatientAndRegistrationInfoVo {
+public class PatientAndRegistrationInfoVo extends PatientInfo {
-    @ApiModelProperty("自增id")
-    private Integer id;
-
-    @ApiModelProperty("患者姓名")
-    private String name;
-
-    @ApiModelProperty("手机号")
-    private String phone;
-
-    @ApiModelProperty("身份证号")
-    private String certno;
-
-    @ApiModelProperty("性别")
-    private String sex;
-
-    @ApiModelProperty("年龄")
-    private Integer age;
-
     @ApiModelProperty("就诊次数")
     private Integer visitCount;
-    @ApiModelProperty("上次就诊时间")
-    private LocalDateTime lastVisitTime;
     @ApiModelProperty("挂号医生姓名")
     private String doctorName;
     @ApiModelProperty("挂号医生科室")

src/main/java/com/syjiaer/clinic/server/entity/patient/vo/PatientRegistrationVo.java

@@ -1,75 +1,13 @@
 package com.syjiaer.clinic.server.entity.patient.vo;
 
+import com.syjiaer.clinic.server.entity.patient.PatientRegistration;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 @Data
-public class PatientRegistrationVo {
+public class PatientRegistrationVo extends PatientRegistration {
-
-    @ApiModelProperty("挂号id")
-    private Integer id;
-
-    @ApiModelProperty("科室id")
-    private Integer organizationSectionId;
-
-    @ApiModelProperty("医生id")
-    private Integer organizationDoctorId;
-
-    @ApiModelProperty("患者姓名")
-    private String name;
-
-    @ApiModelProperty("患者年龄")
-    private Integer age;
-
-    @ApiModelProperty("患者手机号")
-    private String phone;
-
-    @ApiModelProperty("就诊类型 初诊 复诊")
-    private Short visitType;
-
-    @ApiModelProperty("挂号时间")
-    private LocalDateTime createDatetime;
-
-    @ApiModelProperty("推荐")
-    private String recommendations;
-
-    @ApiModelProperty("备注")
-    private String memo;
-
-    @ApiModelProperty("预诊")
-    private String advanceDiagnosis;
-
-    @ApiModelProperty("挂号费")
-    private BigDecimal registrationMoney;
-
-    @ApiModelProperty("逻辑删除")
-    private Integer delFlag;
-
-    @ApiModelProperty("挂号类型 1普通挂号 2医保挂号")
-    private Integer type;
-
-    @ApiModelProperty("1男 2女")
-    private Integer gender;
-
-    @ApiModelProperty("病人id")
-    private Integer patientInfoId;
-
-    @ApiModelProperty("挂号状态 1候诊 2在诊 3已诊 0取消")
-    private Integer status;
-
-    @ApiModelProperty("人员编号")
-    private String psnNo;
-
-    @ApiModelProperty("险种类型")
-    private String insutype;
-
-    @ApiModelProperty("就诊id 挂号后医保返会")
-    private String mdtrtId;
-
-    @ApiModelProperty("流水号")
-    private String fstNo;
 
     @ApiModelProperty("证件类型")
     private String certType;

src/main/java/com/syjiaer/clinic/server/entity/patient/vo/SeeDoctorInfoVo.java

@@ -1,6 +1,7 @@
 package com.syjiaer.clinic.server.entity.patient.vo;
 
 import com.syjiaer.clinic.server.entity.patient.PatientInfo;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -8,20 +9,28 @@ import java.time.LocalDateTime;
 @Data
 public class SeeDoctorInfoVo {
     //患者信息
+    @ApiModelProperty("患者信息")
     private PatientInfo patientInfo;
     //挂号医生id
+    @ApiModelProperty("挂号医生id")
     private Integer dockerId;
     //挂号医生姓名
+    @ApiModelProperty("挂号医生姓名")
     private String dockerName;
     //挂号类型
+    @ApiModelProperty("挂号类型")
     private Integer registerType;
     //医生科室名称
+    @ApiModelProperty("医生科室名称")
     private String sectionName;
     //上一次接诊时间
+    @ApiModelProperty("上一次接诊时间")
     private LocalDateTime lastSeeDoctorTime;
     //就诊次数
+    @ApiModelProperty("就诊次数")
     private Integer seeDoctorCount;
     //医保余额
+    @ApiModelProperty("医保余额")
     private BigDecimal socialBalance;
 
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryInitQuery.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.social.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,12 +9,15 @@ import java.time.LocalDateTime;
 
 @Getter
 @Setter
-public class InventoryInitQuery {
+public class InventoryInitQuery extends PageQuery {
-    private Integer pageNum;
+    @ApiModelProperty("上传状态")
-    private Integer pageSize;
     private Integer uploadStatus;
+    @ApiModelProperty("类型")
     private Integer type;
+    @ApiModelProperty("医保码")
     private String code;
+    @ApiModelProperty("创建时间")
     private LocalDateTime createTimeBefore;
+    @ApiModelProperty("创建时间")
     private LocalDateTime createTimeAfter;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryLogQuery.java

@@ -1,5 +1,7 @@
 package com.syjiaer.clinic.server.entity.social.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,11 +9,15 @@ import java.time.LocalDateTime;
 
 @Getter
 @Setter
-public class InventoryLogQuery {
+public class InventoryLogQuery extends PageQuery {
-    private Integer pageNum;
+
-    private Integer pageSize;
+    @ApiModelProperty("上传状态")
     private Integer uploadStatus;
+    @ApiModelProperty("类型")
     private Integer socialType;
+    @ApiModelProperty("创建时间")
     private LocalDateTime createTimeBefore;
+    @ApiModelProperty("创建时间")
     private LocalDateTime createTimeAfter;
+
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/InventoryPurchaseLogQuery.java

@@ -1,13 +1,15 @@
 package com.syjiaer.clinic.server.entity.social.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class InventoryPurchaseLogQuery {
+public class InventoryPurchaseLogQuery extends PageQuery {
-    private Integer pageNum;
+    @ApiModelProperty("上传状态")
-    private Integer pageSize;
     private Integer uploadStatus;
+    @ApiModelProperty("医保类型")
     private Integer socialType;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationItemDto.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.social.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,24 +11,34 @@ import java.time.LocalDateTime;
 @Setter
 public class ReconciliationItemDto {
     // 清算类别
+    @ApiModelProperty("清算类别")
     private String reconciliationType;
     // 险种类型
+    @ApiModelProperty("险种类型")
     private String insuranceType;
     // 经办机构
+    @ApiModelProperty("经办机构")
     private String handlingInstitution;
     // 医疗费用总额
+    @ApiModelProperty("医疗费用总额")
     private BigDecimal totalMedicalCost = BigDecimal.ZERO;
     // 基金支付总额
+    @ApiModelProperty("基金支付总额")
     private BigDecimal totalFundPayment = BigDecimal.ZERO;
     // 个账支付总额
+    @ApiModelProperty("个账支付总额")
     private BigDecimal totalPersonalAccountPayment = BigDecimal.ZERO;
     // 结算笔数
+    @ApiModelProperty("结算笔数")
     private Integer settlementCount;
     // 对账结果
+    @ApiModelProperty("对账结果")
     private String reconciliationResult;
     //对账开始时间
+    @ApiModelProperty("对账开始时间")
     private LocalDateTime beginTime;
     //对账结束时间
+    @ApiModelProperty("对账结束时间")
     private LocalDateTime endTime;
 
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/ReconciliationLogQuery.java

@@ -1,16 +1,21 @@
 package com.syjiaer.clinic.server.entity.social.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDateTime;
 
 @Data
-public class ReconciliationLogQuery {
+public class ReconciliationLogQuery extends PageQuery {
-    private Integer pageNum;
+    @ApiModelProperty("开始时间")
-    private Integer pageSize;
     private LocalDateTime beginTime;
+    @ApiModelProperty("结束时间")
     private LocalDateTime endTime;
+    @ApiModelProperty("对账类别")
     private String reconciliationType;
+    @ApiModelProperty("险种类型")
     private String insuranceType;
+    @ApiModelProperty("经办机构")
     private String handlingInstitution;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/dto/RetailInventoryQuery.java

@@ -1,14 +1,17 @@
 package com.syjiaer.clinic.server.entity.social.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class RetailInventoryQuery {
+public class RetailInventoryQuery extends PageQuery {
-    private Integer pageNum;
+    @ApiModelProperty("流水号")
-    private Integer pageSize;
     private String code;
+    @ApiModelProperty("上传状态")
     private Integer uploadStatus;
+    @ApiModelProperty("医保类型")
     private Integer socialType;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/NotDoNumberVo.java

@@ -1,15 +1,21 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
 public class NotDoNumberVo {
+    @ApiModelProperty("总未上报数量")
     private long totalNumber;
+    @ApiModelProperty("3501未上报数量")
     private long number3501;
+    @ApiModelProperty("3502未上报数量")
     private long number3502;
+    @ApiModelProperty("3503未上报数量")
     private long number3503;
+    @ApiModelProperty("3505未上报数量")
     private long number3505;
 
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/ReconciliationDetailVo.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,14 +9,24 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class ReconciliationDetailVo {
+    @ApiModelProperty("人员编号")
     private String psnNo;
+    @ApiModelProperty("就诊id 挂号后医保返会")
     private String mdtrtId;
+    @ApiModelProperty("结算id")
     private String setlId;
+    @ApiModelProperty("消息id")
     private String msgid;
+    @ApiModelProperty("对账结果")
     private String stmtRslt;
+    @ApiModelProperty("退费结算标志")
     private String refdSetlFlag;
+    @ApiModelProperty("备注")
     private String memo;
+    @ApiModelProperty("医疗费总额")
     private BigDecimal medfeeSumamt;
+    @ApiModelProperty("基金支付总额")
     private BigDecimal fundPaySumamt;
+    @ApiModelProperty("个账支付总额")
     private BigDecimal acctPay;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/ReconciliationItemVo.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -9,20 +10,28 @@ import java.math.BigDecimal;
 @Setter
 public class ReconciliationItemVo {
     // 清算类别
+    @ApiModelProperty("清算类别")
     private String reconciliationType;
     // 险种类型
+    @ApiModelProperty("险种类型")
     private String insuranceType;
     // 经办机构
+    @ApiModelProperty("经办机构")
     private String handlingInstitution;
     // 医疗费用总额
+    @ApiModelProperty("医疗费用总额")
     private BigDecimal totalMedicalCost ;
     // 基金支付总额
+    @ApiModelProperty("基金支付总额")
     private BigDecimal totalFundPayment ;
     // 个账支付总额
+    @ApiModelProperty("个账支付总额")
     private BigDecimal totalPersonalAccountPayment ;
     // 结算笔数
+    @ApiModelProperty("结算笔数")
     private Integer settlementCount;
     // 对账结果
+    @ApiModelProperty("对账结果")
     private String reconciliationResult;
 
     public ReconciliationItemVo() {

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialDirectoryView.java

@@ -2,7 +2,9 @@ package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.syjiaer.clinic.server.entity.social.SocialDirectory;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -23,58 +25,45 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("social_directory_view")
+public class SocialDirectoryView extends SocialDirectory {
-@ApiModel(value = "SocialDirectoryView对象", description = "")
-public class SocialDirectoryView implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    private String code;
-
-    private String name;
-
-    private String keyword;
-
-    private Integer type;
-
-    private String producer;
-
-    private LocalDateTime createDatetime;
-
-    private LocalDateTime updateDatetime;
-
-    private String versionName;
-    private String data;
 
+    @ApiModelProperty("单位")
     private String unit;
+    @ApiModelProperty("医保编码")
     private String hilistCode;
-
+    @ApiModelProperty("医保目录限价类型")
     private String hilistLmtpricType;
-
+    @ApiModelProperty("医保目录定价上限金额")
     private BigDecimal hilistPricUplmtAmt;
 
+    @ApiModelProperty("自付比例类型")
     private String selfpayPropType;
-
+    @ApiModelProperty("自付比例")
     private BigDecimal selfpayProp;
-
+    @ApiModelProperty("开始日期")
     private LocalDateTime begndate;
-
+    @ApiModelProperty("结束日期")
     private LocalDateTime enddate;
-
+    @ApiModelProperty("五笔助记码")
     private String wubi;
-
+    @ApiModelProperty("拼音")
     private String pinyin;
+    @ApiModelProperty("限制使用标志")
     private String lmtUsedFlag;
+    @ApiModelProperty("收费级别")
     private String chrgitmLv;
+    @ApiModelProperty("json")
     private JSONObject json;
 
-
+    @ApiModelProperty("最小包装单位")
     private String minPackagingUnit;
+    @ApiModelProperty("包装单位")
     private String packagingUnit;
 
+    @ApiModelProperty("库存整数量")
     private Integer inventoryWholeNumber;
+    @ApiModelProperty("库存拆分量数量")
     private Integer inventoryFragmentNumber;
 
 

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryInitVo.java

@@ -2,7 +2,9 @@ package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.syjiaer.clinic.server.entity.inventory.InventoryInit;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -24,37 +26,14 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("social_inventory_init_view")
+public class SocialInventoryInitVo extends InventoryInit {
-@ApiModel(value = "SocialInventoryInitView对象", description = "")
-public class SocialInventoryInitVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Integer id;
-
-    private String code;
-
-    private Integer wholeNumber;
-
-    private LocalDate createDate;
-
-    private Integer uploadStatus;
-
-    private String uploadMessage;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime uploadDatetime;
-
-    private Integer goodsId;
-
-    private Integer inventoryId;
-
-    private Integer fragmentNumber;
 
+    @ApiModelProperty("商品名称")
     private String name;
-
+    @ApiModelProperty("商品单位")
     private String packagingUnit;
-
+    @ApiModelProperty("最小包装单位")
     private String minPackagingUnit;
-
+    @ApiModelProperty("医保编码")
     private String hilistCode;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryLogVo.java

@@ -1,7 +1,9 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.syjiaer.clinic.server.entity.inventory.InventoryLog;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -22,53 +24,13 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("social_inventory_log_view")
+public class SocialInventoryLogVo extends InventoryLog {
-@ApiModel(value = "SocialInventoryLogView对象", description = "")
+    @ApiModelProperty("商品名称")
-public class SocialInventoryLogVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Integer id;
-
-    private Integer goodsId;
-
-    private Integer inventoryId;
-
-    private Integer socialType;
-
-    private Integer changeWholeNumber;
-
-    private Integer changeFragmentNumber;
-
-    private Integer beforeWholeNumber;
-
-    private Integer beforeFragmentNumber;
-
-    private Integer afterWholeNumber;
-
-    private Integer afterFragmentNumber;
-
-    private String remark;
-
-    private LocalDateTime createTime;
-
-    private Integer uploadStatus;
-
-    private String uploadMessage;
-
-    private LocalDateTime uploadDatetime;
-
-    private Integer type;
-
-    private Integer operateId;
-
-    private String operateName;
-
     private String name;
-
+    @ApiModelProperty("商品单位")
     private String packagingUnit;
-
+    @ApiModelProperty("最小包装单位")
     private String minPackagingUnit;
-
+    @ApiModelProperty("医保编码")
     private String hilistCode;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialInventoryPurchaseLogVo.java

@@ -1,7 +1,10 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.syjiaer.clinic.server.entity.inventory.InventoryPurchase;
+import com.syjiaer.clinic.server.entity.inventory.InventoryPurchaseLog;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -22,33 +25,14 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-@TableName("social_inventory_purchase_log_view")
+public class SocialInventoryPurchaseLogVo extends InventoryPurchaseLog {
-@ApiModel(value = "SocialInventoryPurchaseLogView对象", description = "")
-public class SocialInventoryPurchaseLogVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Integer id;
-
-    private String inventoryPurchaseCode;
-
-    private Integer number;
-
-    private Integer uploadStatus;
-
-    private String uploadMessage;
-
-    private LocalDateTime uploadDatetime;
-
-    private Integer inventoryId;
-
-    private Integer socialType;
 
+    @ApiModelProperty("商品名称")
     private String name;
-
+    @ApiModelProperty("商品单位")
     private String packagingUnit;
-
+    @ApiModelProperty("最小包装单位")
     private String minPackagingUnit;
-
+    @ApiModelProperty("医保编码")
     private String hilistCode;
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialItemVo.java

@@ -1,5 +1,8 @@
 package com.syjiaer.clinic.server.entity.social.vo;
 
+import com.alibaba.fastjson2.JSONObject;
+import com.syjiaer.clinic.server.entity.item.Item;
+import com.syjiaer.clinic.server.entity.social.SocialItem;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -12,7 +15,7 @@ import java.time.LocalDateTime;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author NiuZiYuan
@@ -22,50 +25,27 @@ import java.time.LocalDateTime;
 @Setter
 @ToString
 @Accessors(chain = true)
-public class SocialItemVo implements Serializable {
+public class SocialItemVo extends SocialItem {
-
-    private static final long serialVersionUID = 1L;
-
-    private Integer id;
-
-    @ApiModelProperty("项目名称")
-    private String name;
-
-    @ApiModelProperty("医保编码")
-    private String code;
-
-    @ApiModelProperty("单位")
-    private String unit;
-
-    @ApiModelProperty("数据创建时间")
-    private LocalDateTime createDatetime;
-
-    @ApiModelProperty("版本名称")
-    private String versionName;
-
-    @ApiModelProperty("数据修改时间")
-    private LocalDateTime updateDatetime;
 
 
+    @ApiModelProperty("医保目录限价类型")
     private String hilistLmtpricType;
-
+    @ApiModelProperty("医保目录定价上限金额")
     private BigDecimal hilistPricUplmtAmt;
-
+    @ApiModelProperty("自付比例类型")
-    private String chrgitmLv;
-
     private String selfpayPropType;
-
+    @ApiModelProperty("自付比例")
     private BigDecimal selfpayProp;
-
+    @ApiModelProperty("开始日期")
     private LocalDateTime begndate;
-
+    @ApiModelProperty("结束日期")
     private LocalDateTime enddate;
-
+    @ApiModelProperty("五笔助记码")
     private String wubi;
-
+    @ApiModelProperty("拼音")
     private String pinyin;
-
+    @ApiModelProperty("收费级别")
-
+    private String chrgitmLv;
 
 
 }

src/main/java/com/syjiaer/clinic/server/entity/social/vo/SocialPersonInfoVo.java

@@ -3,18 +3,26 @@ package com.syjiaer.clinic.server.entity.social.vo;
 import com.syjiaer.clinic.server.common.api.output.OM1101;
 import com.syjiaer.clinic.server.common.api.output.OM5267;
 import com.syjiaer.clinic.server.common.api.output.OM5283;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 @Data
 public class SocialPersonInfoVo {
     private Integer id;
+    @ApiModelProperty("就诊凭证类型")
     private String mdtrtCertType;
+    @ApiModelProperty("就诊凭证编号")
     private String mdtrtCertNo;
+    @ApiModelProperty("人员基本信息")
     private OM1101.Baseinfo baseinfo;
+    @ApiModelProperty("人员身份信息")
     private List<OM1101.Insuinfo> insuinfo;
+    @ApiModelProperty("人员身份信息")
     private List<OM1101.Idetinfo> iDetinfo;
+    @ApiModelProperty("5267返回数据")
     private OM5267 blockInfo;
+    @ApiModelProperty("5283返回数据")
     private OM5283 hospitalizationInfo;
 
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/ChrgitmLvOverview.java

@@ -1,12 +1,17 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class ChrgitmLvOverview {
+    @ApiModelProperty("限制使用标志")
     private String chrgitmLv;
+    @ApiModelProperty("限制使用标志名称")
     private String name;
+    @ApiModelProperty("数量")
     private Long count;
+    @ApiModelProperty("占比")
     private String ratio;
 
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/GoodsStatistics.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -7,9 +8,13 @@ import java.util.ArrayList;
 import java.util.List;
 @Data
 public class GoodsStatistics {
+    @ApiModelProperty("总成本")
     private BigDecimal totalCost;
+    @ApiModelProperty("总售价")
     private BigDecimal totalPrice;
+    @ApiModelProperty("医保商品数量")
     private Long totalSocialCount;
+    @ApiModelProperty("甲乙丙类占比")
     private List<ChrgitmLvOverview> chrgitmLvInfoList;
 
     public GoodsStatistics() {

src/main/java/com/syjiaer/clinic/server/entity/statistics/GoodsTypeRevenue.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,6 +8,8 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class GoodsTypeRevenue {
+    @ApiModelProperty("类型名称")
     private String name;
+    @ApiModelProperty("总收入")
     private BigDecimal totalRevenue;
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/PayTypeRevenue.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -7,7 +8,10 @@ import java.math.BigDecimal;
 @Getter
 @Setter
 public class PayTypeRevenue {
+    @ApiModelProperty("支付类型")
     private Integer payType;
+    @ApiModelProperty("总收入")
     private BigDecimal totalRevenue;
+    @ApiModelProperty("支付类型名称")
     private String name;
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/PersonPayOverviewVo.java

@@ -1,5 +1,6 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,7 +9,10 @@ import java.util.List;
 @Getter
 @Setter
 public class PersonPayOverviewVo {
+    @ApiModelProperty("日期list")
     private List<String> dateList;
+    @ApiModelProperty("会员营业额list")
     private List<BigDecimal> vipPrice;
+    @ApiModelProperty("普通用户营业额list")
     private List<BigDecimal> commonPrice;
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/RevenueOverviewVo.java

@@ -2,6 +2,7 @@ package com.syjiaer.clinic.server.entity.statistics;
 
 import com.syjiaer.clinic.server.common.enums.GoodsTypeEnum;
 import com.syjiaer.clinic.server.common.enums.RetailOrderPayTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -16,16 +17,20 @@ import java.util.List;
 @Setter
 public class RevenueOverviewVo {
     //总营业额
+    @ApiModelProperty("总营业额")
     private BigDecimal totalRevenue;
     //医保销售额
+    @ApiModelProperty("医保销售额")
     private BigDecimal socialRevenue;
     //总完成单数
+    @ApiModelProperty("总完成单数")
     private Long totalOrderCount;
     //医保单数
+    @ApiModelProperty("医保单数")
     private Long socialOrderCount;
-
+    @ApiModelProperty("商品类型销售额")
     private List<GoodsTypeRevenue> goodsTypeRevenue;
-
+    @ApiModelProperty("支付类型销售额")
     private List<PayTypeRevenue> payTypeRevenue;
 
     public RevenueOverviewVo() {

src/main/java/com/syjiaer/clinic/server/entity/statistics/SalePersonReportVo.java

@@ -1,19 +1,29 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
 
 @Data
 public class SalePersonReportVo {
+    @ApiModelProperty("销售人员id")
     private Integer salePersonId;
+    @ApiModelProperty("销售人员姓名")
     private String salePersonName;
+    @ApiModelProperty("总营业额")
     private BigDecimal totalIncome;
+    @ApiModelProperty("微信营业额")
     private BigDecimal wechatIncome;
+    @ApiModelProperty("支付宝营业额")
     private BigDecimal aliPayIncome;
+    @ApiModelProperty("现金营业额")
     private BigDecimal cashIncome;
+    @ApiModelProperty("其他营业额")
     private BigDecimal otherIncome;
+    @ApiModelProperty("医保营业额")
     private BigDecimal socialIncome;
+    @ApiModelProperty("销售单数")
     private Long count;
 
     public SalePersonReportVo() {

src/main/java/com/syjiaer/clinic/server/entity/statistics/SalesVolumeOverviewVo.java

@@ -1,10 +1,13 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
 @Data
 public class SalesVolumeOverviewVo {
+    @ApiModelProperty("日期list")
     private List<String> dateList;
+    @ApiModelProperty("消费人次list")
     private List<Long> countList;
 }

src/main/java/com/syjiaer/clinic/server/entity/statistics/TipCountVo.java

@@ -1,20 +1,27 @@
 package com.syjiaer.clinic.server.entity.statistics;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class TipCountVo {
     //待诊断数量
+    @ApiModelProperty("待诊断数量")
     private Long waitDiagnosisCount;
     //在诊数量
+    @ApiModelProperty("在诊数量")
     private Long diagnosingCount;
     //完诊数量
+    @ApiModelProperty("完诊数量")
     private Long completeDiaCount;
     //已收费数量
+    @ApiModelProperty("已收费数量")
     private Long chargedCount;
     //已退费数量
+    @ApiModelProperty("已退费数量")
     private Long refundedCount;
     //未收费数量
+    @ApiModelProperty("未收费数量")
     private Long unchargedCount;
 
 

src/main/java/com/syjiaer/clinic/server/entity/vip/dto/VipIntegralLogQuery.java

@@ -1,12 +1,13 @@
 package com.syjiaer.clinic.server.entity.vip.dto;
 
+import com.syjiaer.clinic.server.entity.common.dto.PageQuery;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class VipIntegralLogQuery {
+public class VipIntegralLogQuery extends PageQuery {
+    @ApiModelProperty("会员id")
     private Integer vipId;
-    private Integer pageNum;
-    private Integer pageSize;
 }

src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryPurchaseService.java

@@ -13,6 +13,7 @@ import com.syjiaer.clinic.server.entity.goods.GoodsCate;
 import com.syjiaer.clinic.server.entity.inventory.*;
 import com.syjiaer.clinic.server.entity.inventory.dto.PurchaseOrderQuery;
 import com.syjiaer.clinic.server.entity.inventory.vo.InventoryGoodsVo;
+import com.syjiaer.clinic.server.entity.inventory.vo.InventoryOrderVo;
 import com.syjiaer.clinic.server.entity.inventory.vo.InventoryPurchaseVo;
 import com.syjiaer.clinic.server.entity.manager.ManagerUser;
 import com.syjiaer.clinic.server.mapper.goods.GoodsCateMapper;
@@ -327,7 +328,7 @@ public class InventoryPurchaseService extends BaseService {
      * @param code 采购单号
      * @return inventoryOrderGoodsList 商品信息  inventoryOrder 采购单信息
      */
-    public Map<String, Object> getByCode(String code) {
+    public InventoryOrderVo getByCode(String code) {
         QueryWrapper<Inventory> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("inventory_purchase_code", code);
         queryWrapper.orderByAsc("id");
@@ -349,10 +350,10 @@ public class InventoryPurchaseService extends BaseService {
         BeanUtils.copyProperties(inventoryPurchase, purchaseVo);
         purchaseVo.setManagerUserName(managerUserMapper.selectById(inventoryPurchase.getManagerUserId()).getName());
         purchaseVo.setSupplierName(inventorySupplierMapper.selectById(inventoryPurchase.getSupplierId()).getName());
-        Map<String, Object> map = new HashMap<>();
+        InventoryOrderVo inventoryOrderVo = new InventoryOrderVo();
-        map.put("inventoryOrderGoodsList", goodsVos);
+        inventoryOrderVo.setInventoryOrderGoodsList(goodsVos);
-        map.put("inventoryOrder", purchaseVo);
+        inventoryOrderVo.setInventoryOrder(purchaseVo);
-        return map;
+        return inventoryOrderVo;
     }
 
     /**

src/main/java/com/syjiaer/clinic/server/service/inventory/InventoryService.java

@@ -243,11 +243,11 @@ public class InventoryService extends BaseService {
         return inventoryMapper.selectList(queryWrapper);
     }
 
-    public List<Map<String, Object>> getInventoryLogByGoodsId(int goodsId, LocalDateTime startDateTime, LocalDateTime endDateTime) {
+    public List<InventoryLog> getInventoryLogByGoodsId(int goodsId, LocalDateTime startDateTime, LocalDateTime endDateTime) {
         QueryWrapper<InventoryLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("goods_id", goodsId);
         queryWrapper.between("create_time", startDateTime, endDateTime);
-        return inventoryLogMapper.selectMaps(queryWrapper);
+        return inventoryLogMapper.selectList(queryWrapper);
     }