推广代码调整

src/main/java/com/rf/psychological/api/SubjectApi.java

@@ -1,669 +0,0 @@
-package com.rf.psychological.api;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.rf.psychological.api.key.dao.model.KeyEntity;
-import com.rf.psychological.api.key.service.KeyService;
-import com.rf.psychological.base.rest.BaseController;
-import com.rf.psychological.dao.dto.*;
-import com.rf.psychological.dao.model.AnswerEntity;
-import com.rf.psychological.dao.model.DimensionEntity;
-import com.rf.psychological.file.excel.ExcelClass;
-import com.rf.psychological.group.dao.model.GroupEntity;
-import com.rf.psychological.group.service.GroupInfoService;
-import com.rf.psychological.institution.model.InstitutionEntity;
-import com.rf.psychological.institution.service.InstitutionAuthService;
-import com.rf.psychological.institution.service.InstitutionService;
-import com.rf.psychological.plan.dao.model.TestPlanEntity;
-import com.rf.psychological.scale.dao.model.*;
-import com.rf.psychological.scale.service.*;
-import com.rf.psychological.security.RSAUtils;
-import com.rf.psychological.security.SafetyProcess;
-import com.rf.psychological.user.dao.model.UserEntity;
-import com.rf.psychological.user.service.UserService;
-import com.rf.psychological.utils.*;
-import com.rf.psychological.wxpay.model.PromotionInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.*;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Slf4j
-@RestController
-@RequestMapping("/v1/subject")
-@Api(tags = "外部系统量表操作")
-public class SubjectApi extends BaseController {
-
-    @Autowired
-    private InstitutionService institutionService;
-
-    @Autowired
-    private InstitutionAuthService institutionAuthService;
-
-    @Autowired
-    private ScaleService scaleService;
-
-    @Autowired
-    private UserRecordService userRecordService;
-
-    @Autowired
-    private UserService userService;
-
-    @Autowired
-    private SubjectService subjectService;
-
-    @Autowired
-    private AnswerService answerService;
-
-    @Autowired
-    private ScaleMarksService scaleMarksService;
-
-    @Autowired
-    private DimensionService dimensionService;
-
-    @Autowired
-    private DimensionOrgService dimensionOrgService;
-
-    @Autowired
-    private ScaleScoringVersion scaleScoringVersion;
-
-    @Autowired
-    private ScaleConfigService scaleConfigService;
-
-    @Autowired
-    private KeyService keyService;
-
-    @Autowired
-    private GroupInfoService groupInfoService;
-
-    @ApiOperation(value = "外部系统获取量表列表接口",notes = "data参数包括：pageNum:页码, pageSize:条数,institutionNo:机构编号,subjectName:量表名称")
-    @PostMapping("/getSubjectList")
-    public Result getSubjectList(@RequestBody String params){
-        try {
-            String jsonParams = RSAUtils.decryptByPrivateKey3(params,RSAUtils.privateKeyStr);
-            log.info("getSubjectList===="+jsonParams);
-            JSONObject jsonObject =JSONObject.parseObject( jsonParams);
-            if (!jsonObject.containsKey("institutionNo") ||  StringUtils.isEmpty(jsonObject.getString("institutionNo")) ) {
-                return fail("", "机构编号不能为空");
-            }
-            String institutionNo = jsonObject.getString("institutionNo");
-            if (!jsonObject.containsKey("subjectName")) {
-                return fail("", "入参量表名称不存在");
-            }
-            String subjectName = jsonObject.getString("subjectName");
-            if (!jsonObject.containsKey("pageNum") ||  StringUtils.isEmpty(jsonObject.getString("pageNum")) ) {
-                return fail("", "页码不能为空");
-            }
-            int pageNum = jsonObject.getInteger("pageNum");
-            if (!jsonObject.containsKey("pageSize") ||  StringUtils.isEmpty(jsonObject.getString("pageSize")) ) {
-                return fail("", "条数不能为空");
-            }
-            int pageSize = jsonObject.getInteger("pageSize");
-            //判断机构编号是否存在
-            InstitutionEntity institutionEntity = this.institutionService.findByInstitutionNo(institutionNo);
-            if (institutionEntity == null) {
-                return fail("", "机构编号不存在！");
-            }
-            // 创建返回的json对象
-            JSONObject resultJson = new JSONObject();
-            // 创建量表信息json对象
-            JSONArray resultData = new JSONArray();
-            List<InstitutionAuthSubjectNameDto> byInstitutionNoAndName = this.institutionAuthService.getByInstitutionNoAndName(pageNum, pageSize, institutionNo, "0", subjectName,null);
-            for (InstitutionAuthSubjectNameDto institutionAuthSubject : byInstitutionNoAndName) {
-                JSONObject subjectObject = new JSONObject(true);
-                subjectObject.put("flag",institutionAuthSubject.getFlag());
-                subjectObject.put("name",institutionAuthSubject.getName());
-                subjectObject.put("description",institutionAuthSubject.getDescription());
-                resultData.add(subjectObject);
-            }
-            int num = this.institutionAuthService.getAllByTableInAuthAndSubInfoNum(institutionNo, "0", subjectName,null);
-            resultJson.put("allNum",num);
-            resultJson.put("resultData",resultData);
-            log.info("resultJson===="+resultJson);
-            //获取该机构编号下公钥
-            KeyEntity keyEntity = keyService.find(institutionNo);
-            if (keyEntity == null){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            if(StringUtils.isEmpty(keyEntity.getPubKey())){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            String encryptStr = RSAUtils.encryptByPublicKey3(resultJson.toJSONString(),keyEntity.getPubKey());
-            return success(encryptStr);
-        }catch (Exception e){
-            e.printStackTrace();
-            return fail();
-        }
-    }
-
-    @ApiOperation(value = "外部系统获取量表详情接口",notes = "data参数包括：flag:量表唯一标识, institutionNo:机构编号")
-    @PostMapping("/getSubject")
-    public Result getSubject(@RequestBody String params){
-        try {
-            String jsonParams = RSAUtils.decryptByPrivateKey3(params,RSAUtils.privateKeyStr);
-            log.info("getSubject===="+jsonParams);
-            JSONObject jsonObject =JSONObject.parseObject( jsonParams);
-            if (!jsonObject.containsKey("institutionNo") ||  StringUtils.isEmpty(jsonObject.getString("institutionNo")) ) {
-                return fail("", "机构编号不能为空");
-            }
-            String institutionNo = jsonObject.getString("institutionNo");
-            if (!jsonObject.containsKey("flag") ||  StringUtils.isEmpty(jsonObject.getString("flag")) ) {
-                return fail("", "量表唯一标识不能为空");
-            }
-            String flag = jsonObject.getString("flag");
-            //判断机构编号是否存在
-            InstitutionEntity institutionEntity = this.institutionService.findByInstitutionNo(institutionNo);
-            if (institutionEntity == null) {
-                return fail("", "机构编号不存在！");
-            }
-            // 创建返回的json对象
-            JSONArray resultJson = new JSONArray();
-            List<ScaleEntity> scaleEntityList = this.scaleService.getScaleByFlagAndInstitutionNo(institutionNo, flag);
-            for (ScaleEntity scaleEntity : scaleEntityList) {
-                JSONObject scaleObject = new JSONObject(true);
-                scaleObject.put("questionNo",scaleEntity.getQuestionNo());
-                scaleObject.put("answer",scaleEntity.getAnswer());
-                scaleObject.put("checkItems",scaleEntity.getCheckItems());
-                scaleObject.put("questionType",scaleEntity.getQuestionType());
-                resultJson.add(scaleObject);
-            }
-            log.info("resultJson===="+resultJson);
-            //获取该机构编号下公钥
-            KeyEntity keyEntity = keyService.find(institutionNo);
-            if (keyEntity == null){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            if(StringUtils.isEmpty(keyEntity.getPubKey())){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            String encryptStr = RSAUtils.encryptByPublicKey3(resultJson.toJSONString(),keyEntity.getPubKey());
-            return success(encryptStr);
-        }catch (Exception e){
-            e.printStackTrace();
-            return fail();
-        }
-    }
-
-    @ApiOperation(value = "外部系统量表测试分析接口",notes = "data参数包括：flag:量表唯一标识, userName:用户名, userId:外部用户唯一标识, institutionNo:机构编号, subjectResult:答题详情")
-    @PostMapping("/analysis")
-    public Result analysis(@RequestBody String params){
-        try {
-            String jsonParams = RSAUtils.decryptByPrivateKey3(params,RSAUtils.privateKeyStr);
-            log.info("getSubject===="+jsonParams);
-            JSONObject jsonObject =JSONObject.parseObject( jsonParams);
-            if (!jsonObject.containsKey("institutionNo") ||  StringUtils.isEmpty(jsonObject.getString("institutionNo")) ) {
-                return fail("", "机构编号不能为空");
-            }
-            String institutionNo = jsonObject.getString("institutionNo");
-            if (!jsonObject.containsKey("userId") ||  StringUtils.isEmpty(jsonObject.getString("userId")) ) {
-                return fail("", "外部用户唯一标识不能为空");
-            }
-            String userId = jsonObject.getString("userId");
-            if (!jsonObject.containsKey("flag") ||  StringUtils.isEmpty(jsonObject.getString("flag")) ) {
-                return fail("", "量表唯一标识不能为空");
-            }
-            String flag = jsonObject.getString("flag");
-            if (!jsonObject.containsKey("userName") ||  StringUtils.isEmpty(jsonObject.getString("userName")) ) {
-                return fail("", "用户名不能为空");
-            }
-            String phone = jsonObject.getString("userName");
-            //判断机构编号是否存在
-            InstitutionEntity institutionEntity = this.institutionService.findByInstitutionNo(institutionNo);
-            if (institutionEntity == null) {
-                return fail("", "机构编号不存在！");
-            }
-            //判断用户是否存在
-            UserEntity userEntity = this.userService.findPhoneAndInstitutionNoAndRoleType(phone,institutionNo,Constant.DEFAULT_VALUE_ONE);
-            if(userEntity == null){
-                return fail("用户不存在");
-            }
-            String userName = userEntity.getPetName();
-            String userBirthday = userEntity.getBirthday();
-            String userSex = userEntity.getGender();
-            if (userSex.equals("0")) {
-                userSex = "男";
-            } else {
-                userSex = "女";
-            }
-
-            String testTime = new SimpleDateFormat("yyyy年MM月dd日HH时mm分ss秒").format(new Date());
-            String fileName = userName + Constant.SPLIT_CHAR + userBirthday + Constant.SPLIT_CHAR + userSex + Constant.SPLIT_CHAR + testTime;
-            String testResult = "";
-            JSONArray jsonArray = jsonObject.getJSONArray("subjectResult");
-
-            // 创建返回的json对象
-            JSONObject resultJson = new JSONObject(true);
-            //根据flag获取全部选项
-            List<ScaleEntity> scaleEntities = this.scaleService.getScaleByFlag(flag);
-            //根据flag获取全部答案
-            List<AnswerEntity> answerEntities = this.answerService.getAnswerByFlag(flag);
-            //根据flag获取全部评分规则
-            List<ScaleMarksEntity> scaleMarksEntities = this.scaleMarksService.getScaleMarksByFlag(flag);
-            //根据flag获取全部维度信息
-            List<DimensionEntity> dimensionEntities = this.dimensionService.getDimensionByFlag(flag);
-            //根据flag获取量表名称
-            List<SubjectEntity> subjectEntities = this.subjectService.getSubjectByFlag(flag);
-            resultJson.put("scaleEntities", scaleEntities);
-            resultJson.put("answerEntities", answerEntities);
-            resultJson.put("scaleMarksEntities", scaleMarksEntities);
-            resultJson.put("dimensionEntities", dimensionEntities);
-            //机构编号，用于预警信息判断
-            resultJson.put("institutionNo",institutionNo);
-            //用户id用于预警信息保存
-            resultJson.put("userId",userEntity.getId());
-            resultJson.put("dimensionOrgService",dimensionOrgService);
-            //答题结果列表
-            List<ScaleEntity> dataList = jsonArray.toJavaList(ScaleEntity.class);
-            ScaleConfigEntity scaleConfigByFlag = scaleConfigService.findScaleConfigByFlag(flag);
-            String className = (scaleConfigByFlag== null ?"com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale":scaleConfigByFlag.getResultConfig());
-            Class<?> cls; // 取得Class对象
-            try {
-                cls = Class.forName(className);
-                Constructor<?> cons = cls.getConstructor(JSONArray.class, JSONObject.class);
-//            Object obj = cons.newInstance(); // 为构造方法传递参数
-                Object obj = cons.newInstance(jsonArray, resultJson);
-                //System.out.println(obj);
-                //cls.getDeclaredMethods();
-                Method method = null;
-                //通过配置文件获取量表计分规则使用的版本
-                ObjectMapper objectMapper = new ObjectMapper();
-                String str = objectMapper.writeValueAsString(scaleScoringVersion.getVersionmap());
-                HashMap mapScale = JSON.parseObject(str, HashMap.class);
-                System.out.println(mapScale);
-                Set<Map.Entry<String, String>> en = mapScale.entrySet();
-                for(Map.Entry<String, String> entry : en) {
-                    String[] flags = entry.getValue().split(", ");
-                    for (String obtainFlag:flags){
-                        System.out.println("flag:"+obtainFlag);
-                        if (obtainFlag.equals(flag)){
-                            method = cls.getDeclaredMethod(entry.getKey());
-                            break;
-                        }
-                    }
-                }
-                if ( method == null){
-                    method = cls.getDeclaredMethod("scaleCalculate");
-                }
-                //method = cls.getDeclaredMethod("scaleCalculate");
-                resultJson = (JSONObject) method.invoke(obj);
-            } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InstantiationException |
-                    InvocationTargetException e) {
-                e.printStackTrace();
-            }
-            resultJson.getJSONObject("resultJson").remove("scaleEntities");
-            resultJson.getJSONObject("resultJson").remove("answerEntities");
-            resultJson.getJSONObject("resultJson").remove("scaleMarksEntities");
-            resultJson.getJSONObject("resultJson").remove("dimensionEntities");
-
-            resultJson.getJSONObject("resultJson").remove("institutionNo");
-            resultJson.getJSONObject("resultJson").remove("userId");
-            resultJson.getJSONObject("resultJson").remove("dimensionOrgService");
-
-            if (resultJson.getJSONObject("resultJson").containsKey("resultJson") && resultJson.getJSONObject("resultJson").get("测试结果指导").equals("请认真按照实际情况如实回答")) {
-                resultJson = resultJson.getJSONObject("resultJson");
-                return success(resultJson, "完成");
-            }
-            fileName = fileName + "-" + subjectEntities.get(0).getName() + ".xlsx";
-            //导出文件
-            ExcelUtil.createExcelFile(ScaleEntity.class, dataList, (List<Map<String, String>>) resultJson.get("resultMapList"), new ExcelClass().contentExcel(), fileName, subjectEntities.get(0).getName());
-
-            //计算结果
-            JSONArray dbJsonList = new JSONArray();
-            JSONObject dbJson = new JSONObject(true);
-            boolean versionFlag = false;
-            Map<String, Object> newResultJson = null;
-            if (!resultJson.containsKey("newResultJson")) {
-                dbJson.put("version", 1.0);
-                dbJson.put("newTableContext", "");
-            } else {
-                newResultJson = (Map<String, Object>) resultJson.get("newResultJson");
-                dbJson.put("version", 2.0);
-                dbJson.put("newTableContext", newResultJson);
-                versionFlag = true;
-            }
-
-            resultJson = resultJson.getJSONObject("resultJson");
-            List<WarnEntity> warnEntityList = new ArrayList<WarnEntity>();
-            if(resultJson.containsKey("warnEntityList")) {
-                warnEntityList = resultJson.getJSONArray("warnEntityList").toJavaList(WarnEntity.class);
-                resultJson.remove("warnEntityList");
-            }
-            // 获取JSON第一层所有的key
-            Set<String> keys = resultJson.keySet();
-
-            //列名
-            List colNames = new ArrayList();
-            colNames.add("项目");
-            colNames.add("内容");
-            dbJson.put("colNames", colNames);
-            JSONArray tableContext = new JSONArray();
-
-            // 获取第一层每个key对应的值 的类型
-            for (String key : keys) {
-                //列值
-                List colValue = new ArrayList();
-                colValue.add(resultJson.get(key));
-                JSONObject row = new JSONObject();
-                row.put("name", key);
-                row.put("value", colValue);
-                tableContext.add(row);
-            }
-
-            dbJson.put("tableContext", tableContext);
-
-            dbJsonList.add(dbJson);
-
-            //测试记录
-            int i = 1;
-            // 获取第一层每个key对应的值 的类型
-            for (String key : keys) {
-                if (i == keys.size()) {
-                    testResult += key + ":" + resultJson.get(key);
-                } else {
-                    testResult += key + ":" + resultJson.get(key) + ";";
-                }
-                i++;
-            }
-            String filePath;
-            filePath = "./心理检测/检测结果/" + new SimpleDateFormat("yyyy-MM-dd").format(new Date()) + "/" + subjectEntities.get(0).getName() + "/" + fileName;
-            UserRecordEntity userRecordEntity = testRecord(flag, userId, institutionNo, testTime, filePath, JSON.toJSONString(dbJsonList, SerializerFeature.DisableCircularReferenceDetect), subjectEntities.get(0).getName(), JSON.toJSONString(dataList, SerializerFeature.DisableCircularReferenceDetect), testResult, Constant.DEFAULT_VALUE_ZERO);
-
-            // 创建返回的json对象
-            JSONObject resultJsonObject = new JSONObject();
-            resultJsonObject.put("resultId",userRecordEntity.getId());
-            log.info("resultJsonObject===="+resultJsonObject);
-            //获取该机构编号下公钥
-            KeyEntity keyEntity = keyService.find(institutionNo);
-            if (keyEntity == null){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            if(StringUtils.isEmpty(keyEntity.getPubKey())){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            String encryptStr = RSAUtils.encryptByPublicKey3(resultJsonObject.toJSONString(),keyEntity.getPubKey());
-            return success(encryptStr);
-        }catch (Exception e){
-            e.printStackTrace();
-            return fail();
-        }
-    }
-
-    private UserRecordEntity testRecord(String flag, String phone, String institutionNo, String testTime, String fileName, String testResult, String name, String dataList, String testResults, String testPlanId) {
-        //根据flag记录测试数
-        this.subjectService.addTestNum(flag);
-        //添加用户测试记录
-        UserRecordEntity userRecordEntity = new UserRecordEntity();
-        userRecordEntity.setFlag(flag);
-        userRecordEntity.setPhone(phone);
-        userRecordEntity.setInstitutionNo(institutionNo);
-        userRecordEntity.setTestDate(testTime);
-        userRecordEntity.setTestResult(testResult);
-        userRecordEntity.setType("0");
-        userRecordEntity.setFileName(fileName);
-        userRecordEntity.setName(name);
-        userRecordEntity.setTestRecord(dataList);
-        userRecordEntity.setTestResults(testResults);
-        if (testPlanId == null || testPlanId.equals("")) {
-            userRecordEntity.setTestPlanId("0");
-        } else {
-            userRecordEntity.setTestPlanId(testPlanId);
-        }
-        this.userRecordService.save(userRecordEntity);
-        return userRecordEntity;
-    }
-
-    @ApiOperation(value = "外部系统获取量表测试分析结果接口",notes = "data参数包括：resultId:测试结果唯一标识,userId:外部用户唯一标识, institutionNo:机构编号")
-    @PostMapping("/getSubjectResult")
-    public Result getSubjectResult(@RequestBody String params){
-        try {
-            String jsonParams = RSAUtils.decryptByPrivateKey3(params,RSAUtils.privateKeyStr);
-            JSONObject jsonObject =JSONObject.parseObject(jsonParams);
-            log.info("getSubject===="+jsonParams);
-            if (!jsonObject.containsKey("institutionNo") ||  StringUtils.isEmpty(jsonObject.getString("institutionNo")) ) {
-                return fail("", "机构编号不能为空");
-            }
-            String institutionNo = jsonObject.getString("institutionNo");
-            if (!jsonObject.containsKey("userId") ||  StringUtils.isEmpty(jsonObject.getString("userId")) ) {
-                return fail("", "外部用户唯一标识不能为空");
-            }
-            String userId = jsonObject.getString("userId");
-            if (!jsonObject.containsKey("resultId") ||  StringUtils.isEmpty(jsonObject.getString("resultId")) ) {
-                return fail("", "测试结果唯一标识不能为空");
-            }
-            String resultId = jsonObject.getString("resultId");
-            //判断机构编号是否存在
-            InstitutionEntity institutionEntity = this.institutionService.findByInstitutionNo(institutionNo);
-            if (institutionEntity == null) {
-                return fail("", "机构编号不存在！");
-            }
-            // 创建返回的json对象
-            JSONObject resultJson = new JSONObject();
-            UserRecordEntity userRecordEntity = this.userRecordService.getuserRecordByIdAndInstitutionNoAndPhone(resultId,userId,institutionNo);
-            if (userRecordEntity != null){
-                resultJson.put("name",userRecordEntity.getName());
-                resultJson.put("testDate",userRecordEntity.getTestDate());
-                resultJson.put("testResult",userRecordEntity.getTestResult());
-            }
-            log.info("resultJson===="+resultJson);
-            //获取该机构编号下公钥
-            KeyEntity keyEntity = keyService.find(institutionNo);
-            if (keyEntity == null){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            if(StringUtils.isEmpty(keyEntity.getPubKey())){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            String encryptStr = RSAUtils.encryptByPublicKey3(resultJson.toJSONString(),keyEntity.getPubKey());
-            return success(encryptStr);
-        }catch (Exception e){
-            e.printStackTrace();
-            return fail();
-        }
-    }
-
-    @ApiOperation(value = "外部系统查询机构下所有用户已经做的测试记录",notes = "data参数包括：pageNum:页码, pageSize:条数,institutionNo:机构编号,type:类型（0量表；1认知任务）,searchKey:查询参数")
-    @PostMapping("/getUserRecording")
-    public Result getUserRecording(@RequestBody String params) {
-        try {
-            String jsonParams = RSAUtils.decryptByPrivateKey3(params,RSAUtils.privateKeyStr);
-            JSONObject jsonObject =JSONObject.parseObject(jsonParams);
-            log.info("getUserRecording===="+jsonParams);
-            if (!jsonObject.containsKey("institutionNo") ||  StringUtils.isEmpty(jsonObject.getString("institutionNo")) ) {
-                return fail("", "机构编号不能为空");
-            }
-            String institutionNo = jsonObject.getString("institutionNo");
-            if (!jsonObject.containsKey("type") ||  StringUtils.isEmpty(jsonObject.getString("type")) ) {
-                return fail("", "类型不能为空");
-            }
-            String type = jsonObject.getString("type");
-            if (!jsonObject.containsKey("pageNum") ||  StringUtils.isEmpty(jsonObject.getString("pageNum")) ) {
-                return fail("", "页码不能为空");
-            }
-            int pageNum = jsonObject.getInteger("pageNum");
-            if (!jsonObject.containsKey("pageSize") ||  StringUtils.isEmpty(jsonObject.getString("pageSize")) ) {
-                return fail("", "条数不能为空");
-            }
-            int pageSize = jsonObject.getInteger("pageSize");
-            String searchKey = "";
-            if (jsonObject.containsKey("searchKey") && !StringUtils.isEmpty(jsonObject.getString("searchKey")) ) {
-                searchKey = jsonObject.getString("searchKey");
-            }
-            if (pageSize == 0) {
-                pageSize = 20;
-            }
-            String beginFormat = "", endFormat = "";
-            int num;
-            List<InstitutionRecordingDTO> institutionUserRecordingList = this.userRecordService.getInstitutionUserRecording(pageNum, pageSize, type, institutionNo, searchKey, beginFormat, endFormat);
-            num = this.userRecordService.allCountByInstitutionNo(institutionNo, type, searchKey, "", "");
-            log.info("institutionUserRecordingList:" + JSONObject.toJSONString(institutionUserRecordingList));
-            JSONObject returnJsonObject = new JSONObject();
-            returnJsonObject.put("institutionUserRecordingList", institutionUserRecordingList);
-            returnJsonObject.put("allNum", num);
-            //获取该机构编号下公钥
-            KeyEntity keyEntity = keyService.find(institutionNo);
-            if (keyEntity == null){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            if(StringUtils.isEmpty(keyEntity.getPubKey())){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            String encryptStr = RSAUtils.encryptByPublicKey3(returnJsonObject.toJSONString(),keyEntity.getPubKey());
-            return success(encryptStr);
-        }catch (Exception e){
-            e.printStackTrace();
-            return fail();
-        }
-    }
-
-    @ApiOperation(value = "外部系统查询机构下测试量表下的用户",notes = "data参数包括：pageNum:页码, pageSize:条数,institutionNo:机构编号,name:量表或认知任务名称,searchKey:查询参数")
-    @PostMapping("/getTestUser")
-    public Result getTestUser(@RequestBody String params) {
-        try {
-            String jsonParams = RSAUtils.decryptByPrivateKey3(params,RSAUtils.privateKeyStr);
-            JSONObject jsonObject =JSONObject.parseObject( jsonParams);
-            log.info("getTestUser===="+jsonParams);
-            if (!jsonObject.containsKey("institutionNo") ||  StringUtils.isEmpty(jsonObject.getString("institutionNo")) ) {
-                return fail("", "机构编号不能为空");
-            }
-            String institutionNo = jsonObject.getString("institutionNo");
-            if (!jsonObject.containsKey("name") ||  StringUtils.isEmpty(jsonObject.getString("name")) ) {
-                return fail("", "量表或认知任务名称不能为空");
-            }
-            String name = jsonObject.getString("name");
-            if (!jsonObject.containsKey("pageNum") ||  StringUtils.isEmpty(jsonObject.getString("pageNum")) ) {
-                return fail("", "页码不能为空");
-            }
-            int pageNum = jsonObject.getInteger("pageNum");
-            if (!jsonObject.containsKey("pageSize") ||  StringUtils.isEmpty(jsonObject.getString("pageSize")) ) {
-                return fail("", "条数不能为空");
-            }
-            int pageSize = jsonObject.getInteger("pageSize");
-            String searchKey = "";
-            if (jsonObject.containsKey("searchKey") && !StringUtils.isEmpty(jsonObject.getString("searchKey")) ) {
-                searchKey = jsonObject.getString("searchKey");
-            }
-            if (pageSize == 0) {
-                pageSize = 20;
-            }
-            GroupEntity entity =this.groupInfoService.findGroupByInstitutionNoAndName(Constant.LAN_INSTITUTION_CODE,Constant.DEFAULT_GROUP_NAME);
-            if (entity == null ){
-                return fail("", "机构下无默认分组！");
-            }
-            String groupId = entity.getId();
-            String beginFormat = "", endFormat = "";
-            int num;
-            //添加分组过滤
-            List<InstitutionRecordingUserDTO> institutionUserRecordingList = this.userRecordService.getInstitutionRecording(pageNum, pageSize, institutionNo, name, searchKey, beginFormat, endFormat, groupId);
-            num = this.userRecordService.allCountInstitutionRecording(institutionNo, name, searchKey, beginFormat, endFormat, groupId);
-            List<InstitutionRecordingUserApiDTO> institutionRecordingUserApiDTOList = new ArrayList<>();
-            for (InstitutionRecordingUserDTO institutionRecordingUserDTO : institutionUserRecordingList) {
-                InstitutionRecordingUserApiDTO institutionRecordingUserApiDTO = new InstitutionRecordingUserApiDTO();
-                institutionRecordingUserApiDTO.setPhone(institutionRecordingUserDTO.getPhone());
-                institutionRecordingUserApiDTO.setPetName(institutionRecordingUserDTO.getPetName());
-                institutionRecordingUserApiDTO.setGender(institutionRecordingUserDTO.getGender());
-                institutionRecordingUserApiDTO.setBirthday(institutionRecordingUserDTO.getBirthday());
-                institutionRecordingUserApiDTO.setTestDate(institutionRecordingUserDTO.getTestDate());
-                institutionRecordingUserApiDTO.setInstitutionNo(institutionRecordingUserDTO.getInstitutionNo());
-                institutionRecordingUserApiDTO.setId(institutionRecordingUserDTO.getId());
-                institutionRecordingUserApiDTOList.add(institutionRecordingUserApiDTO);
-            }
-            JSONObject returnJsonObject = new JSONObject();
-            returnJsonObject.put("institutionUserRecordingList", institutionRecordingUserApiDTOList);
-            returnJsonObject.put("allNum", num);
-            //获取该机构编号下公钥
-            KeyEntity keyEntity = keyService.find(institutionNo);
-            if (keyEntity == null){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            if(StringUtils.isEmpty(keyEntity.getPubKey())){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            String encryptStr = RSAUtils.encryptByPublicKey3(returnJsonObject.toJSONString(),keyEntity.getPubKey());
-            return success(encryptStr);
-        }catch (Exception e){
-            e.printStackTrace();
-            return fail();
-        }
-    }
-
-    /**
-     * 查询某用户所有测试记录
-     * @param params
-     * @return
-     */
-    @PostMapping("/getUserAllResult")
-    @ApiOperation(value = "外部系统查询某用户所有测试记录接口",notes = "json字符串形式传参（加密）,data参数包括:phone:账号或电话,institutionNo:机构编号,pageNum:页码, pageSize:条数,searchKey:查询参数")
-    public Result getUserAllResult(@RequestBody String params){
-        try {
-            String jsonParams = RSAUtils.decryptByPrivateKey3(params,RSAUtils.privateKeyStr);
-            JSONObject jsonObject =JSONObject.parseObject(jsonParams);
-            log.info("getUserAllResult===="+jsonParams);
-            if (!jsonObject.containsKey("phone") ||  StringUtils.isEmpty(jsonObject.getString("phone")) ) {
-                return fail("", "账号不能为空");
-            }
-            String phone = jsonObject.getString("phone");
-            log.info("phone: " + phone);
-            if (!jsonObject.containsKey("institutionNo") || StringUtils.isEmpty(jsonObject.getString("institutionNo")) ) {
-                return fail("", "机构编号");
-            }
-            String institutionNo = jsonObject.getString("institutionNo");
-            log.info("institutionNo: " + institutionNo);
-            if (!jsonObject.containsKey("pageNum") ||  StringUtils.isEmpty(jsonObject.getString("pageNum")) ) {
-                return fail("", "页码不能为空");
-            }
-            int pageNum = jsonObject.getInteger("pageNum");
-            if (!jsonObject.containsKey("pageSize") ||  StringUtils.isEmpty(jsonObject.getString("pageSize")) ) {
-                return fail("", "条数不能为空");
-            }
-            int pageSize = jsonObject.getInteger("pageSize");
-            String searchKey = "";
-            if (jsonObject.containsKey("searchKey") && !StringUtils.isEmpty(jsonObject.getString("searchKey")) ) {
-                searchKey = jsonObject.getString("searchKey");
-            }
-            if (pageSize == 0) {
-                pageSize = 20;
-            }
-
-            Page<UserRecordsDto> userRecording = userRecordService.getUserRecording(pageNum, pageSize, phone, institutionNo, searchKey);
-            JSONArray jsonArray = new JSONArray();
-            for (UserRecordsDto userRecord : userRecording){
-                JSONObject object = new JSONObject(true);
-                object.put("name",userRecord.getName());
-                object.put("testDate",userRecord.getTestDate());
-                object.put("testResult",userRecord.getTestResult());
-                jsonArray.add(object);
-            }
-            JSONObject returnJsonObject = new JSONObject();
-            returnJsonObject.put("testResultList", jsonArray);
-            returnJsonObject.put("allNum", userRecording.getTotalElements());
-            //获取该机构编号下公钥
-            KeyEntity keyEntity = keyService.find(institutionNo);
-            if (keyEntity == null){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            if(StringUtils.isEmpty(keyEntity.getPubKey())){
-                return fail(null,"未获取到该机构下秘钥信息");
-            }
-            String encryptStr = RSAUtils.encryptByPublicKey3(returnJsonObject.toJSONString(),keyEntity.getPubKey());
-            return success(encryptStr);
-        }catch (Exception e){
-            e.printStackTrace();
-            return fail();
-        }
-    }
-
-}

src/main/java/com/rf/psychological/api/UserApi.java

@@ -1,208 +0,0 @@
-package com.rf.psychological.api;
-
-import com.alibaba.fastjson.JSONObject;
-import com.rf.psychological.api.key.dao.model.KeyEntity;
-import com.rf.psychological.api.key.service.KeyService;
-import com.rf.psychological.base.rest.BaseController;
-import com.rf.psychological.enums.UserRole;
-import com.rf.psychological.enums.UserStatus;
-import com.rf.psychological.group.dao.model.GroupEntity;
-import com.rf.psychological.group.service.GroupInfoService;
-import com.rf.psychological.institution.model.InstitutionEntity;
-import com.rf.psychological.institution.service.InstitutionService;
-import com.rf.psychological.security.AesEncryptUtils;
-import com.rf.psychological.security.RSAUtils;
-import com.rf.psychological.security.SafetyProcess;
-import com.rf.psychological.user.dao.model.UserEntity;
-import com.rf.psychological.user.service.UserService;
-import com.rf.psychological.utils.Constant;
-import com.rf.psychological.utils.JWTUtil;
-import com.rf.psychological.utils.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.DigestUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * @author Administrator
- */
-@Slf4j
-@RestController
-@RequestMapping("/v1")
-@Api(tags = "外部系统认证操作")
-public class UserApi extends BaseController {
-
-    @Autowired
-    private InstitutionService institutionService;
-
-    @Autowired
-    private KeyService keyService;
-
-    @Autowired
-    private UserService userService;
-
-    @Autowired
-    private GroupInfoService groupInfoService;
-
-    @ApiOperation(value = "外部系统获取token接口",notes = "data参数包括：userName:账号, password:密码,institutionNo:机构编号")
-    @PostMapping("/getToken")
-    public Result getToken(@RequestBody String params){
-        try {
-            String jsonParams = RSAUtils.decryptByPrivateKey3(params,RSAUtils.privateKeyStr);
-            JSONObject jsonObject =JSONObject.parseObject( jsonParams);
-            log.info("getToken===="+jsonParams);
-            if (!jsonObject.containsKey("institutionNo") ||  StringUtils.isEmpty(jsonObject.getString("institutionNo")) ) {
-                return fail("", "机构编号不能为空");
-            }
-            String institutionNo = jsonObject.getString("institutionNo");
-            if (!jsonObject.containsKey("userName") || StringUtils.isEmpty(jsonObject.getString("userName")) ) {
-                return fail("", "账号不能为空");
-            }
-            String phone = jsonObject.getString("userName");
-            log.info("phone: " + phone);
-            //判断机构编号是否存在
-            InstitutionEntity institutionEntity = this.institutionService.findByInstitutionNo(institutionNo);
-            log.info("institutionEntity: " + institutionEntity);
-            if (institutionEntity == null) {
-                return fail("", "机构编号不存在！");
-            }
-            UserEntity userEntity = this.userService.findPhoneAndInstitutionNoAndRoleType(phone, institutionNo, Constant.DEFAULT_VALUE_ONE );
-            log.info("userEntity: " + userEntity);
-            if (!jsonObject.containsKey("password") || StringUtils.isEmpty(  jsonObject.getString("password") )) {
-                return fail("", "密码不能为空");
-            }
-            String password = jsonObject.getString("password");
-            if (userEntity == null) {
-
-                return fail(null, "机构编号或账号错误");
-            }
-            if (userEntity.getPassword().equals(password)) {
-                //生成token
-                userEntity.setPassword(null);
-                String token = JWTUtil.generateToken(userEntity);
-                // 创建返回的json对象
-                JSONObject resultJson = new JSONObject();
-                resultJson.put("token", token);
-                //获取该机构编号下公钥
-                KeyEntity keyEntity = keyService.find(institutionNo);
-                if (keyEntity == null){
-                    return fail(null,"未获取到该机构下秘钥信息");
-                }
-                if(StringUtils.isEmpty(keyEntity.getPubKey())){
-                    return fail(null,"未获取到该机构下秘钥信息");
-                }
-                String encryptStr = RSAUtils.encryptByPublicKey3(resultJson.toJSONString(),keyEntity.getPubKey());
-                 return success(encryptStr);
-            } else {
-                return fail(null, "账号或密码错误");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            return fail();
-        }
-    }
-
-    /**
-     * 注册用户
-     * @param params
-     * @return
-     */
-    @PostMapping("/registerUser")
-    @ApiOperation(value = "外部系统普通用户注册接口",notes = "json字符串形式传参（加密）,data参数包括:birthday：生日，gender:性别，password:密码，phone:账号或电话，petName:姓名")
-    public Result registerUser(@RequestBody String params){
-        try {
-            String jsonParams = RSAUtils.decryptByPrivateKey3(params,RSAUtils.privateKeyStr);
-            JSONObject jsonObject =JSONObject.parseObject(jsonParams);
-            log.info("registerUser===="+jsonParams);
-            if (!jsonObject.containsKey("phone") ||  StringUtils.isEmpty(jsonObject.getString("phone")) ) {
-                return fail("", "账号不能为空");
-            }
-            String phone = jsonObject.getString("phone");
-            log.info("phone: " + phone);
-            if (!jsonObject.containsKey("petName") || StringUtils.isEmpty(jsonObject.getString("petName")) ) {
-                return fail("", "姓名不能为空");
-            }
-            String petName = jsonObject.getString("petName");
-            log.info("petName: " + petName);
-            if (!jsonObject.containsKey("birthday") ||  StringUtils.isEmpty(jsonObject.getString("birthday")) ) {
-                return fail("", "出生日期不能为空");
-            }
-            String birthday = jsonObject.getString("birthday");
-            log.info("birthday: " + birthday);
-            if (!jsonObject.containsKey("gender") || StringUtils.isEmpty(jsonObject.getString("gender")) ) {
-                return fail("", "性别不能为空");
-            }
-            String gender = jsonObject.getString("gender");
-            log.info("gender: " + gender);
-            if (!jsonObject.containsKey("password") || StringUtils.isEmpty(jsonObject.getString("password")) ) {
-                return fail("", "密码不能为空");
-            }
-            String password = jsonObject.getString("password");
-            log.info("password: " + password);
-
-            UserEntity userEntity = jsonObject.toJavaObject(UserEntity.class);
-            userEntity.setModelPhone(Constant.DEFAULT_VALUE_ZERO);
-            userEntity.setInstitutionNo(Constant.LAN_INSTITUTION_CODE);
-            userEntity.setInstitutionName(Constant.LAN_INSTITUTION_NAME);
-            userEntity.setRoleType(UserRole.COMMON.getType());
-            userEntity.setUserStatus(UserStatus.PASS.getType());
-            GroupEntity entity =this.groupInfoService.findGroupByInstitutionNoAndName(Constant.LAN_INSTITUTION_CODE,Constant.DEFAULT_GROUP_NAME);
-            if (entity == null ){
-                return fail("", "机构下无默认分组！");
-            }
-            userEntity.setGId(entity.getId());
-            UserEntity userInfo = this.userService.findPhoneAndInstitutionNoAndRoleType(userEntity.getPhone(), userEntity.getInstitutionNo(),userEntity.getRoleType());
-            if (userInfo == null) {
-                this.userService.save(userEntity);
-                return success();
-            } else {
-                return fail("", "账号已注册");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            return fail();
-        }
-    }
-
-    /**
-     * 删除用户
-     * @param params
-     * @return
-     */
-    @PostMapping("/deleteUser")
-    @ApiOperation(value = "外部系统普通用户删除接口",notes = "json字符串形式传参（加密）,data参数包括:phone:账号或电话,institutionNo:机构编号")
-    public Result deleteUser(@RequestBody String params){
-        try {
-            String jsonParams = RSAUtils.decryptByPrivateKey3(params,RSAUtils.privateKeyStr);
-            JSONObject jsonObject =JSONObject.parseObject( jsonParams);
-            log.info("deleteUser===="+jsonParams);
-            if (!jsonObject.containsKey("phone") ||  StringUtils.isEmpty(jsonObject.getString("phone")) ) {
-                return fail("", "账号不能为空");
-            }
-            String phone = jsonObject.getString("phone");
-            log.info("phone: " + phone);
-            if (!jsonObject.containsKey("institutionNo") || StringUtils.isEmpty(jsonObject.getString("institutionNo")) ) {
-                return fail("", "机构编号");
-            }
-            String institutionNo = jsonObject.getString("institutionNo");
-            log.info("institutionNo: " + institutionNo);
-            UserEntity user = this.userService.findPhoneAndInstitutionNoAndRoleType(phone,institutionNo,Constant.DEFAULT_VALUE_ONE);
-            if (user != null) {
-                this.userService.delete(user);
-                return success();
-            } else {
-                return fail("", "账号不存在");
-            }
-        }catch (Exception e){
-            e.printStackTrace();
-            return fail();
-        }
-    }
-
-}

src/main/java/com/rf/psychological/api/key/dao/model/KeyEntity.java

@@ -1,37 +0,0 @@
-package com.rf.psychological.api.key.dao.model;
-
-import com.rf.psychological.base.model.BaseEntity;
-import lombok.*;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @Author:zzf
- * @Date:2022/11/2:10:06
- * @Description:
- */
-@Entity
-@Data
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@EqualsAndHashCode(callSuper=false)
-@Table(name = "t_key_info")
-@org.hibernate.annotations.Table(appliesTo = "t_key_info", comment = "秘钥实体类")
-@DynamicUpdate
-public class KeyEntity extends BaseEntity {
-
-
-    @Column(name = "institution_no",columnDefinition = "varchar(36) not null comment '机构编号'")
-    private String institutionNo;
-    @Column(name = "pub_key",columnDefinition = "text not null comment '公钥'")
-    private String pubKey;
-    @Column(name = "pri_key",columnDefinition = "text  comment '秘钥'")
-    private String priKey;
-    @Column(name = "call_time",columnDefinition = "int default 0 comment '调用次数'")
-    private int callTime;
-}

src/main/java/com/rf/psychological/api/key/dao/repository/KeyRepository.java

@@ -1,8 +0,0 @@
-package com.rf.psychological.api.key.dao.repository;
-
-import com.rf.psychological.api.key.dao.model.KeyEntity;
-import com.rf.psychological.base.repository.BaseRepository;
-
-public interface KeyRepository extends BaseRepository <KeyEntity,String>{
-    KeyEntity findByInstitutionNo(String institutionNo);
-}

src/main/java/com/rf/psychological/api/key/rest/KeyApi.java

@@ -1,52 +0,0 @@
-package com.rf.psychological.api.key.rest;
-
-import com.alibaba.fastjson.JSONObject;
-import com.rf.psychological.api.key.dao.model.KeyEntity;
-import com.rf.psychological.api.key.service.KeyService;
-import com.rf.psychological.base.rest.BaseController;
-import com.rf.psychological.security.AesEncryptUtils;
-import com.rf.psychological.utils.Result;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-
-/**
- * @Author:zzf
- * @Date:2022/11/2:10:00
- * @Description:秘钥管理
- */
-@Slf4j
-@RestController
-@RequestMapping("/v1/key")
-@Api(tags = "秘钥")
-public class KeyApi extends BaseController {
-
-    @Autowired
-    private KeyService keyService;
-
-    @ApiOperation("保存秘钥")
-    @PostMapping("/save")
-    public Result save(@RequestBody String json) throws Exception {
-        KeyEntity key = JSONObject.parseObject(AesEncryptUtils.decrypt(JSONObject.parseObject(json).getString("data"))).toJavaObject(KeyEntity.class);
-        this.keyService.save(key);
-        return success();
-    }
-
-    @ApiOperation(value = "查询",notes = "如果按照机构号查询，key为institutionNo")
-    @PostMapping("/find")
-    public Result find(@RequestBody String json) throws Exception {
-        JSONObject jsonObject = JSONObject.parseObject(AesEncryptUtils.decrypt(JSONObject.parseObject(json).getString("data")));
-        List<KeyEntity> keyEntityList = this.keyService.find(jsonObject);
-        return success(keyEntityList);
-    }
-
-
-}

src/main/java/com/rf/psychological/api/key/service/KeyService.java

@@ -1,19 +0,0 @@
-package com.rf.psychological.api.key.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.rf.psychological.api.key.dao.model.KeyEntity;
-
-import java.util.List;
-
-public interface KeyService {
-    void save(KeyEntity key);
-
-    List<KeyEntity> find(JSONObject jsonObject);
-
-    /**
-     * 机构编号查询
-     * @param institutionNo
-     * @return
-     */
-    KeyEntity find(String institutionNo);
-}

src/main/java/com/rf/psychological/api/key/service/impl/KeyServiceImpl.java

@@ -1,57 +0,0 @@
-package com.rf.psychological.api.key.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.rf.psychological.api.key.dao.model.KeyEntity;
-import com.rf.psychological.api.key.dao.repository.KeyRepository;
-import com.rf.psychological.api.key.service.KeyService;
-import com.rf.psychological.dao.model.DimensionEntity;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.jpa.domain.Specification;
-import org.springframework.stereotype.Service;
-
-import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Author:zzf
- * @Date:2022/11/2:10:56
- * @Description:
- */
-@Service
-public class KeyServiceImpl implements KeyService {
-
-    @Autowired
-    private KeyRepository keyRepository;
-    @Override
-    public void save(KeyEntity key) {
-        this.keyRepository.save(key);
-    }
-
-    @Override
-    public List<KeyEntity> find(JSONObject jsonObject) {
-        Specification<KeyEntity> subspecification  = (root, criteriaQuery, criteriaBuilder) -> {
-            List<Predicate> predicateList =  new ArrayList<>();
-           if(jsonObject.containsKey("institutionNo") && StringUtils.isNotBlank(jsonObject.getString("institutionNo"))){
-                predicateList.add(criteriaBuilder.equal(root.get("institutionNo"),jsonObject.getString("institutionNo")));
-           }
-            criteriaQuery.where(criteriaBuilder.and(predicateList.toArray(new Predicate[0])));
-            return criteriaQuery.getRestriction();
-        };
-        return this.keyRepository.findAll(subspecification);
-    }
-
-    /**
-     * 机构编号查询
-     *
-     * @param institutionNo
-     * @return
-     */
-    @Override
-    public KeyEntity find(String institutionNo) {
-
-        return this.keyRepository.findByInstitutionNo(institutionNo);
-    }
-}

src/main/java/com/rf/psychological/base/rest/BaseController.java

@@ -2,7 +2,6 @@ package com.rf.psychological.base.rest;
 
 import com.rf.psychological.utils.HttpStatus;
 import com.rf.psychological.utils.Result;
-import com.rf.psychological.utils.ScaleResultBusinessMap;
 
 
 /**
@@ -11,10 +10,6 @@ import com.rf.psychological.utils.ScaleResultBusinessMap;
  * @date 2021/1/18 19:20
  */
 public class BaseController {
-    protected static final String PAGE_NUM = "pageNum";
-
-    protected static final String PAGE_SIZE = "pageSize";
-
     protected Result success() {
         return success(null, "成功");
     }

src/main/java/com/rf/psychological/config/Swagger2Config.java

@@ -24,7 +24,7 @@ import java.util.List;
  */
 @Configuration
 @EnableSwagger2
-@Profile({"test","lan"})
+@Profile({"test","lan","public"})
 public class Swagger2Config {
 
     @Bean
@@ -47,8 +47,8 @@ public class Swagger2Config {
 
     private ApiInfo apiInfo() {
         return new ApiInfoBuilder()
-                .title("机构版后台接口")
-                .version("1.1")
+                .title("微博后台接口")
+                .version("1.0")
                 .build();
     }
 }

src/main/java/com/rf/psychological/filter/JWTInterceptorPublicConfig.java

@@ -38,7 +38,7 @@ public class JWTInterceptorPublicConfig implements WebMvcConfigurer {
         String[] wxPay = new String[]{"/api/wx-pay/native/notify","/api/wx-pay/refunds/notify",
                 "/api/wx-pay/getPhone/*","/api/wx-pay/code2openid","/api/wx-pay/h5Pay",
                 "/api/wx-pay/code2openid2","/api/wx-pay/queryOrder/**","/api/promotionInfo/queryPromotionDetail/**","/record/getWeiboRecordById","/record/getWeiboRecordById/**"};
-        String[] systemApi = new String[]{"/system/login","/system/loginH5","/system/forgotPassword","/system/registerUser","/system/temporaryUser"};
+        String[] systemApi = new String[]{"/system/login","/system/loginH5","/system/forgotPassword","/system/registerUser","/system/temporaryUser","/result/**"};
         registry.addInterceptor(jwtInterceptor)
                 .addPathPatterns("/**")
                 .excludePathPatterns("/", "/index**", "/error")
@@ -60,7 +60,6 @@ public class JWTInterceptorPublicConfig implements WebMvcConfigurer {
                 .excludePathPatterns(temp)
                 .excludePathPatterns("/favicon.ico")
                 .excludePathPatterns("/druid/**")
-//                .excludePathPatterns(temporarily)
                 .excludePathPatterns("/static/**");//排除静态资源
         registry.addInterceptor(userCheckInterceptor)
                 .addPathPatterns("/**")
@@ -79,7 +78,6 @@ public class JWTInterceptorPublicConfig implements WebMvcConfigurer {
                 .excludePathPatterns("/getRecordById")
                 .excludePathPatterns("/userImport")
                 .excludePathPatterns("/test/token")
-//                .excludePathPatterns(temporarily)
                 .excludePathPatterns(swaggerExcludes)
                 .excludePathPatterns(temp)
                 .excludePathPatterns("/favicon.ico")

src/main/java/com/rf/psychological/rest/DeviceController.java

@@ -57,9 +57,55 @@ public class DeviceController extends BaseController {
     }
 
     //@Autowired
-    @RequestMapping("/update")
+    @GetMapping("/update")
     public String update() throws Exception {
 
+        File file = new File("C:\\Users\\Administrator\\Desktop\\标准情商测试.xlsx");
+        try {
+            List<List<List<Object>>> datas = ExcelUtil.getBankListByExcelSheet(new FileInputStream(file.getAbsolutePath()), file.getName());
+            List<ScaleMarksEntity> marksEntities = scaleMarksService.getScaleMarksByFlag("20210820143117");
+            List<AnswerEntity> answerEntities = answerService.getAnswerByFlag("20210820143117");
+            marksEntities.forEach(item ->{
+                log.info(item.toString());
+            });
+            answerEntities.forEach(item ->{
+                log.info(item.toString());
+            });
+            List<List<Object>> marksObj = datas.get(2);
+//            marksObj.forEach(item ->{
+//                ScaleMarksEntity entity = new ScaleMarksEntity();
+//                entity.setName("总分");
+//                entity.setScoreStart(item.get(1).toString());
+//                entity.setScoreEnd(item.get(2).toString());
+//                entity.setSymptom(item.get(3).toString());
+//                entity.setImprovementSuggestions(item.get(4).toString());
+//                entity.setIsTotalScoreExplain("是");
+//                entity.setNameExplain("无");
+//                entity.setStandardDeviation("无");
+//                entity.setScoringType("0");
+//                entity.setFlag("20210820143117");
+//                entity.setSuggestion("无");
+//                entity.setReference("无");
+//                scaleMarksService.saveScaleMarks(entity);
+//
+//                log.info(entity.toString());
+//            });
+
+
+
+//            for (int i =0;i<answerEntities.size();i++){
+//                AnswerEntity answerEntity = answerEntities.get(i);
+//                answerEntity.setName(DESede.encryptString(answerObj.get(i).get(1).toString()));
+//                answerEntity.setScore(DESede.encryptString(answerObj.get(i).get(2).toString()));
+//                log.info(answerEntity.getName());
+//                answerService.updateAnswer(answerEntity);
+//            }
+            //log.info(datas.toString());
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
         /*File file = new File("d:/11/竞品量表筛选后基本信息.xlsx");
         try {
             List<List<List<Object>>> datas = ExcelUtil.getBankListByExcelSheet(new FileInputStream(file.getAbsolutePath()), file.getName());

src/main/java/com/rf/psychological/scale/rest/WebScaleResultController.java

@@ -192,8 +192,8 @@ public class WebScaleResultController extends BaseController {
         //根据flag获取全部维度信息
         List<DimensionEntity> dimensionEntities = this.dimensionService.getDimensionByFlag(flag);
         //根据flag获取量表名称
-        //List<SubjectEntity> subjectEntities = this.subjectService.getSubjectByFlag(flag);
-        ScaleDetailsEntity detailsEntity = this.scaleDetailsService.getSubjectDetailsByFlag(flag);
+        SubjectEntity subjectEntity = this.subjectService.findByFlag(flag);
+        //ScaleDetailsEntity detailsEntity = this.scaleDetailsService.getSubjectDetailsByFlag(flag);
         resultJson.put("scaleEntities", scaleEntities);
         resultJson.put("answerEntities", answerEntities);
         resultJson.put("scaleMarksEntities", scaleMarksEntities);
@@ -259,9 +259,10 @@ public class WebScaleResultController extends BaseController {
             resultJson = resultJson.getJSONObject("resultJson");
             return success(resultJson, "完成");
         }
-        fileName = fileName + "-" + detailsEntity.getScaleName() + ".xlsx";
+        String subjectName = subjectEntity.getName();
+        fileName = fileName + "-" + subjectName + ".xlsx";
         //导出文件
-        ExcelUtil.createExcelFile(ScaleEntity.class, dataList, (List<Map<String, String>>) resultJson.get("resultMapList"), new ExcelClass().contentExcel(), fileName, detailsEntity.getScaleName());
+        ExcelUtil.createExcelFile(ScaleEntity.class, dataList, (List<Map<String, String>>) resultJson.get("resultMapList"), new ExcelClass().contentExcel(), fileName, subjectName);
 
         //计算结果
         JSONArray dbJsonList = new JSONArray();
@@ -343,8 +344,8 @@ public class WebScaleResultController extends BaseController {
             i++;
         }
         String filePath;
-        filePath = "./心理检测/检测结果/" + new SimpleDateFormat("yyyy-MM-dd").format(new Date()) + "/" + detailsEntity.getScaleName() + "/" + fileName;
-        UserRecordEntity userRecordEntity = testRecord(flag, phone, institutionNo, testTime, filePath, JSON.toJSONString(dbJsonList, SerializerFeature.DisableCircularReferenceDetect), detailsEntity.getScaleName(), JSON.toJSONString(dataList, SerializerFeature.DisableCircularReferenceDetect), testResult, testPlanId);
+        filePath = "./心理检测/检测结果/" + new SimpleDateFormat("yyyy-MM-dd").format(new Date()) + "/" + subjectName + "/" + fileName;
+        UserRecordEntity userRecordEntity = testRecord(flag, phone, institutionNo, testTime, filePath, JSON.toJSONString(dbJsonList, SerializerFeature.DisableCircularReferenceDetect), subjectName, JSON.toJSONString(dataList, SerializerFeature.DisableCircularReferenceDetect), testResult, testPlanId);
         //预警信息处理
         if (dimensionScore != null && dimensionScore.size() > 0) {
             if (dimensionEntities != null && dimensionEntities.size() > 0) {
@@ -471,4 +472,6 @@ public class WebScaleResultController extends BaseController {
         return warn;
     }
 
+
+
 }

src/main/java/com/rf/psychological/scale/resultBusiness/scaleResult/COMMONScale.java

@@ -1,17 +1,11 @@
 package com.rf.psychological.scale.resultBusiness.scaleResult;
 
-import cn.hutool.core.util.NumberUtil;
-import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.rf.psychological.dao.model.AnswerEntity;
 import com.rf.psychological.dao.model.DimensionEntity;
-import com.rf.psychological.scale.dao.model.DimensionOrgEntity;
 import com.rf.psychological.scale.dao.model.ScaleMarksEntity;
-import com.rf.psychological.scale.dao.model.WarnEntity;
-import com.rf.psychological.scale.service.DimensionOrgService;
-import org.springframework.beans.factory.annotation.Autowired;
-import sun.util.resources.cldr.zh.CalendarData_zh_Hans_HK;
+import com.rf.psychological.utils.RandomSuggestionUtil;
 
 import java.text.DecimalFormat;
 import java.util.*;
@@ -97,7 +91,7 @@ public class COMMONScale extends BaseScale {
                                 resultJson.put("结论", scaleMarksEntity.getSymptom());
                             }
                             if (scaleMarksEntity.getImprovementSuggestions() != null && !scaleMarksEntity.getImprovementSuggestions().equals("无")) {
-                                String suggest = randomSuggestion(scaleMarksEntity.getImprovementSuggestions());
+                                String suggest = RandomSuggestionUtil.getSuggestion(scaleMarksEntity.getImprovementSuggestions());
                                 resultMap0.put("建议", suggest);
                                 resultJson.put("建议", suggest);
                             }
@@ -119,7 +113,7 @@ public class COMMONScale extends BaseScale {
                                     resultJson.put(dimensionEntity.getName() + "结论", scaleMarksEntity.getSymptom());
                                 }
                                 if (scaleMarksEntity.getImprovementSuggestions() != null && !scaleMarksEntity.getImprovementSuggestions().equals("无")) {
-                                    String suggest = randomSuggestion(scaleMarksEntity.getImprovementSuggestions());
+                                    String suggest = RandomSuggestionUtil.getSuggestion(scaleMarksEntity.getImprovementSuggestions());
                                     resultMap0.put(dimensionEntity.getName() + "建议", suggest);
                                     resultJson.put(dimensionEntity.getName() + "建议", suggest);
                                 }
@@ -159,7 +153,7 @@ public class COMMONScale extends BaseScale {
                             resultJson.put("结论", scaleMarksEntity.getSymptom());
                         }
                         if (scaleMarksEntity.getImprovementSuggestions() != null && !scaleMarksEntity.getImprovementSuggestions().equals("无")) {
-                            String suggest = randomSuggestion(scaleMarksEntity.getImprovementSuggestions());
+                            String suggest = RandomSuggestionUtil.getSuggestion(scaleMarksEntity.getImprovementSuggestions());
                             resultMap0.put("建议", suggest);
                             resultJson.put("建议", suggest);
                         }
@@ -179,17 +173,4 @@ public class COMMONScale extends BaseScale {
         return returnJson;
     }
 
-    private String randomSuggestion(String suggestion){
-        List<String> list = Arrays.asList(suggestion.split(";"));
-        if (list.size()>1){
-            int size = list.size();
-            int num = RandomUtil.randomInt(0,size-1);
-            String text = list.get(num).substring(list.get(num).indexOf("."));
-            return text;
-        }else {
-            return suggestion;
-        }
-    }
-
-
 }

src/main/java/com/rf/psychological/scale/resultBusiness/scaleResult/NEWCOMMONScale.java

@@ -2,6 +2,7 @@ package com.rf.psychological.scale.resultBusiness.scaleResult;
 
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.rf.psychological.dao.dto.scale.NewResultDto;
@@ -10,6 +11,7 @@ import com.rf.psychological.dao.model.DimensionEntity;
 import com.rf.psychological.scale.dao.model.ScaleMarksEntity;
 import com.rf.psychological.scale.scaleresult.ScaleConstant;
 import com.rf.psychological.utils.Constant;
+import com.rf.psychological.utils.RandomSuggestionUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.lang.Nullable;
 
@@ -53,15 +55,8 @@ public class NEWCOMMONScale extends BaseScale {
         //jsonArray:用户自己选择的题目选项
         for (int i = 0; i < jsonArray.size(); i++) {
             JSONObject jsonObject1 = jsonArray.getJSONObject(i);
-            //计算总分
-            for (AnswerEntity answerEntity : answerEntities) {
-                if (answerEntity.getQuestionNo().equals(jsonObject1.getString("questionNo"))) {
-                    if (answerEntity.getName().replaceAll("\\s", "").equals(jsonObject1.getString("checkItems").replaceAll("\\s", ""))) {
-                        score += Double.parseDouble(answerEntity.getScore());
-                        break;
-                    }
-                }
-            }
+            //获取总得分
+            score = this.calculateScore(jsonObject1,answerEntities,score);
             //计算维度分数
             for (int y = 0; y < dimensionEntities.size(); y++) {
                 //获取维度信息
@@ -145,7 +140,7 @@ public class NEWCOMMONScale extends BaseScale {
                     BigDecimal scoreEnd = new BigDecimal(tempTotalScore.getScoreEnd());
                     if (scoreDecimal.compareTo(scoreEnd) <= 0 && scoreDecimal.compareTo(scoreStart) >= 0) {
 
-                        String suggest = randomSuggestion(tempTotalScore.getImprovementSuggestions());
+                        String suggest = RandomSuggestionUtil.getSuggestion(tempTotalScore.getImprovementSuggestions());
                         newResultDtos.add(new NewResultDto("总分", df.format(score), tempTotalScore.getSymptom(), suggest,
                                 tempTotalScore.getFlag(), tempTotalScore.getReference(), tempTotalScore.getNameExplain(), tempTotalScore.getSuggestion(), tempTotalScore.getIsTotalScoreExplain()));
 
@@ -174,7 +169,7 @@ public class NEWCOMMONScale extends BaseScale {
                 BigDecimal scoreStart = new BigDecimal(tempTotalScore.getScoreStart());
                 BigDecimal scoreEnd = new BigDecimal(tempTotalScore.getScoreEnd());
                 if (scoreDecimal.compareTo(scoreEnd) <= 0 && scoreDecimal.compareTo(scoreStart) >= 0) {
-                    String suggest = randomSuggestion(tempTotalScore.getImprovementSuggestions());
+                    String suggest = RandomSuggestionUtil.getSuggestion(tempTotalScore.getImprovementSuggestions());
                     newResultDtos.add(new NewResultDto("总分", df.format(score), tempTotalScore.getSymptom(), suggest,
                             tempTotalScore.getFlag(), tempTotalScore.getReference(), tempTotalScore.getNameExplain(), tempTotalScore.getSuggestion(), tempTotalScore.getIsTotalScoreExplain()));
 
@@ -324,6 +319,27 @@ public class NEWCOMMONScale extends BaseScale {
         }
     }
 
+
+    /**
+     * 计算总得分
+     * @param jsonObject 用戶选择的答案
+     * @param answerEntities  题目答案
+     * @param score 累加得分
+     * @return
+     */
+    private double calculateScore(JSONObject jsonObject,List<AnswerEntity> answerEntities,double score){
+        //计算总分
+        for (AnswerEntity answerEntity : answerEntities) {
+            if (answerEntity.getQuestionNo().equals(jsonObject.getString("questionNo"))) {
+                if (StrUtil.cleanBlank(answerEntity.getName()).equals(StrUtil.cleanBlank(jsonObject.getString("checkItems")))) {
+                    score += Double.parseDouble(answerEntity.getScore());
+                    return score;
+                }
+            }
+        }
+        return score;
+    }
+
     /**
      * 通用计算单个维度分数，以及其维度所在分数段症状等
      *
@@ -395,7 +411,7 @@ public class NEWCOMMONScale extends BaseScale {
 
     private static void putDimResult(Map<String, String> resultMap0, JSONObject resultJson, String dimensionName, NewResultDto newResultDto1, ScaleMarksEntity scaleMarksEntity) {
         //resultMap0.put(dimensionName + "常模参考值", scaleMarksEntity.getReference());
-        String suggest = randomSuggestion(scaleMarksEntity.getImprovementSuggestions());
+        String suggest = RandomSuggestionUtil.getSuggestion(scaleMarksEntity.getImprovementSuggestions());
         resultMap0.put(dimensionName + "解释", scaleMarksEntity.getSymptom());
         resultJson.put(dimensionName + "解释", scaleMarksEntity.getSymptom());
         resultMap0.put(dimensionName + "解读", scaleMarksEntity.getNameExplain());
@@ -407,16 +423,5 @@ public class NEWCOMMONScale extends BaseScale {
         BeanUtils.copyProperties(scaleMarksEntity, newResultDto1);
     }
 
-    private static String randomSuggestion(String suggestion){
-        List<String> list = Arrays.asList(suggestion.split(";"));
-        if (list.size()>1){
-            int size = list.size();
-            int num = RandomUtil.randomInt(0,size-1);
-            String text = list.get(num).substring(list.get(num).indexOf("."));
-            return text;
-        }else {
-            return suggestion;
-        }
-    }
 
 }

src/main/java/com/rf/psychological/scale/service/SubjectService.java

@@ -102,6 +102,8 @@ public interface SubjectService {
      */
     List<SubjectEntity> getSubjectByFlag(String flag);
 
+    SubjectEntity findByFlag(String flag);
+
     /**
      * 根据flag记录测试数
      *

src/main/java/com/rf/psychological/scale/service/impl/SubjectServiceImpl.java

@@ -163,6 +163,12 @@ public class SubjectServiceImpl implements SubjectService {
         return this.subjectRepository.getSubjectByFlag(flag);
     }
 
+
+    @Override
+    public SubjectEntity findByFlag(String flag){
+        return this.subjectRepository.getSubjectEntityByFlag(flag);
+    }
+
     /**
      * 根据flag记录测试数
      *

src/main/java/com/rf/psychological/security/DESede.java

@@ -9,10 +9,7 @@ import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.security.SecureRandom;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * @author zzf
@@ -173,6 +170,8 @@ public class DESede {
     }
 
     public static void main(String[] args) throws Exception {
-        /*System.out.println(encryptString("是的，孩子经常跟我们说听到奇怪的声音，甚至有时候能和声音对话起来。"));*/
-    }
+        String name = "hahah";
+        List<String>  list = Arrays.asList(name.split(";"));
+        System.out.println(list);
+      }
 }

src/main/java/com/rf/psychological/utils/AgeUtil.java

@@ -1,5 +1,7 @@
 package com.rf.psychological.utils;
 
+import cn.hutool.core.util.StrUtil;
+
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -46,6 +48,10 @@ public class AgeUtil {
         try {
             double  age = getAge("2001-07-21");
             System.out.println("age=="+age);
+            String text = "   Hello World ";
+            System.out.println(text);
+            System.out.println(text.replaceAll("\\s", ""));
+            System.out.println(StrUtil.cleanBlank(text));
         } catch (ParseException e) {
             e.printStackTrace();
         } catch (Exception e) {

src/main/java/com/rf/psychological/utils/Data.java

@@ -1,170 +0,0 @@
-package com.rf.psychological.utils;
-
-import lombok.extern.slf4j.Slf4j;
-
-import java.sql.*;
-
-@Slf4j
-public class Data {
-	
-
-	public static void main(String[] args) throws InterruptedException, SQLException {
-
-        String className = "com.mysql.jdbc.Driver";
-        String url = "jdbc:mysql://49.232.26.44:3306/psychological_112";
-        String userName = "root";
-        String password = "Mysql@.2020";
-        Connection con = null;
-
-        log.info("初始化数据库连接");
-        try{
-            Class.forName(className);
-            con = DriverManager.getConnection(url,userName,password);
-        } catch (ClassNotFoundException | SQLException e) {
-            log.error("初始化数据库连接出错：");
-            e.printStackTrace();
-            return;
-        }
-        log.info("初始化数据库完成");
-        Thread.sleep(3000);
-        log.info("step1:修改表结构——开始");
-        PreparedStatement stat = null;
-        try{
-
-            //        修改表结构 增加角色字段
-            String alterTable = "alter table t_user_info add column role_type varchar(2) default '1' comment '用户角色 1、普通用户 2、机构管理员 3、机构超级管理员'";
-            stat = con.prepareStatement(alterTable);
-            stat.execute();
-        } catch (SQLException e) {
-            log.error("step1:修改表结构——失败");
-            e.printStackTrace();
-            return;
-        }finally {
-            if(stat != null){
-                stat.close();
-            }
-        }
-        log.info("step1：修改表结构——完成");
-
-        log.info("机构管理员合并");
-        PreparedStatement stat1 = null;
-        ResultSet rs = null;
-        try{
-            String institution_user_sql = "select * from t_institution_user ";
-            stat1 = con.prepareStatement(institution_user_sql);
-            rs = stat1.executeQuery();
-            while (rs.next()){
-                try {
-                    System.out.println("id  " + rs.getString("id"));
-                    System.out.println("institution_name  " + rs.getString("institution_name"));
-                    System.out.println("institution_no  " + rs.getString("institution_no"));
-                    System.out.println("password  " + rs.getString("password"));
-                    System.out.println("gender  " + rs.getString("gender"));
-                    System.out.println("pet_name  " + rs.getString("pet_name"));
-                    System.out.println("phone  " + rs.getString("phone"));
-                    System.out.println("birthday" + rs.getString("birthday"));
-                    System.out.println("profession" + rs.getString("profession"));
-                    System.out.println("addition_info" + rs.getString("addition_info"));
-                    System.out.println("user_status" + rs.getString("user_status"));
-
-                    String insertSql = "INSERT INTO t_user_info (id, gender, password, pet_name, phone, birthday, profession, addition_info, institution_name, institution_no, user_status, g_id, model_phone, role_type) \r\n"
-                            + "VALUES \r\n"
-                            + "(?, ?, ?,?, ?, ?, ?,?, ?, ?, ?,?, ?, ?)\r\n";
-                    PreparedStatement statement = con.prepareStatement(insertSql);
-                    statement.setString(1, rs.getString("id"));
-                    statement.setString(2,  rs.getString("gender"));
-                    statement.setString(3, rs.getString("password"));
-                    statement.setString(4, rs.getString("pet_name"));
-                    statement.setString(5, rs.getString("phone"));
-                    statement.setString(6, rs.getString("birthday"));
-                    statement.setString(7, rs.getString("profession"));
-                    statement.setString(8, rs.getString("addition_info"));
-                    statement.setString(9, rs.getString("institution_name"));
-                    statement.setString(10, rs.getString("institution_no"));
-                    statement.setString(11, rs.getString("user_status"));
-                    statement.setString(12, "");
-                    statement.setString(13, "0");
-                    statement.setString(14, "2");
-
-                    int i = statement.executeUpdate();
-                    statement.close();
-                    System.out.println("---------"+i+"----------");
-                }catch (Exception e){
-                    System.out.println(rs.getString("institution_no")+"----------i---------"+rs.getString("phone"));
-                }
-
-            }
-        } catch (SQLException e) {
-            log.error("机构管理员合并——失败");
-            e.printStackTrace();
-        }finally {
-            if(rs != null){
-                rs.close();
-            }
-            if(stat1 != null ){
-                stat1.close();
-            }
-        }
-
-
-//        机构超级管理员
-        log.info("机构超级管理员合并");
-        PreparedStatement stat2  = null;
-        ResultSet rs2 = null;
-        try{
-            String sql = "select * from t_institution_info ";
-            stat2 = con.prepareStatement(sql);
-            rs2  = stat2.executeQuery();
-            while (rs2.next()){
-                try {
-                    System.out.println("id  " + rs2.getString("id"));
-                    System.out.println("institution_name  " + rs2.getString("institution_name"));
-                    System.out.println("institution_no  " + rs2.getString("institution_no"));
-                    System.out.println("password  " + rs2.getString("password"));
-                    System.out.println("login_name  " + rs2.getString("login_name"));
-                    String insertSql = "INSERT INTO t_user_info (id, gender, password, pet_name, phone, birthday, profession, addition_info, institution_name, institution_no, user_status, g_id, model_phone, role_type) \r\n"
-                            + "VALUES \r\n"
-                            + "(?, ?, ?,?, ?, ?, ?,?, ?, ?, ?,?, ?, ?)\r\n";
-                    PreparedStatement statement = con.prepareStatement(insertSql);
-                    statement.setString(1, rs2.getString("id"));
-                    statement.setString(2,  "0");
-                    statement.setString(3, rs2.getString("password"));
-                    statement.setString(4, rs2.getString("institution_name"));
-                    statement.setString(5, rs2.getString("login_name"));
-                    statement.setString(6, "");
-                    statement.setString(7, "");
-                    statement.setString(8, "");
-                    statement.setString(9, rs2.getString("institution_name"));
-                    statement.setString(10, rs2.getString("institution_no"));
-                    statement.setString(11, "2");
-                    statement.setString(12, "");
-                    statement.setString(13, "0");
-                    statement.setString(14, "3");
-
-                    int i = statement.executeUpdate();
-                    System.out.println();
-                    statement.close();
-                    System.out.println("----------i---------");
-                }catch (Exception e ){
-                    System.out.println(rs2.getString("institution_no")+"----------i---------"+rs2.getString("login_name"));
-                }
-
-            }
-        } catch (SQLException e) {
-            log.error("机构超级管理员合并失败");
-            e.printStackTrace();
-        }finally {
-            if(rs2 != null){
-                rs2.close();
-            }
-            if(stat2 != null){
-                stat2.close();
-            }
-        }
-        log.error("机构超级管理员合并完成");
-
-        Thread.sleep(1000);
-        log.error("用户合并完成");
-
-    }
-}

src/main/java/com/rf/psychological/utils/RandomSuggestionUtil.java

@@ -0,0 +1,26 @@
+package com.rf.psychological.utils;
+
+import cn.hutool.core.util.RandomUtil;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @Description:随机获取总分说明工具类
+ * @Author: mimang
+ * @Date: 2024/5/7
+ */
+public class RandomSuggestionUtil {
+
+    public static String getSuggestion(String suggestion){
+        List<String> list = Arrays.asList(suggestion.split(";"));
+        if (list.size()>1){
+            int size = list.size();
+            int num = RandomUtil.randomInt(0,size-1);
+            String text = list.get(num).substring(list.get(num).indexOf(".")+1);
+            return text;
+        }else {
+            return suggestion;
+        }
+    }
+}

src/main/java/com/rf/psychological/utils/ScaleResultBusinessMap.java

@@ -1,727 +0,0 @@
-package com.rf.psychological.utils;
-
-import java.util.HashMap;
-
-/**
- * 量表结果计算类注册 （暂时不再使用，从数据库取）
- */
-
-public class ScaleResultBusinessMap {
-    public static HashMap<String, String> ScaleResultsMap = null;
-
-    static {
-//         初始化MAP
-        ScaleResultsMap = new HashMap<>();
-        //System.out.println("初始化量表注册类");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_API, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_LSAS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_BPRS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_HAMA, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_UCLA, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SAS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put(Constant.QUEST_FLAG_MAST,"com.rf.psychological.scale.resultBusiness.scaleResult.MASTScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_BSSI, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put(Constant.QUEST_FLAG_CBQ,"com.rf.psychological.scale.resultBusiness.scaleResult.CBQScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ITS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_GCQ, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SDS, "com.rf.psychological.scale.resultBusiness.scaleResult.SDSScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_TAS_26, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MCSD, "com.rf.psychological.scale.resultBusiness.scaleResult.MCSDScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PHCSS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SD, "com.rf.psychological.scale.resultBusiness.scaleResult.SDScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SAD, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SQ, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_BDI, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_GAD_7, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_CES_D, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MUNSH, "com.rf.psychological.scale.resultBusiness.scaleResult.MUNSHScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PSS, "com.rf.psychological.scale.resultBusiness.scaleResult.PSSScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_HADS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PHQ_9, "com.rf.psychological.scale.resultBusiness.scaleResult.PHQScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_QSA, "com.rf.psychological.scale.resultBusiness.scaleResult.QSAScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SES, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MMPI_K, "com.rf.psychological.scale.resultBusiness.scaleResult.MMPIKScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MMPI_L, "com.rf.psychological.scale.resultBusiness.scaleResult.MMPILScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_NYLS, "com.rf.psychological.scale.resultBusiness.scaleResult.NYLSScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MHLC_A, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MHLC_B, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SIT, "com.rf.psychological.scale.resultBusiness.scaleResult.SITScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_CSES, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MHLC, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_AUDIT, "com.rf.psychological.scale.resultBusiness.scaleResult.AUDITScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_RD, "com.rf.psychological.scale.resultBusiness.scaleResult.RDScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SCL_90, "com.rf.psychological.scale.resultBusiness.scaleResult.SCL90Scale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SCSQ, "com.rf.psychological.scale.resultBusiness.scaleResult.SCSQScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PRCA_24, "com.rf.psychological.scale.resultBusiness.scaleResult.PRCAScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_IAS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PSSS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_APIUS, "com.rf.psychological.scale.resultBusiness.scaleResult.APIUSScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SCCS, "com.rf.psychological.scale.resultBusiness.scaleResult.SCCSScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_AS, "com.rf.psychological.scale.resultBusiness.scaleResult.ASScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ATO, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_QLSCA, "com.rf.psychological.scale.resultBusiness.scaleResult.QLSCAScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_GDS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_CRS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_FAD, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_FES_CV, "com.rf.psychological.scale.resultBusiness.scaleResult.FESCVScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ASAS, "com.rf.psychological.scale.resultBusiness.scaleResult.ASASScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ESLI, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_BRMS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MPS, "com.rf.psychological.scale.resultBusiness.scaleResult.MPSScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PGC, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_LSIA, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put(Constant.QUEST_FLAG_LSIA,"com.rf.psychological.scalesJNI.ScalesJNI");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_TSI, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SITS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_FPS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_TIP, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_TS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put(Constant.QUEST_FLAG_TS,"com.rf.psychological.scalesJNI.ScalesJNI");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PSAI, "com.rf.psychological.scale.resultBusiness.scaleResult.PSAIScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PRS, "com.rf.psychological.scale.resultBusiness.scaleResult.PRSScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_DSI, "com.rf.psychological.scale.resultBusiness.scaleResult.DSIScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_DASS_42, "com.rf.psychological.scale.resultBusiness.scaleResult.NEWCOMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_AIS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_EHS, "com.rf.psychological.scale.resultBusiness.scaleResult.EHSScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ESS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_TTT, "com.rf.psychological.scale.resultBusiness.scaleResult.TTTScale");
-        ScaleResultsMap.put("20220326193800", "com.rf.psychological.scale.resultBusiness.scaleResult.SF36Scale");
-        ScaleResultsMap.put("20210804155508", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804155950", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160121", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put("20210804160152","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160214", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160333", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160402", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160427", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160447", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160509", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160531", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160551", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160615", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160645", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160708", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160731", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160758", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160822", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160848", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160913", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804160938", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161005", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161023", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161047", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161111", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161135", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161216", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161236", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161301", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161325", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161350", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161413", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161433", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161454", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161521", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161603", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161627", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161649", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161715", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161759", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161824", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161849", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161908", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161933", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162007", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162027", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162048", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804161737", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162506", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162527", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162551", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put("20210804162613","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162645", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162714", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162751", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162824", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162843", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162904", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162929", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804162951", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163013", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163034", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put("20210804163104","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163211", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163126", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163233", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163259", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163315", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163333", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163356", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163416", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163517", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163435", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163536", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163555", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put("20210804163618","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163641", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163801", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163817", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163839", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163901", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163921", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163940", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163959", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164017", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164036", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164055", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164112", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164131", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164150", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164210", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164230", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164254", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164311", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164328", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164347", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164411", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164427", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164444", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164500", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164634", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164816", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164919", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164838", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164939", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164957", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165014", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165033", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165051", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165115", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165223", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165242", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165314", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165337", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165400", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165441", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165459", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165516", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165537", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165558", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165617", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165633", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165651", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165709", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165730", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165752", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170209", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170231", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170254", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170427", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170515", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170532", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170603", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170622", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170725", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170645", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170744", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170804", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170819", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170838", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170856", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171021", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171043", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171108", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171149", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171207", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171230", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171251", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171308", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171324", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171342", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171358", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171415", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171433", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171452", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171515", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171530", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171629", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171656", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171719", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171806", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171743", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171824", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171843", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171902", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804171922", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put("20210804171943","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172003", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172022", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172340", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172215", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172401", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172421", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172443", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172501", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172522", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172541", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172556", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172646", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put("20210804172753","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172810", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172736", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804172043", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804165420", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804164857", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put("20210804172242","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804170706", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163457", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210804163150", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220412111118", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220412110816", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220421082644", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220421082538", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-
-        //第二批
-        ScaleResultsMap.put("20210910155601", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910155858", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910160029", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910160146", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910160216", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910160254", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910160325", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910160347", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910160414", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910160515", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910160551", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910162249", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910162306", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910162436", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910162454", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910162850", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910162919", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910162948", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163045", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163107", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163131", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163158", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163219", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163241", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163311", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163334", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163420", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163435", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163452", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163517", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163539", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163557", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910163755", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910164336", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910164644", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210910165112", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210723174414", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-
-        ScaleResultsMap.put("20211118093229", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118095105", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118095607", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118095647", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118095850", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118095916", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118100057", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118100155", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118100323", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118100422", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118100444", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118100509", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118100544", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118100632", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118100929", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118101005", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118101244", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118101337", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118101443", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118101541", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118101710", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118101819", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118102013", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211118090814", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211129163807", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-
-
-        //第三批
-        //ScaleResultsMap.put("20210915114712","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put("20210915113233","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put("20210915115016","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put("20210915115514","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        //ScaleResultsMap.put("20210915113551","com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211020110351", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211020112318", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211020113032", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211020113607", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211020113818", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211020112514", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211021155421", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211021155741", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211021160012", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211023174751", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211101163739", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211101164050", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-
-        ScaleResultsMap.put("20210820143117", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210820143910", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210820144203", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210820145639", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210827170744", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210827171326", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210827171752", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210827172830", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210827174758", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210901113207", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210901113727", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210901113828", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210901113926", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210901114210", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210908113703", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210908113945", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210908114713", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210908115334", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210908121333", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913082601", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913083144", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913083913", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913084345", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913085052", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913085210", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913085400", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913092127", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913092348", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913092518", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913092752", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913092925", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210913093119", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915112305", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915112436", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915112917", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915113053", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915113233", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915113434", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915113551", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915114409", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915114529", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915114712", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915115016", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915115514", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915120603", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915120757", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915121051", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210915121226", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916103928", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916104050", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916104211", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916104306", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916104618", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916105800", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916105952", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916110053", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916110221", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916110355", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916110447", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916110825", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916110934", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210916111038", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210918155946", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210918160131", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210918160637", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210918161254", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210918161352", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210918161811", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210918162018", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210918162228", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210918162613", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922123225", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922123752", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922124359", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922130428", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922131425", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922131506", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922131822", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922132144", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922132409", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922133419", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922134032", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922134152", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922221535", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922221637", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922221757", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922221909", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922222021", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922222308", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922222349", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922222521", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210922222603", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210923215949", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210923220601", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210923220700", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210923221550", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210923223346", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210923231538", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210923232350", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210923232624", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926214035", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926214357", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926214626", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926214904", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926215106", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926215322", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926215606", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926215723", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926220423", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926220616", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926220854", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926221108", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926221257", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926221355", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926221449", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926221822", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926221919", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210926221958", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929220959", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929221120", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929221755", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929221913", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929222112", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929222319", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929222424", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929222520", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929222624", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929222731", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929222811", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210929222912", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20210930095308", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211002193755", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211002193844", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211002193947", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211002194347", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211002194641", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211002195405", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211002213204", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211002213656", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211002213832", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211002213945", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211003094719", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211003095259", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211003095351", "com.rf.psychological.scale.resultBusiness.scaleResult.NEWCOMMONScale");
-        ScaleResultsMap.put("20211003095711", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211003095818", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211003100323", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211003100957", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211003101101", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211003101201", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20211003101316", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-
-        ScaleResultsMap.put("20220124190855", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124191041", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124191211", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124191319", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124191450", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124191718", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124192823", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124192940", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124202714", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124202808", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124202851", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124202953", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124203027", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124203119", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124203336", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124203458", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124203541", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124203636", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124203726", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124203802", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124203834", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220126171007", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220216104956", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220218140518", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220219150122", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220220215606", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220220221627", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220221210607", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220226213739", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220226213855", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220227145412", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220227151201", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220228162852", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220228174318", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220302200820", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220302202320", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220307104708", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220307104923", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220307105039", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220307105121", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220307105155", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220307110701", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220307110922", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220123175535", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220123183205", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220123183401", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124185252", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124185348", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124185514", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220124190640", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220126165651", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220218134931", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220220213841", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put("20220318153050", "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        /**
-         * 新量表模板
-         */
-        ScaleResultsMap.put("20220515221609", "com.rf.psychological.scale.resultBusiness.scaleResult.NEWCOMMONScale");
-        ScaleResultsMap.put("20220516104828", "com.rf.psychological.scale.resultBusiness.scaleResult.NEWCOMMONScale");
-        ScaleResultsMap.put("20220515221718", "com.rf.psychological.scale.resultBusiness.scaleResult.NEWCOMMONScale");
-        ScaleResultsMap.put("20220515221827", "com.rf.psychological.scale.resultBusiness.scaleResult.NEWCOMMONScale");
-        ScaleResultsMap.put("20220515221429", "com.rf.psychological.scale.resultBusiness.scaleResult.NEWCOMMONScale");
-
-
-        /** 许博文 **/
-        ScaleResultsMap.put(Constant.QUEST_TYPE_PSQ, "com.rf.psychological.scale.resultBusiness.scaleResult.PSQScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_AHDSC, "com.rf.psychological.scale.resultBusiness.scaleResult.AHDSCScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_QSQ, "com.rf.psychological.scale.resultBusiness.scaleResult.QSQScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_GSDS, "com.rf.psychological.scale.resultBusiness.scaleResult.GSDSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_DSQ, "com.rf.psychological.scale.resultBusiness.scaleResult.DSQScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_ZungDP, "com.rf.psychological.scale.resultBusiness.scaleResult.ZungDPScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_IDIAT, "com.rf.psychological.scale.resultBusiness.scaleResult.IDIATScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_NHS3, "com.rf.psychological.scale.resultBusiness.scaleResult.NHS3Scale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_IQCODE, "com.rf.psychological.scale.resultBusiness.scaleResult.IQCODEScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_SCAT, "com.rf.psychological.scale.resultBusiness.scaleResult.SCATScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_SACDS, "com.rf.psychological.scale.resultBusiness.scaleResult.SACDSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_PPDC, "com.rf.psychological.scale.resultBusiness.scaleResult.PPDCScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_CCF, "com.rf.psychological.scale.resultBusiness.scaleResult.CCFScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_BE, "com.rf.psychological.scale.resultBusiness.scaleResult.BEScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_EVQEA, "com.rf.psychological.scale.resultBusiness.scaleResult.EVQEAScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_ABE, "com.rf.psychological.scale.resultBusiness.scaleResult.ABEScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_DDBS2, "com.rf.psychological.scale.resultBusiness.scaleResult.DDBS2Scale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_SRBA, "com.rf.psychological.scale.resultBusiness.scaleResult.SRBAScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_PEBS, "com.rf.psychological.scale.resultBusiness.scaleResult.PEBSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_SCRSQ, "com.rf.psychological.scale.resultBusiness.scaleResult.SCRSQScale");
-        /** 许博文 **/
-        ScaleResultsMap.put(Constant.QUEST_TYPE_TSCS, "com.rf.psychological.scale.resultBusiness.scaleResult.TSCSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_DBS, "com.rf.psychological.scale.resultBusiness.scaleResult.DBSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_TCS, "com.rf.psychological.scale.resultBusiness.scaleResult.TCSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_GDMS, "com.rf.psychological.scale.resultBusiness.scaleResult.GDMSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_SRHP, "com.rf.psychological.scale.resultBusiness.scaleResult.SRHPScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_RFNGS, "com.rf.psychological.scale.resultBusiness.scaleResult.RFNGSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_CS, "com.rf.psychological.scale.resultBusiness.scaleResult.CSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_SNAPIV, "com.rf.psychological.scale.resultBusiness.scaleResult.SNAPIVScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_SNAPIV2, "com.rf.psychological.scale.resultBusiness.scaleResult.SNAPIV2Scale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_WFIRS, "com.rf.psychological.scale.resultBusiness.scaleResult.WFIRSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_FCRSS, "com.rf.psychological.scale.resultBusiness.scaleResult.FCRSSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_MDSIC, "com.rf.psychological.scale.resultBusiness.scaleResult.MDSICScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_TLOC, "com.rf.psychological.scale.resultBusiness.scaleResult.TLOCScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_DSA, "com.rf.psychological.scale.resultBusiness.scaleResult.DSAScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_DCBQ, "com.rf.psychological.scale.resultBusiness.scaleResult.DCBQScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_DAS, "com.rf.psychological.scale.resultBusiness.scaleResult.DASScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_TSA, "com.rf.psychological.scale.resultBusiness.scaleResult.TSAScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_BYNDS, "com.rf.psychological.scale.resultBusiness.scaleResult.BYNDSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_PADIC, "com.rf.psychological.scale.resultBusiness.scaleResult.PADICScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_DPOMS, "com.rf.psychological.scale.resultBusiness.scaleResult.DPOMSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_ARQ, "com.rf.psychological.scale.resultBusiness.scaleResult.ARQScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_PQEEPH, "com.rf.psychological.scale.resultBusiness.scaleResult.PQEEPHScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_DDBS, "com.rf.psychological.scale.resultBusiness.scaleResult.DDBSScale");
-
-
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MRA_SAFE, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_OCC_AGE, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_STAI, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PLOC, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SRHMS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_CFD, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SEI, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_GWB, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_WVI, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_DSR, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_BDQ, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_TCSQ, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_STUR, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_WILL, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PRCS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_DACL, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PER, "com.rf.psychological.scale.resultBusiness.scaleResult.PERScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_EPQ, "com.rf.psychological.scale.resultBusiness.scaleResult.EPQScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_TAS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PRT, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PLP, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_AOO, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SADS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_LSIB, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_NDDI_E, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ESM, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_CSHQ, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MSIQ, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_IPC, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_IELCS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_YSV, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_YSP, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_YFI, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_WHD, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PCR, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ESLIS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_DISC, "com.rf.psychological.scale.resultBusiness.scaleResult.DISCScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_AAS, "com.rf.psychological.scale.resultBusiness.scaleResult.AASScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_CCSAS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ECR, "com.rf.psychological.scale.resultBusiness.scaleResult.ECRScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_CCSAS2, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ABT, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_CARS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ABC, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_CABS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ADSC, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_DDI, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_DWTA, "com.rf.psychological.scale.resultBusiness.scaleResult.DWTAScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_THAT, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ZAS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PST, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PAST, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_CAGE, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_STOPB, "com.rf.psychological.scale.resultBusiness.scaleResult.STOPBScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_TCSQT, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_EPDS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PDSS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_CESDC, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MADRS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_FSS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_YBOCS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_PANSS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_ASWS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MFS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_SRBD, "com.rf.psychological.scale.resultBusiness.scaleResult.SRBDScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_TCPSS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_TESS, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MAA, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_IWBIGA, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_FLAG_MASQ, "com.rf.psychological.scale.resultBusiness.scaleResult.COMMONScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_PSQI, "com.rf.psychological.scale.resultBusiness.scaleResult.PSQIScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_CMIM, "com.rf.psychological.scale.resultBusiness.scaleResult.CMIMScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_CMIW, "com.rf.psychological.scale.resultBusiness.scaleResult.CMIWScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_POMS, "com.rf.psychological.scale.resultBusiness.scaleResult.POMSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_MBTI, "com.rf.psychological.scale.resultBusiness.scaleResult.MBTIScale");
-        ScaleResultsMap.put("20220228172644", "com.rf.psychological.scale.resultBusiness.scaleResult.BRIEFScale");
-
-        /** 20220310 lpf **/
-        ScaleResultsMap.put(Constant.QUEST_TYPE_BRT, "com.rf.psychological.scale.resultBusiness.scaleResult.BRTScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_DXSLA, "com.rf.psychological.scale.resultBusiness.scaleResult.DXSLAScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_JRXLYJ, "com.rf.psychological.scale.resultBusiness.scaleResult.JRXLYJScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_Russell, "com.rf.psychological.scale.resultBusiness.scaleResult.RussellScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_STUHEA, "com.rf.psychological.scale.resultBusiness.scaleResult.STUHEAScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_SDLRS, "com.rf.psychological.scale.resultBusiness.scaleResult.SDLRSScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_HLD, "com.rf.psychological.scale.resultBusiness.scaleResult.HLDScale");
-        ScaleResultsMap.put(Constant.QUEST_TYPE_YDRZ, "com.rf.psychological.scale.resultBusiness.scaleResult.YDRZScale");
-        /** END **/
-
-
-    }
-
-    public static HashMap<String, String> getScaleResultsMap() {
-        return ScaleResultsMap;
-    }
-
-}

src/main/java/com/rf/psychological/utils/ScaleScoringVersion.java

@@ -1,13 +1,9 @@
 package com.rf.psychological.utils;
 
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Component

src/main/resources/config/application.yml

@@ -1,7 +1,7 @@
 spring:
   profiles:
     #默认启用test配置文件
-    active: test
+    active: public
   #  mvc:
   #    static-path-pattern: /findFile/**
   #  resources: