diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkBase.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkBase.java index f5b49c8..83caa9c 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkBase.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/LisWorkBase.java @@ -126,7 +126,7 @@ public class LisWorkBase { * @param logtype 操作类型 * @param logdata 备注信息 */ - void setComLog(Date jyrq, String yq, String ybh, String yhdh, String logtype, String logdata) { + public void setComLog(Date jyrq, String yq, String ybh, String yhdh, String logtype, String logdata) { ComLog comLog = new ComLog(); comLog.setJyrq(jyrq); comLog.setYq(yq); @@ -189,7 +189,7 @@ public class LisWorkBase { * @param zt 状态 * @param yhdh 用户 */ - void setlabReqsteplog(String sqh, String zt, String yhdh) { + public void setlabReqsteplog(String sqh, String zt, String yhdh) { int xh = commonUtil.getLabReqsteplogMax(sqh); xh = xh + 1; LabReqsteplog labReqsteplog = new LabReqsteplog(); @@ -229,7 +229,7 @@ public class LisWorkBase { * @param ybh 样本号 * @return 返回 */ - List chkautoinput(String yq, String ybh){ + public List chkautoinput(String yq, String ybh){ List labInputmdlList; if("1".equals(commonUtil.getHISOPT("zdsr"))){ 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 1883b91..b409ce5 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 @@ -1,5 +1,10 @@ package com.czlis.interfaceCommon.utils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Component +@Slf4j public class LisWorkUtils extends LisWorkconfirm{ } diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java index 439101e..b8d170d 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkServiceImpl.java @@ -19,6 +19,7 @@ import com.czlis.liswork.mapper.LisWorkMapper; import com.czlis.liswork.service.LisWorkService; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.*; @@ -27,20 +28,18 @@ import java.util.stream.Collectors; @Service @Slf4j public class LisWorkServiceImpl implements LisWorkService { + @Autowired + LisWorkMapper lisWorkMapper; + @Autowired + CommonUtil commonUtil; + @Autowired + LoginConfigParamUtil loginConfigParamUtil; + @Autowired + ReportUtil reportUtil; + @Autowired + LisWorkUtils lisWorkUtils; - private final LisWorkMapper lisWorkMapper; - private final CommonUtil commonUtil; - private final LoginConfigParamUtil loginConfigParamUtil; - private final ReportUtil reportUtil; - private final LisWorkUtils lisWorkUtils; - public LisWorkServiceImpl(LisWorkMapper lisWorkMapper, CommonUtil commonUtil, LoginConfigParamUtil loginConfigParamUtil, ReportUtil reportUtil, LisWorkUtils lisWorkUtils) { - this.lisWorkMapper = lisWorkMapper; - this.commonUtil = commonUtil; - this.loginConfigParamUtil = loginConfigParamUtil; - this.reportUtil = reportUtil; - this.lisWorkUtils = lisWorkUtils; - } @Override public Result getXmInfo(String yq) {