diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/ComLogConstants.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/ComLogConstants.java
new file mode 100644
index 0000000..d507239
--- /dev/null
+++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/constants/ComLogConstants.java
@@ -0,0 +1,50 @@
+package com.czlis.interfaceCommon.constants;
+
+/**
+ * LIS操作日志分类代码目录
+ */
+public class ComLogConstants {
+    /**费用不符报警*/ public static final String LG_FYBJ="_FYBJ";
+    /**HIS结果返写*/ public static final String LG_JG="_JG";
+    /**HIS结果返写错误*/ public static final String LG_JGE="_JGE";
+    /**HIS计费*/ public static final String LG_SF="_SF";
+    /**HIS计费失败*/ public static final String LG_SFE="_SFE";
+    /**打印阳性报告*/ public static final String LG_A="A";
+    /**备份数据库*/ public static final String LG_B="B";
+    /**修改系统代码*/ public static final String LG_C="C";
+    /**审核报告*/ public static final String LG_CK="CK";
+    /**数据库错误*/ public static final String LG_D="D";
+    /**删除申请*/ public static final String LG_DR="DR";
+    /**登录失败*/ public static final String LG_E="E";
+    /**登录系统*/ public static final String LG_I="I";
+    /**工作量统计*/ public static final String LG_J="J";
+    /**修改标本*/ public static final String LG_M="M";
+    /**退出系统*/ public static final String LG_O="O";
+    /**打印报告单*/ public static final String LG_P="P";
+    /**质控打印*/ public static final String LG_Q="Q";
+    /**打印质控波动图*/ public static final String LG_QG="QG";
+    /**修改质控资料*/ public static final String LG_QM="QM";
+    /**打印质控优顿图*/ public static final String LG_QY="QY";
+    /**系统注册*/ public static final String LG_R="R";
+    /**修改检验项目*/ public static final String LG_T="T";
+    /**退费*/ public static final String LG_TF="TF";
+    /**解除审核*/ public static final String LG_UCK="UCK";
+    /**初审*/ public static final String LG_CK1="CK1";
+    /**撤回初审*/ public static final String LG_UCK1="UCK1";
+    /**撤回初步报告*/ public static final String LG_UCK2="UCK2";
+    /**撤回二级报告*/ public static final String LG_UCK3="UCK3";
+    /**初步报告发出*/ public static final String LG_CK3="CK3";
+    /**二级报告发出*/ public static final String LG_CK4="CK4";
+    /**扫码上机*/ public static final String LG_SJ="SJ";
+    /**撤销上机*/ public static final String LG_SJ0="SJ0";
+    /**打印培养基条码*/ public static final String LG_PYJ="PYJ";
+    /**修改结果*/ public static final String LG_M0="M0";
+    /**修改初步报告*/ public static final String LG_M1="M1";
+    /**修改二级报告*/ public static final String LG_M2="M2";
+    /**修改培养基*/ public static final String LG_M3="M3";
+    /**修改药敏结果*/ public static final String LG_M4="M4";
+    /**打印初报*/ public static final String LG_P1="P1";
+    /**打印二报*/ public static final String LG_P2="P2";
+    /**锁定报告*/ public static final String LG_CK5="CK5";
+    /**解除锁定报告*/ public static final String LG_UCK5="UCK5";
+}
diff --git a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java
index f8eb5a7..592c9e4 100644
--- a/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java
+++ b/liswork/src/main/java/com/czlis/liswork/mapper/LisWorkMapper.java
@@ -23,5 +23,5 @@ public interface LisWorkMapper {
     List<LabResult> getLabResult(LabResult labResult);
     List<LabPatInfo> getLabPatInfo(LabPatInfo labPatInfo);
     List<LabResultMed> getLabResultMedInfo(LabResultMed labResultMed);
-    SysUser getSysUser(@Param("userId") String userId,@Param("mm") String mm);
+    SysUser getSysUser(String userName);
 }
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 bc1fd26..53aa907 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
@@ -6,6 +6,11 @@ import com.czlis.common.core.domain.entity.lis.ComOpt;
 import com.czlis.common.core.domain.entity.lis.LabPat;
 import com.czlis.common.core.domain.entity.lis.LabResult;
 import com.czlis.common.core.domain.entity.lis.LabResultMed;
+import com.czlis.common.enums.UserStatus;
+import com.czlis.common.exception.ServiceException;
+import com.czlis.common.utils.MessageUtils;
+import com.czlis.common.utils.SecurityUtils;
+import com.czlis.common.utils.StringUtils;
 import com.czlis.liswork.mapper.LisWorkMapper;
 
 
@@ -89,12 +94,24 @@ public class LisWorkServiceImpl implements LisWorkService {
     public Result checkUser(String yhdh, String mm) {
         if(yhdh == null || yhdh.equals("")) return new Result("-1","用户名不能为空！");
         if(mm == null || mm.equals("")) return new Result("-1","密码不能为空！");
-        SysUser sysUser = lisWorkMapper.getSysUser(yhdh, mm);
-        if(sysUser != null){
+        SysUser sysUser = lisWorkMapper.getSysUser(yhdh);
+        if (StringUtils.isNull(sysUser)) {
+            log.info("登录用户：{} 不存在.", yhdh);
+            throw new ServiceException(MessageUtils.message("user.not.exists"));
+        } else if (UserStatus.DELETED.getCode().equals(sysUser.getDelFlag())) {
+            log.info("登录用户：{} 已被删除.", yhdh);
+            throw new ServiceException(MessageUtils.message("user.password.delete"));
+        } else if (UserStatus.DISABLE.getCode().equals(sysUser.getStatus())) {
+            log.info("登录用户：{} 已被停用.", yhdh);
+            throw new ServiceException(MessageUtils.message("user.blocked"));
+        }
+       Boolean matchesflag =SecurityUtils.matchesPassword(mm,sysUser.getPassword());
+        if(matchesflag){
             return new Result("0","登录成功！");
         }else{
             return new Result("-1","登录失败，账户密码不正确！");
         }
     }
 
+
 }