diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java index b2b8a6f..36e3f46 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkUtils.java @@ -47,7 +47,8 @@ public class LisWorkUtils { LoginConfigParamUtil loginConfigParamUtil; @Autowired CommonUtil commonUtil; - + @Autowired + LisWorkUtils lisWorkUtils; /** * 初步审核 * @@ -1750,12 +1751,10 @@ public class LisWorkUtils { String yq = labPat.getYq(); String ybh = labPat.getYbh(); String userId = labPat.getYhdh(); + Date sjsj=commonUtil.getCurrentTime(); //修改状态和时间 updateLabReqmainZT(userId, sqh); //保存lab_pat表信息 - labPat.setJyrq(commonUtil.getCurrentTime()); - labPat.setYq(yq); - labPat.setYbh(ybh); labPat.setYblx(commonUtil.getComDictIdByName("BT", labReqmain.getYblx())); labPat.setKsdh(commonUtil.getComDictIdByName("DP", labReqmain.getKsdh())); labPat.setSjys(userId); @@ -1770,13 +1769,13 @@ public class LisWorkUtils { labPat.setNl(Integer.parseInt(age)); labPat.setNldw(unit); labPat.setSqh(sqh); - labPat.setSqsj(commonUtil.getCurrentTime()); + labPat.setSqsj(sjsj); labPat.setJgbz(LabPatConstants.DEFAULT); labPat.setZd(labReqmain.getZd()); labPat.setCyrq(labReqmain.getCysj()); labPat.setJymd(LisUtil.substringByGbkWidth(labReqmain.getJymd(), 0, 50)); labPat.setLastuser(userId); - labPat.setLastdt(commonUtil.getCurrentTime()); + labPat.setLastdt(sjsj); labPat.setShcs(0); labPat.setYljg(labReqmain.getYljg()); labPat.setSfzh(labReqmain.getSfzh()); @@ -1862,7 +1861,8 @@ public class LisWorkUtils { if (!result3.getCode().equals("0")) return result3; //6.写日志 - + lisWorkUtils.setComLog(jyrq,yq,ybh,yhdh,ComLogConstants.LG_SJ,sqh); + if(sqh!=null||"".equals(sqh))lisWorkUtils.setlabReqsteplog(sqh,LabReqmainConstants.START,yhdh); return new Result("0", ""); } diff --git a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java index 3d56e71..097fba7 100644 --- a/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java +++ b/liswork/src/main/java/com/czlis/liswork/controller/work/LisWorkOperController.java @@ -36,6 +36,12 @@ public class LisWorkOperController extends BaseController { public Result newPatInfo(Date jyrq, String sqh, String yq, String ybh) { return lisWorkOperService.newPatInfo(jyrq, ybh, sqh, yq); } + @Log(title = "主界面",businessType = BusinessType.INSERT) + @ApiOperation(("新增空白新样本")) + @GetMapping("/loaddefault") + public Result loaddefault(Date jyrq, String yq, String ybh) { + return lisWorkOperService.loaddefault(jyrq, yq ,ybh); + } /** * 修改病人信息