From 197e445c00e17d31f0bb597a484fbc2648b948c2 Mon Sep 17 00:00:00 2001 From: tangw Date: Thu, 11 Sep 2025 19:11:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E4=B8=9A=E5=8A=A1=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../liswork/mapper/LisWorkOperMapper.java | 1 - .../service/impl/LisWorkOperServiceImpl.java | 77 ++++++++++++++++--- 2 files changed, 68 insertions(+), 10 deletions(-) diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java index 6c3251b..9ebc0e6 100644 --- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java +++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkOperMapper.java @@ -20,5 +20,4 @@ public interface LisWorkOperMapper { Integer checkresultwxh(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh") String ybh); LabPat checkdublereport(@Param("sqh") String sqh, @Param("ybh") String ybh); LabPat checkyqdublereport(@Param("sqh") String sqh,@Param("yq") String yq, @Param("ybh") String ybh); - Integer getxsws(@Param("yq") String yq, @Param("xmdh") String xmdh); } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java index 73a058e..80e8e23 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java @@ -1,6 +1,7 @@ package com.czlis.liswork.service.impl; +import com.czlis.common.core.domain.entity.SysUser; import com.czlis.common.core.domain.entity.lis.*; import com.czlis.common.utils.DateUtils; import com.czlis.common.utils.SecurityUtils; @@ -19,6 +20,7 @@ import com.czlis.interfaceCommon.pojo.inter.GetReqInterface; import com.czlis.interfaceCommon.pojo.inter.SetReport; import com.czlis.interfaceCommon.pojo.inter.SetReqStatus; import com.czlis.interfaceCommon.utils.*; +import com.czlis.liswork.mapper.LisWorkMapper; import com.czlis.liswork.mapper.LisWorkOperMapper; import com.czlis.liswork.mapper.dict.LabInstrvsreqclassMapper; import com.czlis.liswork.pojo.DTO.ResultCalcDTO; @@ -38,7 +40,8 @@ import java.util.stream.Collectors; @Service @Slf4j public class LisWorkOperServiceImpl implements LisWorkOperService { - + @Autowired + private LisWorkMapper lisWorkMapper; @Autowired LisWorkOperMapper lisWorkOperMapper; @Autowired @@ -250,13 +253,13 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { return new Result("4", getAlarmMsg(labResultList),4); } } - if (problemId < 4) problemId = 4; - if (problemId < 5) { + if (problemId < 5) problemId = 5; + if (problemId < 6) { //医学审核条件判断 Result result = chksample(labPat, labResultList, problemId); if (!"0".equals(result.getCode())) return result; } - if (problemId < 5) problemId = 5; + if (problemId < 6) problemId = 6; if (problemId < 99) { //高级医学审核条件判断 Result result = chksamplenew(labPat, labResultList, problemId); @@ -437,10 +440,10 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { */ private Result chksample(LabPat labPat, List labResultList, Integer problemId) { //医学审核条件判断 - if (problemId < 5) { + if (problemId < 6) { String checkvalue = checkResultUtils.chksample(labPat, labResultList); if (checkvalue != null && !"".equals(checkvalue)) { - return new Result("5", checkvalue, 5); + return new Result("5", checkvalue, 6); } } return new Result("0", "保存成功！"); @@ -457,10 +460,11 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { //医学审核条件判断 Boolean setbz = false; String bz = labPat.getBz(); + int startid=6; //医学审核条件判断(新规则),预留99个递归ID - if (problemId < 5) problemId = 5; + if (problemId < startid) problemId = startid; if (problemId < 99) { - int xh = problemId - 5; + int xh = problemId - startid; Map chksamplenewvalue = checkResultUtils.chksamplenew(labPat, labResultList, xh); String chkCode = (String) chksamplenewvalue.get("code"); String chkMsg = (String) chksamplenewvalue.get("msg"); @@ -468,7 +472,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { labPat.setBz(bz); xh = (Integer) chksamplenewvalue.get("xh"); setbz = (Boolean) chksamplenewvalue.get("setbz"); - problemId = 5 + xh; + problemId = startid + xh; if ("5".equals(chkCode)) { if (setbz) { commonUtil.updateLabPat(labPat); @@ -1446,6 +1450,61 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { @Override public Result reglimit( Date jyrq, String yq, String ybh, String yhdh,String btzr,String phone,String tzfs){ log.info("登记危急值{}",tzfs); + int problemId = ServletUtils.getParameterToInt("problemId", 0); + LabPatwarning labPatwarning=commonUtil.getLabPatwarning(jyrq, yq, ybh); + if (labPatwarning != null) { + if(problemId<5) { + return new Result("4", "该标本已经登记,是否重新登记?", 5); + } + commonUtil.deleteLabPatwarning(jyrq, yq, ybh); + commonUtil.deleteLabResultwarning(jyrq, yq, ybh); + } + labPatwarning =new LabPatwarning(); + LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh); + List labResultList = commonUtil.getLabResultList(jyrq, yq, ybh); + String jzbz=labPat.getJzbz().trim(); + if(!"1".equals(jzbz)) {jzbz="0";} + if("".equals(yhdh)||yhdh==null) {yhdh=labPat.getHdys();} + if("".equals(yhdh)||yhdh==null) { + SysUser sysUser= SecurityUtils.getLoginUser().getUser(); + yhdh=sysUser.getNickName(); + }else{ + SysUser sysUser=lisWorkMapper.getSysUser(yhdh); + yhdh=sysUser.getNickName(); + } + String sjys=labPat.getSjys(); + String sjysname=commonUtil.getComDictNameById("SRD",sjys); + if(sjysname==null||"".equals(sjysname)) {sjysname=sjys;} + if("".equals(btzr)||btzr==null) {btzr=labPat.getSjys();} + labPatwarning.setJyrq(jyrq); + labPatwarning.setYq(yq); + labPatwarning.setYbh(ybh); + labPatwarning.setLb(jzbz); + labPatwarning.setBgr(yhdh); + labPatwarning.setBtzr(sjysname); + labPatwarning.setTzsj(new Date()); + if("2".equals(tzfs)){ + labPatwarning.setTzfs("电话通知"); + labPatwarning.setQrr(btzr); + labPatwarning.setQrsj(new Date()); + }else{ + labPatwarning.setTzfs("系统通知"); + } + commonUtil.insertLabPatwarning(labPatwarning); + List labResultList0 = labResultList.stream().filter(xm -> !"".equals(xm.getAlarm_flag().trim()) && xm.getAlarm_flag() != null).collect(Collectors.toList()); + if (labResultList0.size() > 0) { + for (LabResult labResult : labResultList0) { + LabResultwarning labResultwarning = new LabResultwarning(); + labResultwarning.setJyrq(jyrq); + labResultwarning.setYq(yq); + labResultwarning.setYbh(ybh); + labResultwarning.setXmdh(labResult.getXmdh()); + labResultwarning.setCsjg(labResult.getCsjg()); + labResultwarning.setJgbz("J"); + labResultwarning.setBz(""); + commonUtil.insertLabResultwarning(labResultwarning); + } + } return new Result("0", "登记成功"); } }