From d0023e85d800ae0fe53d60a9554b3bdb6ab866c8 Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Sun, 25 Jan 2026 09:11:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E6=9D=A1=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2,=E4=B8=8D=E5=90=88=E6=A0=BC=E6=A0=87=E6=9C=AC?= =?UTF-8?q?=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/entity/lis/LabIntersendList.java | 19 ++ .../utils/LisInterfaceUtil.java | 5 +- .../work/RcvBarcodeRefusedController.java | 42 ++++ .../mapper/work/RcvBarcodeRefusedMapper.java | 12 + .../pojo/DTO/RcvBarcodeRefusedDTO.java | 33 +++ .../service/RcvBarcodeRefusedService.java | 14 ++ .../impl/RcvBarcodeRefusedServiceImpl.java | 209 ++++++++++++++++++ .../mapper/RcvBarcodeRefusedMapper.xml | 68 ++++++ .../czlis/zycx/controller/ZycxController.java | 2 + .../zycx/mapper/LabIntersendListMapper.java | 7 + .../zycx/service/impl/ZycxServiceImpl.java | 40 +++- .../mapper/LabIntersendListMapper.xml | 12 + zycx/src/main/resources/mapper/ZycxMapper.xml | 2 +- 13 files changed, 458 insertions(+), 7 deletions(-) create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabIntersendList.java create mode 100644 liswork/src/main/java/com/czlis/liswork/controller/work/RcvBarcodeRefusedController.java create mode 100644 liswork/src/main/java/com/czlis/liswork/mapper/work/RcvBarcodeRefusedMapper.java create mode 100644 liswork/src/main/java/com/czlis/liswork/pojo/DTO/RcvBarcodeRefusedDTO.java create mode 100644 liswork/src/main/java/com/czlis/liswork/service/RcvBarcodeRefusedService.java create mode 100644 liswork/src/main/java/com/czlis/liswork/service/impl/RcvBarcodeRefusedServiceImpl.java create mode 100644 liswork/src/main/resources/mapper/RcvBarcodeRefusedMapper.xml create mode 100644 zycx/src/main/java/com/czlis/zycx/mapper/LabIntersendListMapper.java create mode 100644 zycx/src/main/resources/mapper/LabIntersendListMapper.xml diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabIntersendList.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabIntersendList.java new file mode 100644 index 0000000..a249639 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabIntersendList.java @@ -0,0 +1,19 @@ +package com.czlis.common.core.domain.entity.lis; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabIntersendList { + private String guid; + private String sendtype; + private String senddata; + private String userid; + private Date createdate; + +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java index 1596789..fd663c7 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisInterfaceUtil.java @@ -29,6 +29,7 @@ import com.czlis.interfaceCommon.service.ISysOperLogService; import com.czlis.interfaceCommon.service.LisInterfaceType; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.HashMap; @@ -105,8 +106,8 @@ public class LisInterfaceUtil { * @param inValue * @return */ - //@Transactional(rollbackFor = Exception.class) - private Result invokeSP(String type,String inValue){ + @Transactional(rollbackFor = Exception.class) + public Result invokeSP(String type,String inValue){ //为了兼容老接口，存储过程方式使用的是xml，这里需要把入参转成xml格式 String xmlStr = changeXml(inValue); diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/RcvBarcodeRefusedController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/RcvBarcodeRefusedController.java new file mode 100644 index 0000000..41a42df --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/RcvBarcodeRefusedController.java @@ -0,0 +1,42 @@ +package com.czlis.liswork.controller.work; + +import com.czlis.common.core.controller.BaseController; +import com.czlis.common.core.domain.Result; +import com.czlis.liswork.pojo.DTO.RcvBarcodeRefusedDTO; +import com.czlis.liswork.service.RcvBarcodeRefusedService; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Api(tags = "拒签及不合格标本登记") +@RestController +@RequestMapping("/refused") +public class RcvBarcodeRefusedController extends BaseController { + + @Autowired + RcvBarcodeRefusedService rcvBarcodeRefusedService; + + + @ApiOperation("获取申请单数据") + @GetMapping("/getData") + public Result getData(String sqh){ + return rcvBarcodeRefusedService.getData(sqh,getUsername()); + } + + @ApiOperation("刷新界面数据") + @GetMapping("/refreshData") + public Result refreshData(String sqh){ + return rcvBarcodeRefusedService.refreshData(sqh); + } + + @PostMapping("/saveData") + public Result saveData(List rcvBarcodeRefusedDTOList){ + return rcvBarcodeRefusedService.saveData(rcvBarcodeRefusedDTOList,getUsername(),getLoginUser().getUser().getNickName()); + } +} diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/work/RcvBarcodeRefusedMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/work/RcvBarcodeRefusedMapper.java new file mode 100644 index 0000000..24e2046 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/mapper/work/RcvBarcodeRefusedMapper.java @@ -0,0 +1,12 @@ +package com.czlis.liswork.mapper.work; + +import java.util.Map; +import java.util.List; + +public interface RcvBarcodeRefusedMapper { + List> refreshData(String sqh); + String getJqly(String refuseText); + String getJymd(String sqh); + String getYblx(String yblx); + +} diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/DTO/RcvBarcodeRefusedDTO.java b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/RcvBarcodeRefusedDTO.java new file mode 100644 index 0000000..c424e20 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/pojo/DTO/RcvBarcodeRefusedDTO.java @@ -0,0 +1,33 @@ +package com.czlis.liswork.pojo.DTO; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotBlank; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class RcvBarcodeRefusedDTO { + @ApiModelProperty("条码号") + private String sqh; + @NotBlank(message = "登记模式不能为空！") + @ApiModelProperty("登记模式") + private String mode; + @NotBlank(message = "不合格类别不能为空！") + @ApiModelProperty("不合格类别") + private String refuseText; + @NotBlank(message = "补充描述不能为空！") + @ApiModelProperty("补充描述") + private String description; + @NotBlank(message = "收费项目不能为空！") + @ApiModelProperty("收费项目") + private String item; + @NotBlank(message = "样本类型不能为空！") + @ApiModelProperty("样本类型") + private String yblx; + @ApiModelProperty("通知人") + private String tzr; +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/RcvBarcodeRefusedService.java b/liswork/src/main/java/com/czlis/liswork/service/RcvBarcodeRefusedService.java new file mode 100644 index 0000000..bfa1789 --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/RcvBarcodeRefusedService.java @@ -0,0 +1,14 @@ +package com.czlis.liswork.service; + +import com.czlis.common.core.domain.Result; +import com.czlis.liswork.pojo.DTO.RcvBarcodeRefusedDTO; + +import java.util.List; + +public interface RcvBarcodeRefusedService { + Result getData(String sqh,String userName); + + Result refreshData(String sqh); + + Result saveData(List rcvBarcodeRefusedDTOList, String userName,String nickName); +} diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/RcvBarcodeRefusedServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/RcvBarcodeRefusedServiceImpl.java new file mode 100644 index 0000000..fb5dcbf --- /dev/null +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/RcvBarcodeRefusedServiceImpl.java @@ -0,0 +1,209 @@ +package com.czlis.liswork.service.impl; + +import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.LabRefused; +import com.czlis.common.core.domain.entity.lis.LabReqmain; +import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants; +import com.czlis.interfaceCommon.mapper.LabRefusedMapper; +import com.czlis.interfaceCommon.pojo.inter.DayMessage; +import com.czlis.interfaceCommon.pojo.inter.GetReqInterface; +import com.czlis.interfaceCommon.utils.CommonUtil; +import com.czlis.interfaceCommon.utils.LisInterfaceUtil; +import com.czlis.interfaceCommon.utils.LisUtil; +import com.czlis.liswork.mapper.work.RcvBarcodeRefusedMapper; +import com.czlis.liswork.pojo.DTO.RcvBarcodeRefusedDTO; +import com.czlis.liswork.service.RcvBarcodeRefusedService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; + +@Service +@Slf4j +public class RcvBarcodeRefusedServiceImpl implements RcvBarcodeRefusedService { + + @Autowired + RcvBarcodeRefusedMapper rcvBarcodeRefusedMapper; + @Autowired + LisInterfaceUtil lisInterfaceUtil; + @Autowired + private CommonUtil commonUtil; + @Autowired + LabRefusedMapper labRefusedMapper; + + @Override + public Result getData(String sqh,String userName) { + //前端需要拦截已经刷过的条码 + + //调用接口，查询申请单 + GetReqInterface getReqInterface = new GetReqInterface(); + getReqInterface.setYljg("1"); + getReqInterface.setBrdh(""); + getReqInterface.setDept(""); + getReqInterface.setSqh(sqh); + getReqInterface.setUserid(userName); + lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.GETREQINTERFACE, getReqInterface); + + //判断条码状态 + LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqh); + if(labReqmainOne == null) return new Result("-1","没有找到该条码的信息！"); + String zt = labReqmainOne.getZt(); + if(zt == null || zt.equals("")) return new Result("-1","没有获取到该条码的状态的信息！"); + switch (zt){ + case "1": + return new Result("-1","条码未打印！"); + case "8": + return new Result("-1","标本已拒收！"); + case "9": + return new Result("-1","条码已经作废！"); + } + List> rcvBarcodeRefusedList = rcvBarcodeRefusedMapper.refreshData(sqh); + return new Result("0","获取数据成功！",rcvBarcodeRefusedList); + } + + /** + * 刷新界面数据 + * @param sqh + * @return + */ + @Override + public Result refreshData(String sqh) { + List> rcvBarcodeRefusedList = rcvBarcodeRefusedMapper.refreshData(sqh); + return new Result("0","获取数据成功！",rcvBarcodeRefusedList); + } + + /** + * 保存数据 + * @param rcvBarcodeRefusedDTOList + * @return + */ + @Override + public Result saveData(List rcvBarcodeRefusedDTOList,String userName,String nickName) { + /** + * 前端调用w_pop_refuse_tzr_xtrmyy这个界面， + * 根据参数sp_refusedid确定，回写tzr 这个字段给我 + * + */ + + if(rcvBarcodeRefusedDTOList.size() == 0) return new Result("-1","入参不能为空！"); + //校验数据 + for (RcvBarcodeRefusedDTO rcvBarcodeRefusedDTO : rcvBarcodeRefusedDTOList) { + String refuseText = rcvBarcodeRefusedDTO.getRefuseText(); + if(refuseText == null || refuseText.equals("")) return new Result("-1","不合格类别不能为空！"); + String sqh = rcvBarcodeRefusedDTO.getSqh(); + if(sqh == null || sqh.equals("")) return new Result("-1","申请号不能为空！"); + String jymd = rcvBarcodeRefusedDTO.getItem(); + if(jymd.equals("")){ + jymd = rcvBarcodeRefusedMapper.getJymd(sqh); + } + if(commonUtil.getComOptValue("HISOPT", "sp_badbzbt").trim().equals("1")){ + String description = rcvBarcodeRefusedDTO.getDescription(); + if(description == null || description.equals("")) return new Result("-1","补充描述不能为空！"); + } + String yblxMC = rcvBarcodeRefusedMapper.getYblx(rcvBarcodeRefusedDTO.getYblx()); + if(yblxMC == null || yblxMC.equals("")) yblxMC = rcvBarcodeRefusedDTO.getYblx(); + String jqly = rcvBarcodeRefusedMapper.getJqly(refuseText); + switch (jqly){ + case "4": + if((jymd.contains("培养") && yblxMC.contains("血")) || (jymd.contains("培养") && jymd.contains("血"))){ + + }else{ + return new Result("-1","只有血培养才能登记血培养污染!"); + } + break; + case "5": + if(yblxMC.contains("全血") || yblxMC.contains("血浆") || yblxMC.contains("脉血")){ + + }else{ + return new Result("-1","只有抗凝血才能登记抗凝不合格"); + } + break; + } + + String lastUserNo = commonUtil.getComOptValue("_BAR_", "rcv_lastuserno"); + if(lastUserNo.equals("1") && userName != null && !userName.equals("")){ + + }else{ + //打开登录窗口，核对信息 + } + + + } + + for (RcvBarcodeRefusedDTO rcvBarcodeRefusedDTO : rcvBarcodeRefusedDTOList) { + //准备保存数据 + String mode = rcvBarcodeRefusedDTO.getMode(); + String sqh = rcvBarcodeRefusedDTO.getSqh(); + LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqh); + if(labReqmainOne == null) return new Result("-1","没有找到申请单信息！"); + String zt = labReqmainOne.getZt().trim(); + String ksdh = LisUtil.isBank(labReqmainOne.getKsdh()); + + if(!mode.equals("1") && zt.equals("4")) return new Result("-1","该标本已审核,已审核标本禁止作废剃回"); +// if(!mode.equals("1")){ +// DayMessage dayMessage = new DayMessage(); +// dayMessage.setYljg("1"); +// dayMessage.setMsg(sqh); +// dayMessage.setMsgid("126"); +// Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.DAYMESSAGE, dayMessage); +// if(!result.getCode().equals("0")) return new Result("-1","调用接口失败！"+result.getMsg()); +// +// } + LabRefused labRefused = new LabRefused(); + labRefused.setSqh(sqh); + labRefused.setRefusedtime(commonUtil.getCurrentTime()); + labRefused.setRefuseder(nickName); + labRefused.setKsdh(ksdh); + labRefused.setBz("0"); + labRefused.setRefusetext(rcvBarcodeRefusedDTO.getRefuseText()); + + String refuseText = rcvBarcodeRefusedDTO.getRefuseText(); + String refName = commonUtil.getComDictNameById("JQLY", refuseText); + if(refName == null || refName.equals("")) refuseText = refName; + LabReqmain labReqmain = new LabReqmain(); + labReqmain.setSqh(sqh); + labReqmain.setBz3(refuseText); + labReqmain.setRefused(mode); + String msgId = ""; + switch (mode){ + case "1": + msgId = "000"; + break; + case "2": + msgId = "124"; + labReqmain.setZt("8"); + break; + case "3": + msgId = "123"; + labReqmain.setZt("9"); + break; + case "4": + msgId = "125"; + labReqmain.setZt("9"); + break; + } + + //调用接口 + DayMessage dayMessage = new DayMessage(); + dayMessage.setYljg("1"); + dayMessage.setMsg(sqh); + dayMessage.setMsgid(msgId); + Result result = lisInterfaceUtil.invokeLisInterface(LisinterfaceNameConstants.DAYMESSAGE, dayMessage); + if(!result.getCode().equals("0")) return new Result("-1","调用接口失败！"+result.getMsg()); + } + + + + return null; + } + + + @Transactional + public void saveDBData(LabRefused labRefused,LabReqmain labReqmain){ + labRefusedMapper.insertLabRefused(labRefused); + commonUtil.updateLabReqmain(labReqmain); + } +} diff --git a/liswork/src/main/resources/mapper/RcvBarcodeRefusedMapper.xml b/liswork/src/main/resources/mapper/RcvBarcodeRefusedMapper.xml new file mode 100644 index 0000000..bbf05cf --- /dev/null +++ b/liswork/src/main/resources/mapper/RcvBarcodeRefusedMapper.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + diff --git a/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java b/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java index a4b1840..37cade0 100644 --- a/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java +++ b/zycx/src/main/java/com/czlis/zycx/controller/ZycxController.java @@ -103,6 +103,8 @@ public class ZycxController extends BaseController { return packBarcodeUtil.printpackid(ksmc); } + @Anonymous + @ApiOperation("测试") @GetMapping("/test1") public Result test1(String sqh) { return zycxService.test1(sqh); diff --git a/zycx/src/main/java/com/czlis/zycx/mapper/LabIntersendListMapper.java b/zycx/src/main/java/com/czlis/zycx/mapper/LabIntersendListMapper.java new file mode 100644 index 0000000..f3f365b --- /dev/null +++ b/zycx/src/main/java/com/czlis/zycx/mapper/LabIntersendListMapper.java @@ -0,0 +1,7 @@ +package com.czlis.zycx.mapper; + +import com.czlis.common.core.domain.entity.lis.LabIntersendList; + +public interface LabIntersendListMapper { + void insert(LabIntersendList labIntersendList); +} diff --git a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java index eac8b58..7634bfc 100644 --- a/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java +++ b/zycx/src/main/java/com/czlis/zycx/service/impl/ZycxServiceImpl.java @@ -2,8 +2,10 @@ package com.czlis.zycx.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.czlis.common.core.domain.Result; +import com.czlis.common.core.domain.entity.lis.LabIntersendList; import com.czlis.common.core.domain.entity.lis.LabReqdetail; import com.czlis.common.core.domain.entity.lis.LabReqmain; import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants; @@ -14,6 +16,8 @@ import com.czlis.interfaceCommon.utils.CommonUtil; import com.czlis.interfaceCommon.utils.LisInterfaceUtil; import com.czlis.interfaceCommon.utils.LisUtil; import com.czlis.interfaceCommon.utils.ReportUtil; +import com.czlis.interfaceCommon.websocket.WebSocketInstrComm; +import com.czlis.zycx.mapper.LabIntersendListMapper; import com.czlis.zycx.mapper.ZycxMapper; import com.czlis.zycx.pojo.QuerySqdVO; import com.czlis.zycx.pojo.Web_getBarcode; @@ -22,6 +26,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.*; @@ -37,6 +42,8 @@ public class ZycxServiceImpl implements ZycxService { private CommonUtil commonUtil; @Autowired private ReportUtil reportUtil; + @Autowired + LabIntersendListMapper labIntersendListMapper; @Value("${lisinterface.sp:}") String sp; @@ -104,9 +111,9 @@ public class ZycxServiceImpl implements ZycxService { String zt = labReqmainOne.getZt(); //打印条码 if(status.equals("11")){ - Result result = printBarCode(sqhOne); - if(!result.getCode().equals("0")) return result; - pdfUrlList.add(result.getData().toString()); +// Result result = printBarCode(sqhOne); +// if(!result.getCode().equals("0")) return result; +// pdfUrlList.add(result.getData().toString()); //修改打印状态 if(zt.trim().equals("1") || zt.trim().equals("8")){ LabReqmain labReqmain = new LabReqmain(); @@ -154,6 +161,13 @@ public class ZycxServiceImpl implements ZycxService { } + if(status.equals("11")){ + //使用PB 的打印插件进行打印 + Result result = printBarCodeByPB(sqh, userid); + //if(!result.getCode().equals("0")) return result; + return result; + } + return new Result("0","执行成功！",pdfUrlList); } @@ -173,7 +187,9 @@ public class ZycxServiceImpl implements ZycxService { @Override public Result test1(String sqh) { - return printBarCode(sqh); + //return printBarCode(sqh); + //webSocketInstrComm.sendToAllClient("服务端发送消息！"); + return new Result("0","发送完毕！"); } /** @@ -191,6 +207,7 @@ public class ZycxServiceImpl implements ZycxService { } + @Transactional public Result createSQDExecSP(String dept, String userid, String st, String et, String yljg){ Map map = new HashMap<>(); map.put("dept", dept); @@ -214,6 +231,7 @@ public class ZycxServiceImpl implements ZycxService { } + @Transactional public Result createSQDExecHTTP(String dept, String userid, String st, String et, String yljg){ GetReqInterface getReqInterface = new GetReqInterface(); getReqInterface.setDept(dept); @@ -226,6 +244,7 @@ public class ZycxServiceImpl implements ZycxService { return lisInterfaceUtil.invokeLisInterfaceLog(LisinterfaceNameConstants.GETREQINTERFACE,getReqInterface,userid); } + @Transactional public Result execSQDExecSP(String sqh,String userid,String status,String yljg){ Map map = new HashMap<>(); map.put("sqh", sqh); @@ -262,6 +281,19 @@ public class ZycxServiceImpl implements ZycxService { return reportUtil.printToPdf("barcode_zy", reportParam, sqh, false); } + public Result printBarCodeByPB(String[] sqh,String userId){ + String sqhStr = StrUtil.join(",", sqh); + LabIntersendList labIntersendList = new LabIntersendList(); + String guid = UUID.randomUUID().toString(); + labIntersendList.setGuid(guid); + labIntersendList.setSendtype("1"); + labIntersendList.setSenddata(sqhStr); + labIntersendList.setUserid(userId); + labIntersendList.setCreatedate(commonUtil.getCurrentTime()); + labIntersendListMapper.insert(labIntersendList); + return new Result("0","打印成功！",guid); + } + } diff --git a/zycx/src/main/resources/mapper/LabIntersendListMapper.xml b/zycx/src/main/resources/mapper/LabIntersendListMapper.xml new file mode 100644 index 0000000..b2ce127 --- /dev/null +++ b/zycx/src/main/resources/mapper/LabIntersendListMapper.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/zycx/src/main/resources/mapper/ZycxMapper.xml b/zycx/src/main/resources/mapper/ZycxMapper.xml index 97e641e..0da8507 100644 --- a/zycx/src/main/resources/mapper/ZycxMapper.xml +++ b/zycx/src/main/resources/mapper/ZycxMapper.xml @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.sqh = #{sqh} - and ((select ','+remark+',' from sys_dict_data where dict_type='lis_reqcx_type' and dict_value=#{zt}) like '%,'+a.zt+',%') + and ((select ','+remark+',' from sys_dict_data where dict_type='lis_reqcx_type' and dict_value=#{zt}) like '%,'+rtrim(ltrim(a.zt))+',%') and (a.ksdh = #{ksdh} or a.bz2 = #{ksdh}) and a.brly = #{brly} and a.yljg = #{yljg}