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

修改idutil

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/domain/vo/RmsVo.java

@@ -299,7 +299,7 @@ public class RmsVo {
         private String belief;
 
         public String getMarial(){
-            return maritalStatus == null ? "" : maritalStatus == 1 ? "未婚" : maritalStatus == 2 ? "已婚" : maritalStatus == 3 ? "离异" : maritalStatus == 4 ? "丧偶" : "未知";
+            return maritalStatus == null ? "" : maritalStatus == 1 ? "已婚" : maritalStatus == 2 ? "未婚" : maritalStatus == 3 ? "离异" : maritalStatus == 4 ? "丧偶" : "未知";
         }
 
         public String getDwelling(){

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/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/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/resources/mapper/dao/ScaleDao.xml

@@ -144,6 +144,13 @@
                 left join hms_version v on v.id = c.version
         where
             c.del_flag = 0 and c.parent_id != 0 and s.is_show = 1 and c.status = 1
+        and (
+            c.level = 20
+            or
+            (c.level = 10 and c.hospital_id = #{hospitalId})
+            or
+            c.create_by = #{userName}
+        )
         <if test="isFemale != null and isFemale">
             and c.id != 1982752141751750656
         </if>