diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java index dc0d81e..58a3a49 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java @@ -152,24 +152,15 @@ public class CommonUtil { @Transactional(rollbackFor = Exception.class) public int insertLabPat(LabPat labPat) { - return labPatMapper.updateLabPat(labPat); + labPatMapper.insertLabPat(labPat); + return 0; } @Transactional(rollbackFor = Exception.class) public int delLabPat(LabPat labPat) { return labPatMapper.updateLabPat(labPat); } - public List getComPat(String brdh,String yljg){ - return comPatMapper.getComPat(brdh,yljg); - } - @Transactional(rollbackFor = Exception.class) - public int deleteComPat(String brdh,String yljg){ - return comPatMapper.deleteComPat(brdh,yljg); - } - @Transactional(rollbackFor = Exception.class) - public int insertComPat(ComPat comPat) { - return comPatMapper.insertComPat(comPat); - } + @Transactional(rollbackFor = Exception.class) public int updateLabPat(LabPat labPat) { return labPatMapper.updateLabPat(labPat); @@ -184,10 +175,22 @@ public class CommonUtil { public String getLabPatJgbz(Date jyrq, String yq, String ybh){ return labPatMapper.getLabPatJgbz(jyrq, yq, ybh); } + public String getSqhByKey(Date jyrq, String yq, String ybh) { return labPatMapper.getSqhByKey(jyrq, yq, ybh); } - + //ComPat + public List getComPat(String brdh,String yljg){ + return comPatMapper.getComPat(brdh,yljg); + } + @Transactional(rollbackFor = Exception.class) + public int deleteComPat(String brdh,String yljg){ + return comPatMapper.deleteComPat(brdh,yljg); + } + @Transactional(rollbackFor = Exception.class) + public int insertComPat(ComPat comPat) { + return comPatMapper.insertComPat(comPat); + } //申请单主表方法集合 public LabReqmain getLabReqmainOne(String sqh) { return labReqmainMapper.getLabReqmainOne(sqh); 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 87ac0d1..419e590 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 @@ -1989,6 +1989,7 @@ public class LisWorkUtils { case "cyrq": case "sqsj": case "nl": + break; case "yhdh": mrz = labInputcol.getMrz(); if (mrz != null && "".equals(mrz)) { @@ -2002,6 +2003,7 @@ public class LisWorkUtils { labPat.setYhdh(mrz); } } + break; case "hdys": String sybh = loginConfigParam.getCurrent_hdys_sybh(); String eybh = loginConfigParam.getCurrent_hdys_eybh(); @@ -2015,7 +2017,7 @@ public class LisWorkUtils { break; default: mrz = labInputcol.getMrz(); - if (mrz != null && "".equals(mrz)) { + if (mrz != null && !"".equals(mrz)) { EntityUtils.setItem(labPat, zdmc, mrz); } } diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml index ecd32fb..109b688 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/LabPatMapper.xml @@ -72,7 +72,6 @@ confirmer, confirmdt, mzdy, - txtval, fslx, ybzt, instrid, @@ -138,7 +137,6 @@ #{confirmer}, #{confirmdt}, #{mzdy}, - #{txtval}, #{fslx}, #{ybzt}, #{instrid},