From 218acfb272d96475bf4f3301034df10db27c6882 Mon Sep 17 00:00:00 2001 From: NiuZiYuan Date: Thu, 29 May 2025 11:27:41 +0800 Subject: [PATCH] dev --- .../server/common/annotations/ApiParam.java | 1 + .../diagnosis/DiagnosisController.java | 20 +++++++++++++++++++ .../controller/goods/GoodsCateController.java | 16 +++++++++++++++ .../controller/goods/GoodsController.java | 8 ++++++-- 4 files changed, 43 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/syjiaer/clinic/server/common/annotations/ApiParam.java b/src/main/java/com/syjiaer/clinic/server/common/annotations/ApiParam.java index 06e0a08..c78f29a 100644 --- a/src/main/java/com/syjiaer/clinic/server/common/annotations/ApiParam.java +++ b/src/main/java/com/syjiaer/clinic/server/common/annotations/ApiParam.java @@ -11,6 +11,7 @@ public @interface ApiParam { String name(); String value() default ""; boolean required() default false; + boolean isArray() default false; String comment() default ""; Class type() default Object.class; String typeName() default ""; diff --git a/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java b/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java index 75dc175..40db757 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/diagnosis/DiagnosisController.java @@ -63,6 +63,10 @@ public class DiagnosisController extends BaseController { */ @ApiOperation("查询患者病历") @RequestMapping("/listByPatient") + @ApiParams({ + @ApiParam(name = "patientId", value = "患者id", required = true) + }) + @ApiReturn(type = MedicalHistoryVo.class,isArray = true) public Result> listByPatient() { Integer patientId = parmsUtil.getInteger("patientId", "患者不能为空"); return success( diagnosisService.listByPatientId(patientId)); @@ -74,6 +78,10 @@ public class DiagnosisController extends BaseController { */ @ApiOperation("根据挂单号回显病历详情") @RequestMapping("/getByRegisId") + @ApiParams({ + @ApiParam(name = "regisId", value = "挂单id", required = true) + }) + @ApiReturn(type = MedicalRecordVo.class) public Result getByRegisId() { Integer regisId = parmsUtil.getInteger("regisId", "挂单id不能为空"); return success(diagnosisService.getDetailByRegisId(regisId)); @@ -83,6 +91,10 @@ public class DiagnosisController extends BaseController { */ @ApiOperation("获取收费队列") @RequestMapping("/ChargeQueueList") + @ApiParams({ + @ApiParam(name = "query", value = "查询参数", required = true, type = ChargeQueueQuery.class) + }) + @ApiReturn(type = ChargeQueueVo.class,isPage = true) public Result> ChargeQueueList() { ChargeQueueQuery query = parmsUtil.getObject("query", ChargeQueueQuery.class); @@ -94,6 +106,10 @@ public class DiagnosisController extends BaseController { */ @ApiOperation("获取挂号信息") @RequestMapping("/getRegistrationDetail") + @ApiParams({ + @ApiParam(name = "regisId", value = "挂单id", required = true) + }) + @ApiReturn(type = SeeDoctorInfoVo.class) public Result getRegistrationDetail() { Integer regisId = parmsUtil.getInteger("regisId", "挂单id不能为空"); return success( diagnosisService.getSeeDockerInfo(regisId)); @@ -104,6 +120,10 @@ public class DiagnosisController extends BaseController { */ @ApiOperation("获取诊断信息") @RequestMapping("/getByDiagnosisCode") + @ApiParams({ + @ApiParam(name = "diagnosisCode", value = "诊断code", required = true) + }) + @ApiReturn(type = MedicalRecordVo.class) public Result getByDiagnosisCode() { String diagnosisCode = parmsUtil.getString("diagnosisCode", "诊断code不能为空"); return success( diagnosisService.getByDiagnosisCode(diagnosisCode)); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java index d44f869..52154ce 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsCateController.java @@ -1,5 +1,8 @@ package com.syjiaer.clinic.server.controller.goods; +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; @@ -35,6 +38,10 @@ public class GoodsCateController extends BaseController { */ @ApiOperation("根据type获取商品二级分类列表") @RequestMapping("list") + @ApiParams({ + @ApiParam(name = "type", value = "商品一级类型", required = true) + }) + @ApiReturn(type = GoodsCate.class,isArray = true) public Result> list(){ int type= parmsUtil.getInteger("type","类型不能为空"); List list=goodsCateService.listByType(type); @@ -46,6 +53,7 @@ public class GoodsCateController extends BaseController { */ @ApiOperation("获取所有分类") @RequestMapping("getAllList") + @ApiReturn(type = GoodsCate.class) public Result>> getAllList(){ Map> resultMap=goodsCateService.listAll(); return success(resultMap); @@ -57,6 +65,10 @@ public class GoodsCateController 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","id不能为空"); goodsCateService.del(id); @@ -70,6 +82,10 @@ public class GoodsCateController extends BaseController { @ApiOperation("保存二级分类") @RecordCommonLog(operation = "保存分类") @RequestMapping("save") + @ApiParams({ + @ApiParam(name = "cateList", value = "分类列表", required = true, type = GoodsCate.class,isArray = true) + }) + @ApiReturn(isNull = true) public Result save(){ List cateList = parmsUtil.getList("cateList", GoodsCate.class); goodsCateService.save(cateList); diff --git a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java index 36bc9ea..8d54653 100644 --- a/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java +++ b/src/main/java/com/syjiaer/clinic/server/controller/goods/GoodsController.java @@ -1,6 +1,8 @@ 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.RecordCommonLog; import com.syjiaer.clinic.server.common.enums.GoodsPricingModelEnum; import com.syjiaer.clinic.server.common.util.ParmsUtil; @@ -43,9 +45,11 @@ public class GoodsController extends BaseController { @RecordCommonLog(operation = "商品建档或修改") @ApiOperation("商品建档或修改") @RequestMapping("save") + @ApiParams({ + @ApiParam(name = "data", value = "商品信息", required = true, type = Goods.class) + }) public Result save() { - - Goods goods = JSONObject.parseObject(JSONObject.toJSONString(parmsUtil.getMap()), Goods.class); + Goods goods=parmsUtil.getObject("data", Goods.class); if (goods.getPurchaseUnitPrice()==null) { return error("请输入参考进价"); }