Merge remote-tracking branch 'origin/master'

lis-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -23,6 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"     column="update_by"    />
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
+		<result property="vshisuser"       column="vshisuser"       />
+		<result property="vshisuser1"       column="vshisuser1"       />
+		<result property="vshisuser2"       column="vshisuser2"       />
+		<result property="yljg"       column="yljg"       />
+		<result property="sn"       column="sn"       />
+		<result property="snid"       column="snid"       />
+		<result property="signCert"       column="signCert"       />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>

liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java

@@ -1491,6 +1491,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
             labPatwarning.setTzfs("系统通知");
         }
         commonUtil.insertLabPatwarning(labPatwarning);
+        String ls_bz="";
         List<LabResult> 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) {
@@ -1503,6 +1504,22 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
                 labResultwarning.setJgbz("J");
                 labResultwarning.setBz("");
                 commonUtil.insertLabResultwarning(labResultwarning);
+                if("".equals(ls_bz)){
+                    ls_bz=labResult.getXmdh();
+                }else {
+                    ls_bz = ls_bz + "," + labResult.getXmdh();
+                }
+            }
+        }
+        String registerlimit=commonUtil.getComOptValue(yq,"registerlimit");
+        if("1".equals(registerlimit)){
+            String bz=labPat.getBz();
+            if(bz==null)bz="";
+            ls_bz="*" + ls_bz + "等值超过生命危急值" + "*";
+            if(!bz.contains(ls_bz)) {
+                bz = bz +ls_bz;
+                labPat.setBz(bz);
+                commonUtil.updateLabPat(labPat);
             }
         }
         return new Result("0", "登记成功");

liswork/src/main/resources/mapper/LisWorkMapper.xml

@@ -2,6 +2,34 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.czlis.liswork.mapper.LisWorkMapper">
+    <resultMap type="SysUser" id="SysUserResult">
+        <id     property="userId"       column="user_id"      />
+        <result property="deptId"       column="dept_id"      />
+        <result property="userName"     column="user_name"    />
+        <result property="nickName"     column="nick_name"    />
+        <result property="email"        column="email"        />
+        <result property="phonenumber"  column="phonenumber"  />
+        <result property="sex"          column="sex"          />
+        <result property="avatar"       column="avatar"       />
+        <result property="password"     column="password"     />
+        <result property="status"       column="status"       />
+        <result property="delFlag"      column="del_flag"     />
+        <result property="loginIp"      column="login_ip"     />
+        <result property="loginDate"    column="login_date"   />
+        <result property="createBy"     column="create_by"    />
+        <result property="createTime"   column="create_time"  />
+        <result property="updateBy"     column="update_by"    />
+        <result property="updateTime"   column="update_time"  />
+        <result property="remark"       column="remark"       />
+        <result property="vshisuser"       column="vshisuser"       />
+        <result property="vshisuser1"       column="vshisuser1"       />
+        <result property="vshisuser2"       column="vshisuser2"       />
+        <result property="yljg"       column="yljg"       />
+        <result property="sn"       column="sn"       />
+        <result property="snid"       column="snid"       />
+        <result property="signCert"       column="signCert"       />
+    </resultMap>
+
     <sql id="selectLabPatVo">
         select jyrq,yq,ybh,jzbz,jgbz,dybz,brly,brdh,brxm,brxb,nl,nldw,ksdh,jymd,yljg from lab_pat
     </sql>
@@ -88,7 +116,7 @@
         <if test="ywdh != null and ywdh != ''">and ywdh = #{ywdh}</if>
     </select>
 
-    <select id="getSysUser" parameterType="String" resultType="com.czlis.common.core.domain.entity.SysUser">
+    <select id="getSysUser" parameterType="String" resultMap="SysUserResult">
         select * from sys_user
         where  user_name = #{userName} and  del_flag = '0'
     </select>

sql/lis8.0/updatedb_lis8.0.sql

@@ -46,3 +46,11 @@ if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS  WHERE TABLE_NAME = 'sys_
 begin
     alter table sys_user add sn_pin varchar(100)
 end
+if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS  WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'dzqm')
+begin
+alter table sys_user add dzqm image
+end
+if not exists(SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS  WHERE TABLE_NAME = 'sys_user' AND COLUMN_NAME = 'snid1')
+begin
+alter table sys_user add snid1 varchar(50)
+end