diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFee.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFee.java index be7799c..45dd290 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFee.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmFee.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import java.math.BigDecimal; + @Data @AllArgsConstructor @NoArgsConstructor @@ -23,4 +24,11 @@ public class XmFee { private String attention; private String indication; private String affect; + private Integer bgts; + private String yblx; + private String dept; + private String lisgroup1; + private String lisgroup2; + private String lisgroup3; + } 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 8966858..f79689a 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 @@ -7,57 +7,62 @@ package com.czlis.common.enums; */ public enum BusinessType { /** - * 其它 + * 其它O */ OTHER, /** - * 新增 + * 新增1 */ INSERT, /** - * 修改 + * 修改2 */ UPDATE, /** - * 删除 + * 删除3 */ DELETE, /** - * 授权 + * 授权4 */ GRANT, /** - * 导出 + * 导出5 */ EXPORT, /** - * 导入 + * 导入6 */ IMPORT, /** - * 强退 + * 强退7 */ FORCE, /** - * 生成代码 + * 生成代码8 */ GENCODE, /** - * 清空数据 + * 清空数据9 */ CLEAN, /** - * 接口调用 + * 接口调用10 */ INTERFACE_INVOKE, + + /** + * 删除明细11 + */ + DELETE_DETAIL, } 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 cb9bfba..b2360df 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/FeeitemClassController.java @@ -42,15 +42,14 @@ public class FeeitemClassController extends BaseController { @ApiOperation("新增条码类别") @PostMapping("/add") - public Result add(@RequestBody LabFeeitemClass labFeeitemClass){ - feeitemClassService.add(labFeeitemClass); - return new Result("0","新增条码类别成功!"); + public Result add(@RequestBody List labFeeitemClassList){ + return feeitemClassService.add(labFeeitemClassList); } @ApiOperation("修改条码类别") @PostMapping("/update") - public Result update(@RequestBody LabFeeitemClass labFeeitemClass){ - feeitemClassService.update(labFeeitemClass); + public Result update(@RequestBody List labFeeitemClassList){ + feeitemClassService.update(labFeeitemClassList); return new Result("0","修改条码成功!"); } 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 30fca77..c48c5c3 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java +++ b/mzcx/src/main/java/com/czlis/mzcx/controller/XmFeeController.java @@ -1,9 +1,11 @@ package com.czlis.mzcx.controller; +import com.czlis.common.annotation.Anonymous; 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.mzcx.pojo.XmFeeDTO; import com.czlis.mzcx.service.XmFeeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -29,28 +31,30 @@ public class XmFeeController extends BaseController { @GetMapping("/query") public TableDataInfo query(String sfxmdh,String yljg,String xmlb){ startPage(); - List xmFeeList = xmFeeService.query(sfxmdh,yljg,xmlb); + List xmFeeList = xmFeeService.query(sfxmdh,yljg,xmlb); return getDataTable(xmFeeList); } @ApiOperation("新增收费项目") @PostMapping("/addXmfee") - public Result addXmfee(@RequestBody XmFee xmFee){ - xmFeeService.addXmFee(xmFee); - return new Result("0","新增收费项目成功!"); + public Result addXmfee(@RequestBody List xmFeeList){ + log.info("新增收费项目:{}",xmFeeList); + return xmFeeService.addXmFee(xmFeeList); } @ApiOperation("修改收费项目") @PostMapping("/update") - public Result update(@RequestBody XmFee xmFee){ - xmFeeService.update(xmFee); + public Result update(@RequestBody List xmFeeList){ + log.info("修改收费项目:{}",xmFeeList); + xmFeeService.update(xmFeeList); return new Result("0","修改收费项目成功!"); } @ApiOperation("删除收费项目") @DeleteMapping("/del") - public Result delete(String sflbdh){ - return xmFeeService.delete(sflbdh); + public Result delete(String sfxmdh){ + log.info("删除收费项目:{}",sfxmdh); + return xmFeeService.delete(sfxmdh); } } diff --git a/mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java b/mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java index 8545ad4..5f7efb7 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java +++ b/mzcx/src/main/java/com/czlis/mzcx/mapper/RptgetRuleMapper.java @@ -15,4 +15,5 @@ public interface RptgetRuleMapper { void delete(String bglqdh); void deleteDetail(String bglqdh, Integer xh); Long getLabRptgetRuleDetailCount(String bglqdh); + Integer getMaxNo(); } diff --git a/mzcx/src/main/java/com/czlis/mzcx/mapper/XmFeeMapper.java b/mzcx/src/main/java/com/czlis/mzcx/mapper/XmFeeMapper.java index 30faf94..e2c4fd0 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/mapper/XmFeeMapper.java +++ b/mzcx/src/main/java/com/czlis/mzcx/mapper/XmFeeMapper.java @@ -1,12 +1,13 @@ package com.czlis.mzcx.mapper; import com.czlis.common.core.domain.entity.lis.XmFee; +import com.czlis.mzcx.pojo.XmFeeDTO; import org.apache.ibatis.annotations.Param; import java.util.List; public interface XmFeeMapper { - List query(@Param("sfxmdh") String sfxmdh,@Param("yljg") String yljg,@Param("xmlb") String xmlb); + List query(@Param("sfxmdh") String sfxmdh, @Param("yljg") String yljg, @Param("xmlb") String xmlb); void add(XmFee xmFee); diff --git a/mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeDTO.java b/mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeDTO.java new file mode 100644 index 0000000..631d264 --- /dev/null +++ b/mzcx/src/main/java/com/czlis/mzcx/pojo/XmFeeDTO.java @@ -0,0 +1,35 @@ +package com.czlis.mzcx.pojo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class XmFeeDTO { + private String sfxmdh; + private String sfxmmc; + private String xmlb; + private BigDecimal dj; + private String zjf; + private String bz; + private Integer bglqdh; + private String spec; + private String yljg; + private String lisgroup; + private String attention; + private String indication; + private String affect; + private Integer bgts; + private String yblx; + private String dept; + private String lisgroup1; + private String lisgroup2; + private String lisgroup3; + private String sflbmc; + private String bkcolor; + private String sflbdh; +} diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemClassService.java b/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemClassService.java index 3cbb30b..d5f4dd4 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemClassService.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/FeeitemClassService.java @@ -8,9 +8,9 @@ import java.util.List; public interface FeeitemClassService { List query(String sflbdh, String sflbmc); - void add(LabFeeitemClass labFeeitemClass); + Result add(List labFeeitemClassList); - void update(LabFeeitemClass labFeeitemClass); + void update(List labFeeitemClassList); Result delete(String sflbdh); } diff --git a/mzcx/src/main/java/com/czlis/mzcx/service/XmFeeService.java b/mzcx/src/main/java/com/czlis/mzcx/service/XmFeeService.java index d6d30cb..0dc6813 100644 --- a/mzcx/src/main/java/com/czlis/mzcx/service/XmFeeService.java +++ b/mzcx/src/main/java/com/czlis/mzcx/service/XmFeeService.java @@ -2,15 +2,16 @@ package com.czlis.mzcx.service; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.XmFee; +import com.czlis.mzcx.pojo.XmFeeDTO; import java.util.List; public interface XmFeeService { - List query(String sfxmdh, String yljg, String xmlb); + List query(String sfxmdh, String yljg, String xmlb); - void addXmFee(XmFee xmFee); + Result addXmFee(List xmFeeList); - void update(XmFee xmFee); + void update(List xmFeeList); Result delete(String sfxmdh); } 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 b5dbee6..000bc82 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 @@ -1,6 +1,8 @@ package com.czlis.mzcx.service.impl; +import com.czlis.common.annotation.Log; import com.czlis.common.core.domain.Result; +import com.czlis.common.enums.BusinessType; import com.czlis.mzcx.mapper.FeeitemClassMapper; import com.czlis.common.core.domain.entity.lis.LabFeeitemClass; import com.czlis.mzcx.service.FeeitemClassService; @@ -29,18 +31,28 @@ public class FeeitemClassServiceImpl implements FeeitemClassService { return feeitemClassMapper.query(sflbdh, sflbmc); } + @Log(title = "条码类别",businessType = BusinessType.INSERT) @Transactional(rollbackFor = Exception.class) @Override - public void add(LabFeeitemClass labFeeitemClass) { - feeitemClassMapper.add(labFeeitemClass); + public Result add(List labFeeitemClassList) { + for (LabFeeitemClass labFeeitemClass : labFeeitemClassList) { + List existList = feeitemClassMapper.query(labFeeitemClass.getSflbdh(), ""); + if(existList.size()>0) return new Result("-1","条码类别代码:"+labFeeitemClass.getSflbdh()+"已存在!"); + feeitemClassMapper.add(labFeeitemClass); + } + return new Result("0","新增条码类别成功!"); } + @Log(title = "条码类别",businessType = BusinessType.UPDATE) @Transactional(rollbackFor = Exception.class) @Override - public void update(LabFeeitemClass labFeeitemClass) { - feeitemClassMapper.update(labFeeitemClass); + public void update(List labFeeitemClassList) { + for (LabFeeitemClass labFeeitemClass : labFeeitemClassList) { + feeitemClassMapper.update(labFeeitemClass); + } } + @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/RptgetRuleServiceImpl.java b/mzcx/src/main/java/com/czlis/mzcx/service/impl/RptgetRuleServiceImpl.java index 9069814..c018a08 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 @@ -1,6 +1,8 @@ package com.czlis.mzcx.service.impl; +import com.czlis.common.annotation.Log; import com.czlis.common.core.domain.Result; +import com.czlis.common.enums.BusinessType; import com.czlis.mzcx.mapper.RptgetRuleMapper; import com.czlis.common.core.domain.entity.lis.LabRptgetRule; import com.czlis.mzcx.pojo.LabRptgetRuleDTO; @@ -33,10 +35,13 @@ 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(); for (LabRptgetRule labRptgetRule : ruleList) { - Integer bglqdh = labRptgetRule.getBglqdh(); + Integer bglqdh = maxNo++; + labRptgetRule.setBglqdh(bglqdh); if(bglqdh == null || bglqdh == 0) return new Result("-1","报告列表中的报告领取代码不可以为空!"); rptgetRuleMapper.insert(labRptgetRule); } @@ -54,6 +59,7 @@ 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) { @@ -72,6 +78,7 @@ 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","存在报告领取规则明细数据,请先删除明细数据再删除列表数据!"); @@ -79,6 +86,7 @@ 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 d0db777..8504a49 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 @@ -1,8 +1,12 @@ package com.czlis.mzcx.service.impl; +import com.czlis.common.annotation.Anonymous; +import com.czlis.common.annotation.Log; import com.czlis.common.core.domain.Result; +import com.czlis.common.enums.BusinessType; import com.czlis.mzcx.mapper.XmFeeMapper; import com.czlis.common.core.domain.entity.lis.XmFee; +import com.czlis.mzcx.pojo.XmFeeDTO; import com.czlis.mzcx.service.XmFeeService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -20,28 +24,38 @@ public class XmFeeServiceImpl implements XmFeeService { private XmFeeMapper xmFeeMapper; @Override - public List query(String sfxmdh, String yljg, String xmlb) { + public List query(String sfxmdh, String yljg, String xmlb) { return xmFeeMapper.query(sfxmdh,yljg,xmlb); } + @Log(title = "收费项目维护",businessType = BusinessType.IMPORT) @Transactional(rollbackFor = Exception.class) @Override - public void addXmFee(XmFee xmFee) { - xmFeeMapper.add(xmFee); + public Result addXmFee(List xmFeeList) { + for (XmFee xmFee : xmFeeList) { + List existList = xmFeeMapper.query(xmFee.getSfxmdh(), xmFee.getYljg(), ""); + if(existList.size()>0) return new Result("-1","已经存在收费项目代码:"+xmFee.getSfxmdh()+"的项目!"); + xmFeeMapper.add(xmFee); + } + return new Result("0","添加成功!"); } + @Log(title = "收费项目维护",businessType = BusinessType.UPDATE) @Transactional(rollbackFor = Exception.class) @Override - public void update(XmFee xmFee) { - xmFeeMapper.update(xmFee); + public void update(List xmFeeList) { + for (XmFee xmFee : xmFeeList) { + xmFeeMapper.update(xmFee); + } } + @Log(title = "收费项目维护",businessType = BusinessType.DELETE) @Transactional(rollbackFor = Exception.class) @Override public Result delete(String sfxmdh) { - //这里需要补逻辑,如果有对应的收费项目,这里应该不能删,要先去掉对应的收费项目 - Long xmFeeVsCount = xmFeeMapper.getXmFeeVsCount(sfxmdh); - if(xmFeeVsCount > 0) return new Result("-1","有关联的收费项目代码,要先删掉关联的项目代码才能删掉对应的项目!"); + //后期再考虑增加删除限制判断 + //Long xmFeeVsCount = xmFeeMapper.getXmFeeVsCount(sfxmdh); + //if(xmFeeVsCount > 0) return new Result("-1","有关联的收费项目代码,要先删掉关联的项目代码才能删掉对应的项目!"); xmFeeMapper.delete(sfxmdh); return new Result("0","删除收费项目代码成功!"); } diff --git a/mzcx/src/main/resources/mapper/RptgetRuleMapper.xml b/mzcx/src/main/resources/mapper/RptgetRuleMapper.xml index 4358e06..05171e4 100644 --- a/mzcx/src/main/resources/mapper/RptgetRuleMapper.xml +++ b/mzcx/src/main/resources/mapper/RptgetRuleMapper.xml @@ -90,4 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(1) from lab_rptgetruledetail where bglqdh = #{bglqdh} + \ No newline at end of file diff --git a/mzcx/src/main/resources/mapper/XmFeeMapper.xml b/mzcx/src/main/resources/mapper/XmFeeMapper.xml index bae0e41..113cd9d 100644 --- a/mzcx/src/main/resources/mapper/XmFeeMapper.xml +++ b/mzcx/src/main/resources/mapper/XmFeeMapper.xml @@ -3,13 +3,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + select xm_Fee.*, + lab_feeitemclass.sflbmc, + lab_feeitemclass.bkcolor, + lab_feeitemclass.sflbdh + from xm_Fee left join lab_feeitem_vs_class on lab_feeitem_vs_class.sfxmdh=xm_fee.sfxmdh + LEFT JOIN lab_feeitemclass ON lab_feeitem_vs_class.sflbdh=lab_feeitemclass.sflbdh - and sfxmdh = #{sfxmdh} - and yljg = #{yljg} - and xmlb = #{xmlb} + and (xm_Fee.sfxmdh like '%'+#{sfxmdh}+'%' or xm_Fee.sfxmmc like '%'+#{sfxmdh}+'%') + and xm_Fee.yljg = #{yljg} + and xm_Fee.xmlb = #{xmlb} + order by xm_Fee.sfxmdh @@ -26,6 +32,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" attention, indication, affect, + yblx, + bgts, + dept, sfxmdh )values ( #{sfxmmc}, @@ -40,6 +49,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{attention}, #{indication}, #{affect}, + #{yblx}, + #{bgts}, + #{dept}, #{sfxmdh} ) @@ -59,7 +71,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" attention = #{attention}, indication = #{indication}, affect = #{affect}, - #{sfxmdh} + yblx = #{yblx}, + bgts = #{bgts}, + dept = #{dept}, + sfxmdh = #{sfxmdh} where sfxmdh = #{sfxmdh}