Merge remote-tracking branch 'origin/master'

lis-system/src/main/resources/application.yml

@@ -13,7 +13,6 @@ czlis:
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
   captchaType: math
-  interfaceUrl: http://localhost:8080
 
 # 开发环境配置
 server:
@@ -46,7 +45,7 @@ logging:
 user:
   password:
     # 密码最大错误次数
-    maxRetryCount: 5
+    maxRetryCount: 10
     # 密码锁定时间（默认10分钟）
     lockTime: 10
 
@@ -97,6 +96,7 @@ spring:
     time-zone: GMT+8
     serialization:
       write-dates-as-timestamps: false # 禁用时间戳格式，使用自定义格式
+    default-property-inclusion: always
 
 # token配置
 token:
@@ -105,7 +105,7 @@ token:
   # 令牌密钥
   secret: abcdefghijklmnopqrstuvwxyz
   # 令牌有效期（默认30分钟）
-  expireTime: 30
+  expireTime: 300
 
 # MyBatis配置
 mybatis:
@@ -120,6 +120,7 @@ mybatis:
     log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
     #输出日志到控制台
     #org.apache.ibatis.logging.stdout.StdOutImpl
+    call-setters-on-nulls: true
 
 # PageHelper分页插件
 pagehelper:

lis-system/src/main/resources/mybatis/mybatis-config.xml

@@ -15,6 +15,8 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
         <setting name="logImpl"                  value="SLF4J"  />
         <!-- 使用驼峰命名法转换字段 -->
 		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
-	</settings>
+        <!--默认为null 的值也显示出来-->
+        <setting name="callSettersOnNulls" value="true"/>
+    </settings>
 	
 </configuration>

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

@@ -41,24 +41,32 @@
     </select>
 
     <select id="getReqInfo" resultType="map">
-        SELECT lab_reqmain.sqys,
+        SELECT isnull(lab_reqmain.sqys,'') as sqys,
                lab_reqmain.sqsj,
-               lab_reqmain.jsys,
+               isnull(lab_reqmain.jsys,'') as jsys,
                lab_reqmain.jssj,
-               lab_reqmain.zxys,
+               isnull(lab_reqmain.zxys,'') as zxys,
                lab_reqmain.zxsj,
                lab_reqmain.cysj,
-               lab_reqmain.cyr,
+               isnull(lab_reqmain.cyr,'') as cyr,
-               lab_reqmain.bbsjr,
+               isnull(lab_reqmain.bbsjr,'') as bbsjr,
                lab_reqmain.bbsjsj,
                lab_reqmain.libpos,
-               lab_reqmain.inlibtime,
+               isnull(lab_reqmain.inlibtime,'') as inlibtime,
-               lab_reqmain.inlibman,
+               isnull(lab_reqmain.inlibman,'') as inlibman,
-               lab_reqmain.outlibtime,
+               isnull(lab_reqmain.outlibtime,'') as outlibtime,
-               lab_reqmain.outlibman,
+               isnull(lab_reqmain.outlibman,'') as outlibman,
+               lab_reqmain.sjsj,
+               isnull(lab_reqmain.phone,'') as phone,
+               isnull(lab_reqmain.phone1,'') as phone1,
+               isnull(lab_reqmain.sfzh,'') as sfzh,
+               isnull(lab_reqmain.addr,'') as addr,
                lab_pat.yhdh as cp_jyz,
                lab_pat.hdys as cp_hdz,
-               lab_reqmain.phone,lab_reqmain.phone1,lab_reqmain.sfzh,lab_reqmain.addr
+               lab_pat.confirmdt,
+               isnull(lab_pat.sn_tss,'') as sn_tss,
+               isnull(lab_pat.sn_result,'') as sn_result,
+               isnull(lab_pat.sjys,'') as sjys
         FROM lab_reqmain ,lab_pat
         WHERE lab_reqmain.sqh = lab_pat.sqh and lab_pat.jyrq = #{jyrq} and lab_pat.yq = #{yq} and lab_pat.ybh = #{ybh}