From 08ac90618f214b5888b4fb5e996e7f45985b1020 Mon Sep 17 00:00:00 2001 From: tangw Date: Wed, 24 Sep 2025 15:41:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=9F=A5=E8=AF=A2=E6=A0=B7?= =?UTF-8?q?=E6=9C=AC=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/domain/entity/lis/LabInputcol.java | 24 ++++++++++++ .../mapper/LabInputcolMapper.java | 9 +++++ .../interfaceCommon/utils/CommonUtil.java | 6 ++- .../resources/mapper/LabInputcolMapper.xml | 10 +++++ .../liswork/service/LisWorkOperService.java | 2 +- .../service/impl/LisWorkOperServiceImpl.java | 37 ++++++++++++++++--- 6 files changed, 80 insertions(+), 8 deletions(-) create mode 100644 lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputcol.java create mode 100644 lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputcolMapper.java create mode 100644 lis-interfaceCommon/src/main/resources/mapper/LabInputcolMapper.xml diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputcol.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputcol.java new file mode 100644 index 0000000..c32f910 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/LabInputcol.java @@ -0,0 +1,24 @@ +package com.czlis.common.core.domain.entity.lis; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabInputcol { + + private String yq; + private String zdmc; + private String zdts; + private String mrts; + private String kybj; + private String zdjy; + private String mrz; + private String kj; + private Integer xh; + + + +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputcolMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputcolMapper.java new file mode 100644 index 0000000..ccc20a6 --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/LabInputcolMapper.java @@ -0,0 +1,9 @@ +package com.czlis.interfaceCommon.mapper; + +import com.czlis.common.core.domain.entity.lis.LabInputcol; + +import java.util.List; + +public interface LabInputcolMapper { + List getLabInputcol(String yq); +} 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 6ace15e..acf57f4 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 @@ -71,6 +71,8 @@ public class CommonUtil { LabResultMedMapper labResultMedMapper; @Autowired LabReportvsitemMapper labReportvsitemMapper; + @Autowired + LabInputcolMapper labInputcolMapper; //====检验主表操作方法集合=== public LabPat getLabPatOne(Date jyrq, String yq, String ybh) { return labPatMapper.getLabPatOne(jyrq, yq, ybh); @@ -340,7 +342,9 @@ public class CommonUtil { return zdmc; } } - + public List getLabInputcol(String yq){ + return labInputcolMapper.getLabInputcol(yq); + } //字典查询方法集合 public String getComDictNameById(String zdlb, String zddh) { List comDictList = getDictCache(zdlb); diff --git a/lis-interfaceCommon/src/main/resources/mapper/LabInputcolMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/LabInputcolMapper.xml new file mode 100644 index 0000000..4640850 --- /dev/null +++ b/lis-interfaceCommon/src/main/resources/mapper/LabInputcolMapper.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java b/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java index f381ab9..b0c38a5 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java +++ b/liswork/src/main/java/com/czlis/liswork/service/LisWorkOperService.java @@ -30,7 +30,7 @@ public interface LisWorkOperService { * @param ybh */ void setItemSqxmdh(Date jyrq, String yq, String ybh); - + Result loaddefault(Date jyrq, String yq, String ybh); /** * 审核报告 * 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 5783dfb..ec872da 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 @@ -298,7 +298,32 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { return new Result("0", "保存成功！"); } - + /** + * 获取新样本默认值 + * @param jyrq + * @param yq + * @param ybh + * @return + */ + @Override + public Result loaddefault(Date jyrq, String yq, String ybh) { + LabPat labPat=new LabPat(); + labPat.setSqsj(commonUtil.getCurrentTime()); + String yljg=commonUtil.getLabInstr(yq).getYljg(); + labPat.setYljg(yljg); + List labInputcolList= commonUtil.getLabInputcol(yq); + for (LabInputcol labInputcol : labInputcolList) { + if(!"!".equals(labInputcol)){ + String zdmc=labInputcol.getZdmc(); + switch(zdmc){ + case "": + break; + default: + } + } + } + return new Result("0", "审核成功！",labPat); + } public void updateLabReqmainZT(String userId, String sqh) { Map map = new HashMap<>(); map.put("userId", userId); @@ -379,7 +404,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { if(sqh!=null){ setlabReqsteplog(sqh,SampleStatusConstants.CONFIRM,hdys); } - return new Result("3", "审核成功！"); + return new Result("0", "审核成功！"); } @Override public Result confirm1(Date jyrq, String yq, String ybh, String hdys) { @@ -442,7 +467,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { // if(sqh!=null){ // setlabReqsteplog(sqh,SampleStatusConstants.CONFIRM,hdys); // } - return new Result("3", "审核成功！"); + return new Result("0", "审核成功！"); } /** @@ -1557,7 +1582,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { */ @Override public Result unconfirm(Date jyrq, String yq, String ybh, String yhdh) { - if (yhdh == null || "".equals(yhdh)) return new Result("-1", "操作者为空，无法解除审核！"); + if (yhdh == null || "".equals(yhdh)) return new Result("1", "操作者为空，无法解除审核！"); int problemId = ServletUtils.getParameterToInt("problemId", 0); LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh); if (problemId < 3) { @@ -1649,7 +1674,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { } @Override public Result unconfirm1(Date jyrq, String yq, String ybh, String yhdh) { - if (yhdh == null || "".equals(yhdh)) return new Result("-1", "操作者为空，无法解除审核！"); + if (yhdh == null || "".equals(yhdh)) return new Result("1", "操作者为空，无法解除审核！"); int problemId = ServletUtils.getParameterToInt("problemId", 0); LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh); if (problemId < 3) { @@ -1670,7 +1695,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { labPat.setJgbz(ReportStatusConstants.DEFAULT); commonUtil.updateLabPat(labPat); setComLog(jyrq, yq, ybh,yhdh, ComLogConstants.LG_UCK1,""); - return new Result("1", "取消成功!"); + return new Result("0", "取消成功!"); } /**