diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java index 96acc7340..cf54f17dd 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java @@ -10,11 +10,13 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.RedissonCacheKey; import com.glxp.api.controller.BaseController; +import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.basic.BasicSkSickerEntity; import com.glxp.api.http.ErpBasicClient; import com.glxp.api.req.basic.BasicSkSickerRequest; import com.glxp.api.req.basic.GetSickPrescribeRequest; import com.glxp.api.req.basic.GetSickRequest; +import com.glxp.api.req.basic.SickerPrescribeSaveRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkSickerResponse; import com.glxp.api.service.basic.BasicSkSickerService; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java index 7205f1697..b5d22adb1 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSkPrescribeController.java @@ -13,10 +13,7 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.entity.basic.BasicSkPrescribeEntity; import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; import com.glxp.api.entity.basic.BasicSkSickerEntity; -import com.glxp.api.req.basic.BasicProductTypeRequest; -import com.glxp.api.req.basic.BasicSkPrescribeRequest; -import com.glxp.api.req.basic.GetSickPrescribeRequest; -import com.glxp.api.req.basic.GetSickRequest; +import com.glxp.api.req.basic.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicSkPrescribeResponse; import com.glxp.api.res.basic.BasicSkSickerResponse; @@ -94,4 +91,25 @@ public class BasicSkPrescribeController extends BaseController { } + @PostMapping("/udiwms/basic/sk/prescribe/deleteDataByCode") + public BaseResponse deleteDataByCode(@RequestBody GetSickPrescribeRequest getSickPrescribeRequest, BindingResult bindingResult) { + String code = getSickPrescribeRequest.getCode(); + if (StrUtil.isBlank(code)){ + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); + } + basicSkPrescribeService.removeById(code); + return ResultVOUtils.success(); + } + + /** + * 保存前端处方信息 + * + * @return + */ + @GetMapping("/udiwms/basic/sk/prescribe/save") + public BaseResponse sickerPrescribeSave(@RequestBody SickerPrescribeSaveRequest sickerPrescribeSaveRequest) { + List list = sickerPrescribeSaveRequest.getList(); + basicSkPrescribeService.saveOrUpdateBatch(list); + return ResultVOUtils.success(); + } } diff --git a/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java index 85db353c4..65541b963 100644 --- a/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/GetSickPrescribeRequest.java @@ -11,7 +11,8 @@ public class GetSickPrescribeRequest extends ListPageRequest { private String sickCode; private String idNum; private String phone; - private String searchTime; + private String startTime; + private String endTime; private String thirdSys; /** * 住院号(必传) diff --git a/src/main/java/com/glxp/api/req/basic/SickerPrescribeSaveRequest.java b/src/main/java/com/glxp/api/req/basic/SickerPrescribeSaveRequest.java new file mode 100644 index 000000000..2d5410f5b --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/SickerPrescribeSaveRequest.java @@ -0,0 +1,15 @@ +package com.glxp.api.req.basic; + +import com.glxp.api.entity.basic.BasicSkPrescribeEntity; +import com.glxp.api.res.basic.BasicSkSickerResponse; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.List; + +@Data +public class SickerPrescribeSaveRequest { + + @NotNull(message = "处方列表不可以为空!") + private List list; +}