Merge branch 'master-dev' of http://116.204.114.73:3000/ccsens_zhengzhichuan/cga_v2 into master-dev

ruisi_java/ruisi-cc-common/src/main/java/com/ccsens/common/constant/ErrorConstant.java

@@ -98,6 +98,8 @@ public enum ErrorConstant implements BaseEnum {
     USER_NEW_OLD_PASSWORD_EQUALS(40020, "新密码不能与旧密码相同"),
     //密码错误
     USER_PASSWORD_ERROR(40021, "密码错误"),
+    //密码错误
+    PASSWORD_LENGTH_ERROR(400221, "密码长度必须在5到20个字符之间"),
     //查询记录多于预期
     RECORD_TOO_MANY_THAN_EXPECTED(50001, "查询记录多于预期"),
     //FinishKey不正确

ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/aspectj/GlobalDataSourceAspect.java

@@ -90,7 +90,7 @@ public class GlobalDataSourceAspect {
                 throw new BaseException(ErrorConstant.DATASOURCE_NOT_FOUND);
             }
             return dataSourceByHospitalId;
-        }else if(StrUtil.isEmpty(authHeader)){
+        }else if(StrUtil.isNotEmpty(authHeader)){
             LoginUser loginUser = SecurityUtils.getLoginUser();
             log.info("切面中获取当前用户的数据源: {}", loginUser.getUser().getDataSourceKey());
             if(ObjectUtil.isNull(loginUser)){

ruisi_java/ruisi-cc-framework/src/main/java/com/ccsens/framework/web/service/UmsDataSourceServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.ccsens.common.constant.ErrorConstant;
 import com.ccsens.common.exception.base.BaseException;
+import com.ccsens.common.utils.IDGenerator;
 import com.ccsens.common.utils.SecurityUtils;
 import com.ccsens.framework.datasource.DataSourceManager;
 import com.ccsens.system.domain.po.UmsDataSource;
@@ -67,7 +68,7 @@ public class UmsDataSourceServiceImpl implements UmsDataSourceService {
         //创建数据源
         dataSourceManager.createDataSource(umsDataSource);
         if (umsDataSource.getId() == null) {
-            umsDataSource.setId(IdUtil.getSnowflake().nextId());
+            umsDataSource.setId(IDGenerator.nextSnowflakeId());
             umsDataSource.setCreateBy(SecurityUtils.getUsername());
             umsDataSource.setCreateTime(new Date());
             dataSourceMapper.insertSelective(umsDataSource);

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/AmsReportTemplateAllServiceImpl.java

@@ -2,6 +2,7 @@ package com.ccsens.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
+import com.ccsens.common.utils.IDGenerator;
 import com.ccsens.common.utils.SecurityUtils;
 import com.ccsens.system.domain.dto.AmsReportTemplateAllDto;
 import com.ccsens.system.domain.po.AmsReportTemplateAll;
@@ -37,17 +38,17 @@ public class AmsReportTemplateAllServiceImpl implements AmsReportTemplateAllServ
         AmsReportTemplateAll amsReportTemplateAll = BeanUtil.copyProperties(dto, AmsReportTemplateAll.class);
         if (dto.getId() == null) {
             if (dto.getType() == 2) {
-                amsReportTemplateAll.setId(IdUtil.getSnowflake().nextId());
+                amsReportTemplateAll.setId(IDGenerator.nextSnowflakeId());
                 amsReportTemplateAll.setType((byte) 0);
                 amsReportTemplateAll.setDelFlag((byte) 0);
                 amsReportTemplateAll.setCreateBy(SecurityUtils.getUsername());
                 amsReportTemplateAllMapper.insertSelective(amsReportTemplateAll);
 
-                amsReportTemplateAll.setId(IdUtil.getSnowflake().nextId());
+                amsReportTemplateAll.setId(IDGenerator.nextSnowflakeId());
                 amsReportTemplateAll.setType((byte) 1);
                 amsReportTemplateAllMapper.insertSelective(amsReportTemplateAll);
             }else {
-                amsReportTemplateAll.setId(IdUtil.getSnowflake().nextId());
+                amsReportTemplateAll.setId(IDGenerator.nextSnowflakeId());
                 amsReportTemplateAll.setDelFlag((byte) 0);
                 amsReportTemplateAll.setCreateBy(SecurityUtils.getUsername());
                 amsReportTemplateAllMapper.insertSelective(amsReportTemplateAll);

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/DockServiceImpl.java

@@ -17,6 +17,7 @@ import com.ccsens.common.core.domain.model.LoginUser;
 import com.ccsens.common.enums.DataSourceType;
 import com.ccsens.common.exception.base.BaseException;
 import com.ccsens.common.utils.DateUtils;
+import com.ccsens.common.utils.IDGenerator;
 import com.ccsens.common.utils.SecurityUtils;
 import com.ccsens.common.utils.StringUtils;
 import com.ccsens.system.domain.SysUserRole;
@@ -143,7 +144,7 @@ public class DockServiceImpl implements DockService {
         } else {
             //不存在则插入
             pmsPatient = new PmsPatient();
-            pmsPatient.setId(IdUtil.getSnowflake().nextId());
+            pmsPatient.setId(IDGenerator.nextSnowflakeId());
             apiSavePatient(pmsPatient, patientInfo);
             pmsPatient.setHospitalId(hospitalId);
             pmsPatient.setCreateBy(doctorName);
@@ -168,7 +169,7 @@ public class DockServiceImpl implements DockService {
             pmsPatientBodyMapper.updateByPrimaryKeySelective(pmsPatientBody);
         } else {
             pmsPatientBody = new PmsPatientBody();
-            pmsPatientBody.setId(IdUtil.getSnowflake().nextId());
+            pmsPatientBody.setId(IDGenerator.nextSnowflakeId());
             pmsPatientBody.setPatientId(pmsPatient.getId());
             apiSaveVisit(pmsPatientBody, visitInfo);
             pmsPatientBody.setDepartment(deptName);
@@ -186,7 +187,7 @@ public class DockServiceImpl implements DockService {
             for (DockDto.Zhenduan dockPatientDiagnosis : visitInfo.getDiagnosis()) {
                 //添加业务表
                 PmsPatientDiagnosis pmsPatientDiagnosis = new PmsPatientDiagnosis();
-                pmsPatientDiagnosis.setId(IdUtil.getSnowflake().nextId());
+                pmsPatientDiagnosis.setId(IDGenerator.nextSnowflakeId());
                 pmsPatientDiagnosis.setPatientId(pmsPatientBody.getPatientId());
                 pmsPatientDiagnosis.setVisitNo(dockPatientDiagnosis.getVisitNo());
                 pmsPatientDiagnosis.setDiagnosisType(dockPatientDiagnosis.getDiagnosisType());
@@ -207,7 +208,7 @@ public class DockServiceImpl implements DockService {
 
             for (DockDto.Yongyao dockPatientMedicationInfo : visitInfo.getMedications()) {
                 PmsPatientParentIllness pmsPatientParentIllness = new PmsPatientParentIllness();
-                pmsPatientParentIllness.setId(IdUtil.getSnowflake().nextId());
+                pmsPatientParentIllness.setId(IDGenerator.nextSnowflakeId());
                 pmsPatientParentIllness.setPatientId(pmsPatientBody.getPatientId());
                 pmsPatientParentIllness.setVisitNo(dockPatientMedicationInfo.getVisitNo());
                 pmsPatientParentIllness.setDrugName(dockPatientMedicationInfo.getDrugName());
@@ -653,7 +654,7 @@ public class DockServiceImpl implements DockService {
             } else {
                 //不存在则插入
                 pmsPatient = new PmsPatient();
-                pmsPatient.setId(IdUtil.getSnowflake().nextId());
+                pmsPatient.setId(IDGenerator.nextSnowflakeId());
                 disposePmsPatient(dockPatientBaseInfo, pmsPatient);
                 pmsPatient.setHospitalId(hospitalId);
                 pmsPatient.setCreateBy(CollUtil.isEmpty(sysUserList) ? null : sysUserList.get(0).getUserName());
@@ -722,7 +723,7 @@ public class DockServiceImpl implements DockService {
             if (CollUtil.isNotEmpty(dockPatientBaseInfos)) {
                 //存在则更新
                 pmsPatient = new PmsPatient();
-                pmsPatient.setId(IdUtil.getSnowflake().nextId());
+                pmsPatient.setId(IDGenerator.nextSnowflakeId());
                 disposePmsPatient(dockPatientBaseInfos.get(0), pmsPatient);
                 //更新患者所属的部门和创建者信息，暂不考虑其他，每次都更新
                 pmsPatient.setHospitalId(hospitalId);
@@ -757,7 +758,7 @@ public class DockServiceImpl implements DockService {
             pmsPatientBodyMapper.updateByPrimaryKeySelective(pmsPatientBody);
         } else {
             pmsPatientBody = new PmsPatientBody();
-            pmsPatientBody.setId(IdUtil.getSnowflake().nextId());
+            pmsPatientBody.setId(IDGenerator.nextSnowflakeId());
             pmsPatientBody.setPatientId(pmsPatient.getId());
             disposePmsPatientBody(dockPatientVisitInfo, pmsPatientBody);
             pmsPatientBody.setDepartment(deptName);
@@ -811,7 +812,7 @@ public class DockServiceImpl implements DockService {
             for (DockPatientDiagnosis dockPatientDiagnosis : dockPatientDiagnosisMap.get(key)) {
                 //添加业务表
                 PmsPatientDiagnosis pmsPatientDiagnosis = new PmsPatientDiagnosis();
-                pmsPatientDiagnosis.setId(IdUtil.getSnowflake().nextId());
+                pmsPatientDiagnosis.setId(IDGenerator.nextSnowflakeId());
                 pmsPatientDiagnosis.setPatientId(pmsPatientBody.getPatientId());
                 pmsPatientDiagnosis.setVisitNo(dockPatientDiagnosis.getVisitNo());
                 pmsPatientDiagnosis.setDiagnosisType(dockPatientDiagnosis.getDiagnosisType());
@@ -871,7 +872,7 @@ public class DockServiceImpl implements DockService {
 
             for (DockPatientMedicationInfo dockPatientMedicationInfo : dockPatientMedicationInfoMap.get(key)) {
                 PmsPatientParentIllness pmsPatientParentIllness = new PmsPatientParentIllness();
-                pmsPatientParentIllness.setId(IdUtil.getSnowflake().nextId());
+                pmsPatientParentIllness.setId(IDGenerator.nextSnowflakeId());
                 pmsPatientParentIllness.setPatientId(pmsPatientBody.getPatientId());
                 pmsPatientParentIllness.setVisitNo(dockPatientMedicationInfo.getVisitNo());
                 pmsPatientParentIllness.setDrugName(dockPatientMedicationInfo.getDrugName());

ruisi_java/ruisi-system/src/main/java/com/ccsens/system/service/impl/SysUserServiceImpl.java

@@ -18,6 +18,7 @@ import com.ccsens.common.core.redis.RedisCache;
 import com.ccsens.common.enums.DataSourceType;
 import com.ccsens.common.exception.ServiceException;
 import com.ccsens.common.exception.base.BaseException;
+import com.ccsens.common.utils.IDGenerator;
 import com.ccsens.common.utils.SecurityUtils;
 import com.ccsens.common.utils.SmsUtil;
 import com.ccsens.common.utils.StringUtils;
@@ -375,7 +376,7 @@ public class SysUserServiceImpl implements ISysUserService {
     @Override
     @Transactional
     public int insertUser(SysUser user) {
-        user.setUserId(IdUtil.getSnowflake().nextId());
+        user.setUserId(IDGenerator.nextSnowflakeId());
         // 新增用户信息
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联

ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/system/SysDeptController.java

@@ -3,6 +3,7 @@ package com.ccsens.admin.controller.system;
 import java.util.List;
 
 import cn.hutool.core.util.IdUtil;
+import com.ccsens.common.utils.IDGenerator;
 import com.ccsens.framework.aspectj.AdminGlobalDataSourceAspect;
 import com.ccsens.framework.aspectj.GlobalDataSourceAspect;
 import com.ccsens.framework.datasource.DynamicDataSourceContextHolder;
@@ -80,7 +81,7 @@ public class SysDeptController extends BaseController {
             return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(getUsername());
-        dept.setDeptId(IdUtil.getSnowflake().nextId());
+        dept.setDeptId(IDGenerator.nextSnowflakeId());
         int i = deptService.insertDept(dept);
 
         //同步到主库

ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/system/SysUserController.java

@@ -7,9 +7,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.ccsens.common.annotation.DataSource;
+import com.ccsens.common.constant.ErrorConstant;
+import com.ccsens.common.constant.UserConstants;
 import com.ccsens.common.constant.WebConstant;
 import com.ccsens.common.enums.DataSourceType;
+import com.ccsens.common.exception.base.BaseException;
+import com.ccsens.framework.datasource.DynamicDataSourceContextHolder;
 import com.ccsens.system.service.*;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -207,6 +212,11 @@ public class SysUserController extends BaseController {
     public AjaxResult resetPwd(@RequestBody SysUser user) {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
+
+        // 密码如果不在指定范围内 错误
+        if (user.getPassword().length() < UserConstants.PASSWORD_MIN_LENGTH || user.getPassword().length() > UserConstants.PASSWORD_MAX_LENGTH) {
+            throw new BaseException(ErrorConstant.PASSWORD_LENGTH_ERROR);
+        }
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         user.setUpdateBy(getUsername());
         int i = userService.resetPwd(user);

ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/HmsServiceImpl.java

@@ -361,7 +361,7 @@ public class HmsServiceImpl implements IHmsService {
                 }
             }
 
-            hmsReportConfig.setId(IdUtil.getSnowflake().nextId());
+            hmsReportConfig.setId(IDGenerator.nextSnowflakeId());
             hmsReportConfig.setDelFlag((byte) 0);
             i = hmsReportConfigMapper.insertSelective(hmsReportConfig);
         }else {

ruisi_java/ruisi-web-admin/src/test/java/SynchronizeTest.java

@@ -244,7 +244,7 @@ public class SynchronizeTest {
 //                    }
 //
 //                    ScaleDto.AddScale addScale = new ScaleDto.AddScale();
-//                    addScale.setId(IdUtil.getSnowflake().nextId());
+//                    addScale.setId(IDGenerator.nextSnowflakeId());
 //                    addScale.setName(tbScaleConf.getName());
 //                    addScale.setCode(tbScaleConf.getEnName());
 //                    addScale.setUuid(tbScaleConf.getId());
@@ -278,7 +278,7 @@ public class SynchronizeTest {
 //                            } else {
 //                                question.setOperateType((byte) 0);
 //                            }
-//                            question.setId(IdUtil.getSnowflake().nextId());
+//                            question.setId(IDGenerator.nextSnowflakeId());
 //                            question.setRecodeStarttime(Byte.parseByte(tbQuestionConf.getHasTimer()));
 //                            option.setQuestion(question);
 //
@@ -288,7 +288,7 @@ public class SynchronizeTest {
 //                                List<QuestionDto.Option> options = new ArrayList<>();
 //                                for (TbOptions tbOption : tbOptions) {
 //                                    QuestionDto.Option option1 = new QuestionDto.Option();
-//                                    option1.setId(IdUtil.getSnowflake().nextId());
+//                                    option1.setId(IDGenerator.nextSnowflakeId());
 //                                    option1.setScore(new BigDecimal(tbOption.getScore()));
 //                                    option1.setType("1".equals(tbOption.getType()) ? "redio" : "2".equals(tbOption.getType()) ? "checkbox" : "numberScore");
 //                                    option1.setQuestionId(question.getId());

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/controller/DockController.java

@@ -1,7 +1,9 @@
 package com.ccsens.client.controller;
 
 import com.ccsens.common.annotation.Anonymous;
+import com.ccsens.common.annotation.DataSource;
 import com.ccsens.common.core.domain.JsonResponse;
+import com.ccsens.common.enums.DataSourceType;
 import com.ccsens.framework.web.service.SysLoginService;
 import com.ccsens.system.domain.dto.DockDto;
 import com.ccsens.system.service.DockService;
@@ -47,6 +49,7 @@ public class DockController {
      * @return 重定向至本系统
      */
     @Anonymous
+    @DataSource(DataSourceType.MASTER)
     @ApiOperation("对接院内登录重定向至本系统")
     @GetMapping("/redirect")
     public void loginRedirect(String visitNo, String emplCode, HttpServletResponse response) throws IOException {

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/controller/UmsController.java

@@ -9,10 +9,7 @@ import cn.hutool.core.util.StrUtil;
 import com.ccsens.common.annotation.Anonymous;
 import com.ccsens.common.annotation.DataSource;
 import com.ccsens.common.annotation.Log;
-import com.ccsens.common.constant.CacheConstants;
-import com.ccsens.common.constant.Constants;
-import com.ccsens.common.constant.ErrorConstant;
-import com.ccsens.common.constant.GenConstants;
+import com.ccsens.common.constant.*;
 import com.ccsens.common.core.controller.BaseController;
 import com.ccsens.common.core.domain.AjaxResult;
 import com.ccsens.common.core.domain.BaseDto;
@@ -26,8 +23,12 @@ import com.ccsens.common.core.redis.RedisCache;
 import com.ccsens.common.enums.BusinessType;
 import com.ccsens.common.enums.DataSourceType;
 import com.ccsens.common.exception.base.BaseException;
+import com.ccsens.common.exception.user.UserPasswordNotMatchExceptionRy;
+import com.ccsens.common.utils.MessageUtils;
 import com.ccsens.common.utils.SecurityUtils;
 import com.ccsens.framework.datasource.DynamicDataSourceContextHolder;
+import com.ccsens.framework.manager.AsyncManager;
+import com.ccsens.framework.manager.factory.AsyncFactory;
 import com.ccsens.framework.web.service.SysLoginService;
 import com.ccsens.framework.web.service.TokenService;
 import com.ccsens.framework.web.service.UmsDataSourceService;
@@ -43,6 +44,7 @@ import com.ccsens.system.domain.vo.SysLoginVo;
 import com.ccsens.system.domain.vo.UmsDataSourceVo;
 import com.ccsens.system.persist.mapper.HmsHospitalConfigMapper;
 import com.ccsens.system.persist.mapper.SysConfigMapper;
+import com.ccsens.system.persist.mapper.SysUserMapper;
 import com.ccsens.system.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -51,8 +53,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -77,6 +82,8 @@ public class UmsController extends BaseController {
     private ISysUserService userService;
     @Resource
     private ISysDeptService sysDeptService;
+    @Resource
+    private SysUserMapper sysUserMapper;
     @Autowired
     private ISysMenuService menuService;
     @Autowired
@@ -230,17 +237,25 @@ public class UmsController extends BaseController {
         if (SecurityUtils.matchesPassword(updatePwd.getNewPassword(), password)) {
             throw new BaseException(ErrorConstant.USER_NEW_OLD_PASSWORD_EQUALS);
         }
+        // 密码如果不在指定范围内 错误
+        if (updatePwd.getNewPassword().length() < UserConstants.PASSWORD_MIN_LENGTH || updatePwd.getNewPassword().length() > UserConstants.PASSWORD_MAX_LENGTH) {
+            throw new BaseException(ErrorConstant.PASSWORD_LENGTH_ERROR);
+        }
         if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(updatePwd.getNewPassword())) > 0) {
             // 更新缓存用户密码
             loginUser.getUser().setPassword(SecurityUtils.encryptPassword(updatePwd.getNewPassword()));
             tokenService.setLoginUser(loginUser);
         }
 
-        //查询从库数据源
-        List<UmsDataSourceVo.Result> query = umsDataSourceService.query(loginUser.getHospitalId());
-        if (CollectionUtil.isNotEmpty(query)) {
+        //从请求头查询deptId
+        HttpServletRequest request = ((ServletRequestAttributes)
+                RequestContextHolder.getRequestAttributes()).getRequest();
+        String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID);
+        //根据部门ID查询数据源
+        String dataSourceByHospitalId = sysUserMapper.getDataSourceByHospitalId(Long.parseLong(deptId));
+        if (StrUtil.isNotEmpty(dataSourceByHospitalId)) {
             //切换从库
-            DynamicDataSourceContextHolder.setDataSourceType(query.get(0).getDataSourceKey());
+            DynamicDataSourceContextHolder.setDataSourceType(dataSourceByHospitalId);
             userService.resetUserPwd(userName, SecurityUtils.encryptPassword(updatePwd.getNewPassword()));
         }
         return JsonResponse.ok();

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/AmsServiceImpl.java

@@ -1117,7 +1117,7 @@ public class AmsServiceImpl implements IAmsService {
                         evaluationScaleCognitiveRelevance.setTotalScore(scaleAchievement.getTotalScore());
                         evaluationScaleCognitiveRelevance.setSort(scaleAchievement.getSort());
                         evaluationScaleCognitiveRelevance.setCreateTime(new Date());
-                        evaluationScaleCognitiveRelevance.setId(IdUtil.getSnowflake().nextId());
+                        evaluationScaleCognitiveRelevance.setId(IDGenerator.nextSnowflakeId());
                         evaluationScaleCognitiveRelevance.setComboId(score.getComboId());
                         evaluationScaleCognitiveRelevance.setCreateBy(SecurityUtils.getUsername());
                         emsEvaluationScaleCognitiveRelevanceMapper.insert(evaluationScaleCognitiveRelevance);
@@ -1137,7 +1137,7 @@ public class AmsServiceImpl implements IAmsService {
                                 emsEvaluationScaleCognitiveRelevance.setDelFlag(GenConstants.Ht.NO_DEL);
                                 emsEvaluationScaleCognitiveRelevance.setSort(subReport.getSort());
                                 emsEvaluationScaleCognitiveRelevance.setTotalScore(new BigDecimal(subReport.getTotalScore()));
-                                emsEvaluationScaleCognitiveRelevance.setId(IdUtil.getSnowflake().nextId());
+                                emsEvaluationScaleCognitiveRelevance.setId(IDGenerator.nextSnowflakeId());
                                 emsEvaluationScaleCognitiveRelevance.setCreateBy(SecurityUtils.getUsername());
                                 emsEvaluationScaleCognitiveRelevanceMapper.insert(emsEvaluationScaleCognitiveRelevance);
                                 if (CollectionUtil.isNotEmpty(subReport.getSubReport())) {
@@ -1150,7 +1150,7 @@ public class AmsServiceImpl implements IAmsService {
                                         emsEvaluationScaleCognitiveRelevance1.setCreateTime(new Date());
                                         emsEvaluationScaleCognitiveRelevance1.setTotalScore(new BigDecimal(subReport.getTotalScore()));
                                         emsEvaluationScaleCognitiveRelevance1.setParentId(emsEvaluationScaleCognitiveRelevance.getId());
-                                        emsEvaluationScaleCognitiveRelevance1.setId(IdUtil.getSnowflake().nextId());
+                                        emsEvaluationScaleCognitiveRelevance1.setId(IDGenerator.nextSnowflakeId());
                                         emsEvaluationScaleCognitiveRelevance1.setDelFlag(GenConstants.Ht.NO_DEL);
                                         emsEvaluationScaleCognitiveRelevance1.setCreateBy(SecurityUtils.getUsername());
                                         emsEvaluationScaleCognitiveRelevanceMapper.insert(emsEvaluationScaleCognitiveRelevance1);
@@ -1255,7 +1255,7 @@ public class AmsServiceImpl implements IAmsService {
         List<EmsEvaluationQuestionDuration> emsEvaluationQuestionDurations = emsEvaluationQuestionDurationMapper.selectByExample(emsEvaluationQuestionDurationExample);
         if (CollUtil.isEmpty(emsEvaluationQuestionDurations)) {
             EmsEvaluationQuestionDuration emsEvaluationQuestionDuration = new EmsEvaluationQuestionDuration();
-            emsEvaluationQuestionDuration.setId(IdUtil.getSnowflake().nextId());
+            emsEvaluationQuestionDuration.setId(IDGenerator.nextSnowflakeId());
             emsEvaluationQuestionDuration.setEvaluationId(queryDto.getEvaluationId());
             emsEvaluationQuestionDuration.setDuration(queryDto.getDuration());
             emsEvaluationQuestionDuration.setQuestionId(queryDto.getQuestionId());

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/IEmsServiceImpl.java

@@ -158,7 +158,7 @@ public class IEmsServiceImpl implements IEmsService {
 
         EmsEvaluationAduit emsEvaluationAduit = new EmsEvaluationAduit();
         emsEvaluationAduit.setEvaluationId(evaluationId);
-        emsEvaluationAduit.setId(IdUtil.getSnowflake().nextId());
+        emsEvaluationAduit.setId(IDGenerator.nextSnowflakeId());
         emsEvaluationAduit.setStatus(status);
         emsEvaluationAduit.setSignPath(signPath);
         emsEvaluationAduit.setAssessorSignPath(assessorSignPath);

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/PmsPatientServiceImpl.java

@@ -185,7 +185,7 @@ public class PmsPatientServiceImpl implements IPmsPatientService {
             Map<String, String> groupValue = group.getGroupValue();
             for (Map.Entry<String, String> entry : groupValue.entrySet()) {
                 LdPatientRecord ldPatientRecord = new LdPatientRecord();
-                ldPatientRecord.setId(IdUtil.getSnowflake().nextId());
+                ldPatientRecord.setId(IDGenerator.nextSnowflakeId());
                 ldPatientRecord.setPatientId(dto.getPatientId());
                 ldPatientRecord.setCategory(dto.getClassifyName());
                 ldPatientRecord.setCodeGroup(group.getGroup());

ruisi_java/ruisi-web-client/src/main/java/com/ccsens/client/service/impl/RmsServiceImpl.java

@@ -297,6 +297,8 @@ public class RmsServiceImpl implements IRmsService {
                     reportScaleScoreMap.put(score.getCode(), rmsReportScaleScores.get(0));
                 }
                 if ("TZBS_LN".equals(score.getCode()) || "TZBS_BZ".equals(score.getCode())) {
+                    score.setSubReport(new ArrayList<>());
+                    zytzbs(dto.getEvaluationId(), score);
 //                    添加体质辨识结论
                     List<TzbsRmsReportResult> reportResultList = score.getReportResultList();
                     if (CollUtil.isNotEmpty(reportResultList)) {
@@ -314,6 +316,12 @@ public class RmsServiceImpl implements IRmsService {
                             rmsReportYsjyMapper.insertSelective(reportResult);
                         });
                     }
+
+                    ClientEvaVo.ReportView reportView = reportView(dto.getEvaluationId(), score.getCode());
+                    if (reportView != null) {
+                        score.setImpression(reportView.getResult());
+                        score.setScore(reportView.getTotalScore());
+                    }
                 }
                 //添加量表分数统计
                 RmsReportScaleScore reportScaleScore = new RmsReportScaleScore();
@@ -321,6 +329,7 @@ public class RmsServiceImpl implements IRmsService {
                 reportScaleScore.setReportId(report.getId());
                 reportScaleScore.setScaleCode(score.getCode());
                 reportScaleScore.setResult(score.getImpression());
+                reportScaleScore.setImpression(score.getImpression());
                 reportScaleScore.setScore(score.getScore());
                 reportScaleScore.setIsShow((byte) 1);
                 reportScaleScore.setComboId(score.getComboId());
@@ -474,6 +483,14 @@ public class RmsServiceImpl implements IRmsService {
                         score.setScoreDistributions(distributions);
                     }
                 }
+
+                if ("TZBS_LN".equals(score.getCode()) || "TZBS_BZ".equals(score.getCode())) {
+                    ClientEvaVo.ReportView reportView = reportView(dto.getEvaluationId(), score.getCode());
+                    if (reportView != null) {
+                        score.setImpression(reportView.getResult());
+                        score.setScore(reportView.getTotalScore());
+                    }
+                }
             }
         }
 
@@ -567,6 +584,7 @@ public class RmsServiceImpl implements IRmsService {
         //3.2 生成报告单辨识结果
         List<ReportVo.EvaResult> resultList = countReportResult(evaluationId, score.getCode());
         List<TzbsRmsReportResult> reportResultList = CollectionUtil.newArrayList();
+        BigDecimal totalScore = BigDecimal.ZERO;
         for (ReportVo.EvaResult resultVo : resultList) {
             //转换为RmsReportResult对象
             TzbsRmsReportResult reportResult = new TzbsRmsReportResult();
@@ -584,8 +602,11 @@ public class RmsServiceImpl implements IRmsService {
             reportScore.setCode(resultVo.getConstiCode());
             reportScore.setName(resultVo.getConstiName());
             reportScore.setScore(reportResult.getConstiScore());
+            reportScore.setTotalScore(score.getTotalScore());
             score.addSub(reportScore);
+            totalScore = totalScore.add(reportScore.getScore());
         }
+        score.setScore(totalScore);
         score.setReportResultList(reportResultList);
 
         //3.3 生成养生建议

ruisi_java/ruisi-web-client/src/main/resources/application-dev.yml

@@ -11,7 +11,7 @@ spring:
 #        password: po3OynBO[M3579p6L7)o
         url: jdbc:mysql://127.0.0.1:3306/ruisi_cga?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: root
-        password: 123456
+        password: q7510327
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭

ruisi_java/ruisi-web-client/src/main/resources/mapper/dao/ScaleDao.xml

@@ -52,6 +52,7 @@
         <result column="sort" property="sort" />
         <result column="version" property="version" />
         <result column="versionName" property="versionName" />
+        <result column="parentId" property="parentId" />
 
         <collection property="scaleList" ofType="com.ccsens.system.domain.vo.ScaleVo$ScaleComboItem">
             <id column="id" property="comboId"/>
@@ -112,6 +113,7 @@
             c.level,
             c.status,
             c.hospital_id,
+            c.parent_id as parentId,
             d.dept_name as hospitalName,
             d.leader,
             d.phone,
@@ -168,6 +170,7 @@
             csr.sort as comboScaleSort,
             c.status,
             c.version,
+            c.parent_id as parentId,
             h.version as versionName,
             c.level
         from

web_admin/src/views/index.vue

@@ -343,7 +343,11 @@ export default {
     },
     // 时间范围查询
     handleTimeChange(_type) {
-      if (_type !== true) {
+      if (Array.isArray(_type)) {
+        this.param.beginTime = _type[0];
+        this.param.endTime = _type[1];
+        this.param.timeType = null;
+      } else if (_type !== true) {
         this.param.timeType = "";
       }
       this.getNnicd(); // 疾病排行

web_admin/src/views/largeScreen.vue

@@ -327,7 +327,11 @@ export default {
     },
     // 时间范围查询
     handleTimeChange(_type) {
-      if (_type !== true) {
+      if (Array.isArray(_type)) {
+        this.param.beginTime = _type[0];
+        this.param.endTime = _type[1];
+        this.param.timeType = null;
+      } else if (_type !== true) {
         this.param.timeType = "";
       }
       this.getNnicd(); // 疾病排行

web_admin/src/views/statistics/index.vue

@@ -563,7 +563,11 @@ export default {
     },
     // 时间范围查询
     handleTimeChange(_type) {
-      if (_type !== true) {
+      if (Array.isArray(_type)) {
+        this.param.beginTime = _type[0];
+        this.param.endTime = _type[1];
+        this.param.timeType = null;
+      } else if (_type !== true) {
         this.param.timeType = "";
       }
       this.getList();

web_client/src/views/statistics.vue

@@ -475,7 +475,11 @@ export default {
     },
     // 时间范围查询
     handleTimeChange(_type) {
-      if (_type !== true) {
+      if (Array.isArray(_type)) {
+        this.param.beginTime = _type[0];
+        this.param.endTime = _type[1];
+        this.param.timeType = null;
+      } else if (_type !== true) {
         this.param.timeType = "";
       }
       this.getList();