diff --git a/lis-common/src/main/java/com/czlis/common/enums/BusinessType.java b/lis-common/src/main/java/com/czlis/common/enums/BusinessType.java index f79689a..1833c54 100644 --- a/lis-common/src/main/java/com/czlis/common/enums/BusinessType.java +++ b/lis-common/src/main/java/com/czlis/common/enums/BusinessType.java @@ -65,4 +65,12 @@ public enum BusinessType { * 删除明细11 */ DELETE_DETAIL, + /** + * 打印12 + */ + PRINT, + /** + * 打印回单 + */ + PRINTBACKPAPER, } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComOptMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComOptMapper.java index b36976d..e2daeb3 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComOptMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComOptMapper.java @@ -3,8 +3,18 @@ package com.czlis.interfaceCommon.mapper; import com.czlis.common.core.domain.entity.lis.ComOpt; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface ComOptMapper { ComOpt getComOptOne(@Param("yq") String yq,@Param("xxdh") String xxdh); String getComOptValue(@Param("yq") String yq,@Param("xxdh") String xxdh); + List getComOptList(ComOpt comOpt); + + void add(ComOpt comOpt); + + void update(ComOpt comOpt); + + void delete(@Param("yq") String yq,@Param("xxdh") String xxdh); + } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java index f39b2c5..48f88c3 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java @@ -229,7 +229,7 @@ public class ReportUtil { public Result printToPdf(BarCodeParam barCodeParam, String pdfName){ String templatePath = RuoYiConfig.getProfile()+"/templates/barcode_zy.jrxml"; // 模板文件路径 - String outputPath = RuoYiConfig.getProfile()+"/config/static/"+pdfName+".pdf"; // PDF输出路径(多级目录会自动创建) + String outputPath = RuoYiConfig.getProfile()+"/config/static/printPDF/"+pdfName+".pdf"; // PDF输出路径(多级目录会自动创建) log.info("打印输入输出地址:{},{}",templatePath,outputPath); Map stringObjectMap = BeanUtil.beanToMap(barCodeParam); try { diff --git a/lis-interfaceCommon/src/main/resources/mapper/ComOptMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/ComOptMapper.xml index 9232d3c..4bca15d 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/ComOptMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/ComOptMapper.xml @@ -11,6 +11,36 @@ + + + insert into com_opt( + bz, + yq,xxdh,xxlb,xxqz + )values( + #{bz}, + #{yq},#{xxdh},#{xxlb},#{xxqz} + ) + + + + update com_opt set + xxlb = #{xxlb}, + bz = #{bz}, + xxqz = #{xxqz} + where yq = #{yq} and xxdh = #{xxdh} + + + + delete from com_opt where yq = #{yq} and xxdh = #{xxdh} + diff --git a/lis-quartz/src/main/java/com/czlis/quartz/task/LisTask.java b/lis-quartz/src/main/java/com/czlis/quartz/task/LisTask.java index 4e84d29..de1350d 100644 --- a/lis-quartz/src/main/java/com/czlis/quartz/task/LisTask.java +++ b/lis-quartz/src/main/java/com/czlis/quartz/task/LisTask.java @@ -1,10 +1,12 @@ package com.czlis.quartz.task; import cn.hutool.json.JSONUtil; +import com.czlis.common.config.RuoYiConfig; import com.czlis.common.core.domain.Result; import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants; import com.czlis.interfaceCommon.pojo.inter.SetDict; import com.czlis.interfaceCommon.utils.LisInterfaceUtil; +import com.czlis.quartz.util.LisTaskUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -73,4 +75,14 @@ public class LisTask { setDict.setYljg("1"); return lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.SETDICT, setDict); } + + /** + * 定时清理打印条码的pdf文件 + * @return + */ + public Result cleanPDF(){ + String outputPath = RuoYiConfig.getProfile()+"/config/static/printPDF"; + LisTaskUtil.deletePdfFilesBefore(outputPath); + return new Result("0","删除文件成功!"); + } } diff --git a/lis-quartz/src/main/java/com/czlis/quartz/util/LisTaskUtil.java b/lis-quartz/src/main/java/com/czlis/quartz/util/LisTaskUtil.java new file mode 100644 index 0000000..fc67712 --- /dev/null +++ b/lis-quartz/src/main/java/com/czlis/quartz/util/LisTaskUtil.java @@ -0,0 +1,81 @@ +package com.czlis.quartz.util; + +import cn.hutool.core.date.DateUtil; +import lombok.extern.slf4j.Slf4j; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +@Slf4j +public class LisTaskUtil { + + /** + * 判断文件是否为PDF文件 + */ + private static boolean isPdfFile(File file) { + String fileName = file.getName().toLowerCase(); + return fileName.endsWith(".pdf"); + } + + /** + * 查找符合条件中所有PDF文件(包括子目录) + */ + private static List findPdfFiles(File directory) { + List pdfFiles = new ArrayList<>(); + File[] files = directory.listFiles(); + + if (files == null) { + return pdfFiles; + } + + for (File file : files) { + if (file.isDirectory()) { + // 递归查找子目录 + pdfFiles.addAll(findPdfFiles(file)); + } else if (isPdfFile(file)) { + pdfFiles.add(file); + } + } + + return pdfFiles; + } + + /** + * 删除指定时间点之前的PDF文件 + * @return 被删除的文件数量 + */ + public static int deletePdfFilesBefore(String storagePath) { + File storageDir = new File(storagePath); + + // 验证存储目录是否存在 + if (!storageDir.exists() || !storageDir.isDirectory()) { + log.error("PDF存储目录不存在或不是一个有效的目录: {}", storagePath); + return -1; + } + + // 转换截止时间为毫秒时间戳 + //long cutoffMillis = cutoffTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli(); + String now = DateUtil.today(); //当天日期 + long time = DateUtil.parse(now, "yyyy-MM-dd").getTime(); + + // 查找并删除符合条件的PDF文件 + List pdfFiles = findPdfFiles(storageDir); + int deletedCount = 0; + + for (File file : pdfFiles) { + // 检查文件最后修改时间是否早于截止时间 + if (file.lastModified() < time) { + if (file.delete()) { + deletedCount++; + } else { + // 可以添加日志记录删除失败的文件 + log.error("无法删除文件: " + file.getAbsolutePath()); + System.err.println("无法删除文件: " + file.getAbsolutePath()); + } + } + } + + return deletedCount; + } +} 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 new file mode 100644 index 0000000..857c309 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/ComOptController.java @@ -0,0 +1,54 @@ +package com.czlis.liswork.controller.xtwh; + +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.ComOpt; +import com.czlis.common.core.domain.entity.lis.LabPat; +import com.czlis.common.core.page.TableDataInfo; +import com.czlis.liswork.service.ComOptService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + + +import java.util.List; + +@Api(tags = "后台参数界面") +@RestController +@RequestMapping("/param") +@Slf4j +public class ComOptController extends BaseController { + + @Autowired + private ComOptService comOptService; + + @ApiOperation("查询参数列表") + @GetMapping("/query") + public TableDataInfo getComOptList(ComOpt comOpt) { + startPage(); + List comOptList = comOptService.getComOptList(comOpt); + return getDataTable(comOptList); + } + + @ApiOperation("新增参数") + @PostMapping("/add") + public Result add(@RequestBody ComOpt comOpt) { + return comOptService.add(comOpt); + } + + @ApiOperation("修改参数") + @PostMapping("/update") + public Result update(@RequestBody ComOpt comOpt) { + return comOptService.update(comOpt); + } + + @ApiOperation("删除参数") + @DeleteMapping("/del") + public Result delete(String yq,String xxdh) { + return comOptService.delete(yq,xxdh); + } + + +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/ComOptService.java b/liswork/src/main/java/com/czlis/liswork/service/ComOptService.java new file mode 100644 index 0000000..561cdbd --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/ComOptService.java @@ -0,0 +1,16 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.ComOpt; + +import java.util.List; + +public interface ComOptService { + List getComOptList(ComOpt comOpt); + + Result add(ComOpt comOpt); + + Result update(ComOpt comOpt); + + Result delete(String yq, String xxdh); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/ComOptServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/ComOptServiceImpl.java new file mode 100644 index 0000000..1014fb1 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/ComOptServiceImpl.java @@ -0,0 +1,45 @@ +package com.czlis.liswork.service.impl; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.ComOpt; +import com.czlis.interfaceCommon.mapper.ComOptMapper; +import com.czlis.liswork.service.ComOptService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@Slf4j +public class ComOptServiceImpl implements ComOptService { + + @Autowired + private ComOptMapper comOptMapper; + + @Override + public List getComOptList(ComOpt comOpt) { + List comOptList = comOptMapper.getComOptList(comOpt); + return comOptList; + } + + @Override + public Result add(ComOpt comOpt) { + comOptMapper.add(comOpt); + return new Result("0","新增成功!"); + } + + @Override + public Result update(ComOpt comOpt) { + comOptMapper.update(comOpt); + return new Result("0","修改数据成功!"); + } + + @Override + public Result delete(String yq, String xxdh) { + comOptMapper.delete(yq,xxdh); + return new Result("0","删除数据成功!"); + } + + +} 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 b2360df..22b25b9 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java @@ -1,9 +1,11 @@ package com.czlis.mzcx.controller; +import com.czlis.common.annotation.Log; 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.core.domain.entity.lis.LabFeeitemClass; +import com.czlis.common.enums.BusinessType; import com.czlis.mzcx.service.FeeitemClassService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -40,12 +42,14 @@ public class FeeitemClassController extends BaseController { return getDataTable(labFeeitemClassList); } + @Log(title = "条码类别",businessType = BusinessType.INSERT) @ApiOperation("新增条码类别") @PostMapping("/add") public Result add(@RequestBody List labFeeitemClassList){ return feeitemClassService.add(labFeeitemClassList); } + @Log(title = "条码类别",businessType = BusinessType.UPDATE) @ApiOperation("修改条码类别") @PostMapping("/update") public Result update(@RequestBody List labFeeitemClassList){ @@ -53,6 +57,7 @@ public class FeeitemClassController extends BaseController { return new Result("0","修改条码成功!"); } + @Log(title = "条码类别",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 08895b2..2fc53c8 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemVsClassController.java @@ -1,9 +1,12 @@ package com.czlis.mzcx.controller; +import com.czlis.common.annotation.Anonymous; +import com.czlis.common.annotation.Log; 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.core.domain.entity.lis.LabFeeitemVsClass; +import com.czlis.common.enums.BusinessType; import com.czlis.mzcx.service.FeeitemVsClassService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,24 +28,32 @@ public class FeeitemVsClassController extends BaseController { @Autowired private FeeitemVsClassService feeitemVsClassService; + @ApiOperation("查询条码类别与项目对照") @GetMapping("/query") - public TableDataInfo query(LabFeeitemVsClass labFeeitemVsClass) { - startPage(); - List labFeeitemVsClassList = feeitemVsClassService.query(labFeeitemVsClass); - return getDataTable(labFeeitemVsClassList); + public Result query(LabFeeitemVsClass labFeeitemVsClass) { + return feeitemVsClassService.query(labFeeitemVsClass); } + @Log(title = "条码类别与项目对照",businessType = BusinessType.INSERT) @ApiOperation("新增条码类别与项目对照") @PostMapping("/add") - public Result add(@RequestBody LabFeeitemVsClass labFeeitemVsClass) { - feeitemVsClassService.add(labFeeitemVsClass); + public Result add(@RequestBody List labFeeitemVsClassList) { + log.info("条码类别项目对照:{}", labFeeitemVsClassList); + feeitemVsClassService.add(labFeeitemVsClassList); return new Result("0","添加成功!"); } + @Log(title = "条码类别与项目对照",businessType = BusinessType.DELETE) @ApiOperation("删除条码类别与项目对照") @DeleteMapping("/del") public Result del(String sfxmdh){ return feeitemVsClassService.del(sfxmdh); } + + @ApiOperation("查询未对照的项目") + @GetMapping("/queryunmatch") + public Result queryUnMatch(String sflbdh){ + return feeitemVsClassService.queryUnMatch(sflbdh); + } } 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 e3aabde..c7ca60a 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/MZCXController.java @@ -1,9 +1,11 @@ package com.czlis.mzcx.controller; import com.czlis.common.annotation.Anonymous; +import com.czlis.common.annotation.Log; 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.mzcx.pojo.MzcxSqdDTO; import com.czlis.mzcx.service.MZCXService; import io.swagger.annotations.Api; @@ -51,16 +53,19 @@ public class MZCXController extends BaseController { * @param sqh * @return */ + @Log(title = "门诊采血",businessType = BusinessType.PRINT) @GetMapping("/printBarcode") public Result printSQD(String sqh) { return mzcxService.printSQD(sqh); } + @Log(title = "门诊采血",businessType = BusinessType.PRINT) @PostMapping("/printBarcode") public Result printAll(@RequestBody List sqhs) { return mzcxService.printAll(sqhs); } + @Log(title = "门诊采血",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 1bbfff6..4d0d163 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/RptgetRuleController.java @@ -1,10 +1,12 @@ package com.czlis.mzcx.controller; import com.czlis.common.annotation.Anonymous; +import com.czlis.common.annotation.Log; 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.core.domain.entity.lis.LabRptgetRule; +import com.czlis.common.enums.BusinessType; import com.czlis.mzcx.pojo.LabRptgetRuleDTO; import com.czlis.common.core.domain.entity.lis.LabRptgetRuleDetail; import com.czlis.mzcx.service.RptgetRuleService; @@ -48,7 +50,7 @@ public class RptgetRuleController extends BaseController { @ApiOperation("新增报告领取规则") @PostMapping("/add") - @Anonymous + @Log(title = "报告领取规则",businessType = BusinessType.INSERT) public Result add(@RequestBody LabRptgetRuleDTO labRptgetRuleDTO) { log.info("新增报告领取规则:{}",labRptgetRuleDTO); return rptgetRuleService.add(labRptgetRuleDTO); @@ -57,16 +59,19 @@ public class RptgetRuleController extends BaseController { @ApiOperation("修改报告领取规则") @PostMapping("/update") + @Log(title = "报告领取规则",businessType = BusinessType.UPDATE) public Result update(@RequestBody LabRptgetRuleDTO labRptgetRuleDTO) { return rptgetRuleService.update(labRptgetRuleDTO); } + @Log(title = "报告领取规则",businessType = BusinessType.DELETE) @ApiOperation("删除报告领取规则列表") @DeleteMapping("/del") public Result delete(String bglqdh){ return rptgetRuleService.delete(bglqdh); } + @Log(title = "报告领取规则",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 c48c5c3..70a068a 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java @@ -1,10 +1,12 @@ package com.czlis.mzcx.controller; import com.czlis.common.annotation.Anonymous; +import com.czlis.common.annotation.Log; 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.core.domain.entity.lis.XmFee; +import com.czlis.common.enums.BusinessType; import com.czlis.mzcx.pojo.XmFeeDTO; import com.czlis.mzcx.service.XmFeeService; import io.swagger.annotations.Api; @@ -37,11 +39,13 @@ public class XmFeeController extends BaseController { @ApiOperation("新增收费项目") @PostMapping("/addXmfee") + @Log(title = "收费项目维护",businessType = BusinessType.INSERT) public Result addXmfee(@RequestBody List xmFeeList){ log.info("新增收费项目:{}",xmFeeList); return xmFeeService.addXmFee(xmFeeList); } + @Log(title = "收费项目维护",businessType = BusinessType.UPDATE) @ApiOperation("修改收费项目") @PostMapping("/update") public Result update(@RequestBody List xmFeeList){ @@ -50,6 +54,7 @@ public class XmFeeController extends BaseController { return new Result("0","修改收费项目成功!"); } + @Log(title = "收费项目维护",businessType = BusinessType.DELETE) @ApiOperation("删除收费项目") @DeleteMapping("/del") public Result delete(String sfxmdh){ diff --git a/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java b/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java index 1983231..dd183d9 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java +++ b/mzcx/src/main/java/com/czlis/mzcx/mapper/FeeitemVsClassMapper.java @@ -1,13 +1,17 @@ package com.czlis.mzcx.mapper; import com.czlis.common.core.domain.entity.lis.LabFeeitemVsClass; +import com.czlis.common.core.domain.entity.lis.XmFee; +import com.czlis.mzcx.pojo.LabFeeitemVsClassDTO; import java.util.List; public interface FeeitemVsClassMapper { - List query(LabFeeitemVsClass labFeeitemVsClass); + List query(LabFeeitemVsClass labFeeitemVsClass); void add(LabFeeitemVsClass labFeeitemVsClass); void del(String sfxmdh); + + List queryUnMatch(String sflbdh); } diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClassDTO.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClassDTO.java new file mode 100644 index 0000000..b7a70af --- /dev/null +++ b/mzcx/src/main/java/com/czlis/mzcx/pojo/LabFeeitemVsClassDTO.java @@ -0,0 +1,20 @@ +package com.czlis.mzcx.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabFeeitemVsClassDTO { + @NotBlank(message = "sflbdh不能为空") + private String sflbdh; + @NotBlank(message = "xh不能为空") + private Integer xh; + @NotBlank(message = "sfxmdh不能为空") + private String sfxmdh; + private String sfxmmc; +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java b/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java index 96587b5..2c692fa 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemVsClassService.java @@ -6,9 +6,11 @@ import com.czlis.common.core.domain.entity.lis.LabFeeitemVsClass; import java.util.List; public interface FeeitemVsClassService { - List query(LabFeeitemVsClass labFeeitemVsClass); + Result query(LabFeeitemVsClass labFeeitemVsClass); - void add(LabFeeitemVsClass labFeeitemVsClass); + void add(List labFeeitemVsClass); Result del(String sfxmdh); + + Result queryUnMatch(String sflbdh); } diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemClassServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemClassServiceImpl.java index 000bc82..293d4c2 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemClassServiceImpl.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemClassServiceImpl.java @@ -31,7 +31,7 @@ public class FeeitemClassServiceImpl implements FeeitemClassService { return feeitemClassMapper.query(sflbdh, sflbmc); } - @Log(title = "条码类别",businessType = BusinessType.INSERT) + @Transactional(rollbackFor = Exception.class) @Override public Result add(List labFeeitemClassList) { @@ -43,7 +43,7 @@ public class FeeitemClassServiceImpl implements FeeitemClassService { return new Result("0","新增条码类别成功!"); } - @Log(title = "条码类别",businessType = BusinessType.UPDATE) + @Transactional(rollbackFor = Exception.class) @Override public void update(List labFeeitemClassList) { @@ -52,7 +52,7 @@ public class FeeitemClassServiceImpl implements FeeitemClassService { } } - @Log(title = "条码类别",businessType = BusinessType.DELETE) + @Transactional(rollbackFor = Exception.class) @Override public Result delete(String sflbdh) { diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java index fde7c5e..94c93da 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/impl/FeeitemVsClassServiceImpl.java @@ -1,15 +1,20 @@ package com.czlis.mzcx.service.impl; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.XmFee; import com.czlis.mzcx.mapper.FeeitemVsClassMapper; import com.czlis.common.core.domain.entity.lis.LabFeeitemVsClass; +import com.czlis.mzcx.pojo.LabFeeitemVsClassDTO; import com.czlis.mzcx.service.FeeitemVsClassService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; @Service @Slf4j @@ -19,13 +24,21 @@ public class FeeitemVsClassServiceImpl implements FeeitemVsClassService { FeeitemVsClassMapper feeitemVsClassMapper; @Override - public List query(LabFeeitemVsClass labFeeitemVsClass) { - return feeitemVsClassMapper.query(labFeeitemVsClass); + public Result query(LabFeeitemVsClass labFeeitemVsClass) { + List labFeeitemVsClassList = feeitemVsClassMapper.query(labFeeitemVsClass); + String sflbdh = labFeeitemVsClass.getSflbdh(); + List xmFeeList = feeitemVsClassMapper.queryUnMatch(sflbdh); + Map map = new HashMap<>(); + map.put("labFeeitemVsClassList",labFeeitemVsClassList); + map.put("xmFeeList",xmFeeList); + return new Result("0","查询成功!",map); } @Override - public void add(LabFeeitemVsClass labFeeitemVsClass) { - feeitemVsClassMapper.add(labFeeitemVsClass); + public void add(List labFeeitemVsClassList) { + for (LabFeeitemVsClass labFeeitemVsClass : labFeeitemVsClassList) { + feeitemVsClassMapper.add(labFeeitemVsClass); + } } @Override @@ -33,4 +46,10 @@ public class FeeitemVsClassServiceImpl implements FeeitemVsClassService { feeitemVsClassMapper.del(sfxmdh); return new Result("0","删除成功!"); } + + @Override + public Result queryUnMatch(String sflbdh) { + List xmFeeList = feeitemVsClassMapper.queryUnMatch(sflbdh); + return new Result("0","查询成功!",xmFeeList); + } } diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java index 36e3e03..2ca3c22 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java @@ -35,7 +35,6 @@ public class RptgetRuleServiceImpl implements RptgetRuleService { @Transactional(rollbackFor = Exception.class) @Override - @Log(title = "报告领取规则",businessType = BusinessType.INSERT) public Result add(LabRptgetRuleDTO labRptgetRuleDTO) { List ruleList = labRptgetRuleDTO.getRuleList(); //Integer maxNo = rptgetRuleMapper.getMaxNo(); @@ -62,7 +61,6 @@ public class RptgetRuleServiceImpl implements RptgetRuleService { @Transactional(rollbackFor = Exception.class) @Override - @Log(title = "报告领取规则",businessType = BusinessType.UPDATE) public Result update(LabRptgetRuleDTO labRptgetRuleDTO) { List ruleList = labRptgetRuleDTO.getRuleList(); for (LabRptgetRule labRptgetRule : ruleList) { @@ -87,7 +85,6 @@ public class RptgetRuleServiceImpl implements RptgetRuleService { } @Override - @Log(title = "报告领取规则",businessType = BusinessType.DELETE) public Result delete(String bglqdh) { // Long labRptgetRuleDetailCount = rptgetRuleMapper.getLabRptgetRuleDetailCount(bglqdh); // if(labRptgetRuleDetailCount > 0) return new Result("-1","存在报告领取规则明细数据,请先删除明细数据再删除列表数据!"); @@ -100,7 +97,6 @@ public class RptgetRuleServiceImpl implements RptgetRuleService { return new Result("0","删除报告领取规则列表成功!"); } - @Log(title = "报告领取规则",businessType = BusinessType.DELETE_DETAIL) @Override public Result deleteDetail(String bglqdh, Integer xh) { rptgetRuleMapper.deleteDetail(bglqdh,xh); diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/impl/XmFeeServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/XmFeeServiceImpl.java index 8504a49..c357dbc 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/impl/XmFeeServiceImpl.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/impl/XmFeeServiceImpl.java @@ -28,7 +28,7 @@ public class XmFeeServiceImpl implements XmFeeService { return xmFeeMapper.query(sfxmdh,yljg,xmlb); } - @Log(title = "收费项目维护",businessType = BusinessType.IMPORT) + @Transactional(rollbackFor = Exception.class) @Override public Result addXmFee(List xmFeeList) { @@ -40,7 +40,8 @@ public class XmFeeServiceImpl implements XmFeeService { return new Result("0","添加成功!"); } - @Log(title = "收费项目维护",businessType = BusinessType.UPDATE) + + @Transactional(rollbackFor = Exception.class) @Override public void update(List xmFeeList) { @@ -49,7 +50,7 @@ public class XmFeeServiceImpl implements XmFeeService { } } - @Log(title = "收费项目维护",businessType = BusinessType.DELETE) + @Transactional(rollbackFor = Exception.class) @Override public Result delete(String sfxmdh) { diff --git a/mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml b/mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml index 052aeb7..6e7b4f2 100644 --- a/mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml +++ b/mzcx/src/main/resources/mapper/FeeitemVsClassMapper.xml @@ -4,11 +4,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + select a.*,b.sfxmmc from lab_feeitem_vs_class a,xm_fee b - and sflbdh = #{sflbdh} - and sfxmdh = #{sfxmdh} + a.sfxmdh = b.sfxmdh + and a.sflbdh = #{sflbdh} + and a.sfxmdh = #{sfxmdh} @@ -27,5 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from lab_feeitem_vs_class where sfxmdh = #{sfxmdh} + + \ No newline at end of file diff --git a/sql/lis8.0/ruoyi_lis8.0_sqlserver.sql b/sql/lis8.0/ruoyi_lis8.0_sqlserver.sql index 1d469f4..2bbfda7 100644 --- a/sql/lis8.0/ruoyi_lis8.0_sqlserver.sql +++ b/sql/lis8.0/ruoyi_lis8.0_sqlserver.sql @@ -1589,9 +1589,15 @@ if not exists(select 1 from dbo.sys_job where invoke_target = 'lisTask.getDictWR if not exists(select 1 from dbo.sys_job where invoke_target = 'lisTask.getXmFee' ) begin INSERT INTO dbo.sys_job (job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, update_by, update_time, remark) - VALUES ('获取his收费项目', 'DEFAULT', 'lisTask.getXmFee', '0 0 23 * * ?', '3', '1', '1', 'admin', '2025-08-15 11:58:04.853', '', NULL, '') + VALUES ('获取his收费项目', 'SYSTEM', 'lisTask.getXmFee', '0 0 23 * * ?', '3', '1', '1', 'admin', '2025-08-15 11:58:04.853', '', NULL, '') end +if not exists(select 1 from dbo.sys_job where invoke_target = 'lisTask.cleanPDF' ) + begin + INSERT INTO dbo.sys_job (job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, update_by, update_time, remark) + VALUES ('删除当天以前打印的pdf文件', 'SYSTEM', 'lisTask.cleanPDF', '0 0 23 * * ?', '1', '1', '1', 'admin', '2025-09-15 10:51:58.27', '', NULL, '') + end + IF EXISTS (SELECT * FROM dbo.sysobjects WHERE name LIKE '%DF__sys_oper___json%' AND type = 'D' AND parent_obj = OBJECT_ID(N'[dbo].[sys_oper_log]'))