多余代码调整

src/main/java/com/rf/psychological/dao/model/ASKEntity.java

@@ -1,55 +0,0 @@
-package com.rf.psychological.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
- * @description:
- * @date 2021/1/20 17:38
- */
-@Entity
-@Data
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Table(name = "t_ask_info")
-@org.hibernate.annotations.Table(appliesTo = "t_ask_info", comment = "艾森克人格量表")
-@DynamicUpdate
-public class ASKEntity extends BaseEntity {
-
-    /**
-     * 编号
-     */
-    @Column(name = "no", columnDefinition = "int(10) comment '编号'")
-    private int no;
-
-    /**
-     * 内容
-     */
-    @Column(name = "content", columnDefinition = "text comment '内容'")
-    private String content;
-
-    /**
-     * 选项
-     */
-    @Column(name = "check_items", columnDefinition = "text comment '选项'")
-    private String checkItems;
-
-    /**
-     * 类型
-     * 1：是记1分
-     * 0：否记1分
-     */
-    @Column(name = "type", columnDefinition = "varchar(2) comment '类型：1正向，0反向'")
-    private String type;
-
-    @Column(name = "scale", columnDefinition = "varchar(2) comment '量表'")
-    private String scale;
-}

src/main/java/com/rf/psychological/dao/model/AviationEntity.java

@@ -1,40 +0,0 @@
-package com.rf.psychological.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
- * @description:汉化版美国航空航天局任务负荷指数量表
- * @date 2021/1/20 17:47
- */
-@Entity
-@Data
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Table(name = "t_aviation_info")
-@org.hibernate.annotations.Table(appliesTo = "t_aviation_info", comment = "汉化版美国航空航天局任务负荷指数量表")
-@DynamicUpdate
-public class AviationEntity extends BaseEntity {
-    /**
-     * 编号
-     */
-    @Column(name = "no", columnDefinition = "int(10) comment '编号'")
-    private int no;
-
-    /**
-     * 内容
-     */
-    @Column(name = "content", columnDefinition = "text comment '内容'")
-    private String content;
-
-    @Column(name = "checked", columnDefinition = "varchar(10) comment '得分'")
-    private String checked;
-}

src/main/java/com/rf/psychological/dao/model/CattellEntity.java

@@ -1,56 +0,0 @@
-package com.rf.psychological.dao.model;
-
-import com.rf.psychological.base.model.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @author zzf
- * @description:卡氏十六种人格因素量表 实体类
- * @date 2021/2/2 15:01
- */
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Table(name = "t_cattell_info")
-@org.hibernate.annotations.Table(appliesTo = "t_cattell_info", comment = "卡氏十六种人格因素量表")
-public class CattellEntity extends BaseEntity {
-
-    /**
-     * 编号
-     */
-    @Column(name = "no", columnDefinition = "int (10) comment '编号'")
-    private int no;
-
-    /**
-     * 内容
-     */
-    @Column(name = "content", columnDefinition = "text comment '内容'")
-    private String content;
-
-    /**
-     * 选项
-     */
-    @Column(name = "check_items", columnDefinition = "text comment '选项'")
-    private String checkItems;
-
-    /**
-     * 默认选项
-     */
-    @Column(name = "checked", columnDefinition = "text comment '默认选项'")
-    private String checked;
-
-    /**
-     * 人格因素
-     */
-    @Column(name = "type", columnDefinition = "varchar(2) comment '人格因素'")
-    private String type;
-
-
-}

src/main/java/com/rf/psychological/dao/model/DepressEntity.java

@@ -1,53 +0,0 @@
-package com.rf.psychological.dao.model;
-
-import com.rf.psychological.base.model.BaseEntity;
-import lombok.*;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @author zzf
- * @description:抑郁焦虑压力量表
- * @date 2021/1/20 18:31
- */
-@Entity
-@Data
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Table(name = "t_depress_info")
-@org.hibernate.annotations.Table(appliesTo = "t_depress_info", comment = "抑郁焦虑压力量表")
-public class DepressEntity extends BaseEntity {
-    /**
-     * 编号
-     */
-    @Column(name = "no", columnDefinition = "int (10) comment '编号'")
-    private int no;
-
-    /**
-     * 内容
-     */
-    @Column(name = "content", columnDefinition = "text comment '内容'")
-    private String content;
-
-    /**
-     * 选项
-     */
-    @Column(name = "check_items", columnDefinition = "text comment '选项'")
-    private String checkItems;
-
-    /**
-     * 默认选项
-     */
-    @Column(name = "checked", columnDefinition = "text comment '默认选项'")
-    private String checked;
-
-    /**
-     * 类型
-     */
-    @Column(name = "type", columnDefinition = "varchar(2) comment '类型 1压力指数  2焦虑指数  3抑郁指数'")
-    private String type;
-}

src/main/java/com/rf/psychological/dao/model/LifeEntity.java

@@ -1,38 +0,0 @@
-package com.rf.psychological.dao.model;
-
-import com.rf.psychological.base.model.BaseEntity;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.DynamicUpdate;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @author zzf
- * @description:
- * @date 2021/2/1 16:46
- */
-@Data
-@Entity
-@NoArgsConstructor
-@AllArgsConstructor
-@Table(name = "t_life_info")
-@org.hibernate.annotations.Table(appliesTo = "t_life_info", comment = "生活事件量表")
-@DynamicUpdate
-public class LifeEntity extends BaseEntity {
-
-    @Column(name = "no", columnDefinition = "int(10) comment '题号'")
-    private int no;
-
-    @Column(name = "content", columnDefinition = "varchar(200) comment '内容'")
-    private String content;
-
-    @Column(name = "checked", columnDefinition = "varchar(10) comment '发生次数'")
-    private String checked;
-
-    @Column(name = "score", columnDefinition = "int(10) comment '单次分值'")
-    private int score;
-}

src/main/java/com/rf/psychological/dao/model/MoodEntity.java

@@ -1,46 +0,0 @@
-package com.rf.psychological.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
- * @description:正性负性情绪量表
- * @date 2021/1/20 18:40
- */
-@Entity
-@Data
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Table(name = "t_mood_info")
-@org.hibernate.annotations.Table(appliesTo = "t_mood_info", comment = "正性负性情绪量表")
-@DynamicUpdate
-public class MoodEntity extends BaseEntity {
-    /**
-     * 编号
-     */
-    @Column(name = "no", columnDefinition = "int(10) comment '编号'")
-    private int no;
-
-    /**
-     * 内容
-     */
-    @Column(name = "content", columnDefinition = "text comment '内容'")
-    private String content;
-
-    /**
-     * 类型：1 正向情绪 0 反向情绪
-     */
-    @Column(name = "type", columnDefinition = "varchar(2) comment '类型：1正向情绪 0反向情绪'")
-    private String type;
-
-    @Column(name = "checked", columnDefinition = "varchar(50) comment '选择项'")
-    private String checked;
-}

src/main/java/com/rf/psychological/dao/model/POMSEntity.java

@@ -1,51 +0,0 @@
-package com.rf.psychological.dao.model;
-
-import com.rf.psychological.base.model.BaseEntity;
-import lombok.*;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @author zzf
- * @description:心境状态量表（POMS）
- * @date 2021/1/20 8:44
- */
-@Entity
-@Data
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Table(name = "t_poms_info")
-@org.hibernate.annotations.Table(appliesTo = "t_poms_info", comment = "心境状态量表测试信息表")
-public class POMSEntity extends BaseEntity {
-
-    /**
-     * 编号
-     */
-    @Column(name = "no", columnDefinition = "int(10) comment '编号'")
-    private int no;
-
-    /**
-     * 内容
-     */
-    @Column(name = "content", columnDefinition = "text comment '内容'")
-    private String content;
-
-    /**
-     * 选项
-     */
-    @Column(name = "check_items", columnDefinition = "text comment '选项'")
-    private String checkItems;
-
-    /**
-     * 默认选项
-     */
-    @Column(name = "checked", columnDefinition = "text comment '默认选项'")
-    private String checked;
-
-    @Column(name = "type", columnDefinition = "varchar(2) comment '类型：1紧张；2愤怒；3疲劳；4:抑郁；5精力；6慌乱；7自我情绪相关'")
-    private String type;
-}

src/main/java/com/rf/psychological/dao/model/SupportEntity.java

@@ -1,50 +0,0 @@
-package com.rf.psychological.dao.model;
-
-import com.rf.psychological.base.model.BaseEntity;
-import lombok.*;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @author zzf
- * @description:社会支持评定量表
- * @date 2021/1/20 17:55
- */
-@Entity
-@Data
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Table(name = "t_support_info")
-@org.hibernate.annotations.Table(appliesTo = "t_support_info", comment = "社会支持评定量表")
-public class SupportEntity extends BaseEntity {
-    /**
-     * 编号
-     */
-    @Column(name = "no", columnDefinition = "varchar(10) comment '编号'")
-    private String no;
-
-    /**
-     * 内容
-     */
-    @Column(name = "content", columnDefinition = "text comment '内容'")
-    private String content;
-
-    /**
-     * 选项
-     */
-    @Column(name = "check_items", columnDefinition = "text comment '选项'")
-    private String checkItems;
-
-    /**
-     * 默认选项
-     */
-    @Column(name = "checked", columnDefinition = "text comment '默认选项'")
-    private String checked;
-
-    @Column(name = "sort_by", columnDefinition = "int(10) comment '排序字段'")
-    private int sortBy;
-}

src/main/java/com/rf/psychological/dao/repository/ASKRepository.java

@@ -1,13 +0,0 @@
-package com.rf.psychological.dao.repository;
-
-import com.rf.psychological.base.repository.BaseRepository;
-import com.rf.psychological.dao.model.ASKEntity;
-
-/**
- * @author zzf
- * @description:
- * @date 2021/1/20 17:40
- */
-public interface ASKRepository extends BaseRepository<ASKEntity,String> {
-
-}

src/main/java/com/rf/psychological/dao/repository/AviationRepository.java

@@ -1,12 +0,0 @@
-package com.rf.psychological.dao.repository;
-
-import com.rf.psychological.base.repository.BaseRepository;
-import com.rf.psychological.dao.model.AviationEntity;
-
-/**
- * @author zzf
- * @description:
- * @date 2021/1/20 17:49
- */
-public interface AviationRepository extends BaseRepository<AviationEntity,String> {
-}

src/main/java/com/rf/psychological/dao/repository/CattellRepository.java

@@ -1,12 +0,0 @@
-package com.rf.psychological.dao.repository;
-
-import com.rf.psychological.base.repository.BaseRepository;
-import com.rf.psychological.dao.model.CattellEntity;
-
-/**
- * @author zzf
- * @description:卡氏十六种人格因素量表
- * @date 2021/2/2 15:18
- */
-public interface CattellRepository extends BaseRepository<CattellEntity,String> {
-}

src/main/java/com/rf/psychological/dao/repository/DepressRepository.java

@@ -1,12 +0,0 @@
-package com.rf.psychological.dao.repository;
-
-import com.rf.psychological.base.repository.BaseRepository;
-import com.rf.psychological.dao.model.DepressEntity;
-
-/**
- * @author zzf
- * @description:抑郁焦虑压力量表
- * @date 2021/1/20 18:33
- */
-public interface DepressRepository extends BaseRepository<DepressEntity,String> {
-}

src/main/java/com/rf/psychological/dao/repository/LifeRepository.java

@@ -1,12 +0,0 @@
-package com.rf.psychological.dao.repository;
-
-import com.rf.psychological.base.repository.BaseRepository;
-import com.rf.psychological.dao.model.LifeEntity;
-
-/**
- * @author zzf
- * @description:
- * @date 2021/2/1 16:58
- */
-public interface LifeRepository extends BaseRepository<LifeEntity,String> {
-}

src/main/java/com/rf/psychological/dao/repository/MoodRepository.java

@@ -1,12 +0,0 @@
-package com.rf.psychological.dao.repository;
-
-import com.rf.psychological.base.repository.BaseRepository;
-import com.rf.psychological.dao.model.MoodEntity;
-
-/**
- * @author zzf
- * @description:正性负性情绪量表
- * @date 2021/1/20 18:42
- */
-public interface MoodRepository extends BaseRepository<MoodEntity,String> {
-}

src/main/java/com/rf/psychological/dao/repository/POMSRepository.java

@@ -1,14 +0,0 @@
-package com.rf.psychological.dao.repository;
-
-import com.rf.psychological.base.repository.BaseRepository;
-import com.rf.psychological.dao.model.POMSEntity;
-
-/**
- * @author zzf
- * @description:⼼境状态量表（简式POMS）
- * @date 2021/1/20 8:49
- */
-public interface POMSRepository extends BaseRepository<POMSEntity,String> {
-
-
-}

src/main/java/com/rf/psychological/dao/repository/SupportRepository.java

@@ -1,12 +0,0 @@
-package com.rf.psychological.dao.repository;
-
-import com.rf.psychological.base.repository.BaseRepository;
-import com.rf.psychological.dao.model.SupportEntity;
-
-/**
- * @author zzf
- * @description:
- * @date 2021/1/20 18:07
- */
-public interface SupportRepository extends BaseRepository<SupportEntity,String> {
-}

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

@@ -54,286 +54,6 @@ public class ScaleResultController extends BaseController {
         String fileName = userName+ Constant.SPLIT_CHAR+userBirthday+Constant.SPLIT_CHAR+userSex+Constant.SPLIT_CHAR+testTime;
         JSONArray jsonArray = jsonObject.getJSONArray("data");
         List<Map<String,String>> resultMapList = null;
-        //艾森克
-        if(Constant.QUEST_TYPE_ASK.equals(type)){
-            int scoreE=0;
-            int scoreN=0;
-            int scoreP=0;
-            int scoreL=0;
-            for(int i=0;i<jsonArray.size();i++){
-                JSONObject jsonObject1 = jsonArray.getJSONObject(i);
-                if(jsonObject1.getString("scale").equals(Constant.SCALE_TYPE_E)&&jsonObject1.getString("checkItems").equals(Constant.YES)){
-                    scoreE +=1;
-                }else if(jsonObject1.getString("scale").equals(Constant.SCALE_TYPE_N)&&jsonObject1.getString("checkItems").equals(Constant.YES)){
-                    scoreN +=1;
-                }else if(jsonObject1.getString("scale").equals(Constant.SCALE_TYPE_P)&&jsonObject1.getString("checkItems").equals(Constant.YES)){
-                    scoreP +=1;
-                }else if(jsonObject1.getString("scale").equals(Constant.SCALE_TYPE_L)&&jsonObject1.getString("checkItems").equals(Constant.YES)){
-                    scoreL +=1;
-                }
-            }
-            //答题结果列表
-            List<ASKEntity> dataList= jsonArray.toJavaList(ASKEntity.class);
-            //得分列表
-            Map<String,String> resultMap = new LinkedHashMap<>();
-            resultMap.put("分量E得分",String.valueOf(scoreE));
-            resultMap.put("分量N得分",String.valueOf(scoreN));
-            resultMap.put("分量P得分",String.valueOf(scoreP));
-            resultMap.put("分量L得分",String.valueOf(scoreL));
-            System.out.println("分量E得分："+scoreE+";分量N得分："+scoreN+";分量P得分："+scoreP+";分量L得分："+scoreL);
-            fileName = fileName+"-"+Constant.SHEET_NAME_ASK+".xlsx";
-            resultMapList = new ArrayList<>();
-            resultMapList.add(resultMap);
-//            导出文件
-            ExcelUtil.createExcelFile(ASKEntity.class,dataList,resultMapList,new ExcelClass().contentExcel(Constant.QUEST_TYPE_ASK),fileName,Constant.SHEET_NAME_ASK);
-            //匹兹堡睡眠质量指数
-        }else if(Constant.QUEST_TYPE_POMS.equals(type)){
-            int [] scores= {0,0,0,0,0,0,0,0};
-            for (int i=0;i<jsonArray.size();i++) {
-                JSONObject jsonObject1= jsonArray.getJSONObject(i);
-                int model = jsonObject1.getIntValue("type");
-                String checked = jsonObject1.getString("checked");
-                    if(checked.equals("几乎没有")){
-
-                    }else if (checked.equals("有点")){
-                        scores[model-1] +=1;
-                    }else if (checked.equals("适中")){
-                        scores[model-1] +=2;
-                    }else if (checked.equals("相当多")){
-                        scores[model-1] +=3;
-                    }else if (checked.equals("⾮常多")){
-                        scores[model-1] +=4;
-                    }
-            }
-            //TMD(情绪纷乱的总分)=5个消极的情绪得分之和减去两个积极情绪(精⼒，⾃尊感)得分之和+100
-            scores[7]=scores[0]+scores[1]+scores[2]+scores[3]+scores[5]-scores[4]-scores[6]+100;
-            System.out.println("POMS得分："+scores.toString());
-            fileName = fileName+"-"+Constant.SHEET_NAME_POMS+".xlsx";
-            Map<String,String> resultMap = new LinkedHashMap<>();
-            resultMap.put("紧张",String.valueOf(scores[0]));
-            resultMap.put("愤怒",String.valueOf(scores[1]));
-            resultMap.put("疲劳",String.valueOf(scores[2]));
-            resultMap.put("抑郁",String.valueOf(scores[3]));
-            resultMap.put("精力",String.valueOf(scores[4]));
-            resultMap.put("慌乱",String.valueOf(scores[5]));
-            resultMap.put("自我情绪相关",String.valueOf(scores[6]));
-            resultMap.put("总分",String.valueOf(scores[7]));
-            resultMapList = new ArrayList<>();
-            resultMapList.add(resultMap);
-            ExcelUtil.createExcelFile(POMSEntity.class,jsonArray.toJavaList(POMSEntity.class),resultMapList,new ExcelClass().contentExcel(Constant.QUEST_TYPE_POMS),fileName,Constant.SHEET_NAME_POMS);
-            //症状自评
-        }else if(Constant.QUEST_TYPE_AVAI.equals(type)){
-            int score = 0 ;
-            for (int i = 0; i < jsonArray.size(); i++) {
-                JSONObject jsonObject1 = jsonArray.getJSONObject(i);
-                score += jsonObject1.getInteger("checked");
-            }
-            //平均分保留两位小数
-            double avgScore = new BigDecimal((double)score/(double)jsonArray.size()).setScale(2, RoundingMode.HALF_UP).doubleValue();
-            System.out.println("总得分："+score+";平均得分："+avgScore);
-            fileName = fileName+"-"+Constant.SHEET_NAME_AVAI+".xlsx";
-            Map<String,String> resultMap = new LinkedHashMap<>();
-            resultMap.put("总得分",String.valueOf(score));
-            resultMap.put("平均得分",String.valueOf(avgScore));
-            resultMapList = new ArrayList<>();
-            resultMapList.add(resultMap);
-            ExcelUtil.createExcelFile(AviationEntity.class,jsonArray.toJavaList(AviationEntity.class),resultMapList,new ExcelClass().contentExcel(Constant.QUEST_TYPE_AVAI),fileName,Constant.SHEET_NAME_AVAI);
-            //社会支持评定量表
-        }else if (Constant.QUEST_TYPE_SUPP.equals(type)){
-            //总分
-            int sumScore = 0;
-            //主管得分
-            int chargeScore = 0;
-            //客观得分
-            int impersonalityScore = 0;
-            //利用度
-            int utilizationScore = 0;
-            for (int i = 0; i < jsonArray.size(); i++) {
-                JSONObject jsonObject1 = jsonArray.getJSONObject(i);
-                String checked = jsonObject1.getString("checked");
-                if(i==0||(i>=2&&i<=5)||(i==8)){
-                    if(checked.contains("(1)")){
-                        sumScore += 1 ;
-                        chargeScore +=1;
-                    }else if(checked.contains("(2)")){
-                        sumScore += 2 ;
-                        chargeScore += 2;
-                    }else if(checked.contains("(3)")){
-                        sumScore += 3 ;
-                        chargeScore+= 3;
-                    }else if(checked.contains("(4)")){
-                        sumScore += 4 ;
-                        chargeScore+=4;
-                    }
-                }else if(i==1){
-                    if(checked.contains("(1)")){
-                       impersonalityScore +=1;
-                        sumScore += 1 ;
-                    }else if(checked.contains("(2)")){
-                        impersonalityScore+=2;
-                        sumScore += 2 ;
-                    }else if(checked.contains("(3)")){
-                        impersonalityScore+=3;
-                        sumScore += 3 ;
-                    }else if(checked.contains("(4)")){
-                        impersonalityScore+=4;
-                        sumScore += 4 ;
-                    }
-                }else if(i==6||i==7){
-                    if(checked.equals("无任何来源")){
-
-                    }else {
-                        String [] strings= checked.replace("[","").replace("]","").split("，");
-                        int length = strings.length;
-                        sumScore += length;
-                        impersonalityScore +=length;
-                    }
-
-                }else if(i==9||i==10){
-                    if(checked.contains("(1)")){
-
-                    }else if(checked.contains("(2)")){
-                        impersonalityScore += checked.split(";").length;
-                        sumScore +=  checked.split(";").length;;
-                    }
-                }else {
-                    if(checked.contains("(1)")){
-                        utilizationScore +=1;
-                        sumScore += 1 ;
-                    }else if(checked.contains("(2)")){
-                        utilizationScore+=2;
-                        sumScore += 2 ;
-                    }else if(checked.contains("(3)")){
-                        utilizationScore+=3;
-                        sumScore += 3 ;
-                    }else if(checked.contains("(4)")){
-                        utilizationScore+=4;
-                        sumScore += 4 ;
-                    }
-
-                }
-            }
-            System.out.println("总分："+sumScore+";客观得分："+impersonalityScore+";主观得分："+chargeScore+";支持的利用度："+utilizationScore);
-            fileName=fileName+"-"+Constant.SHEET_NAME_SUPP+".xlsx";
-            Map<String,String> resultMap = new LinkedHashMap<>();
-            resultMap.put("客观得分",String.valueOf(impersonalityScore));
-            resultMap.put("主观得分",String.valueOf(chargeScore));
-            resultMap.put("支持的利用度",String.valueOf(utilizationScore));
-            resultMap.put("总分",String.valueOf(sumScore));
-            resultMapList = new ArrayList<>();
-            resultMapList.add(resultMap);
-            ExcelUtil.createExcelFile(SupportEntity.class,jsonArray.toJavaList(SupportEntity.class),resultMapList,new ExcelClass().contentExcel(Constant.QUEST_TYPE_SUPP),fileName,Constant.SHEET_NAME_SUPP);
-            //抑郁焦虑压力表
-        }else if (Constant.QUEST_TYPE_DEPR.equals(type)){
-            //压力的分  焦虑得分  抑郁得分
-            int [] score = {0,0,0};
-            for (int i = 0; i < jsonArray.size(); i++) {
-                JSONObject jsonObject1 = jsonArray.getJSONObject(i);
-                String checked = jsonObject1.getString("checked");
-                int model = jsonObject1.getIntValue("type");
-                if(checked.equals("非常符合")){
-                    score[model-1] += 3;
-                }else if(checked.equals("大部分符合")){
-                    score[model-1] += 2;
-                }else if(checked.equals("小部分符合")){
-                    score[model-1] +=1;
-                }
-            }
-            System.out.println("压力得分："+score[0]+";焦虑得分："+score[1]+";抑郁得分："+score[2]);
-            fileName=fileName+"-"+Constant.SHEET_NAME_DEPR+".xlsx";
-            Map<String,String> resultMap = new LinkedHashMap<>();
-            resultMap.put("压力指数",String.valueOf(score[0]));
-            resultMap.put("焦虑指数",String.valueOf(score[1]));
-            resultMap.put("抑郁指数",String.valueOf(score[2]));
-            resultMapList = new ArrayList<>();
-            resultMapList.add(resultMap);
-            ExcelUtil.createExcelFile(DepressEntity.class,jsonArray.toJavaList(DepressEntity.class),resultMapList,new ExcelClass().contentExcel(Constant.QUEST_TYPE_DEPR),fileName,Constant.SHEET_NAME_DEPR);
-            //正性负性情绪量表
-        }else if (Constant.QUEST_TYPE_MOOD.equals(type)){
-            //反向情绪  正向情绪
-            int [] score = {0,0};
-            for (int i = 0; i < jsonArray.size(); i++) {
-                JSONObject jsonObject1 = jsonArray.getJSONObject(i);
-                int model = jsonObject1.getIntValue("type");
-                String checked = jsonObject1.getString("checked");
-                if(checked.equals("几乎没有")){
-                    score[model] += 1;
-                }else if(checked.equals("比较少")){
-                    score[model] += 2;
-                }else if(checked.equals("中等程度")){
-                    score[model] += 3;
-                }else if(checked.equals("比较多")){
-                    score[model] += 4;
-                }else if(checked.equals("及其多")){
-                    score[model] += 5;
-                }
-            }
-            System.out.println("负向情绪得分："+score[0]+";正向情绪得分："+score[1]);
-            fileName=fileName+"-"+Constant.SHEET_NAME_MOOD+".xlsx";
-            Map<String,String> resultMap = new LinkedHashMap<>();
-            resultMap.put("负向情绪得分",String.valueOf(score[0]));
-            resultMap.put("正向情绪得分",String.valueOf(score[1]));
-            resultMapList = new ArrayList<>();
-            resultMapList.add(resultMap);
-            ExcelUtil.createExcelFile(MoodEntity.class,jsonArray.toJavaList(MoodEntity.class),resultMapList,new ExcelClass().contentExcel(Constant.QUEST_TYPE_MOOD),fileName,Constant.SHEET_NAME_MOOD);
-        }else if(Constant.QUEST_TYPE_LIFE.equals(type)){
-            int score = 0;
-            List<LifeEntity> dataList = jsonArray.toJavaList(LifeEntity.class);
-            for (LifeEntity lifeEntity:dataList) {
-                score = score + lifeEntity.getScore()*Integer.parseInt(lifeEntity.getChecked());
-            }
-            Map<String,String> resultMap = new LinkedHashMap<>();
-            resultMap.put("总分",String.valueOf(score));
-            fileName = fileName+"-"+Constant.SHEET_NAME_LIFE+".xlsx";
-            resultMapList = new ArrayList<>();
-            resultMapList.add(resultMap);
-            ExcelUtil.createExcelFile(LifeEntity.class,dataList,resultMapList,new ExcelClass().contentExcel(Constant.QUEST_TYPE_LIFE),fileName,Constant.SHEET_NAME_LIFE);
-        }else if (Constant.QUEST_TYPE_CATTELL.equals(type)){
-            List<CattellEntity>dataList = jsonArray.toJavaList(CattellEntity.class);
-            Map<String,String> resultMap = new LinkedHashMap<>();
-            //第1、2、187 题不参与计算
-            for (int i =2;i<dataList.size()-1;i++) {
-                CattellEntity cattellEntity = dataList.get(i);
-                int no = cattellEntity.getNo();
-                resultMap.put("因素B得分",String.valueOf(0));
-                String factor = cattellEntity.getType();
-                String checked = cattellEntity.getChecked();
-                int score = 0;
-                //B因素一下选项加1分，其他选项均为0分:28.B   53.B   54.B   77.C   78.B   102.C   103.B   127.C   128.B   152.B   153.C   177.A   178.A
-                if(factor.equals("B")){
-                    if(((no == 28||no == 53 || no ==54 || no ==78||no ==103 ||no == 128 || no == 152 )&&checked.equals("B"))||((no == 77 || no ==102 || no ==127 || no == 153)&&checked.equals("C"))||((no == 177 || no == 178)&& checked.equals("A"))){
-                        score = 1;
-                    }
-                }else{
-                    if(checked.equals("B")){
-                        score =1;
-                    }else{
-                        if(no ==3 || no ==4 || no == 7 || no == 13 || no == 17 || no == 18 || no == 20 || no == 21 || no == 25 || no == 30 || no == 33 || (no >= 36&&no<=40)|| no == 42 || no == 43 || (no>=46 && no <= 50) || no == 52 || no == 55 || no == 56 || no == 58 || no == 59
-                                || no == 65 || (no >= 69 && no <= 74)|| no == 88 || no == 91 || (no >= 98 && no <= 101) || no == 104|| no == 105 || (no >= 107 && no <= 119)|| no == 124 || no == 126 ||(no>=129&&no<=134)
-                                || no == 136 || no == 138 || no == 140 || no == 142 || no == 143 || (no>=145 && no <= 150)|| no == 155 || no == 156 || no == 160 || no ==163 || no ==164
-                                || (no>=167 && no <= 169) || no == 171 || no == 173 || no == 174 || no == 176 || no>=179){
-                            if(checked.equals("A")){
-                                score = 2;
-                            }
-                        }else{
-                            if(checked.equals("C")){
-                                score = 2;
-                            }
-                        }
-                    }
-                }
-                String key = "因素"+factor+"得分";
-                if(resultMap.get(key)==null){
-                    resultMap.put(key,String.valueOf(score));
-                }else {
-                    resultMap.put(key,String.valueOf(Integer.parseInt(resultMap.get("因素B得分")+score)));
-                }
-            }
-            fileName = fileName+"-"+Constant.SHEET_NAME_CATTELL+".xlsx";
-            resultMapList = new ArrayList<>();
-            resultMapList.add(resultMap);
-            ExcelUtil.createExcelFile(CattellEntity.class,dataList,resultMapList,new ExcelClass().contentExcel(Constant.QUEST_TYPE_CATTELL),fileName,Constant.SHEET_NAME_CATTELL);
-        }
         return success("success","完成");
     }
 

src/main/java/com/rf/psychological/service/ASKService.java

@@ -1,18 +0,0 @@
-package com.rf.psychological.service;
-
-import com.rf.psychological.dao.model.ASKEntity;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:
- * @date 2021/1/20 17:41
- */
-public interface ASKService {
-    /**
-     * 全量查询
-     * @return
-     */
-    List<ASKEntity> findAll();
-}

src/main/java/com/rf/psychological/service/AviationService.java

@@ -1,18 +0,0 @@
-package com.rf.psychological.service;
-
-import com.rf.psychological.dao.model.AviationEntity;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:
- * @date 2021/1/20 17:50
- */
-public interface AviationService {
-    /**
-     * 全量查询
-     * @return
-     */
-    List<AviationEntity> findAll();
-}

src/main/java/com/rf/psychological/service/CattellService.java

@@ -1,20 +0,0 @@
-package com.rf.psychological.service;
-
-import com.rf.psychological.dao.model.CattellEntity;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:卡氏十六种人格因素量表
- * @date 2021/2/2 15:19
- */
-public interface CattellService {
-
-
-    /**
-     * 查询量表
-     * @return
-     */
-    List<CattellEntity> findAll();
-}

src/main/java/com/rf/psychological/service/DepressService.java

@@ -1,18 +0,0 @@
-package com.rf.psychological.service;
-
-import com.rf.psychological.dao.model.DepressEntity;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:抑郁焦虑压力量表
- * @date 2021/1/20 18:34
- */
-public interface DepressService {
-    /**
-     * 全量查询
-     * @return
-     */
-    List<DepressEntity> findAll();
-}

src/main/java/com/rf/psychological/service/LifeService.java

@@ -1,18 +0,0 @@
-package com.rf.psychological.service;
-
-import com.rf.psychological.dao.model.LifeEntity;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:生活事件量表
- * @date 2021/2/1 16:57
- */
-public interface LifeService {
-    /**
-     * 全量查询
-     * @return
-     */
-    List<LifeEntity> findAll();
-}

src/main/java/com/rf/psychological/service/MoodService.java

@@ -1,18 +0,0 @@
-package com.rf.psychological.service;
-
-import com.rf.psychological.dao.model.MoodEntity;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:正性负性情绪量表
- * @date 2021/1/20 18:42
- */
-public interface MoodService {
-    /**
-     * 全量查询正性负性情绪量表
-     * @return
-     */
-    List<MoodEntity> findAll();
-}

src/main/java/com/rf/psychological/service/POMSService.java

@@ -1,18 +0,0 @@
-package com.rf.psychological.service;
-
-import com.rf.psychological.dao.model.POMSEntity;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:⼼境状态量表（简式POMS）
- * @date 2021/1/20 8:50
- */
-public interface POMSService {
-    /**
-     * 查询全量
-     * @return
-     */
-    List<POMSEntity> findAll();
-}

src/main/java/com/rf/psychological/service/SupportService.java

@@ -1,18 +0,0 @@
-package com.rf.psychological.service;
-
-import com.rf.psychological.dao.model.SupportEntity;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:社会支持评定量表
- * @date 2021/1/20 18:08
- */
-public interface SupportService {
-    /**
-     * 全量查询
-     * @return
-     */
-    List<SupportEntity> findAll();
-}

src/main/java/com/rf/psychological/service/impl/ASKServiceImpl.java

@@ -1,30 +0,0 @@
-package com.rf.psychological.service.impl;
-
-import com.rf.psychological.dao.model.ASKEntity;
-import com.rf.psychological.dao.repository.ASKRepository;
-import com.rf.psychological.service.ASKService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:
- * @date 2021/1/20 17:41
- */
-@Service
-public class ASKServiceImpl implements ASKService {
-    @Autowired
-    private ASKRepository askRepository;
-    /**
-     * 全量查询
-     *
-     * @return
-     */
-    @Override
-    public List<ASKEntity> findAll() {
-        return this.askRepository.findAll(Sort.by("no"));
-    }
-}

src/main/java/com/rf/psychological/service/impl/AviationServiceImpl.java

@@ -1,30 +0,0 @@
-package com.rf.psychological.service.impl;
-
-import com.rf.psychological.dao.model.AviationEntity;
-import com.rf.psychological.dao.repository.AviationRepository;
-import com.rf.psychological.service.AviationService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:
- * @date 2021/1/20 17:50
- */
-@Service
-
-public class AviationServiceImpl implements AviationService {
-    @Autowired
-    private AviationRepository aviationRepository;
-    /**
-     * 全量查询
-     *
-     * @return
-     */
-    @Override
-    public List<AviationEntity> findAll() {
-        return this.aviationRepository.findAll();
-    }
-}

src/main/java/com/rf/psychological/service/impl/CattellServiceImpl.java

@@ -1,30 +0,0 @@
-package com.rf.psychological.service.impl;
-
-import com.rf.psychological.dao.model.CattellEntity;
-import com.rf.psychological.dao.repository.CattellRepository;
-import com.rf.psychological.service.CattellService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:卡氏十六种人格因素量表
- * @date 2021/2/2 15:19
- */
-@Service
-public class CattellServiceImpl implements CattellService {
-    @Autowired
-    private CattellRepository cattellRepository;
-    /**
-     * 查询量表
-     *
-     * @return
-     */
-    @Override
-    public List<CattellEntity> findAll() {
-        return cattellRepository.findAll(Sort.by("no"));
-    }
-}

src/main/java/com/rf/psychological/service/impl/DepressServiceImpl.java

@@ -1,30 +0,0 @@
-package com.rf.psychological.service.impl;
-
-import com.rf.psychological.dao.model.DepressEntity;
-import com.rf.psychological.dao.repository.DepressRepository;
-import com.rf.psychological.service.DepressService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:抑郁焦虑压力量表
- * @date 2021/1/20 18:34
- */
-@Service
-public class DepressServiceImpl implements DepressService {
-    @Autowired
-    private DepressRepository depressRepository;
-    /**
-     * 全量查询
-     *
-     * @return
-     */
-    @Override
-    public List<DepressEntity> findAll() {
-        return this.depressRepository.findAll(Sort.by("no"));
-    }
-}

src/main/java/com/rf/psychological/service/impl/LifeServiceImpl.java

@@ -1,29 +0,0 @@
-package com.rf.psychological.service.impl;
-
-import com.rf.psychological.dao.model.LifeEntity;
-import com.rf.psychological.dao.repository.LifeRepository;
-import com.rf.psychological.service.LifeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-import java.util.List;
-
-/**
- * @author zzf
- * @description:生活事件量表
- * @date 2021/2/1 16:57
- */
-@Service
-public class LifeServiceImpl implements LifeService {
-    @Autowired
-    private LifeRepository lifeRepository;
-    /**
-     * 全量查询
-     *
-     * @return
-     */
-    @Override
-    public List<LifeEntity> findAll() {
-        return this.lifeRepository.findAll(Sort.by("no"));
-    }
-}

src/main/java/com/rf/psychological/service/impl/MoodServiceImpl.java

@@ -1,30 +0,0 @@
-package com.rf.psychological.service.impl;
-
-import com.rf.psychological.dao.model.MoodEntity;
-import com.rf.psychological.dao.repository.MoodRepository;
-import com.rf.psychological.service.MoodService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:正性负性情绪量表
- * @date 2021/1/20 18:42
- */
-@Service
-public class MoodServiceImpl implements MoodService {
-    @Autowired
-    private MoodRepository moodRepository;
-    /**
-     * 全量查询正性负性情绪量表
-     *
-     * @return
-     */
-    @Override
-    public List<MoodEntity> findAll() {
-        return this.moodRepository.findAll(Sort.by("no"));
-    }
-}

src/main/java/com/rf/psychological/service/impl/POMSServiceImpl.java

@@ -1,31 +0,0 @@
-package com.rf.psychological.service.impl;
-
-import com.rf.psychological.dao.model.POMSEntity;
-import com.rf.psychological.dao.repository.POMSRepository;
-import com.rf.psychological.service.POMSService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:⼼境状态量表（简式POMS）
- * @date 2021/1/20 8:50
- */
-@Service
-public class POMSServiceImpl implements POMSService {
-
-    @Autowired
-    private POMSRepository pomsRepository;
-    /**
-     * 查询全量
-     *
-     * @return
-     */
-    @Override
-    public List<POMSEntity> findAll() {
-        return this.pomsRepository.findAll(Sort.by("no"));
-    }
-}

src/main/java/com/rf/psychological/service/impl/SupportServiceImpl.java

@@ -1,32 +0,0 @@
-package com.rf.psychological.service.impl;
-
-import com.rf.psychological.dao.model.SupportEntity;
-import com.rf.psychological.dao.repository.SupportRepository;
-import com.rf.psychological.service.SupportService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Sort;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:社会支持评定量表
- * @date 2021/1/20 18:08
- */
-@Service
-public class SupportServiceImpl implements SupportService {
-
-    @Autowired
-    private SupportRepository supportRepository;
-    /**
-     * 全量查询
-     *
-     * @return
-     */
-    @Override
-    public List<SupportEntity> findAll() {
-
-        return this.supportRepository.findAll(Sort.by(Sort.Direction.ASC, "sortBy"));
-    }
-}

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

@@ -296,10 +296,7 @@ public class Constant {
      * 简易精神状态测试
      **/
     public static final String QUEST_TYPE_MMSE = "MMSE";
-    /**
-     * 简易精神状态测试V2
-     **/
-    public static final String QUEST_TYPE_MMSE_V2 = "MMSE_V2";
+
     /**
      * 听觉测试
      **/
@@ -332,10 +329,7 @@ public class Constant {
      * 目标追踪测试
      **/
     public static final String QUEST_TYPE_GTCT = "GTCT";
-    /**
-     * 目标追踪测试
-     */
-    public static final String QUEST_TYPE_GTCT_CHILD = "CHILD";
+
     /**
      * 多目标追踪(儿童版)
      */
@@ -450,18 +444,11 @@ public class Constant {
      * 情绪测试3：点探测(儿童版)
      **/
     public static final String QUEST_TYPE_FDOT_CHILD = "FDOT_CHILD";
-    /**
-     * 情绪测试2：词汇测试(成瘾版)
-     **/
-    public static final String QUEST_TYPE_ECAT_ADDICTION = "ECAT_ADDICTION";
+
     /**
      * Faces Dot Probe Task (FDOT)
      **/
     public static final String QUEST_TYPE_FDOT = "FDOT";
-    /**
-     * 征冰心理健康测评
-     **/
-    public static final String QUEST_TYPE_ZBMHA = "ZBMHA";
 
     /**
      * 视觉模拟渴求
@@ -528,7 +515,6 @@ public class Constant {
     public static final String SHEET_NAME_SUPP = "社会支持评定量表";
     public static final String SHEET_NAME_DEPR = "抑郁焦虑压力表";
     public static final String SHEET_NAME_MOOD = "正性负性情绪量表";
-    public static final String SHEET_NAME_STATUS = "状态-特质焦虑量表";
     /**
      * 认知任务测试
      **/
@@ -586,7 +572,6 @@ public class Constant {
     public static final String SHEET_NAME_STTA = "形状连线测试A";
     public static final String SHEET_NAME_STTB = "形状连线测试B";
     public static final String SHEET_NAME_DST = "数字广度测验";
-    public static final String SHEET_NAME_MTH = "华山版听觉词语学习";
     public static final String SHEET_NAME_BSNTask = "Boston命名测验";
     public static final String SHEET_NAME_AMWSTask = "动物词语流畅性测试";
     public static final String SHEET_NAME_ETB01 = "人脸表情识别任务";
@@ -600,12 +585,10 @@ public class Constant {
     public static final String SHEET_NAME_FDOT_CHILD = "情绪测试3：点探测(儿童版)";
     public static final String SHEET_NAME_ECAT_ADDICTION = "情绪测试2：词汇测试(成瘾版)";
     public static final String SHEET_NAME_FDOT = "情绪测试3：点探测";
-    public static final String SHEET_NAME_ZBMHA = "征冰心理健康测评";
     public static final String SHEET_NAME_VAS= "视觉模拟渴求";
     public static final String SHEET_NAME_STROOP= "Stroop试验";
     public static final String SHEET_NAME_STROOP_TASK= "Stroop任务";
     public static final String SHEET_NAME_DSST= "数字符号转换测验";
-    public static final String SHEET_NAME_PSY_CAPITAL= "心理资本";
     public static final String SHEET_NAME_DST_VOICE= "数字广度测验（语音版）";
     public static final String SHEET_NAME_EAT= "面孔情绪评价任务";
     public static final String SHEET_NAME_EPRT= "情绪图片评定任务";
@@ -748,7 +731,6 @@ public class Constant {
     public static final String SHEET_NAME_GDS = "老年抑郁量表";
     public static final String SHEET_NAME_CRS = "Carroll抑郁量表";
     public static final String SHEET_NAME_FAD = "家庭功能评定";
-    public static final String SHEET_NAME_FES_CV = "家庭环境量表中文版";
     public static final String SHEET_NAME_ASAS = "青少年学生疏离感量表";
     public static final String SHEET_NAME_ESLI = "情绪-社交孤独问卷";
     public static final String SHEET_NAME_BRMS = "贝克-拉范森躁狂量表";
@@ -768,16 +750,13 @@ public class Constant {
     public static final String SHEET_NAME_EHS = "爱丁堡利手量表";
     public static final String SHEET_NAME_ESS = "爱泼沃斯嗜睡量表";
     public static final String SHEET_NAME_TTT = "气质类型测试";
-    public static final String SHEET_NAME_CDA = " 儿童依赖性评估测试（女生版）";
 
     public static final String SHEET_NAME_MRA_SAFE = "在婚姻里，你有安全感吗？";
     public static final String SHEET_NAME_OCC_AGE = "职业心理年龄测试";
     public static final String SHEET_NAME_STAI = "状态一特质焦虑问卷";
     public static final String SHEET_NAME_PLOC = "子女教育心理控制源量表";
-    public static final String SHEET_NAME_SRHMS = "自测健康评定量表";
     public static final String SHEET_NAME_CFD = "自信心测试";
     public static final String SHEET_NAME_SEI = "自尊调查表";
-    public static final String SHEET_NAME_GWB = "总体幸福感量表";
     public static final String SHEET_NAME_WVI = "舒伯职业价值观量表";
     public static final String SHEET_NAME_DSR = "双方性调节量表";
     public static final String SHEET_NAME_BDQ = "双相情感障碍自评量表";
@@ -785,7 +764,6 @@ public class Constant {
     public static final String SHEET_NAME_STUR = "同学关系测验问卷";
     public static final String SHEET_NAME_WILL = "威廉斯创造力倾向测评量表";
     public static final String SHEET_NAME_PRCS = "演说者信心自评量表";
-    public static final String SHEET_NAME_MCMQ = "医学应对问卷";
     public static final String SHEET_NAME_DACL = "抑郁形容词检查表";
     public static final String SHEET_NAME_PER = "性向测试问卷";
     public static final String SHEET_NAME_EPQ = "艾森克人格量表";
@@ -800,7 +778,6 @@ public class Constant {
     public static final String SHEET_NAME_CSHQ = "儿童睡眠习惯问卷";
     public static final String SHEET_NAME_MSIQ = "马斯洛安全感-不安全感问卷";
     public static final String SHEET_NAME_IPC = "内控性、有势力的他人及机遇量表";
-    public static final String SHEET_NAME_IELCS = "内在—外在心理控制源量表";
     public static final String SHEET_NAME_YSV = "你到底“几斤几两”——测测你的自我价值";
     public static final String SHEET_NAME_YSP = "你对另一半满意吗？";
     public static final String SHEET_NAME_YFI = "你给人的第一印象如何？";
@@ -810,9 +787,7 @@ public class Constant {
     public static final String SHEET_NAME_DISC = "DISC性格测试题";
     public static final String SHEET_NAME_AAS = "成人依恋量表";
     public static final String SHEET_NAME_CCSAS = "儿童行为问卷（父母用）";
-    public static final String SHEET_NAME_ECR = "亲密关系经历量表";
     public static final String SHEET_NAME_CCSAS2 = "中国大学生适应量表";
-    public static final String SHEET_NAME_QOLIE = "青少年癫痫患者生活质量评定量表(QOLIE-AD-48） 青少年（6-18岁）";
     public static final String SHEET_NAME_ABT = "A型、B型性格测试";
     public static final String SHEET_NAME_CARS = "儿童自闭症评量量表";
     public static final String SHEET_NAME_ABC = "孤独症儿童行为量表";
@@ -820,12 +795,8 @@ public class Constant {
     public static final String SHEET_NAME_ADSC = "青少年忧郁情绪自我检视表";
     public static final String SHEET_NAME_DDI = "痛苦表露指数";
     public static final String SHEET_NAME_DWTA = "心理测试：你应对职场动荡的能力";
-
     public static final String SHEET_NAME_STOPB = "STOP-Bang量表";
 
-    public static final String SHEET_NAME_PSQI = "匹兹堡睡眠质量指数";
-
-    public static final String SHEET_NAME_POMS = "心境状态量表";
 
 
 
@@ -990,25 +961,13 @@ public class Constant {
      **/
     public static final String QUEST_TYPE_JRXLYJ = "20220302195619";
     public static final String SHEET_NAME_JRXLYJ = "军人心理应激自评问卷";
-    /**
-     * 中国中学生心理健康量表
-     **/
-    public static final String QUEST_TYPE_STUHEA = "20220228164442";
+
     public static final String SHEET_NAME_STUHEA = "中国中学生心理健康量表";
-    /**
-     * 中学生自我导向学习倾向性量表 SDLRS
-     **/
-    public static final String QUEST_TYPE_SDLRS = "20220126171621";
+
     public static final String SHEET_NAME_SDLRS = "中学生自我导向学习倾向性量表 SDLRS";
-    /**
-     * Russell吸烟原因问卷
-     **/
-    public static final String QUEST_TYPE_Russell = "20220307104830";
+
     public static final String SHEET_NAME_Russell = "Russell吸烟原因问卷";
-    /**
-     * 运动认知特质焦虑量表
-     **/
-    public static final String QUEST_TYPE_YDRZ = "20220307110757";
+
     public static final String SHEET_NAME_YDRZ = "运动认知特质焦虑量表";
 /** END **/
 
@@ -1019,5 +978,5 @@ public class Constant {
     public static final String USER_PLAN_STATUS_UNCOMPLETED = "0";
     public static final String USER_PLAN_STATUS_COMPLETED = "9";
 
-    public static final String EXCLUDE_PACKAGE_NAME = "wxpay";
+
 }

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

@@ -712,54 +712,7 @@ public class ExcelUtil {
                                     }
                                 }
                             }
-                            if (clazz.equals(ASKEntity.class) || clazz.equals(MoodEntity.class) ) {
-                                if (propertyName.equals("checkItems")) {
-                                    if (value.equals("yes")) {
-                                        value = "是";
-                                    } else if (value.equals("no")) {
-                                        value = "否";
-                                    }
-                                }
-                                if (propertyName.equals("type")) {
-                                    if (value.equals("1")) {
-                                        value = "正向";
-                                    } else if (value.equals("0")) {
-                                        value = "反向";
-                                    }
-                                }
-                            }
-                            //类型：1紧张；2愤怒；3疲劳；4:抑郁；5精力；6慌乱；7自我情绪相关
-                            if (clazz.equals(POMSEntity.class)) {
-                                if (propertyName.equals("type")) {
-                                    if (value.equals("1")) {
-                                        value = "紧张";
-                                    } else if (value.equals("2")) {
-                                        value = "愤怒";
-                                    } else if (value.equals("3")) {
-                                        value = "疲劳";
-                                    } else if (value.equals("4")) {
-                                        value = "抑郁";
-                                    } else if (value.equals("5")) {
-                                        value = "精力";
-                                    } else if (value.equals("6")) {
-                                        value = "慌乱";
-                                    } else if (value.equals("7")) {
-                                        value = "自我情绪";
-                                    }
-                                }
-                            }
-                            //类型 1压力指数  2焦虑指数  3抑郁指数
-                            if (clazz.equals(DepressEntity.class)) {
-                                if (propertyName.equals("type")) {
-                                    if (value.equals("1")) {
-                                        value = "压力指数";
-                                    } else if (value.equals("2")) {
-                                        value = "焦虑指数";
-                                    } else if (value.equals("3")) {
-                                        value = "抑郁指数";
-                                    }
-                                }
-                            }
+
                             if (clazz.equals(MemoryEntity.class)) {
                                 if (propertyName.equals("backCount")) {
                                     value = value + "-back";