diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdl.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdl.java index 03c58bc..6097fa6 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdl.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdl.java @@ -15,5 +15,7 @@ public class LabInputmdl { private Integer qsybh; private Integer jsybh; private String yblx; + private String oldMbmc; + } diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdlDetail.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdlDetail.java index ce2bc8d..0da3e76 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdlDetail.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputmdlDetail.java @@ -14,4 +14,5 @@ public class LabInputmdlDetail { private String xmdh; private String mrz; private String xmmc; + private String oldMbmc; } diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmReqitemVsReportitem.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmReqitemVsReportitem.java index c174b1e..f0469b5 100644 --- a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmReqitemVsReportitem.java +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/XmReqitemVsReportitem.java @@ -18,4 +18,6 @@ public class XmReqitemVsReportitem { private String tdh; private String mrz; private String def; + private String xmmc; + private String sl; } 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 index a271e2c..a2c3c13 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/SysLogConstants.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/SysLogConstants.java @@ -29,5 +29,5 @@ public class SysLogConstants { public static final String XMMEDINSTR_LOG = "抗生素通道号设定"; public static final String XMMEDMAIN_LOG = "细菌抗生素组对照"; public static final String XMKNOWLEDGE_LOG = "知识库"; - + public static final String LABCHECKRULES_LOG = "高级审核条件"; } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabCheckrulesMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabCheckrulesMapper.java index 1082505..426d364 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabCheckrulesMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabCheckrulesMapper.java @@ -1,5 +1,6 @@ package com.czlis.interfaceCommon.mapper; +import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.LabCheckrules; import java.util.List; @@ -18,4 +19,12 @@ public interface LabCheckrulesMapper { * @return */ List getLabCheckrulesAutocheck(String yq); + + void insert(LabCheckrules labCheckrules); + + void update(LabCheckrules labCheckrules); + + List query(LabCheckrules labCheckrules); + + void delete(int ruleid); } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputmdlMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputmdlMapper.java index d0983ee..c9c6ad1 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputmdlMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputmdlMapper.java @@ -9,7 +9,7 @@ import java.util.List; public interface LabInputmdlMapper { List query(LabInputmdl labInputmdl); - List queryDetail(LabInputmdl labInputmdl); + List queryDetail(LabInputmdlDetail labInputmdlDetail); void add(LabInputmdl labInputmdl); diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatInfoMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatInfoMapper.java new file mode 100644 index 0000000..3655e35 --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabPatInfoMapper.java @@ -0,0 +1,9 @@ +package com.czlis.interfaceCommon.mapper; + +import com.czlis.common.core.domain.entity.lis.LabPatInfo; + +public interface LabPatInfoMapper { + LabPatInfo selectLabPatInfoOne(LabPatInfo labPatInfo); + void insert(LabPatInfo labPatInfo); + void update(LabPatInfo labPatInfo); +} diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabCheckrulesMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabCheckrulesMapper.xml index 864e220..f5d0274 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabCheckrulesMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabCheckrulesMapper.xml @@ -12,4 +12,44 @@ FROM lab_checkrules where (isnull(autocheck,'') = '1') and rptunitid = #{yq} + + + + insert into lab_checkrules( + autocheck, + rptunitid, checkrules, checktype, logflag, logcontent, ruledisplay, actions) + values( + #{autocheck}, + #{rptunitid}, #{checkrules},#{checktype},#{logflag},#{logcontent},#{ruledisplay},#{actions} + ) + + + + update lab_checkrules set + checkrules = #{checkrules}, + checktype = #{checktype}, + logflag = #{logflag}, + logcontent = #{logcontent}, + ruledisplay = #{ruledisplay}, + actions = #{actions}, + autocheck = #{autocheck}, + rptunitid = #{rptunitid} + where ruleid = #{ruleid} + + + + delete from lab_checkrules where ruleid = #{ruleid} + + diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlMapper.xml index 2dc4a49..e51640f 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabInputmdlMapper.xml @@ -7,16 +7,17 @@ select * from lab_inputmdl and yq = #{yq} - and mbmc = #{mbmc} + and mbmc like '%'+#{mbmc}+'%' @@ -39,7 +40,6 @@ update lab_inputmdl - mbmc = #{mbmc}, srbh = #{srbh}, zdsr = #{zdsr}, qsybh = #{qsybh}, @@ -47,7 +47,7 @@ yblx = #{yblx}, yq = #{yq},mbmc = #{mbmc} - where yq = #{yq},mbmc = #{mbmc} + where yq = #{yq} and mbmc = #{oldMbmc} @@ -57,7 +57,7 @@ mrz = #{mrz}, yq = #{yq},mbmc = #{mbmc},xh=#{xh} - where yq = #{yq},mbmc = #{mbmc},xh=#{xh} + where yq = #{yq} and mbmc = #{oldMbmc} and xh=#{xh} @@ -65,7 +65,8 @@ - delete from lab_inputmdldetail where yq = #{yq} and mbmc = #{mbmc} and xh = #{xh} + delete from lab_inputmdldetail where yq = #{yq} and mbmc = #{mbmc} + and xh = #{xh} + select * from lab_patinfo where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh} and xxlb = #{xxlb} + + + insert into lab_patinfo( + val1, + val2, + val3, + textinfo, + jyrq, yq, ybh, xxlb) values( + #{val1}, + #{val2}, + #{val3}, + #{textinfo}, + #{jyrq},#{yq},#{ybh},#{xxlb} + ) + + + + update lab_patinfo set + val1 = #{val1}, + val2 = #{val2}, + val3 = #{val3}, + textinfo = #{textinfo}, + jyrq = #{jyrq}, yq = #{yq} , ybh = #{ybh} + where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh} and xxlb = #{xxlb} + + \ No newline at end of file diff --git a/liswork/src/main/java/com/czlis/liswork/controller/dict/XmInfoController.java b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmInfoController.java new file mode 100644 index 0000000..f3d7d31 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/dict/XmInfoController.java @@ -0,0 +1,29 @@ +package com.czlis.liswork.controller.dict; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.XmInfo; +import com.czlis.liswork.service.XmInfoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 老的xm_info数据查询 + */ +@Api(tags = "老的xm_info数据查询") +@RestController +@RequestMapping("/oldxminfo") +public class XmInfoController { + + @Autowired + private XmInfoService xmInfoService; + + @ApiOperation("查询数据") + @GetMapping("/query") + public Result query(XmInfo xmInfo) { + return xmInfoService.query(xmInfo); + } +} 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 e8efc42..9d7f7a2 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 @@ -10,11 +10,9 @@ import com.czlis.interfaceCommon.constants.SysLogConstants; import com.czlis.liswork.service.XmReqitemVsReportitemService; 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.DeleteMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -24,13 +22,20 @@ import java.util.List; @Api(tags = "收费项目报告项目对照") @RestController @RequestMapping("/vsReportitem") +@Slf4j public class XmReqitemVsReportitemController extends BaseController { @Autowired private XmReqitemVsReportitemService xmReqitemVsReportitemService; @ApiOperation("查询收费项目报告项目对照") - @PostMapping("/query") + @GetMapping("/queryList") + public Result queryList(XmReqitemVsReportitem xmReqitemVsReportitem){ + return xmReqitemVsReportitemService.queryList(xmReqitemVsReportitem); + } + + @ApiOperation("查询收费项目报告项目对照") + @GetMapping("/query") public TableDataInfo query(XmReqitemVsReportitem xmReqitemVsReportitem){ startPage(); List xmReqitemVsReportitemList = xmReqitemVsReportitemService.query(xmReqitemVsReportitem); @@ -40,21 +45,28 @@ public class XmReqitemVsReportitemController extends BaseController { @ApiOperation("新增收费项目报告项目对照") @PostMapping("/add") @Log(title = SysLogConstants.XMREQITEMVSREPORTITEM_LOG,businessType = BusinessType.INSERT) - public Result add(XmReqitemVsReportitem xmReqitemVsReportitem){ - return xmReqitemVsReportitemService.add(xmReqitemVsReportitem); + public Result add(@RequestBody List xmReqitemVsReportitemList){ + return xmReqitemVsReportitemService.add(xmReqitemVsReportitemList); } @ApiOperation("删除收费项目报告项目对照") @DeleteMapping("/del") @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); + public Result delete(@RequestParam String sqxmdh,@RequestParam String yq,@RequestParam String xmdh,@RequestParam String seq){ + return xmReqitemVsReportitemService.delete(sqxmdh,yq,xmdh,seq); } @ApiOperation("修改收费项目报告项目对照") @PostMapping("/update") @Log(title = SysLogConstants.XMREQITEMVSREPORTITEM_LOG ,businessType = BusinessType.UPDATE) - public Result update(XmReqitemVsReportitem xmReqitemVsReportitem){ + public Result update(@RequestBody XmReqitemVsReportitem xmReqitemVsReportitem){ return xmReqitemVsReportitemService.update(xmReqitemVsReportitem); } + + @Log(title = SysLogConstants.XMREQITEMVSREPORTITEM_LOG ,businessType = BusinessType.UPDATE) + @ApiOperation("搜索项目") + @GetMapping("/search") + public Result searchXmdh(String yq){ + return xmReqitemVsReportitemService.searchXmdh(yq); + } } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabCheckrulesController.java b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabCheckrulesController.java new file mode 100644 index 0000000..e96ea2d --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/xtwh/LabCheckrulesController.java @@ -0,0 +1,46 @@ +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.LabCheckrules; +import com.czlis.common.enums.BusinessType; +import com.czlis.interfaceCommon.constants.SysLogConstants; +import com.czlis.liswork.service.LabCheckrulesService; +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("/labCheckrules") +@Slf4j +public class LabCheckrulesController { + + @Autowired + private LabCheckrulesService labCheckrulesService; + + @ApiOperation("获取审核条件列表") + @GetMapping("/queryList") + public Result queryList(LabCheckrules labCheckrules) { + return labCheckrulesService.queryList(labCheckrules); + } + + + @Log(title = SysLogConstants.LABCHECKRULES_LOG,businessType = BusinessType.UPDATE) + @ApiOperation("保存高级审核条件") + @PostMapping("/update") + public Result update(@RequestBody List labCheckrulesList){ + return labCheckrulesService.update(labCheckrulesList); + } + + @Log(title = SysLogConstants.LABCHECKRULES_LOG,businessType = BusinessType.DELETE) + @GetMapping("/delete") + @ApiOperation("删除高级审核条件") + public Result delete(int id){ + return labCheckrulesService.delete(id); + } +} 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 dd3203d..9824fd6 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 @@ -34,8 +34,8 @@ public class LabInputmdlController { @ApiOperation("查询明细数据") @GetMapping("/queryDetail") - public Result queryDetail(LabInputmdl labInputmdl){ - return labInputmdlService.queryDetail(labInputmdl); + public Result queryDetail(LabInputmdlDetail labInputmdlDetail){ + return labInputmdlService.queryDetail(labInputmdlDetail); } @Log(title = SysLogConstants.LABINPUTMDL_LOG,businessType = BusinessType.INSERT) @@ -61,8 +61,8 @@ public class LabInputmdlController { @Log(title = SysLogConstants.LABINPUTMDL_LOG,businessType = BusinessType.DELETE_DETAIL) @ApiOperation("删除明细数据") - @GetMapping("/deleteDetail") - public Result deleteDetail(List labInputmdlDetailList){ + @PostMapping("/deleteDetail") + public Result deleteDetail(@RequestBody List labInputmdlDetailList){ return labInputmdlService.deleteDetail(labInputmdlDetailList); } diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java index 82cb14d..9cdc044 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/dict/XmReqitemVsReportitemMapper.java @@ -4,11 +4,17 @@ import com.czlis.common.core.domain.entity.lis.XmReqitemVsReportitem; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; +import java.util.Objects; public interface XmReqitemVsReportitemMapper { List query(XmReqitemVsReportitem xmReqitemVsReportitem); void add(XmReqitemVsReportitem xmReqitemVsReportitem); - void delete(@Param("sqxmdh") String sqxmdh,@Param("yq") String yq,@Param("xmdh") String xmdh,@Param("tdh") String tdh); + void delete(@Param("sqxmdh") String sqxmdh,@Param("yq") String yq,@Param("xmdh") String xmdh,@Param("seq") String seq); void update(XmReqitemVsReportitem xmReqitemVsReportitem); + XmReqitemVsReportitem queryOne(XmReqitemVsReportitem xmReqitemVsReportitem); + List> queryList(XmReqitemVsReportitem xmReqitemVsReportitem); + String getSqxmdhOne(String yq); + void searchXmdh(String yq); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/LabCheckrulesService.java b/liswork/src/main/java/com/czlis/liswork/service/LabCheckrulesService.java new file mode 100644 index 0000000..1f430b2 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/LabCheckrulesService.java @@ -0,0 +1,14 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.LabCheckrules; + +import java.util.List; + +public interface LabCheckrulesService { + Result queryList(LabCheckrules labCheckrules); + + Result update(List labCheckrulesList); + + Result delete(int id); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/LabInputmdlService.java b/liswork/src/main/java/com/czlis/liswork/service/LabInputmdlService.java index 07d85cd..0cf89ed 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LabInputmdlService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LabInputmdlService.java @@ -10,7 +10,7 @@ import java.util.List; public interface LabInputmdlService { Result query(LabInputmdl labInputmdl); - Result queryDetail(LabInputmdl labInputmdl); + Result queryDetail(LabInputmdlDetail labInputmdlDetail); Result add(LabInputmdlDTO labInputmdlDTO); diff --git a/liswork/src/main/java/com/czlis/liswork/service/XmInfoService.java b/liswork/src/main/java/com/czlis/liswork/service/XmInfoService.java new file mode 100644 index 0000000..ef029b3 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/XmInfoService.java @@ -0,0 +1,8 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.XmInfo; + +public interface XmInfoService { + Result query(XmInfo xmInfo); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/XmReqitemVsReportitemService.java b/liswork/src/main/java/com/czlis/liswork/service/XmReqitemVsReportitemService.java index 99b7a58..378b394 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/XmReqitemVsReportitemService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/XmReqitemVsReportitemService.java @@ -7,7 +7,11 @@ import java.util.List; public interface XmReqitemVsReportitemService { List query(XmReqitemVsReportitem xmReqitemVsReportitem); - Result add(XmReqitemVsReportitem xmReqitemVsReportitem); - Result delete(String sqxmdh, String yq, String xmdh, String tdh); + Result add(List xmReqitemVsReportitem); + Result delete(String sqxmdh, String yq, String xmdh, String seq); Result update(XmReqitemVsReportitem xmReqitemVsReportitem); + + Result queryList(XmReqitemVsReportitem xmReqitemVsReportitem); + + Result searchXmdh(String yq); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/XmInfoServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/XmInfoServiceImpl.java new file mode 100644 index 0000000..d492d08 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/XmInfoServiceImpl.java @@ -0,0 +1,27 @@ +package com.czlis.liswork.service.impl; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.XmInfo; +import com.czlis.interfaceCommon.mapper.XmInfoMapper; +import com.czlis.liswork.service.XmInfoService; +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 XmInfoServiceImpl implements XmInfoService { + + @Autowired + XmInfoMapper xmInfoMapper; + + @Override + public Result query(XmInfo xmInfo) { + if(xmInfo == null) return new Result("-1","入参不能为空"); + if(xmInfo.getYq() == null || xmInfo.getYq().equals("")) return new Result("-1","入参yq不能为空！"); + List xmInfoList = xmInfoMapper.getXmInfoList(xmInfo.getYq()); + return new Result("0","获取数据成功！",xmInfoList); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java index e0e9bd0..7a9dcd5 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/XmReqitemVsReportitemImpl.java @@ -10,6 +10,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; @Service @Slf4j @@ -25,15 +28,24 @@ public class XmReqitemVsReportitemImpl implements XmReqitemVsReportitemService { @Transactional(rollbackFor = Exception.class) @Override - public Result add(XmReqitemVsReportitem xmReqitemVsReportitem) { - xmReqitemVsReportitemMapper.add(xmReqitemVsReportitem); + public Result add(List xmReqitemVsReportitemList) { + for (XmReqitemVsReportitem xmReqitemVsReportitem : xmReqitemVsReportitemList) { + if(xmReqitemVsReportitem.getSeq() == null || xmReqitemVsReportitem.getSeq().equals("")) return new Result("-1","序号不能为空！"); + XmReqitemVsReportitem xmReqitemVsReportitem1 = xmReqitemVsReportitemMapper.queryOne(xmReqitemVsReportitem); + if(xmReqitemVsReportitem1 != null){ + xmReqitemVsReportitemMapper.update(xmReqitemVsReportitem); + }else { + xmReqitemVsReportitemMapper.add(xmReqitemVsReportitem); + } + } + return new Result("0","添加项目成功！"); } @Transactional(rollbackFor = Exception.class) @Override - public Result delete(String sqxmdh, String yq, String xmdh, String tdh) { - xmReqitemVsReportitemMapper.delete(sqxmdh,yq,xmdh,tdh); + public Result delete(String sqxmdh, String yq, String xmdh, String seq) { + xmReqitemVsReportitemMapper.delete(sqxmdh,yq,xmdh,seq); return new Result("0","删除项目成功！"); } @@ -43,4 +55,26 @@ public class XmReqitemVsReportitemImpl implements XmReqitemVsReportitemService { xmReqitemVsReportitemMapper.update(xmReqitemVsReportitem); return new Result("0","修改项目成功！"); } + + @Override + public Result queryList(XmReqitemVsReportitem xmReqitemVsReportitem) { + List> xmReqitemVsReportitemList = xmReqitemVsReportitemMapper.queryList(xmReqitemVsReportitem); + if(xmReqitemVsReportitem.getSl() != null ){ + //过滤数据，只看仪器对照收费项目 + if(xmReqitemVsReportitem.getSl().equals("1")){ + List> collect = xmReqitemVsReportitemList.stream().filter(item -> item.get("sl").toString().equals("1")).collect(Collectors.toList()); + return new Result("0","获取数据成功！",collect); + } + } + + return new Result("0","获取数据成功！",xmReqitemVsReportitemList); + } + + @Override + public Result searchXmdh(String yq) { + String sqxmdhOne = xmReqitemVsReportitemMapper.getSqxmdhOne(yq); + if(sqxmdhOne != null && !sqxmdhOne.equals("")) return new Result("-1","有重复对应收费"+sqxmdhOne); + xmReqitemVsReportitemMapper.searchXmdh(yq); + return new Result("0","搜索项目成功！"); + } } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/LabCheckrulesServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/LabCheckrulesServiceImpl.java new file mode 100644 index 0000000..1fa80e7 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/LabCheckrulesServiceImpl.java @@ -0,0 +1,47 @@ +package com.czlis.liswork.service.impl.xtwh; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.LabCheckrules; +import com.czlis.interfaceCommon.mapper.LabCheckrulesMapper; +import com.czlis.liswork.service.LabCheckrulesService; +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 LabCheckrulesServiceImpl implements LabCheckrulesService { + + @Autowired + private LabCheckrulesMapper labCheckrulesMapper; + + @Override + public Result queryList(LabCheckrules labCheckrules) { + List labCheckrulesList = labCheckrulesMapper.query(labCheckrules); + return new Result("0","获取数据成功！",labCheckrulesList); + } + + @Override + public Result update(List labCheckrulesList) { + for (LabCheckrules labCheckrules : labCheckrulesList) { + LabCheckrules labCheckrules1 = new LabCheckrules(); + if(labCheckrules.getRuleid() == null){ + labCheckrulesMapper.insert(labCheckrules); + }else{ + labCheckrulesMapper.update(labCheckrules); + } + } + return new Result("0","保存数据成功！"); + } + + @Override + public Result delete(int id) { + labCheckrulesMapper.delete(id); + return new Result("0","删除成功！"); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/LabInputmdlServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/LabInputmdlServiceImpl.java index 2c83f9b..21372db 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/LabInputmdlServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/xtwh/LabInputmdlServiceImpl.java @@ -26,8 +26,8 @@ public class LabInputmdlServiceImpl implements LabInputmdlService { } @Override - public Result queryDetail(LabInputmdl labInputmdl) { - List labInputmdlDetailList = labInputmdlMapper.queryDetail(labInputmdl); + public Result queryDetail(LabInputmdlDetail labInputmdlDetail) { + List labInputmdlDetailList = labInputmdlMapper.queryDetail(labInputmdlDetail); return new Result("0","查询成功！",labInputmdlDetailList); } @@ -46,7 +46,13 @@ public class LabInputmdlServiceImpl implements LabInputmdlService { labInputmdlMapper.update(labInputmdlDTO.getLabInputmdl()); List labInputmdlDetailList = labInputmdlDTO.getLabInputmdlDetailList(); for (LabInputmdlDetail labInputmdlDetail : labInputmdlDetailList) { - labInputmdlMapper.updateDetail(labInputmdlDetail); + List labInputmdlDetailList1 = labInputmdlMapper.queryDetail(labInputmdlDetail); + if(labInputmdlDetailList1.size() > 0){ + labInputmdlMapper.updateDetail(labInputmdlDetail); + }else{ + labInputmdlMapper.addDetail(labInputmdlDetail); + } + } return new Result("0","修改数据成功！"); } @@ -66,6 +72,7 @@ public class LabInputmdlServiceImpl implements LabInputmdlService { @Override public Result deleteDetail(List labInputmdlDetailList) { for (LabInputmdlDetail labInputmdlDetail : labInputmdlDetailList) { + if(labInputmdlDetail.getXh() == null) return new Result("-1","序号不能为空！"); labInputmdlMapper.deleteDetail(labInputmdlDetail); } return new Result("0","删除明细成功！"); diff --git a/liswork/src/main/resources/mapper/XmReqitemVsReportitemMapper.xml b/liswork/src/main/resources/mapper/XmReqitemVsReportitemMapper.xml index ca559cb..74a53a7 100644 --- a/liswork/src/main/resources/mapper/XmReqitemVsReportitemMapper.xml +++ b/liswork/src/main/resources/mapper/XmReqitemVsReportitemMapper.xml @@ -4,16 +4,17 @@ @@ -54,8 +55,29 @@ delete from xm_reqitem_vs_reportitem where sqxmdh = #{sqxmdh} and yq = #{yq} and xmdh = #{xmdh} - and tdh = #{tdh} + and seq = #{seq} + + + + + + + + b.sfxmmc ]]> + + diff --git a/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java b/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java index ef36622..bc41d71 100644 --- a/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java +++ b/zybgcx/src/main/java/com/czlis/zybgcx/service/impl/ZybgcxServcieImpl.java @@ -6,9 +6,11 @@ import cn.hutool.core.util.StrUtil; import com.czlis.common.config.RuoYiConfig; import com.czlis.common.core.domain.Result; import com.czlis.common.core.domain.entity.lis.LabPat; +import com.czlis.common.core.domain.entity.lis.LabPatInfo; import com.czlis.common.core.domain.entity.lis.LabReqreportPdffile; import com.czlis.common.utils.file.FileUtils; import com.czlis.common.utils.uuid.UUID; +import com.czlis.interfaceCommon.mapper.LabPatInfoMapper; import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.interfaceCommon.utils.LisUtil; import com.czlis.interfaceCommon.utils.PdfPaperConverter; @@ -39,6 +41,8 @@ public class ZybgcxServcieImpl implements ZybgcxService { private CommonUtil commonUtil; @Autowired ReportUtil reportUtil; + @Autowired + private LabPatInfoMapper labPatInfoMapper; /** * 获取报告信息 @@ -200,6 +204,12 @@ public class ZybgcxServcieImpl implements ZybgcxService { return new Result("-1",e.getMessage()); } + //修改打印标志 + for (String string : bgdh) { + updatePrintStatus(string); + } + + return new Result("0","打印成功！",encode); } @@ -267,5 +277,60 @@ public class ZybgcxServcieImpl implements ZybgcxService { } + public Result updatePrintStatus(String printId){ + log.info("打印状态修改入参："+printId); + String[] strings = StrUtil.splitToArray(printId, "_"); + Date jyrq = DateUtil.parse(strings[0],"yyyyMMdd"); + String yq = strings[1]; + String ybh = strings[2]; + LabPat labPatOne = commonUtil.getLabPatOne(jyrq, yq, ybh); + String jgbz = labPatOne.getJgbz(); + if(!jgbz.equals("2")) return new Result("-1","报告还没有审核，不允许打印！"); + LabPat labPat = new LabPat(); + labPat.setDybz("1"); + labPat.setJyrq(jyrq); + labPat.setYq(yq); + labPat.setYbh(ybh); + //labPat.setDysj(commonUtil.currentDateTime()); + try{ + LabPatInfo lab_patinfoOne = getLab_patinfoOne(jyrq, yq, ybh); + if(lab_patinfoOne == null){ + LabPatInfo lab_patinfo = new LabPatInfo(); + lab_patinfo.setJyrq(jyrq); + lab_patinfo.setYq(yq); + lab_patinfo.setYbh(ybh); + lab_patinfo.setXxlb("AUTOP_NEW"); + lab_patinfo.setVal1("最后一次的打印时间："+DateUtil.format(commonUtil.getCurrentTime(),"yyyy-MM-dd HH:mm:ss")); + lab_patinfo.setVal2("1"); + labPatInfoMapper.insert(lab_patinfo); + }else{ + LabPatInfo labPatinfo = new LabPatInfo(); + labPatinfo.setVal1("最后一次的打印时间："+DateUtil.format(commonUtil.getCurrentTime(),"yyyy-MM-dd HH:mm:ss")); + labPatinfo.setVal2("1"); + labPatinfo.setJyrq(jyrq); + labPatinfo.setYq(yq); + labPatinfo.setYbh(ybh); + labPatinfo.setXxlb("AUTOP_NEW"); + labPatInfoMapper.update(labPatinfo); + } + commonUtil.updateLabPat(labPat); + }catch (Exception e){ + log.info("id:"+printId+",修改打印状态失败：",e); + return new Result("-1","修改打印状态失败："+e.getMessage()); + } + log.info("printID:"+printId+"修改打印状态成功！"); + return new Result("0","修改打印状态成功！"); + } + + public LabPatInfo getLab_patinfoOne(Date jyrq,String yq,String ybh){ + LabPatInfo labPatInfo = new LabPatInfo(); + labPatInfo.setJyrq(jyrq); + labPatInfo.setYq(yq); + labPatInfo.setYbh(ybh); + labPatInfo.setXxlb("AUTOP_NEW"); + return labPatInfoMapper.selectLabPatInfoOne(labPatInfo); + } + + }