diff --git a/src/main/java/com/glxp/api/controller/inout/IoDepartmentOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoDepartmentOrderController.java index 5d81c1964..2610eb7d7 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoDepartmentOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoDepartmentOrderController.java @@ -9,10 +9,7 @@ import com.glxp.api.req.inout.AddSkSiackerListRequest; import com.glxp.api.req.inout.FilterSkSiackerListRequest; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.service.inout.IoDepartmentOrderService; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -73,6 +70,18 @@ public class IoDepartmentOrderController extends BaseController { return ResultVOUtils.success("点击成功!"); } + /** + * 删除 + * + * @param + * @return + */ + @DeleteMapping("/udiwms/inout/ioDepartmentOrder/deleteSkSicker") + public BaseResponse deleteSkSicker(String adNum) { + ioDepartmentOrderService.deleteSkSicker(adNum); + return ResultVOUtils.success("操作成功!"); + } + /** * 新增患者 diff --git a/src/main/java/com/glxp/api/req/inout/FilterSkSiackerListRequest.java b/src/main/java/com/glxp/api/req/inout/FilterSkSiackerListRequest.java index 7da26c9e2..e71708a3a 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterSkSiackerListRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterSkSiackerListRequest.java @@ -13,4 +13,6 @@ public class FilterSkSiackerListRequest extends ListPageRequest { private String startTime; private String endTime; + + private String deptCode; } diff --git a/src/main/java/com/glxp/api/service/inout/IoDepartmentOrderService.java b/src/main/java/com/glxp/api/service/inout/IoDepartmentOrderService.java index f6332728c..6ae8f1f8f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoDepartmentOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoDepartmentOrderService.java @@ -23,4 +23,6 @@ public interface IoDepartmentOrderService { void addInfoSkSicker(AddSkSiackerListRequest addSkSiackerListRequest); void clickToTriggerbyCode(String adNum); + + void deleteSkSicker(String adNum); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java index 389bf9a7a..fa2204685 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoDepartmentOrderServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.UUID; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.basic.BasicSkSickerMapper; @@ -119,4 +120,12 @@ public class IoDepartmentOrderServiceImpl implements IoDepartmentOrderService { } } } + + @Override + public void deleteSkSicker(String adNum) { + UpdateWrapper qw = new UpdateWrapper<>(); + qw.eq("adNum", adNum); + skSickerMapper.delete(qw); + } + } diff --git a/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml b/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml index a92495a38..5ad28d09d 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicSkSickerMapper.xml @@ -89,6 +89,9 @@ OR basic_sk_sicker.adNum LIKE concat('%', #{name}, '%') OR basic_sk_sicker.code LIKE concat('%', #{name}, '%') + + basic_sk_sicker.deptCode = #{deptCode} + AND date_format(updateTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')