Compare commits
No commits in common. "0d88e613f2788566b4bd06b8dc831cd7688b1885" and "e7f4a9c8de38122e36ad5eb5e5b67d33577fc211" have entirely different histories.
0d88e613f2
...
e7f4a9c8de
|
|
@ -11,7 +11,6 @@ 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 "";
|
||||
|
|
|
|||
|
|
@ -63,10 +63,6 @@ public class DiagnosisController extends BaseController {
|
|||
*/
|
||||
@ApiOperation("查询患者病历")
|
||||
@RequestMapping("/listByPatient")
|
||||
@ApiParams({
|
||||
@ApiParam(name = "patientId", value = "患者id", required = true)
|
||||
})
|
||||
@ApiReturn(type = MedicalHistoryVo.class,isArray = true)
|
||||
public Result<List<MedicalHistoryVo>> listByPatient() {
|
||||
Integer patientId = parmsUtil.getInteger("patientId", "患者不能为空");
|
||||
return success( diagnosisService.listByPatientId(patientId));
|
||||
|
|
@ -78,10 +74,6 @@ public class DiagnosisController extends BaseController {
|
|||
*/
|
||||
@ApiOperation("根据挂单号回显病历详情")
|
||||
@RequestMapping("/getByRegisId")
|
||||
@ApiParams({
|
||||
@ApiParam(name = "regisId", value = "挂单id", required = true)
|
||||
})
|
||||
@ApiReturn(type = MedicalRecordVo.class)
|
||||
public Result<MedicalRecordVo> getByRegisId() {
|
||||
Integer regisId = parmsUtil.getInteger("regisId", "挂单id不能为空");
|
||||
return success(diagnosisService.getDetailByRegisId(regisId));
|
||||
|
|
@ -91,10 +83,6 @@ 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<Page<ChargeQueueVo>> ChargeQueueList() {
|
||||
ChargeQueueQuery query = parmsUtil.getObject("query", ChargeQueueQuery.class);
|
||||
|
||||
|
|
@ -106,10 +94,6 @@ public class DiagnosisController extends BaseController {
|
|||
*/
|
||||
@ApiOperation("获取挂号信息")
|
||||
@RequestMapping("/getRegistrationDetail")
|
||||
@ApiParams({
|
||||
@ApiParam(name = "regisId", value = "挂单id", required = true)
|
||||
})
|
||||
@ApiReturn(type = SeeDoctorInfoVo.class)
|
||||
public Result<SeeDoctorInfoVo> getRegistrationDetail() {
|
||||
Integer regisId = parmsUtil.getInteger("regisId", "挂单id不能为空");
|
||||
return success( diagnosisService.getSeeDockerInfo(regisId));
|
||||
|
|
@ -120,10 +104,6 @@ public class DiagnosisController extends BaseController {
|
|||
*/
|
||||
@ApiOperation("获取诊断信息")
|
||||
@RequestMapping("/getByDiagnosisCode")
|
||||
@ApiParams({
|
||||
@ApiParam(name = "diagnosisCode", value = "诊断code", required = true)
|
||||
})
|
||||
@ApiReturn(type = MedicalRecordVo.class)
|
||||
public Result<MedicalRecordVo> getByDiagnosisCode() {
|
||||
String diagnosisCode = parmsUtil.getString("diagnosisCode", "诊断code不能为空");
|
||||
return success( diagnosisService.getByDiagnosisCode(diagnosisCode));
|
||||
|
|
|
|||
|
|
@ -1,8 +1,5 @@
|
|||
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;
|
||||
|
|
@ -38,10 +35,6 @@ 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<GoodsCate>> list(){
|
||||
int type= parmsUtil.getInteger("type","类型不能为空");
|
||||
List<GoodsCate> list=goodsCateService.listByType(type);
|
||||
|
|
@ -53,7 +46,6 @@ public class GoodsCateController extends BaseController {
|
|||
*/
|
||||
@ApiOperation("获取所有分类")
|
||||
@RequestMapping("getAllList")
|
||||
@ApiReturn(type = GoodsCate.class)
|
||||
public Result<Map<Integer,List<GoodsCate>>> getAllList(){
|
||||
Map<Integer,List<GoodsCate>> resultMap=goodsCateService.listAll();
|
||||
return success(resultMap);
|
||||
|
|
@ -65,10 +57,6 @@ 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);
|
||||
|
|
@ -82,10 +70,6 @@ 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<GoodsCate> cateList = parmsUtil.getList("cateList", GoodsCate.class);
|
||||
goodsCateService.save(cateList);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
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;
|
||||
|
|
@ -45,11 +43,9 @@ public class GoodsController extends BaseController {
|
|||
@RecordCommonLog(operation = "商品建档或修改")
|
||||
@ApiOperation("商品建档或修改")
|
||||
@RequestMapping("save")
|
||||
@ApiParams({
|
||||
@ApiParam(name = "data", value = "商品信息", required = true, type = Goods.class)
|
||||
})
|
||||
public Result<Object> save() {
|
||||
Goods goods=parmsUtil.getObject("data", Goods.class);
|
||||
|
||||
Goods goods = JSONObject.parseObject(JSONObject.toJSONString(parmsUtil.getMap()), Goods.class);
|
||||
if (goods.getPurchaseUnitPrice()==null) {
|
||||
return error("请输入参考进价");
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue