Merge remote-tracking branch 'origin/dev/20210608_2.0.4' into test通用版本

doc/033.20210608v2.0.4/qc_initv2.0.4.sql

@@ -1,5 +1,6 @@
 use `qc`;
 
-INSERT INTO `sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '30', '4', '^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[$@$!%*?&])[A-Za-z\\d$@$!%*?&]{8,12}$', '2', '0', '正则表达式(至少8个字符，少于12个字符，大写字母+小写字母+数字+特殊字符)');
+-- 字典表加入密码正则表达式  不同的医院需要修改id为对应的医院id
+SET @id ='4';
+INSERT INTO `sys_dictionary_info` ( `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ( 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '30', @id, '^(?=.*?[A-Z])(?=(.*[a-z]){1,})(?=(.*[\\d]){1,})(?=(.*[\\W]){1,})(?!.*\\s).{8,12}$', '2', '0', '正则表达式(至少8个字符，少于12个字符，大写字母+小写字母+数字+特殊字符)');
 

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

@@ -235,7 +235,14 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/consoleByDept/medicalCheckFormKs").permitAll()
                 .antMatchers("/print/export/medicalCheckExportByDept").permitAll()
                 .antMatchers("/consoleByDept/medicalCheckTitleKs").permitAll()
+                .antMatchers("/console/qualityControl").permitAll()
+                .antMatchers("/console/export/qualityControlExport").permitAll()
+                .antMatchers("/consoleByDept/qualityControlByDept").permitAll()
+                .antMatchers("/print/export/qualityControlExportByDept").permitAll()
+                .antMatchers("/qc/behospitalInfo/getMedQualityCoList").permitAll()
+                .antMatchers("/console/saveMedicaIndicator").permitAll()
                 .antMatchers("/qc/medCheckInfo/createMedBeHospitalInfoType").permitAll()
+                .antMatchers("/qc/medCheckInfo/addMedCheckInfo").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

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

@@ -279,14 +279,20 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/consoleByDept/medicalCheckFormKs", request)
                 || matchers("/print/export/medicalCheckExportByDept", request)
                 || matchers("/consoleByDept/medicalCheckTitleKs", request)
+                || matchers("/console/qualityControl", request)
+                || matchers("/console/export/qualityControlExport", request)
+                || matchers("/consoleByDept/qualityControlByDept", request)
+                || matchers("/print/export/qualityControlExportByDept", request)
+                || matchers("/qc/behospitalInfo/getMedQualityCoList", request)
+                || matchers("/console/saveMedicaIndicator", request)
                 || matchers("/qc/medCheckInfo/createMedBeHospitalInfoType", request)
+                || matchers("/qc/medCheckInfo/addMedCheckInfo", request)
                 || matchers("/", request)) {
             return true;
         }
         return false;
     }
 
-
     private boolean matchers(String url, HttpServletRequest request) {
         AntPathRequestMatcher matcher = new AntPathRequestMatcher(url);
         if (matcher.matches(request)) {

src/main/java/com/diagbot/dto/ModifyPasswordVO.java

@@ -13,5 +13,4 @@ import lombok.Setter;
 public class ModifyPasswordVO {
     private String password; //原密码
     private String modifyPassword; //新密码
-    private String confirmModifyPassword; //确认新密码
 }

src/main/java/com/diagbot/dto/ReBeHosDTO.java

@@ -37,11 +37,12 @@ public class ReBeHosDTO {
     private Integer diffDays;
 
 
+    @Excel(name = "是否有出院31天内再住院计划", width = 30, needMerge = true,  orderNum = "5")
     private String lastAgainBehospitalPlan;//31天再入院计划(是/否)
 
     /**
      * 比较病历组
      */
-    @ExcelCollection(name = "", orderNum = "5")
+    @ExcelCollection(name = "", orderNum = "6")
     private List<ReBeHosDetailDTO> details;
 }

src/main/java/com/diagbot/dto/ReBeHosDetailDTO.java

@@ -67,4 +67,6 @@ public class ReBeHosDetailDTO {
     @Excel(name = "住院费用", width = 15, orderNum = "9")
     private String totleFee;
 
+    private String age;
+
 }

src/main/java/com/diagbot/dto/ReBeHosMergeDTO.java

@@ -43,6 +43,8 @@ public class ReBeHosMergeDTO {
     private String totleFee;
     private String behospitalDayNum;
     private String againBehospitalPlan;//31天再入院计划(是/否)
+    private String age;//年龄
+    private String lastAge;//年龄
     private String lastTotleFee;
     private String lastBehospitalDayNum;
     private String lastAgainBehospitalPlan;//31天再入院计划(是/否)

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

@@ -223,6 +223,13 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 .eq("behospital_code", getDetailVO.getBehospitalCode()), false
         );
 
+        // 获取患者年龄
+        HomePage homePage = homePageFacade.getOne(new QueryWrapper<HomePage>()
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_id", getDetailVO.getHospitalId())
+                .eq("behospital_code", getDetailVO.getBehospitalCode()), false
+        );
+
         List<String> paramList = getDetailVO.getParamStr();// 参数列表
 
         if (ListUtil.isEmpty(paramList) || paramList.contains("beHospital")) {
@@ -231,6 +238,9 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                 throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "该病历已删除!");
             }
             BeanUtil.copyProperties(behospitalInfo, behosDTO);
+            if(null != homePage && StringUtils.isNotEmpty(homePage.getAge()) && StringUtils.isNotEmpty(homePage.getAgeUnit())){
+                behosDTO.setAge(homePage.getAge()+homePage.getAgeUnit());
+            }
             res.put("beHospital", behosDTO);
         }
 

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

@@ -3017,6 +3017,7 @@ public class ConsoleFacade {
                 details.add(detailRecord);
                 ReBeHosDetailDTO lastDetailRecord = new ReBeHosDetailDTO();
                 lastDetailRecord.setName(record.getName());
+                lastDetailRecord.setAge(record.getLastAge());
                 lastDetailRecord.setBehDeptId(record.getLastBehDeptId());
                 lastDetailRecord.setBehDeptName(record.getLastBehDeptName());
                 lastDetailRecord.setBehospitalCode(record.getLastBehospitalCode());

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

@@ -257,7 +257,7 @@ public class SysUserFacade extends SysUserServiceImpl {
      * @param modifyPassword 新密码
      * @return 修改密码是否成功
      */
-    public Boolean modifyPassword(String password, String modifyPassword,String confirmModifyPassword) {
+    public Boolean modifyPassword(String password, String modifyPassword) {
         //使用MD5对原密码和新密码进行加密
         String MD5Password = DigestUtils.md5DigestAsHex(password.getBytes());
         String MD5ModifyPassword = DigestUtils.md5DigestAsHex(modifyPassword.getBytes());
@@ -269,10 +269,6 @@ public class SysUserFacade extends SysUserServiceImpl {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "请输入新密码");
         }
-        if (StringUtil.isBlank(confirmModifyPassword)) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "请输入确认新密码");
-        }
         //对传入的密码进行格式验证
         String hospitalID = SysUserUtils.getCurrentHospitalID();
         Boolean regularBoolean = passwordRegular(modifyPassword,hospitalID);
@@ -296,11 +292,6 @@ public class SysUserFacade extends SysUserServiceImpl {
             throw new CommonException(CommonErrorCode.PARAM_IS_ERROR,
                     "原密码和新密码不能相同");
         }
-        //“原密码”正确、“新密码”符合密码规则且不与原密码相同，新密码与确认新密码不一致
-        if(!modifyPassword.equals(confirmModifyPassword)){
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR,
-                    "两次密码输入不一致");
-        }
         String entryPassword = passwordEncoder.encode(MD5ModifyPassword);
         user.setPassword(entryPassword);
         user.setGmtModified(DateUtil.now());
@@ -315,8 +306,6 @@ public class SysUserFacade extends SysUserServiceImpl {
      * @return
      */
     public Boolean passwordRegular(String password,String hospitalId){
-        //获取字点表中存储的正则表达式   ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&])[A-Za-z\d$@$!%*?&]{8,}  至少8个字符，1个大写字母，1个小写字母，1个数字和1个特殊字符
-        //获取字点表中存储的正则表达式   ^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[$@$!%*?&])[A-Za-z\d$@$!%*?&]{8,12}$  至少8个字符最多12个字符，1个大写字母，1个小写字母，1个数字和1个特殊字符
         boolean check=true;
         Map<String, Map<String, String>> dictionaryWithKey = sysDictionaryFacade.getDictionaryWithKey();
         if(dictionaryWithKey!=null){

src/main/java/com/diagbot/vo/AnalyzeVO.java

@@ -28,6 +28,6 @@ public class AnalyzeVO {
     @ApiModelProperty(hidden = true)
     private Integer delStatus;
     //已核查不能再次评分校验
-    @ApiModelProperty(hidden = true)
+    @ApiModelProperty("已核查不能再次评分标志位，false表示核查与评分无关已核查也可以评分")
     private Boolean checkFlag = false;
 }

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

@@ -85,8 +85,6 @@ public class BehospitalInfoController {
     @SysLogger("analyze")
     @Transactional
     public RespDTO<AnalyzeDTO> analyze(@RequestBody AnalyzeVO analyzeVO) {
-        analyzeVO.setUseCrfCache(true);
-        analyzeVO.setCheckFlag(true);
         return RespDTO.onSuc(behospitalInfoFacade.analyze(analyzeVO));
     }
 

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

@@ -61,7 +61,7 @@ public class SysUserController {
 
     @ApiOperation(value = "登录获取jwt[by:gaodm]",
             notes = "username：用户名,必填<br>" +
-                    "password：密码, 必填, 默认密码：dc483e80a7a0bd9ef71d8cf973673924<br> ")
+                    "password：密码, 必填, 默认密码：a123456<br> ")
     @PostMapping("/getJwt")
     @SysLogger("getJwt")
     public RespDTO<JwtDTO> getJwt(@RequestBody UserLoginVO userLoginVO) {
@@ -98,13 +98,12 @@ public class SysUserController {
 
     @ApiOperation(value = "修改密码[by:gaodm]",
             notes = "password：原密码,必填<br>" +
-                    "modifyPassword：新密码, 必填<br> "+
-                    "confirmModifyPassword：确认新密码, 必填<br> ")
+                    "modifyPassword：新密码, 必填<br> ")
     @PostMapping("/midifyPassword")
     @SysLogger("midifyPassword")
     @Transactional
     public RespDTO<Boolean> midifyPassword(@RequestBody ModifyPasswordVO modifyPasswordVO) {
-        Boolean flag = userFacade.modifyPassword(modifyPasswordVO.getPassword(), modifyPasswordVO.getModifyPassword(),modifyPasswordVO.getConfirmModifyPassword());
+        Boolean flag = userFacade.modifyPassword(modifyPasswordVO.getPassword(), modifyPasswordVO.getModifyPassword());
         return RespDTO.onSuc(flag);
     }
 

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -13959,7 +13959,9 @@
         mhp.total_fee AS totleFee,
         mhp.behospital_day_num AS behospitalDayNum,
         mhp.again_behospital_plan AS againBehospitalPlan,
+        IF(mhp.age is null, null,CONCAT( ifnull(mhp.age,'') ,ifnull(mhp.age_unit,'') ))as age,
         mhp_last.again_behospital_plan AS lastAgainBehospitalPlan,
+        IF(mhp_last.age is null, null,CONCAT( ifnull(mhp_last.age,'') ,ifnull(mhp_last.age_unit,'') ))as lastAge,
         mhp_last.total_fee AS lastTotleFee,
         mhp_last.behospital_day_num AS lastBehospitalDayNum
         FROM