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 c7ec169..6d7d0b7 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 @@ -10,7 +10,6 @@ import com.czlis.interfaceCommon.pojo.inter.GetReqInterface; import com.czlis.interfaceCommon.pojo.inter.SetReqStatus; 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.zycx.mapper.ZycxMapper; import com.czlis.zycx.pojo.QuerySqdVO; @@ -78,11 +77,43 @@ public class ZycxServiceImpl implements ZycxService { Result result = execSQDExecHTTP(sqhOne, userid, status, yljg); if(!result.getCode().equals("0")) return result; } + + + LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqhOne); + if(labReqmainOne == null) return new Result("-1","没有找到申请单数据!"); + String zt = labReqmainOne.getZt(); //打印条码 if(status.equals("11")){ 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(); + labReqmain.setZt("11"); + labReqmain.setSqh(sqhOne); + commonUtil.updateLabReqmain(labReqmain); + } + } + + //采样 + if(status.equals("12")){ + if(zt.equals("1") || zt.equals("8") || zt.equals("11")){ + LabReqmain labReqmain = new LabReqmain(); + labReqmain.setZt("12"); + labReqmain.setSqh(sqhOne); + commonUtil.updateLabReqmain(labReqmain); + } + } + + //送检 + if(status.equals("13")){ + if(zt.equals("1") || zt.equals("8") || zt.equals("11") || zt.equals("12")){ + LabReqmain labReqmain = new LabReqmain(); + labReqmain.setZt("13"); + labReqmain.setSqh(sqhOne); + commonUtil.updateLabReqmain(labReqmain); + } } } @@ -172,19 +203,7 @@ public class ZycxServiceImpl implements ZycxService { public Result printBarCode(String sqh){ ReportParam reportParam = new ReportParam(); reportParam.setSqh(sqh); - Result result = reportUtil.printToPdf("barcode_zy", reportParam, sqh, false); - if(!result.getCode().equals("0")) return result; - //修改打印状态 - LabReqmain labReqmainOne = commonUtil.getLabReqmainOne(sqh); - if(labReqmainOne == null) return new Result("-1","没有找到申请单数据!"); - String zt = labReqmainOne.getZt(); - if(zt.trim().equals("1") || zt.trim().equals("8")){ - LabReqmain labReqmain = new LabReqmain(); - labReqmain.setZt("11"); - labReqmain.setSqh(sqh); - commonUtil.updateLabReqmain(labReqmain); - } - return new Result("0","打印成功!",result.getData()); + return reportUtil.printToPdf("barcode_zy", reportParam, sqh, false); }