diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java index a0a6b82..33d8812 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjArchiveController.java @@ -32,20 +32,6 @@ public class GyzjArchiveController extends BaseController { @Autowired private IGyzjService gyzjService; - @Autowired - private IGyzjTzService gyzjTzService; - @Autowired - private IGyzjJcgjService gyzjJcgjService; - /** - * 上传文件存储在本地的根路径 - */ - @Value("${file.path}") - private String localFilePath; - /** - * 资源映射路径 前缀 - */ - @Value("${file.prefix}") - public String localFilePrefix; /** diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java index 33ae6ac..a1bc118 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/GyzjController.java @@ -78,7 +78,7 @@ public class GyzjController extends BaseController /** * 稽查轨迹列表 */ - @RequiresPermissions("business:resource:gyzj:list") + @RequiresPermissions(value={"business:resource:gyzj:xq","business:archive:gyzj:xq"}, logical= Logical.OR) @GetMapping("/jcgjList") public TableDataInfo jcgjList(GyzjJcgj form) { @@ -90,7 +90,7 @@ public class GyzjController extends BaseController /** * 台账列表 */ - @RequiresPermissions("business:resource:gyzj:list") + @RequiresPermissions(value={"business:resource:gyzj:xq","business:archive:gyzj:xq"}, logical= Logical.OR) @GetMapping("/tzList") public TableDataInfo tzList(GyzjTz form) { @@ -102,7 +102,7 @@ public class GyzjController extends BaseController /** * 详细信息 */ - @RequiresPermissions("business:resource:gyzj:xq") + @RequiresPermissions(value={"business:resource:gyzj:xq","business:archive:gyzj:xq"}, logical= Logical.OR) @GetMapping(value = "/info") public AjaxResult getInfo(Long id) { @@ -112,7 +112,7 @@ public class GyzjController extends BaseController /** * 导出 */ - @RequiresPermissions("business:resource:gyzj:xq") + @RequiresPermissions(value={"business:resource:gyzj:xq","business:archive:gyzj:xq"}, logical= Logical.OR) @GetMapping(value = "/exportDetail") public AjaxResult exportDetail(Long id,String lang) { GyzjJcgj gyzjJcgj = new GyzjJcgj(); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyArchiveController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyArchiveController.java index cb22db3..53c0b10 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyArchiveController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyArchiveController.java @@ -13,7 +13,6 @@ import com.hxhq.common.core.web.domain.AjaxResult; import com.hxhq.common.core.web.page.TableDataInfo; import com.hxhq.common.security.annotation.Logical; import com.hxhq.common.security.annotation.RequiresPermissions; -import com.hxhq.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; @@ -29,345 +28,102 @@ import java.util.List; */ @RestController @RequestMapping("/business/mjyArchive") -public class MjyArchiveController extends BaseController { +public class MjyArchiveController extends BaseController +{ @Autowired private IMjyService mjyService; - @Autowired - private IMjyTzService mjyTzService; - @Autowired - private IMjyJcgjService mjyJcgjService; - /** - * 上传文件存储在本地的根路径 - */ - @Value("${file.path}") - private String localFilePath; - /** - * 资源映射路径 前缀 - */ - @Value("${file.prefix}") - public String localFilePrefix; - - /** - * 列表 - */ - @RequiresPermissions(value={"business:studyMjy:list", "business:nonTrialMjy:list", "business:drugMjy:list"}, logical= Logical.OR) - @GetMapping("/studyList") - public TableDataInfo studyList(SearchForm form) { - startPage(); - List list = mjyService.queryStudyList(form); - return getDataTable(list); - } /** * 列表 */ - @RequiresPermissions("business:resource:mjy:list") + @RequiresPermissions("business:archive:mjy:list") @GetMapping("/list") - public TableDataInfo list(SearchForm form) { - startPage(); - List list = mjyService.queryList(form); - return getDataTable(list); - } - - /** - * 稽查轨迹列表 - */ - @RequiresPermissions("business:resource:mjy:list") - @GetMapping("/jcgjList") - public TableDataInfo jcgjList(MjyJcgj form) { - startPage(); - List list = mjyJcgjService.queryList(form); - return getDataTable(list); - } - - /** - * 台账列表 - */ - @RequiresPermissions("business:resource:mjy:list") - @GetMapping("/tzList") - public TableDataInfo tzList(MjyTz form) { + public TableDataInfo list(SearchForm form) + { startPage(); - List list = mjyTzService.queryList(form); + List list = mjyService.queryArchiveList(form); return getDataTable(list); } /** - * 详细信息 + * 同意归档 */ - @RequiresPermissions("business:resource:mjy:xq") - @GetMapping(value = "/info") - public AjaxResult getInfo(Long id) { - return AjaxResult.success(mjyService.queryInfo(id)); - } - - /** - * 导出 - */ - @RequiresPermissions("business:resource:mjy:xq") - @GetMapping(value = "/exportDetail") - public AjaxResult exportDetail(Long id,String lang) { - MjyJcgj mjyJcgj = new MjyJcgj(); - mjyJcgj.setMjyId(id); - List mjyJcgjList = mjyJcgjService.queryList(mjyJcgj); - MjyTz mjyTz = new MjyTz(); - mjyTz.setMjyId(id); - List mjyTzList = mjyTzService.queryList(mjyTz); - return AjaxResult.success(localFilePrefix + PdfExportUtil.export( - "com.hxhq.business.utils.pdf.resource.Drug", - "exportDetail", - mjyService.queryInfo(id), - mjyTzList, - mjyJcgjList, - lang, - localFilePath)); - } - - - /** - * 解档 - */ - @PostMapping("/jd") - @RequiresPermissions("business:resource:mjy:jd") - public AjaxResult jd(@RequestBody JdForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.jd(form); - return AjaxResult.success("操作成功"); - } - - /** - * 批量归档 - */ - @PostMapping("/plgd") - @RequiresPermissions("business:resource:mjy:gd") - public AjaxResult plgd(@RequestBody GdForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.plgd(form); - return AjaxResult.success("操作成功"); - } - - /** - * 归档 - */ - @PostMapping("/gd") - @RequiresPermissions("business:resource:mjy:gd") - public AjaxResult gd(@RequestBody GdForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.gd(form); - return AjaxResult.success("操作成功"); - } - - - /** - * 批量锁定 - */ - @PostMapping("/plsd") - @RequiresPermissions("business:resource:mjy:sd") - public AjaxResult plsd(@RequestBody SdForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.plsd(form); - return AjaxResult.success("操作成功"); - } - - /** - * 锁定 - */ - @PostMapping("/sd") - @RequiresPermissions("business:resource:mjy:sd") - public AjaxResult sd(@RequestBody SdForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.sd(form); - return AjaxResult.success("操作成功"); - } - - - /** - * 解锁 - */ - @PostMapping("/js") - @RequiresPermissions("business:resource:mjy:js") - public AjaxResult js(@RequestBody JsForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.js(form); - return AjaxResult.success("操作成功"); - } - - /** - * 批量处置药剂 - */ - @PostMapping("/plczyj") - @RequiresPermissions(value={"business:resource:mjy:czyj", "business:studyMjy:czyj", "business:nonTrialMjy:czyj", "business:drugMjy:czyj"}, logical= Logical.OR) - public AjaxResult plczyj(@RequestBody PlczyjForm form) { - form.setClrId(SecurityUtils.getUserId()); - mjyService.plczyj(form); - return AjaxResult.success("操作成功"); - } - - /** - * 处置药剂 - */ - @PostMapping("/czyj") - @RequiresPermissions("business:resource:mjy:czyj") - public AjaxResult czyj(@RequestBody CzyjForm form) { - form.setClrId(SecurityUtils.getUserId()); - mjyService.czyj(form); - return AjaxResult.success("操作成功"); - } - - /** - * 批量处置容器 - */ - @PostMapping("/plczrq") - @RequiresPermissions("business:resource:mjy:czrq") - public AjaxResult plczrq(@RequestBody PlczrqForm form) { - form.setClrId(SecurityUtils.getUserId()); - mjyService.plczrq(form); - return AjaxResult.success("操作成功"); - } - - /** - * 处置容器 - */ - @PostMapping("/czrq") - @RequiresPermissions("business:resource:mjy:czrq") - public AjaxResult czrq(@RequestBody CzrqForm form) { - form.setClrId(SecurityUtils.getUserId()); - mjyService.czrq(form); - return AjaxResult.success("操作成功"); - } - - - /** - * 钥匙发放 - */ - @PostMapping("ysff") - @RequiresPermissions("business:resource:mjy:ysff") - public AjaxResult ysff(@RequestBody YsffForm form) { - form.setFfrId(SecurityUtils.getUserId()); - mjyService.ysff(form); - return AjaxResult.success("操作成功"); - } - - - /** - * 发放 - */ - @PostMapping("ff") - @RequiresPermissions("business:resource:mjy:ff") - public AjaxResult ff(@RequestBody FfForm form) { - mjyService.ff(form); - return AjaxResult.success("操作成功"); - } - - - /** - * 批量发放 - */ - @PostMapping("plff") - @RequiresPermissions("business:resource:mjy:ff") - public AjaxResult plff(@RequestBody PlffForm form) { - mjyService.plff(form); + @PostMapping("/tygd") + @RequiresPermissions("business:archive:mjy:tygd") + public AjaxResult tygd(@RequestBody ArchiveForm form) + { + mjyService.tygd(form); return AjaxResult.success("操作成功"); } /** - * 编辑 + * 拒绝归档 */ - @PostMapping("bj") - @RequiresPermissions(value={"business:resource:mjy:bj", "business:studyMjy:bj", "business:nonTrialMjy:bj", "business:drugMjy:bj"}, logical= Logical.OR) - public AjaxResult bj(@RequestBody BjForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.bj(form); + @PostMapping("/jjgd") + @RequiresPermissions("business:archive:mjy:jjgd") + public AjaxResult jjgd(@RequestBody ArchiveForm form) + { + mjyService.jjgd(form); return AjaxResult.success("操作成功"); } - /** - * 审核编辑 + * 同意解档 */ - @PostMapping("shbj") - @RequiresPermissions("business:resource:mjy:shbj") - public AjaxResult shbj(@RequestBody ShbjForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.shbj(form); + @PostMapping("/tyjd") + @RequiresPermissions("business:archive:mjy:tyjd") + public AjaxResult tyjd(@RequestBody ArchiveForm form) + { + mjyService.tyjd(form); return AjaxResult.success("操作成功"); } /** - * 修改库存 + * 拒绝解档 */ - @PostMapping("xgkc") - @RequiresPermissions(value={"business:resource:mjy:xgkc", "business:studyMjy:xgkc", "business:nonTrialMjy:xgkc", "business:drugMjy:xgkc"}, logical= Logical.OR) - public AjaxResult xgkc(@RequestBody XgkcForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.xgkc(form); + @PostMapping("/jjjd") + @RequiresPermissions("business:archive:mjy:jjjd") + public AjaxResult jjjd(@RequestBody ArchiveForm form) + { + mjyService.jjjd(form); return AjaxResult.success("操作成功"); } - /** - * 审核修改库存 + * 同意借阅 */ - @PostMapping("shxgkc") - @RequiresPermissions("business:resource:mjy:shxgkc") - public AjaxResult shxgkc(@RequestBody ShxgkcForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.shxgkc(form); + @PostMapping("/tyjy") + @RequiresPermissions("business:archive:mjy:tyjy") + public AjaxResult tyjy(@RequestBody ArchiveForm form) + { + mjyService.tyjy(form); return AjaxResult.success("操作成功"); } - /** - * 归还 - */ - @PostMapping("gh") - @RequiresPermissions({"business:resource:mjy:gh"}) - public AjaxResult gh(@RequestBody GhForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.gh(form); - return AjaxResult.success("操作成功"); - } /** - * 入库 + * 拒绝借阅 */ - @PostMapping("rk") - @RequiresPermissions({"business:resource:mjy:rk"}) - public AjaxResult rk(@RequestBody RkForm form) { - mjyService.rk(form); + @PostMapping("/jjjy") + @RequiresPermissions("business:archive:mjy:jjjy") + public AjaxResult jjjy(@RequestBody ArchiveForm form) + { + mjyService.jjjy(form); return AjaxResult.success("操作成功"); } - /** - * 借阅 - */ - @PostMapping("/jy") - @RequiresPermissions("business:resource:mjy:jy") - public AjaxResult jy(@RequestBody JyForm form) { - form.setQmrId(SecurityUtils.getUserId()); - mjyService.jy(form); - return AjaxResult.success("操作成功"); - } /** - * 存储 + * 确认归还 */ - @PostMapping("cc") - @RequiresPermissions(value={"business:studyMjy:cc","business:nonTrialMjy:cc","business:drugMjy:cc"}, logical= Logical.OR) - public AjaxResult cc(@RequestBody CcForm form) + @PostMapping("/qrgh") + @RequiresPermissions("business:archive:mjy:qrgh") + public AjaxResult qrgh(@RequestBody ArchiveForm form) { - mjyService.cc(form); + mjyService.qrgh(form); return AjaxResult.success("操作成功"); } - /** - * 取出 - */ - @PostMapping("qc") - @RequiresPermissions(value={"business:studyMjy:qc","business:nonTrialMjy:qc","business:drugMjy:qc"}, logical= Logical.OR) - public AjaxResult qc(@RequestBody CcForm form) - { - mjyService.qc(form); - return AjaxResult.success("操作成功"); - } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java index 3455819..3ff509b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/MjyController.java @@ -72,7 +72,7 @@ public class MjyController extends BaseController { /** * 稽查轨迹列表 */ - @RequiresPermissions("business:resource:mjy:list") + @RequiresPermissions(value={"business:resource:mjy:xq","business:archive:mjy:xq"}, logical= Logical.OR) @GetMapping("/jcgjList") public TableDataInfo jcgjList(MjyJcgj form) { startPage(); @@ -83,7 +83,7 @@ public class MjyController extends BaseController { /** * 台账列表 */ - @RequiresPermissions("business:resource:mjy:list") + @RequiresPermissions(value={"business:resource:mjy:xq","business:archive:mjy:xq"}, logical= Logical.OR) @GetMapping("/tzList") public TableDataInfo tzList(MjyTz form) { startPage(); @@ -94,7 +94,7 @@ public class MjyController extends BaseController { /** * 详细信息 */ - @RequiresPermissions("business:resource:mjy:xq") + @RequiresPermissions(value={"business:resource:mjy:xq","business:archive:mjy:xq"}, logical= Logical.OR) @GetMapping(value = "/info") public AjaxResult getInfo(Long id) { return AjaxResult.success(mjyService.queryInfo(id)); @@ -103,7 +103,7 @@ public class MjyController extends BaseController { /** * 导出 */ - @RequiresPermissions("business:resource:mjy:xq") + @RequiresPermissions(value={"business:resource:mjy:xq","business:archive:mjy:xq"}, logical= Logical.OR) @GetMapping(value = "/exportDetail") public AjaxResult exportDetail(Long id,String lang) { MjyJcgj mjyJcgj = new MjyJcgj(); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java index 3bb2061..609dbf0 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Mjy.java @@ -71,6 +71,8 @@ public class Mjy extends MpBaseEntity /** 存储状态：1：取出；3：存储*/ private Integer cczt; + /** 档案状态：1：未归档；3：已归档*/ + private Integer dazt; /** 关联暂存柜id */ @TableField(updateStrategy = FieldStrategy.IGNORED) @@ -217,6 +219,14 @@ public class Mjy extends MpBaseEntity /** 发放目的其他 */ private String mdOther; + public Integer getDazt() { + return dazt; + } + + public void setDazt(Integer dazt) { + this.dazt = dazt; + } + public Integer getCczt() { return cczt; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ArchiveForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ArchiveForm.java new file mode 100644 index 0000000..9a62d6d --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/mjy/ArchiveForm.java @@ -0,0 +1,79 @@ +package com.hxhq.business.form.mjy; + +import com.fasterxml.jackson.annotation.JsonFormat; + +import java.util.Date; + +/** + * @author 15881 + */ +public class ArchiveForm { + + /** 给药制剂id */ + private Long id; + + /** 备注 */ + private String remark; + + /** 签名人id */ + private Long qmrId; + + /** 签名人密码 */ + private String qmrmm; + + /** 借阅日期开始 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyksrq; + + /** 借阅日期结束 */ + @JsonFormat(pattern = "yyyy-MM-dd") + private Date jyjsrq; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Long getQmrId() { + return qmrId; + } + + public void setQmrId(Long qmrId) { + this.qmrId = qmrId; + } + + public String getQmrmm() { + return qmrmm; + } + + public void setQmrmm(String qmrmm) { + this.qmrmm = qmrmm; + } + + public Date getJyksrq() { + return jyksrq; + } + + public void setJyksrq(Date jyksrq) { + this.jyksrq = jyksrq; + } + + public Date getJyjsrq() { + return jyjsrq; + } + + public void setJyjsrq(Date jyjsrq) { + this.jyjsrq = jyjsrq; + } +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java index dc74144..edf8d27 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyService.java @@ -6,10 +6,8 @@ import com.hxhq.business.domain.Mjy; import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.dto.mjy.DetailDto; import com.hxhq.business.dto.mjy.ListDto; +import com.hxhq.business.form.mjy.ArchiveForm; import com.hxhq.business.form.mjy.*; -; -import org.springframework.web.bind.annotation.RequestBody; - /** * 麻精药Service接口 * @@ -17,6 +15,9 @@ import org.springframework.web.bind.annotation.RequestBody; * @date 2025-12-18 */ public interface IMjyService extends IService { + + //region 资源库管理 + /** * 查询麻精药列表 * @@ -195,4 +196,54 @@ public interface IMjyService extends IService { * 取出 */ public void qc(CcForm form) ; + + //endregion + + //region 档案管理 + + /** + * 查询麻精药列表 + * + * @param form 麻精药 + * @return 麻精药集合 + */ + public List queryArchiveList(SearchForm form); + + /** + * 同意归档 + */ + public void tygd(ArchiveForm form); + + /** + * 拒绝归档 + */ + public void jjgd(ArchiveForm form); + + /** + * 同意解档 + */ + public void tyjd(ArchiveForm form); + + /** + * 拒绝解档 + */ + public void jjjd(ArchiveForm form); + + /** + * 同意借阅 + */ + public void tyjy(ArchiveForm form); + + /** + * 拒绝借阅 + */ + public void jjjy(ArchiveForm form); + + /** + * 确认归还 + */ + public void qrgh(ArchiveForm form); + + //endregion + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java index d579b48..bbe4155 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java @@ -1340,7 +1340,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG if (gyzjOld == null) { throw new ServiceException("给药制剂不存在或已删除"); } - if (!gyzjOld.getZjzt().equals(ZjztEnum.ysd.getValue())) { + if (!gyzjOld.getZjzt().equals(ZjztEnum.dgd.getValue())) { throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是待归档状态，不能操作"); } gyzjOld.setZjzt(ZjztEnum.ysd.getValue()); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java index 5ddaff2..3811672 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java @@ -50,6 +50,8 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS @Autowired private IMjyTzService mjyTzService; + //region 资源库管理 + /** * 列表 * @@ -221,6 +223,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS for (Mjy mjy : mjyList) { //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； mjy.setZjzt(ZjztEnum.dgd.getValue()); + mjy.setDazt(DaztEnum.ygd.getValue()); //稽查轨迹 mjyJcgjList.add(mjyJcgjService.getJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark())); } @@ -252,6 +255,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS } //申请归档，档案员可在档案管理中进行确认归档审核；申请后状态更新成待归档； mjyOld.setZjzt(ZjztEnum.dgd.getValue()); + mjyOld.setDazt(DaztEnum.ygd.getValue()); this.updateById(mjyOld); //稽查轨迹 mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.orange.getValue(),null, qmr, form.getRemark()); @@ -1166,6 +1170,237 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS mjyTzService.saveTz(mjyOld.getId(),null,null,qmr,qmr2,null,null,null,null,null,"取出",mjyOld.getKc(),mjyOld.getKcdw(),form.getRemark()); } + //endregion + + //region 档案管理 + + /** + * 查询给药制剂列表 + * + * @param form 给药制剂 + * @return 给药制剂集合 + */ + @Override + public List queryArchiveList(SearchForm form){ + QueryWrapper queryWrapper = Wrappers.query(); + queryWrapper.eq("t.del_flag", "0"); + queryWrapper.eq("t.`dazt`", DaztEnum.ygd.getValue()); + if (form.getJyzt() != null && form.getJyzt().intValue() > 0) { + queryWrapper.eq("t.jyzt", form.getJyzt()); + } + if (form.getZjzt() != null && form.getZjzt().intValue() > 0) { + queryWrapper.eq("t.zjzt", form.getZjzt()); + } + if (StringUtils.isNoneBlank(form.getMc())) { + queryWrapper.and(p -> p.like("t.`mc`", form.getMc())); + } + if (StringUtils.isNoneBlank(form.getBh())) { + queryWrapper.and(p -> p.like("t.`bh`", form.getBh())); + } + if (StringUtils.isNoneBlank(form.getStartDate())) { + queryWrapper.apply("t.sxrq>={0}", form.getStartDate()); + } + if (StringUtils.isNoneBlank(form.getEndDate())) { + queryWrapper.apply("t.sxrq<{0}", form.getEndDate()); + } + queryWrapper.orderByDesc("t.id"); + return baseMapper.queryList(queryWrapper); + } + + /** + * 同意归档 + */ + @Override + public void tygd(ArchiveForm form){ + SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + //验证签名人密码 + checkPassword(qmr,form.getQmrmm(),false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new ServiceException("给药制剂不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.dgd.getValue())) { + throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待归档状态，不能操作"); + } + mjyOld.setZjzt(ZjztEnum.gd.getValue()); + this.updateById(mjyOld); + //稽查轨迹 + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意归档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); + + } + + /** + * 拒绝归档 + */ + @Override + public void jjgd(ArchiveForm form){ + SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + //验证签名人密码 + checkPassword(qmr,form.getQmrmm(),false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new ServiceException("给药制剂不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.dgd.getValue())) { + throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待归档状态，不能操作"); + } + mjyOld.setZjzt(ZjztEnum.ysd.getValue()); + mjyOld.setDazt(DaztEnum.wgd.getValue()); + this.updateById(mjyOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("原因", form.getRemark()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null); + + } + + /** + * 同意解档 + */ + @Override + public void tyjd(ArchiveForm form){ + SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + //验证签名人密码 + checkPassword(qmr,form.getQmrmm(),false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new ServiceException("给药制剂不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.djd.getValue())) { + throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待解档状态，不能操作"); + } + mjyOld.setZjzt(ZjztEnum.ysd.getValue()); + mjyOld.setDazt(DaztEnum.wgd.getValue()); + this.updateById(mjyOld); + //稽查轨迹 + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意解档", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); + + } + + /** + * 拒绝解档 + */ + @Override + public void jjjd(ArchiveForm form){ + SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + //验证签名人密码 + checkPassword(qmr,form.getQmrmm(),false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new ServiceException("给药制剂不存在或已删除"); + } + if (!mjyOld.getZjzt().equals(ZjztEnum.djd.getValue())) { + throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待解档状态，不能操作"); + } + mjyOld.setZjzt(ZjztEnum.gd.getValue()); + this.updateById(mjyOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("原因", form.getRemark()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null); + + } + + /** + * 同意借阅 + */ + @Override + public void tyjy(ArchiveForm form){ + SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + //验证签名人密码 + checkPassword(qmr,form.getQmrmm(),false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new ServiceException("给药制剂不存在或已删除"); + } + if (!mjyOld.getJyzt().equals(JyztEnum.djy.getValue())) { + throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待借阅状态，不能操作"); + } + mjyOld.setJyzt(JyztEnum.jyz.getValue()); + mjyOld.setJyksrq(form.getJyksrq()); + mjyOld.setJyjsrq(form.getJyjsrq()); + this.updateById(mjyOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("开始日期", DateUtils.dateTime(form.getJyksrq())); + formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq())); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark()); + + } + + /** + * 拒绝借阅 + */ + @Override + public void jjjy(ArchiveForm form){ + SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + //验证签名人密码 + checkPassword(qmr,form.getQmrmm(),false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new ServiceException("给药制剂不存在或已删除"); + } + if (!mjyOld.getJyzt().equals(JyztEnum.djy.getValue())) { + throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是待借阅状态，不能操作"); + } + mjyOld.setJyzt(JyztEnum.wjy.getValue()); + mjyOld.setJyksrq(form.getJyksrq()); + mjyOld.setJyjsrq(form.getJyjsrq()); + this.updateById(mjyOld); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("开始日期", DateUtils.dateTime(form.getJyksrq())); + formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq())); + formData.put("原因", form.getRemark()); + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null); + + } + + /** + * 确认归还 + */ + @Override + public void qrgh(ArchiveForm form){ + SysUser qmr=SecurityUtils.getLoginUser().getSysUser(); + //验证签名人密码 + checkPassword(qmr,form.getQmrmm(),false); + if (form.getId() == null || form.getId().longValue() < 0) { + throw new ServiceException("参数id不正确"); + } + Mjy mjyOld = this.getById(form.getId()); + if (mjyOld == null) { + throw new ServiceException("给药制剂不存在或已删除"); + } + if (!mjyOld.getJyzt().equals(JyztEnum.jyz.getValue())) { + throw new ServiceException("给药制剂【" + mjyOld.getMc() + "】不是借阅中状态，不能操作"); + } + mjyOld.setJyzt(JyztEnum.wjy.getValue()); + this.updateById(mjyOld); + //稽查轨迹 + mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), null, qmr, form.getRemark()); + + } + + //endregion + /** * 验证密码 *