From b08dcab5780f062d0219d450b7d0b4d35e8d02b8 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Mon, 17 Nov 2025 10:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/SysLogConstants.java | 32 +++++++ .../controller/dict/DictController.java | 5 +- .../controller/dict/InstrController.java | 21 +++-- .../controller/dict/ReportItemController.java | 23 ++--- .../controller/dict/XmBaseController.java | 7 +- .../controller/dict/XmFeeInstrController.java | 7 +- .../dict/XmReqitemVsReportitemController.java | 7 +- .../controller/work/LisWorkController.java | 89 ++++++++++++------- .../work/LisWorkOperController.java | 35 ++++---- .../work/LisWorkPageInfoController.java | 8 +- .../controller/xtwh/ComOptController.java | 7 +- .../xtwh/LabInputmdlController.java | 9 +- .../xtwh/LabInstrvsreqclassController.java | 7 +- .../controller/xtwh/LabTatctrlController.java | 7 +- .../controller/xtwh/XmCompController.java | 7 +- .../controller/xtwh/XmMedController.java | 11 +-- .../controller/xtwh/XmMedgroupController.java | 7 +- .../controller/xtwh/XmMedinterController.java | 7 +- .../controller/xtwh/XmMedmainController.java | 5 ++ .../controller/FeeitemClassController.java | 7 +- .../controller/FeeitemVsClassController.java | 5 +- .../czlis/mzcx/controller/MZCXController.java | 7 +- .../mzcx/controller/RptgetRuleController.java | 9 +- .../mzcx/controller/XmFeeController.java | 7 +- 24 files changed, 210 insertions(+), 126 deletions(-) create mode 100644 lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/SysLogConstants.java diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/SysLogConstants.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/SysLogConstants.java new file mode 100644 index 0000000..ae61edf --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/SysLogConstants.java @@ -0,0 +1,32 @@ +package com.czlis.interfaceCommon.constants; + +/** + * 系统日志 + */ +public class SysLogConstants { + public static final String FEEITEMCLASS_LOG = "条码类别"; + public static final String FEEITEMVSCLASS_LOG = "条码类别与项目对照"; + public static final String MZCX_LOG = "门诊采血"; + public static final String RPTGETRULE_LOG = "报告领取规则"; + public static final String XMFEE_LOG = "收费项目维护"; + public static final String DICT_LOG = "常见字典"; + public static final String INSTR_LOG = "仪器维护"; + public static final String REPORTITEM_LOG = "检验项目"; + public static final String XMFILTER_LOG = "光片波长对照表"; + public static final String XMLOT_LOG = "试剂维护"; + public static final String XMALARMDETAIL_LOG = "危急值特定判断条件"; + public static final String XMBASE_LOG = "报告项目"; + public static final String XMFEEINSTR_LOG = "仪器收费项目对照"; + public static final String XMREQITEMVSREPORTITEM_LOG = "收费项目报告项目"; + public static final String LISWORK_LOG = "主界面"; + public static final String COMOPT_LOG = "后台参数"; + public static final String LABINPUTMDL_LOG = "项目模板"; + public static final String LABINSTRVSREQCLASS_LOG = "仪器条码类别对照"; + public static final String LABTATCTRL_LOG = "TAT设定"; + public static final String XMCOMP_LOG = "项目组合"; + public static final String XMMED_LOG = "常用抗生素"; + public static final String XMMEDGROUP_LOG = "常用抗生素组"; + public static final String XMMEDINSTR_LOG = "抗生素通道号设定"; + public static final String XMMEDMAIN_LOG = "细菌抗生素组对照"; + +} diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java index 21a58fb..4d2538f 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/DictController.java @@ -9,6 +9,7 @@ import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.ComDict; import com.czlis.common.enums.BusinessType; import com.czlis.common.utils.poi.ExcelUtil; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.ComDictService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -57,7 +58,7 @@ public class DictController extends BaseController { @ApiOperation("新增字典") @PostMapping("/add") - @Log(title = "常见字典" ,businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.DICT_LOG ,businessType = BusinessType.INSERT) public Result add(@RequestBody ComDict comDict) { log.info("调用新增字典{}", comDict); return comDictService.insertComDict(comDict); @@ -66,7 +67,7 @@ public class DictController extends BaseController { @ApiOperation("删除字典") @DeleteMapping("/del") - @Log(title = "常见字典" ,businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.DICT_LOG,businessType = BusinessType.DELETE) public Result del(@RequestBody ComDict comDict) { log.info("调用删除字典接口{}", comDict); return comDictService.delComDict(comDict); diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/InstrController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/InstrController.java index e463685..d721a79 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/InstrController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/InstrController.java @@ -5,6 +5,7 @@ import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.LabInstr; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.InstrService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -27,32 +28,34 @@ public class InstrController extends BaseController { @ApiOperation("查询数据") @GetMapping("/query") - public Result query(String yq){ - return new Result("0","",instrService.query(yq)); + public Result query(String yq) { + return new Result("0", "", instrService.query(yq)); } + @ApiOperation("按组查询数据") @GetMapping("/querybylisgroup") - public Result querybylisgroup(String lisgroup){ + public Result querybylisgroup(String lisgroup) { return instrService.querybylisgroup(lisgroup); } + @ApiOperation("新增数据") @PostMapping("/add") - @Log(title = "仪器维护" ,businessType = BusinessType.INSERT) - public Result add(LabInstr labInstr){ + @Log(title = SysLogConstants.INSTR_LOG, businessType = BusinessType.INSERT) + public Result add(LabInstr labInstr) { return instrService.add(labInstr); } @ApiOperation("修改数据") @PostMapping("/update") - @Log(title = "仪器维护" ,businessType = BusinessType.UPDATE) - public Result update(LabInstr labInstr){ + @Log(title = SysLogConstants.INSTR_LOG, businessType = BusinessType.UPDATE) + public Result update(LabInstr labInstr) { return instrService.update(labInstr); } @ApiOperation("删除数据") @DeleteMapping("/del") - @Log(title = "仪器维护" ,businessType = BusinessType.DELETE) - public Result delete(String yq){ + @Log(title = SysLogConstants.INSTR_LOG, businessType = BusinessType.DELETE) + public Result delete(String yq) { return instrService.delete(yq); } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java index 4d345dd..3695273 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/ReportItemController.java @@ -7,6 +7,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.*; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.pojo.DTO.XmInfoNewDTO; import com.czlis.liswork.service.ReportItemService; import io.swagger.annotations.Api; @@ -51,35 +52,35 @@ public class ReportItemController extends BaseController { return reportItemService.queryXmInfoNew(xmInfoNew); } - @Log(title = "检验项目",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.REPORTITEM_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增检验项目") @PostMapping("/add") public Result add(@RequestBody XmInfoNewDTO xmInfoNewDTO){ return reportItemService.add(xmInfoNewDTO); } - @Log(title = "检验项目",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.REPORTITEM_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除检验项目") @DeleteMapping("/del") public Result delete(Integer xmid){ return reportItemService.delete(xmid); } - @Log(title = "检验项目",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.REPORTITEM_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改检验项目") @PostMapping("/update") public Result update(@RequestBody XmInfoNewDTO xmInfoNewDTO){ return reportItemService.update(xmInfoNewDTO); } - @Log(title = "检验项目",businessType = BusinessType.INSERT_VS) + @Log(title = SysLogConstants.REPORTITEM_LOG,businessType = BusinessType.INSERT_VS) @ApiOperation("新增仪器项目对照") @PostMapping("/addvs") public Result addvs(@RequestBody XmInfoVs xmInfoVs){ return reportItemService.addvs(xmInfoVs); } - @Log(title = "检验项目",businessType = BusinessType.DELETE_VS) + @Log(title = SysLogConstants.REPORTITEM_LOG,businessType = BusinessType.DELETE_VS) @ApiOperation("删除仪器项目对照") @DeleteMapping("/delvs") public Result deleteXmInfoVs(Integer vsid){ @@ -92,14 +93,14 @@ public class ReportItemController extends BaseController { return reportItemService.getXmFilter(xmFilter); } - @Log(title = "光片波长对照表",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMFILTER_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增滤光片波长对照表") @PostMapping("/addXmFilter") public Result addXmFilter(@RequestBody XmFilter xmFilter){ return reportItemService.addXmFilter(xmFilter); } - @Log(title = "光片波长对照表",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMFILTER_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除滤光片波长对照表") @GetMapping("/delXmFilter") public Result deleteXmFilter(String yq,String lgph){ @@ -112,14 +113,14 @@ public class ReportItemController extends BaseController { return reportItemService.getXmLot(); } - @Log(title = "试剂维护",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMLOT_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增试剂维护数据") @PostMapping("/addXmLot") public Result addXmLot(@RequestBody XmLot xmLot){ return reportItemService.addXmLot(xmLot); } - @Log(title = "试剂维护",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMLOT_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除试剂维护数据") @GetMapping("/delXmLot") public Result deleteXmLot(String yq,String sjph){ @@ -132,14 +133,14 @@ public class ReportItemController extends BaseController { return reportItemService.queryXmAlarmdetailNew(xmAlarmdetailNew); } - @Log(title = "危急值特定判断条件",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMALARMDETAIL_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增危急值特定判断条件") @PostMapping("/addXmAlarmdetailNew") public Result addXmAlarmdetailNew(@RequestBody List xmAlarmdetailNew){ return reportItemService.addXmAlarmdetailNew(xmAlarmdetailNew); } - @Log(title = "危急值特定判断条件",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMALARMDETAIL_LOG,businessType = BusinessType.DELETE) @ApiOperation("修改危急值特定判断条件") @GetMapping("/delXmAlarmdetailNew") public Result delXmAlarmdetailNew(XmAlarmdetailNew xmAlarmdetailNew){ diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmBaseController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmBaseController.java index 7f55d09..e440fb2 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmBaseController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmBaseController.java @@ -6,6 +6,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.XmBase; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.XmBaseService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -37,21 +38,21 @@ public class XmBaseController extends BaseController { @ApiOperation("新增报告项目") @PostMapping("/add") - @Log(title = "报告项目" ,businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMBASE_LOG,businessType = BusinessType.INSERT) public Result add(@RequestBody XmBase xmBase){ return xmBaseService.add(xmBase); } @ApiOperation("删除报告项目") @DeleteMapping("/del") - @Log(title = "报告项目" ,businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMBASE_LOG ,businessType = BusinessType.DELETE) public Result delete(@RequestBody String xmdh){ return xmBaseService.delete(xmdh); } @ApiOperation("修改报告项目") @PostMapping("/update") - @Log(title = "报告项目" ,businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.XMBASE_LOG ,businessType = BusinessType.UPDATE) public Result update(@RequestBody @NotBlank(message = "参数不能为空！") XmBase xmBase){ return xmBaseService.update(xmBase); } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java index 2fcb72f..ec78c9f 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmFeeInstrController.java @@ -6,6 +6,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.XmFeeInstr; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.XmFeeInstrService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -34,21 +35,21 @@ public class XmFeeInstrController extends BaseController { return getDataTable(xmFeeInstrList); } - @Log(title = "仪器收费项目对照",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMFEEINSTR_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增仪器收费项目对照") @PostMapping("/add") public Result add(XmFeeInstr xmFeeInstr){ return xmFeeInstrService.add(xmFeeInstr); } - @Log(title = "仪器收费项目对照",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.XMFEEINSTR_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改仪器收费项目对照") @PostMapping("/update") public Result update(XmFeeInstr xmFeeInstr){ return xmFeeInstrService.update(xmFeeInstr); } - @Log(title = "仪器收费项目对照",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMFEEINSTR_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除仪器收费项目对照") @DeleteMapping("/del") public Result delete(@NotBlank(message = "yq参数不能为空！") String yq,@NotBlank(message = "sfxmdh参数不能为空！") String sfxmdh){ diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java index 7358296..e8efc42 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmReqitemVsReportitemController.java @@ -6,6 +6,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.XmReqitemVsReportitem; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.XmReqitemVsReportitemService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -38,21 +39,21 @@ public class XmReqitemVsReportitemController extends BaseController { @ApiOperation("新增收费项目报告项目对照") @PostMapping("/add") - @Log(title = "收费项目报告项目" ,businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMREQITEMVSREPORTITEM_LOG,businessType = BusinessType.INSERT) public Result add(XmReqitemVsReportitem xmReqitemVsReportitem){ return xmReqitemVsReportitemService.add(xmReqitemVsReportitem); } @ApiOperation("删除收费项目报告项目对照") @DeleteMapping("/del") - @Log(title = "收费项目报告项目" ,businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMREQITEMVSREPORTITEM_LOG ,businessType = BusinessType.DELETE) public Result delete(String sqxmdh,String yq,String xmdh,String tdh){ return xmReqitemVsReportitemService.delete(sqxmdh,yq,xmdh,tdh); } @ApiOperation("修改收费项目报告项目对照") @PostMapping("/update") - @Log(title = "收费项目报告项目" ,businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.XMREQITEMVSREPORTITEM_LOG ,businessType = BusinessType.UPDATE) public Result update(XmReqitemVsReportitem xmReqitemVsReportitem){ return xmReqitemVsReportitemService.update(xmReqitemVsReportitem); } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java index a8115b3..f6e362d 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkController.java @@ -7,6 +7,7 @@ import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.LabResultService; import com.czlis.liswork.service.LisWorkService; import io.swagger.annotations.Api; @@ -32,6 +33,7 @@ public class LisWorkController extends BaseController { private LisWorkService lisWorkService; @Autowired private LabResultService labResultService; + @ApiOperation("可操作仪器查询") @GetMapping("/instrdlist") public Result getInstrdList() { @@ -41,21 +43,25 @@ public class LisWorkController extends BaseController { // loginConfigParamUtil.setLoginConfigParam(loginConfigParam); return lisWorkService.getInstrdList(); } + @ApiOperation("仪器组可操作仪器查询") @GetMapping("/getGroupInstrdList") - public Result getGroupInstrdList(String lisgroup){ + public Result getGroupInstrdList(String lisgroup) { return lisWorkService.getGroupInstrdList(lisgroup); } + @ApiOperation("切换仪器，查询仪器参数") @GetMapping("/instrdconfig") public Result getInstrdConfig(String yq) { return lisWorkService.getInstrdConfig(yq); } + @ApiOperation("获取样本列表") @GetMapping("/samplelist") - public Result getSampleList(Date jyrq,String yq,Long days){ - return new Result("0", "获取样本数据成功！",lisWorkService.getSampleList(jyrq,yq,days)); - } + public Result getSampleList(Date jyrq, String yq, Long days) { + return new Result("0", "获取样本数据成功！", lisWorkService.getSampleList(jyrq, yq, days)); + } + @ApiOperation("获取样本列表") @GetMapping("/samplelistpage") public TableDataInfo samplelistpage(Date jyrq, String yq, Long days) { @@ -68,21 +74,24 @@ public class LisWorkController extends BaseController { clearPage(); } } + @ApiOperation("获取普通样本信息") @GetMapping("/sampleinfo") public Result sampleInfo(Date jyrq, String yq, String ybh) { return lisWorkService.getLabPat(jyrq, yq, ybh); } + @ApiOperation("获取检验项目字典信息") @GetMapping("/queryxminfo") public Result queryxminfo(String yq) { return lisWorkService.getXmInfo(yq); } + @ApiOperation("获取检验项目常用取值信息") @GetMapping("/queryxmval") - public Result queryxmval(String yq,String xmdh) { - return lisWorkService.getXmVal(yq,xmdh); + public Result queryxmval(String yq, String xmdh) { + return lisWorkService.getXmVal(yq, xmdh); } @ApiOperation("工号密码验证") @@ -90,93 +99,107 @@ public class LisWorkController extends BaseController { public Result checkUser(String yhdh, String mm) { return lisWorkService.checkUser(yhdh, mm); } + @ApiOperation("获取检验结果") @GetMapping("/resultinfo") public Result getresultinfo(LabResult labResult) { Date jyrq = labResult.getJyrq(); String yq = labResult.getYq(); String ybh = labResult.getYbh(); - // log.info("jyrq,{}", jyrq.toString()); + // log.info("jyrq,{}", jyrq.toString()); return lisWorkService.getresultinfo(jyrq, yq, ybh); } - @Log(title = "主界面",businessType = BusinessType.DELETE_DETAIL) + + @Log(title = SysLogConstants.LISWORK_LOG, businessType = BusinessType.DELETE_DETAIL) @ApiOperation("删除检验结果") @PostMapping("/deleteresult") public Result deleteresult(@RequestBody List labResultlist) { return labResultService.delLabResultList(labResultlist); } - @Log(title = "主界面",businessType = BusinessType.UPDATE_DETAIL) + + @Log(title = SysLogConstants.LISWORK_LOG, businessType = BusinessType.UPDATE_DETAIL) @ApiOperation("项目模板输入结果") @GetMapping("/setinputmdl") - public Result setinputmdl(Date jyrq, String yq, String ybh,String mbmc) { + public Result setinputmdl(Date jyrq, String yq, String ybh, String mbmc) { - return lisWorkService.setinputmdl(jyrq,yq,ybh,mbmc); + return lisWorkService.setinputmdl(jyrq, yq, ybh, mbmc); } - @Log(title = "主界面",businessType = BusinessType.UPDATE_DETAIL) + + @Log(title = SysLogConstants.LISWORK_LOG, businessType = BusinessType.UPDATE_DETAIL) @ApiOperation("结果修改记录") @GetMapping("/getresultchangelog") - public Result getresultchangelog(Date jyrq, String yq, String ybh,String xmdh) { + public Result getresultchangelog(Date jyrq, String yq, String ybh, String xmdh) { - return lisWorkService.getresultchangelog(jyrq,yq,ybh,xmdh); + return lisWorkService.getresultchangelog(jyrq, yq, ybh, xmdh); } + @ApiOperation("打印报告") @GetMapping("/print") public Result printReport(LabPat labPat) { return lisWorkService.printReport(labPat); } + @ApiOperation("查看电子病历") @GetMapping("/emrquery") public Result emrquery(Date jyrq, String yq, String ybh) { - return lisWorkService.emrquery(jyrq,yq,ybh); + return lisWorkService.emrquery(jyrq, yq, ybh); } + @ApiOperation("查看患者360视图") @GetMapping("/allpatquery") public Result allpatquery(Date jyrq, String yq, String ybh) { - return lisWorkService.allpatquery(jyrq,yq,ybh); + return lisWorkService.allpatquery(jyrq, yq, ybh); } + @ApiOperation("双工流水线") @GetMapping("/datalink") public Result datalink(Date jyrq, String yq) { - return lisWorkService.datalink(jyrq,yq); + return lisWorkService.datalink(jyrq, yq); } + @ApiOperation("更改流水线状态") @GetMapping("/changelink") - public Result changelink(Date jyrq, String yq, String ybh,String instrid) { - return lisWorkService.changelink(jyrq,yq,ybh,instrid); + public Result changelink(Date jyrq, String yq, String ybh, String instrid) { + return lisWorkService.changelink(jyrq, yq, ybh, instrid); } + @ApiOperation("批量更改流水线状态") @PostMapping("/changelinklist") public Result changelinklist(@RequestBody List labPatList) { - if(labPatList.isEmpty()) return new Result("-1","无数据"); - for(LabPat labPat : labPatList) { - lisWorkService.changelink(labPat.getJyrq(),labPat.getYq(),labPat.getYbh(),labPat.getInstrid()); + if (labPatList.isEmpty()) return new Result("-1", "无数据"); + for (LabPat labPat : labPatList) { + lisWorkService.changelink(labPat.getJyrq(), labPat.getYq(), labPat.getYbh(), labPat.getInstrid()); } - return new Result("0","成功"); + return new Result("0", "成功"); } @ApiOperation("清除所有未做项目") @GetMapping("/clearnotcomplete") - public Result clearnotcomplete(Date jyrq, String yq,String ybh) { - return lisWorkService.clearnotcomplete(jyrq,yq,ybh); + public Result clearnotcomplete(Date jyrq, String yq, String ybh) { + return lisWorkService.clearnotcomplete(jyrq, yq, ybh); } + @ApiOperation("清除打印标志") @GetMapping("/clearprintflag") - public Result clearprintflag(Date jyrq, String yq,String ybh) { - return lisWorkService.clearprintflag(jyrq,yq,ybh); + public Result clearprintflag(Date jyrq, String yq, String ybh) { + return lisWorkService.clearprintflag(jyrq, yq, ybh); } + @ApiOperation("查看备份数据") @GetMapping("/viewbackup") - public Result viewbackup(Date jyrq, String yq,String ybh) { - return lisWorkService.viewbackup(jyrq,yq,ybh); + public Result viewbackup(Date jyrq, String yq, String ybh) { + return lisWorkService.viewbackup(jyrq, yq, ybh); } + @ApiOperation("未建项目结果") @GetMapping("/noitemresult") - public Result noitemresult(Date jyrq, String yq,String ybh) { - return lisWorkService.getnoitemresult(jyrq,yq,ybh); + public Result noitemresult(Date jyrq, String yq, String ybh) { + return lisWorkService.getnoitemresult(jyrq, yq, ybh); } + @ApiOperation("项目与通道号对照") @GetMapping("/setiteminter") - public Result setiteminter(Date jyrq, String yq,String ybh,String xmdh,String xmdh0) { - return lisWorkService.setiteminter(jyrq,yq,ybh,xmdh,xmdh0); + public Result setiteminter(Date jyrq, String yq, String ybh, String xmdh, String xmdh0) { + return lisWorkService.setiteminter(jyrq, yq, ybh, xmdh, xmdh0); } } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java index 07a77c3..d20f586 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java @@ -7,6 +7,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.common.core.domain.entity.lis.LabResult; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.mapper.LisWorkPageInfoMapper; import com.czlis.liswork.service.LisWorkOperService; import io.swagger.annotations.Api; @@ -27,20 +28,20 @@ public class LisWorkOperController extends BaseController { @Autowired private LisWorkOperService lisWorkOperService; - @Log(title = "主界面",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.INSERT) @ApiOperation(("新增病人信息")) @GetMapping("/newpat") public Result newPatInfo(Date jyrq, String sqh, String yq, String ybh) { return lisWorkOperService.newPatInfo(jyrq, ybh, sqh, yq); } - @Log(title = "主界面",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.INSERT) @ApiOperation(("新增空白新样本")) @GetMapping("/loaddefault") public Result loaddefault(Date jyrq, String yq, String ybh) { return lisWorkOperService.loaddefault(jyrq, yq ,ybh); } - @Log(title = "主界面",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改病人信息") @PostMapping("/changepat") public Result changePat(@RequestBody LabPat labPat) { @@ -53,7 +54,7 @@ public class LisWorkOperController extends BaseController { return lisWorkOperService.changePat(labPat); } - @Log(title = "主界面",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改病人信息,输入病人代号需要单独处理") @GetMapping("/changepatcolumn") public Result changepatcolumn(Date jyrq, String yq, String ybh, String column, String value) { @@ -69,20 +70,20 @@ public class LisWorkOperController extends BaseController { return lisWorkOperService.changePatColumn(jyrq, yq, ybh, column, value); } - @Log(title = "主界面",businessType = BusinessType.UPDATE_DETAIL) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.UPDATE_DETAIL) @ApiOperation("修改病人结果") @PostMapping("/changeresult") public Result changeresult(@RequestBody LabResult labResult) { return lisWorkOperService.changeresult(labResult); } - @Log(title = "主界面",businessType = BusinessType.INSERT_DETAIL) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.INSERT_DETAIL) @ApiOperation("新增病人结果") @PostMapping("/newresult") public Result newresult(@RequestBody LabResult labResult) { return lisWorkOperService.newresult(labResult); } - @Log(title = "主界面",businessType = BusinessType.UPDATE_DETAIL) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.UPDATE_DETAIL) @ApiOperation("保存病人结果") @PostMapping("/saveresult") public Result saveresult(@RequestBody List labResult) { @@ -99,65 +100,65 @@ public class LisWorkOperController extends BaseController { * @param yhdh 核对医生 * @return 返回消息 */ - @Log(title = "主界面",businessType = BusinessType.CHECK) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.CHECK) @ApiOperation("审核报告") @GetMapping("/check2") public Result check2(Date jyrq, String yq, String ybh, String yhdh) { return lisWorkOperService.confirm(jyrq, yq, ybh, yhdh); } - @Log(title = "主界面",businessType = BusinessType.CHECK1) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.CHECK1) @ApiOperation("初审报告") @GetMapping("/check1") public Result check1(Date jyrq, String yq, String ybh, String yhdh) { return lisWorkOperService.confirm1(jyrq, yq, ybh, yhdh); } - @Log(title = "主界面",businessType = BusinessType.UNCHECK) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.UNCHECK) @ApiOperation("取消审核") @GetMapping("/uncheck2") public Result uncheck2(Date jyrq, String yq, String ybh, String yhdh) { return lisWorkOperService.unconfirm(jyrq, yq, ybh, yhdh); } - @Log(title = "主界面",businessType = BusinessType.UNCHECK1) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.UNCHECK1) @ApiOperation("取消初审") @GetMapping("/uncheck1") public Result uncheck1(Date jyrq, String yq, String ybh, String yhdh) { return lisWorkOperService.unconfirm1(jyrq, yq, ybh, yhdh); } - @Log(title = "主界面",businessType = BusinessType.UNCHECK_REGISTER) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.UNCHECK_REGISTER) @ApiOperation("解除审核原因登记") @GetMapping("/unconfirmlog") public Result unconfirmlog(Date jyrq, String yq, String ybh, String yhdh, String reason) { return lisWorkOperService.unconfirmlog(jyrq, yq, ybh, yhdh, reason); } - @Log(title = "主界面",businessType = BusinessType.CRITICAL_REGISTER) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.CRITICAL_REGISTER) @ApiOperation("登记危急值") @GetMapping("/reglimit") public Result reglimit(Date jyrq, String yq, String ybh, String yhdh, String qrr, String phone, String tzfs) { return lisWorkOperService.reglimit(jyrq, yq, ybh, yhdh, qrr, phone, tzfs); } - @Log(title = "主界面",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除样本") @GetMapping("/delsample") public Result delsample(Date jyrq, String yq, String ybh) { return lisWorkOperService.delsample(jyrq, yq, ybh); } - @Log(title = "主界面",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.LISWORK_LOG,businessType = BusinessType.UPDATE) @ApiOperation("指定为某样本复查结果") @GetMapping("/setredosample") public Result setredosample(Date jyrq, String yq, String ybh, String newyq, String newybh) { return lisWorkOperService.setredosample(jyrq,yq,ybh,newyq,newybh); } - @Log(title = "主界面") + @Log(title = SysLogConstants.LISWORK_LOG) @ApiOperation("锁定报告") @GetMapping("/locksample") public Result locksample(Date jyrq, String yq, String ybh, String yhdh) { return lisWorkOperService.locksample(jyrq, yq, ybh, yhdh); } - @Log(title = "主界面") + @Log(title = SysLogConstants.LISWORK_LOG) @ApiOperation("解锁报告") @GetMapping("/unlocksample") public Result unlocksample(Date jyrq, String yq, String ybh, String yhdh) { diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java index 43b4ea1..8f9b529 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkPageInfoController.java @@ -45,12 +45,13 @@ public class LisWorkPageInfoController extends BaseController { return lisWorkPageInfoService.saveRedo(labResultRe); } + @ApiOperation("删除复查结果") @PostMapping("/deleteRedo") public Result deleteRedo(@RequestBody LabResultRe labResultRe) { return lisWorkPageInfoService.deleteRedo(labResultRe); } - @Anonymous + @ApiOperation("获取历史结果") @GetMapping("/history") public Result getHistory(Date jyrq, String yq, String ybh) { @@ -63,7 +64,7 @@ public class LisWorkPageInfoController extends BaseController { return lisWorkPageInfoService.getOtherinstr(jyrq, yq, ybh); } - @Anonymous + @ApiOperation("获取其他仪器结果明细") @GetMapping("/otherinstrdetail") public Result getOtherinstrDetail(String brdh, String yq, Date jyrq, String ybh) { @@ -93,10 +94,11 @@ public class LisWorkPageInfoController extends BaseController { public Result getInputmdl(String yq) { return lisWorkPageInfoService.getInputmdl(yq); } + @ApiOperation("获取临床意义") @GetMapping("/clinicref") public Result getclinicref(String yq, String xmdh) { - return lisWorkPageInfoService.getclinicref(yq,xmdh); + return lisWorkPageInfoService.getclinicref(yq, xmdh); } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComOptController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComOptController.java index f9b291c..7061a30 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComOptController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComOptController.java @@ -9,6 +9,7 @@ import com.czlis.common.core.domain.entity.lis.ComOptTemplate; import com.czlis.common.core.domain.entity.lis.LabPat; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.ComOptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -36,21 +37,21 @@ public class ComOptController extends BaseController { return getDataTable(comOptList); } - @Log(title = "后台参数",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.COMOPT_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增参数") @PostMapping("/add") public Result add(@RequestBody ComOpt comOpt) { return comOptService.add(comOpt); } - @Log(title = "后台参数",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.COMOPT_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改参数") @PostMapping("/update") public Result update(@RequestBody ComOpt comOpt) { return comOptService.update(comOpt); } - @Log(title = "后台参数",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.COMOPT_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除参数") @DeleteMapping("/del") public Result delete(String yq,String xxdh) { diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabInputmdlController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabInputmdlController.java index 11e53b8..dd3203d 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabInputmdlController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabInputmdlController.java @@ -5,6 +5,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.LabInputmdl; import com.czlis.common.core.domain.entity.lis.LabInputmdlDetail; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.pojo.DTO.LabInputmdlDTO; import com.czlis.liswork.service.LabInputmdlService; import io.swagger.annotations.Api; @@ -37,28 +38,28 @@ public class LabInputmdlController { return labInputmdlService.queryDetail(labInputmdl); } - @Log(title = "项目模板",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.LABINPUTMDL_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增模板") @PostMapping("/add") public Result add(@RequestBody LabInputmdlDTO labInputmdlDTO){ return labInputmdlService.add(labInputmdlDTO); } - @Log(title = "项目模板",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.LABINPUTMDL_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改模板") @PostMapping("/update") public Result update(@RequestBody LabInputmdlDTO labInputmdlDTO){ return labInputmdlService.update(labInputmdlDTO); } - @Log(title = "项目模板",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.LABINPUTMDL_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除模板") @GetMapping("/delete") public Result delete(LabInputmdl labInputmdl){ return labInputmdlService.delete(labInputmdl); } - @Log(title = "项目模板",businessType = BusinessType.DELETE_DETAIL) + @Log(title = SysLogConstants.LABINPUTMDL_LOG,businessType = BusinessType.DELETE_DETAIL) @ApiOperation("删除明细数据") @GetMapping("/deleteDetail") public Result deleteDetail(List labInputmdlDetailList){ diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabInstrvsreqclassController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabInstrvsreqclassController.java index b63bd71..b75e054 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabInstrvsreqclassController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabInstrvsreqclassController.java @@ -4,6 +4,7 @@ import com.czlis.common.annotation.Log; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.LabInstrvsreqclass; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.LabInstrvsreqclassService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -32,7 +33,7 @@ public class LabInstrvsreqclassController { return labInstrvsreqclassService.queryReqClass(yq); } - @Log(title = "仪器条码类别对照",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.LABINSTRVSREQCLASS_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增仪器条码类别对照") @PostMapping("/add") public Result add(@RequestBody LabInstrvsreqclass labInstrvsreqclass){ @@ -40,14 +41,14 @@ public class LabInstrvsreqclassController { return labInstrvsreqclassService.add(labInstrvsreqclass); } - @Log(title = "仪器条码类别对照",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.LABINSTRVSREQCLASS_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改仪器条码类别对照") @PostMapping("/update") public Result update(@RequestBody LabInstrvsreqclass labInstrvsreqclass){ return labInstrvsreqclassService.update(labInstrvsreqclass); } - @Log(title = "仪器条码类别对照",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.LABINSTRVSREQCLASS_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除仪器条码类别对照") @GetMapping("/delete") public Result delete(LabInstrvsreqclass labInstrvsreqclass){ diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabTatctrlController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabTatctrlController.java index 209da06..d3e27d4 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabTatctrlController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabTatctrlController.java @@ -6,6 +6,7 @@ import com.czlis.common.core.domain.entity.lis.LabTatctrl; import com.czlis.common.core.domain.entity.lis.XmHisreq; import com.czlis.common.core.domain.entity.lis.view.VwReqitemclass; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.LabTatctrlService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -41,21 +42,21 @@ public class LabTatctrlController { return labTatctrlService.queryXmHisreq(xmHisreq); } - @Log(title = "TAT设定",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.LABTATCTRL_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增TAT设定") @PostMapping("/add") public Result add(@RequestBody LabTatctrl labTatctrl){ return labTatctrlService.add(labTatctrl); } - @Log(title = "TAT设定",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.LABTATCTRL_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改TAT设定") @PostMapping("/update") public Result update(@RequestBody LabTatctrl labTatctrl){ return labTatctrlService.update(labTatctrl); } - @Log(title = "TAT设定",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.LABTATCTRL_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除TAT设定") @GetMapping("/del") public Result delete(LabTatctrl labTatctrl){ diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmCompController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmCompController.java index f31cb61..fc68cb3 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmCompController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmCompController.java @@ -4,6 +4,7 @@ import com.czlis.common.annotation.Log; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.XmComp; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.XmCompService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,21 +30,21 @@ public class XmCompController { return xmCompService.getXmCompList(xmComp); } - @Log(title = "项目组合",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMCOMP_LOG,businessType = BusinessType.INSERT) @ApiOperation("增加项目组合") @PostMapping("/add") public Result addXmComp(@RequestBody List xmComp) { return xmCompService.addXmComp(xmComp); } - @Log(title = "项目组合",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.XMCOMP_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改项目组合") @PostMapping("/update") public Result updateXmComp(@RequestBody List xmComp) { return xmCompService.updateXmComp(xmComp); } - @Log(title = "项目组合",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMCOMP_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除项目组合") @GetMapping("/del") public Result deleteXmComp(XmComp xmComp) { diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedController.java index 581153a..0d43d89 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedController.java @@ -5,6 +5,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.XmMed; import com.czlis.common.core.domain.entity.lis.XmMedResult; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.XmMedService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,14 +30,14 @@ public class XmMedController { return xmMedService.queryList(xmMed); } - @Log(title = "常用抗生素",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMMED_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增常用抗生素") @PostMapping("/add") public Result add(@RequestBody List xmMed){ return xmMedService.add(xmMed); } - @Log(title = "常用抗生素",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMMED_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除常用抗生素") @GetMapping("/del") public Result delete(XmMed xmMed){ @@ -58,21 +59,21 @@ public class XmMedController { return xmMedService.queryCommonResult(xmMedResult); } - @Log(title = "抗生素常见结果",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMMED_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增常见结果") @PostMapping("/addCommResult") public Result addCommResult(@RequestBody XmMedResult xmMedResult){ return xmMedService.addCommResult(xmMedResult); } - @Log(title = "抗生素常见结果",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.XMMED_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改常见结果") @PostMapping("/updateCommResult") public Result updateCommResult(XmMedResult xmMedResult){ return xmMedService.updateCommResult(xmMedResult); } - @Log(title = "抗生素常见结果",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMMED_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除常见结果") @GetMapping("/deleteCommResult") public Result deleteCommResult(XmMedResult xmMedResult){ diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedgroupController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedgroupController.java index 805528e..fec09bc 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedgroupController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedgroupController.java @@ -5,6 +5,7 @@ import com.czlis.common.annotation.Log; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.XmMedgroup; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.XmMedgroupService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -30,21 +31,21 @@ public class XmMedgroupController { return xmMedgroupService.query(xmMedgroup); } - @Log(title = "常用抗生素组",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMMEDGROUP_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增数据") @PostMapping("/add") public Result add(XmMedgroup xmMedgroup){ return xmMedgroupService.add(xmMedgroup); } - @Log(title = "常用抗生素组",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.XMMEDGROUP_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改数据") @PostMapping("/update") public Result update(XmMedgroup xmMedgroup){ return xmMedgroupService.update(xmMedgroup); } - @Log(title = "常用抗生素组",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMMEDGROUP_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除数据") @GetMapping("del") public Result delete(XmMedgroup xmMedgroup){ diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedinterController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedinterController.java index 94b3b02..1130dcc 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedinterController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedinterController.java @@ -4,6 +4,7 @@ import com.czlis.common.annotation.Log; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.XmMedinter; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.XmMedinterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -27,21 +28,21 @@ public class XmMedinterController { return xmMedinterService.queryList(xmMedinter); } - @Log(title = "抗生素通道号设定",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMMEDINSTR_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增数据") @PostMapping("/add") public Result add(@RequestBody XmMedinter xmMedinter){ return xmMedinterService.add(xmMedinter); } - @Log(title = "抗生素通道号设定",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.XMMEDINSTR_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改数据") @PostMapping("/update") public Result update(@RequestBody XmMedinter xmMedinter){ return xmMedinterService.update(xmMedinter); } - @Log(title = "抗生素通道号设定",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMMEDINSTR_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除数据") @GetMapping("/del") public Result delete(XmMedinter xmMedinter){ diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedmainController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedmainController.java index e975505..d9782ab 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedmainController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/XmMedmainController.java @@ -1,8 +1,11 @@ package com.czlis.liswork.controller.xtwh; +import com.czlis.common.annotation.Log; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.XmMedDetail; import com.czlis.common.core.domain.entity.lis.XmMedMain; +import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.XmMedmainService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -51,12 +54,14 @@ public class XmMedmainController { return xmMedmainService.queryMedDetail(xmMedDetail); } + @Log(title = SysLogConstants.XMMEDMAIN_LOG , businessType = BusinessType.INSERT) @ApiOperation("新增抗生素组") @PostMapping("/addmain") public Result addMedMain(XmMedMain xmMedMain){ return xmMedmainService.addMedMain(xmMedMain); } + @Log(title = SysLogConstants.XMMEDMAIN_LOG , businessType = BusinessType.INSERT_DETAIL) @ApiOperation("新增抗生素组明细") @PostMapping("/adddetail") public Result addMedDetail(List xmMedDetailList){ diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java index 22b25b9..307eece 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java @@ -6,6 +6,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.LabFeeitemClass; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.mzcx.service.FeeitemClassService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -42,14 +43,14 @@ public class FeeitemClassController extends BaseController { return getDataTable(labFeeitemClassList); } - @Log(title = "条码类别",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.FEEITEMCLASS_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增条码类别") @PostMapping("/add") public Result add(@RequestBody List labFeeitemClassList){ return feeitemClassService.add(labFeeitemClassList); } - @Log(title = "条码类别",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.FEEITEMCLASS_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改条码类别") @PostMapping("/update") public Result update(@RequestBody List labFeeitemClassList){ @@ -57,7 +58,7 @@ public class FeeitemClassController extends BaseController { return new Result("0","修改条码成功！"); } - @Log(title = "条码类别",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.FEEITEMCLASS_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除条码类别") @DeleteMapping("/del") public Result delete(String sflbdh){ diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java index 2fc53c8..0785b19 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java @@ -7,6 +7,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.LabFeeitemVsClass; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.mzcx.service.FeeitemVsClassService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -35,7 +36,7 @@ public class FeeitemVsClassController extends BaseController { return feeitemVsClassService.query(labFeeitemVsClass); } - @Log(title = "条码类别与项目对照",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.FEEITEMVSCLASS_LOG,businessType = BusinessType.INSERT) @ApiOperation("新增条码类别与项目对照") @PostMapping("/add") public Result add(@RequestBody List labFeeitemVsClassList) { @@ -44,7 +45,7 @@ public class FeeitemVsClassController extends BaseController { return new Result("0","添加成功！"); } - @Log(title = "条码类别与项目对照",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.FEEITEMVSCLASS_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除条码类别与项目对照") @DeleteMapping("/del") public Result del(String sfxmdh){ diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java index c7ca60a..e300340 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java @@ -6,6 +6,7 @@ import com.czlis.common.core.controller.BaseController; import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.mzcx.pojo.MzcxSqdDTO; import com.czlis.mzcx.service.MZCXService; import io.swagger.annotations.Api; @@ -53,19 +54,19 @@ public class MZCXController extends BaseController { * @param sqh * @return */ - @Log(title = "门诊采血",businessType = BusinessType.PRINT) + @Log(title = SysLogConstants.MZCX_LOG,businessType = BusinessType.PRINT) @GetMapping("/printBarcode") public Result printSQD(String sqh) { return mzcxService.printSQD(sqh); } - @Log(title = "门诊采血",businessType = BusinessType.PRINT) + @Log(title = SysLogConstants.MZCX_LOG,businessType = BusinessType.PRINT) @PostMapping("/printBarcode") public Result printAll(@RequestBody List sqhs) { return mzcxService.printAll(sqhs); } - @Log(title = "门诊采血",businessType = BusinessType.PRINTBACKPAPER) + @Log(title = SysLogConstants.MZCX_LOG,businessType = BusinessType.PRINTBACKPAPER) @ApiOperation("打印回单") @PostMapping("/printBackpaper") public Result printBackpaper(@RequestBody List sqhs) { diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java index 4d0d163..2f4b2bf 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java @@ -7,6 +7,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.LabRptgetRule; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.mzcx.pojo.LabRptgetRuleDTO; import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail; import com.czlis.mzcx.service.RptgetRuleService; @@ -50,7 +51,7 @@ public class RptgetRuleController extends BaseController { @ApiOperation("新增报告领取规则") @PostMapping("/add") - @Log(title = "报告领取规则",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.RPTGETRULE_LOG,businessType = BusinessType.INSERT) public Result add(@RequestBody LabRptgetRuleDTO labRptgetRuleDTO) { log.info("新增报告领取规则：{}",labRptgetRuleDTO); return rptgetRuleService.add(labRptgetRuleDTO); @@ -59,19 +60,19 @@ public class RptgetRuleController extends BaseController { @ApiOperation("修改报告领取规则") @PostMapping("/update") - @Log(title = "报告领取规则",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.RPTGETRULE_LOG,businessType = BusinessType.UPDATE) public Result update(@RequestBody LabRptgetRuleDTO labRptgetRuleDTO) { return rptgetRuleService.update(labRptgetRuleDTO); } - @Log(title = "报告领取规则",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.RPTGETRULE_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除报告领取规则列表") @DeleteMapping("/del") public Result delete(String bglqdh){ return rptgetRuleService.delete(bglqdh); } - @Log(title = "报告领取规则",businessType = BusinessType.DELETE_DETAIL) + @Log(title = SysLogConstants.RPTGETRULE_LOG,businessType = BusinessType.DELETE_DETAIL) @ApiOperation("删除报告领取规则明细") @DeleteMapping("/delDetail") public Result deleteDetail(String bglqdh,Integer xh){ diff --git a/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java b/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java index 70a068a..6501c2f 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java @@ -7,6 +7,7 @@ import com.czlis.common.core.domain.Result; import com.czlis.common.core.page.TableDataInfo; import com.czlis.common.core.domain.entity.lis.XmFee; import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.mzcx.pojo.XmFeeDTO; import com.czlis.mzcx.service.XmFeeService; import io.swagger.annotations.Api; @@ -39,13 +40,13 @@ public class XmFeeController extends BaseController { @ApiOperation("新增收费项目") @PostMapping("/addXmfee") - @Log(title = "收费项目维护",businessType = BusinessType.INSERT) + @Log(title = SysLogConstants.XMFEE_LOG,businessType = BusinessType.INSERT) public Result addXmfee(@RequestBody List xmFeeList){ log.info("新增收费项目：{}",xmFeeList); return xmFeeService.addXmFee(xmFeeList); } - @Log(title = "收费项目维护",businessType = BusinessType.UPDATE) + @Log(title = SysLogConstants.XMFEE_LOG,businessType = BusinessType.UPDATE) @ApiOperation("修改收费项目") @PostMapping("/update") public Result update(@RequestBody List xmFeeList){ @@ -54,7 +55,7 @@ public class XmFeeController extends BaseController { return new Result("0","修改收费项目成功！"); } - @Log(title = "收费项目维护",businessType = BusinessType.DELETE) + @Log(title = SysLogConstants.XMFEE_LOG,businessType = BusinessType.DELETE) @ApiOperation("删除收费项目") @DeleteMapping("/del") public Result delete(String sfxmdh){