Merge branch 'dev_20210908_湘雅登录页面'

# Conflicts:
#	pom.xml

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -38,6 +38,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .authorizeRequests()
                 .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*").permitAll()
                 .antMatchers("/sys/user/getJwt").permitAll()
+                .antMatchers("/sys/user/getHospitalMark").permitAll()
                 .antMatchers("/sys/user/getJwtNoPass").permitAll()
                 .antMatchers("/sys/user/refreshJwt").permitAll()
                 .antMatchers("/sys/user/checkToken").permitAll()

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -81,6 +81,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/actuator/**", request)
                 || matchers("/hystrix/**", request)
                 || matchers("/sys/user/getJwt", request)
+                || matchers("/sys/user/getHospitalMark", request)
                 || matchers("/sys/user/getJwtNoPass", request)
                 || matchers("/sys/user/refreshJwt", request)
                 || matchers("/sys/dictionaryInfo/getDictionary", request)

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -980,6 +980,7 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 */
 //        ==================================
 
+        addData("有创操作", recMap, medrecVoList);
 
         addData("病理检验送检单", recMap, medrecVoList);
 

src/main/java/com/diagbot/facade/SysUserFacade.java

@@ -8,6 +8,7 @@ import com.diagbot.dto.*;
 import com.diagbot.entity.BasHospitalInfo;
 import com.diagbot.entity.JWT;
 import com.diagbot.entity.JwtStore;
+import com.diagbot.entity.SysHospitalSet;
 import com.diagbot.entity.SysUser;
 import com.diagbot.entity.SysUserDept;
 import com.diagbot.entity.SysUserHospital;
@@ -84,10 +85,32 @@ public class SysUserFacade extends SysUserServiceImpl {
     private SysUserRoleFacade sysUserRoleFacade;
     @Autowired
     private SysDictionaryFacade sysDictionaryFacade;
+    @Autowired
+    private SysHospitalSetFacade sysHospitalSetFacade;
+
+
 
+
+    /**
+     * 获取标识--选择登录页面
+     * @return java.lang.Long
+     */
+    public Long getHospitalMark() {
+        Long mark = 0L;//0-默认通用医院 1-湘雅医院特殊登录页面
+        SysHospitalSet sysHospitalSet = sysHospitalSetFacade.lambdaQuery()
+                .eq(SysHospitalSet::getHospitalId, 35)
+                .eq(SysHospitalSet::getIsDeleted, IsDeleteEnum.N.getKey())
+                .eq(SysHospitalSet::getCode, "special_page_csxy").one();
+        if(null != sysHospitalSet){
+            String val = sysHospitalSet.getValue();
+            if(StringUtil.isNotBlank(val) && "1".equals(val)){
+               mark =  Long.valueOf(val);
+            }
+        }
+        return mark;
+    }
     /**
      * 获取jwt
-     *
      * @param username 用户名
      * @param password 密码
      * @return jwt

src/main/java/com/diagbot/web/SysUserController.java

@@ -69,6 +69,13 @@ public class SysUserController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "获取标识--选择登录页面[by:cy]")
+    @PostMapping("/getHospitalMark")
+    @SysLogger("getHospitalMark")
+    public RespDTO<Long> getHospitalMark() {
+        Long mark = userFacade.getHospitalMark();
+        return RespDTO.onSuc(mark);
+    }
     @ApiOperation(value = "登录获取jwt[by:gaodm]",
             notes = "username：用户名,必填<br>")
     @PostMapping("/getJwtNoPass")

src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: mrqc-sys
   profiles:
-    active: local
+    active: test
   main:
     allow-bean-definition-overriding: true
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -17997,8 +17997,7 @@
         mbi.behospital_code behospitalCode,
         mhp.age,
         TIMESTAMPDIFF(year,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) as ageYear,
-        TIMESTAMPDIFF(month,DATE_ADD(ifnull(mhp.birthday,mbi.birthday),INTERVAL TIMESTAMPDIFF(year,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) year),mbi.behospital_date) as ageMon,
-        TIMESTAMPDIFF(day,DATE_ADD(ifnull(mhp.birthday,mbi.birthday),INTERVAL TIMESTAMPDIFF(month,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) month),mbi.behospital_date) as ageDay
+        TIMESTAMPDIFF(day,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) as ageDay
         FROM
         med_behospital_info mbi
         LEFT JOIN med_home_page mhp

src/main/resources/mapper/MedCheckInfoMapper.xml

@@ -236,10 +236,11 @@
         mbi.`name`,
         mbi.file_code fileCode,
         mbi.sex,
+        TIMESTAMPDIFF(day,ifnull(mhp.birthday,mbi.birthday),mbi.behospital_date) as birthday,
         mhp.age,
         mbi.beh_dept_name behDeptName,
         mbi.leave_hospital_date leaveHospitalDate,
-        mhp.behospital_day_num behospitalDayNum,
+        mhp.behospital_day_num+0 behospitalDayNum,
         mbi.doctor_name doctorName,
         mqi.score_res scoreRes,
         mqi.`level`,