删除多余代码

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/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/PSQIEntity.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/19 16:31
- */
-@Entity
-@Data
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Table(name = "t_qsti_info")
-@org.hibernate.annotations.Table(appliesTo = "t_qsti_info", comment = "匹兹堡睡眠质量指数测试信息表")
-public class PSQIEntity 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;
-
-}

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

@@ -1,56 +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:47
- */
-@Entity
-@Data
-@Getter
-@Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Table(name = "t_status_info")
-@org.hibernate.annotations.Table(appliesTo = "t_status_info", comment = "状态-特质焦虑量表")
-public class StatusEntity 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;
-
-    /**
-     * 类型：0反向得分  1正向得分
-     */
-    @Column(name = "type", columnDefinition = "varchar(2) comment '类型：0反向得分  1正向得分'")
-    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/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/PSQIRepository.java

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

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

@@ -1,12 +0,0 @@
-package com.rf.psychological.dao.repository;
-
-import com.rf.psychological.base.repository.BaseRepository;
-import com.rf.psychological.dao.model.StatusEntity;
-
-/**
- * @author zzf
- * @description:状态-特质焦虑量表
- * @date 2021/1/20 18:50
- */
-public interface StatusRepository extends BaseRepository<StatusEntity,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,108 +54,7 @@ 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_PSQI.equals(type)){
-            //睡眠质量
-            int scoreQuality = checkQuality(jsonArray);
-            //入睡时间
-            int scoreTime = checkTime(jsonArray);
-            //睡眠时间
-            int scoreHour = checkHour(jsonArray);
-            //睡眠效率
-            int scoreEfficiency = checkEfficiency(jsonArray);
-            //睡眠障碍
-            int scoreObstruct = checkObstruct(jsonArray);
-            //催眠药物
-            int scoreMedicine = checkMedicine(jsonArray);
-            //日间功能障碍
-            int scoreDay = checkDay(jsonArray);
-            System.out.println("A睡眠质量："+scoreQuality+";B入睡时间："+scoreTime+";C睡眠时间："+scoreHour+";D睡眠效率："+scoreEfficiency+";E失眠障碍："+scoreObstruct+";F催眠药物："+scoreMedicine+";日间工程障碍："+scoreDay);
-            int score = scoreQuality+scoreTime+scoreHour+scoreEfficiency+scoreObstruct+scoreMedicine+scoreDay;
-            System.out.println("PSQI总分："+score);
-            Map<String,String> resultMap = new LinkedHashMap<>();
-            resultMap.put("A睡眠质量",String.valueOf(scoreQuality));
-            resultMap.put("B入睡时间",String.valueOf(scoreTime));
-            resultMap.put("C睡眠时间",String.valueOf(scoreHour));
-            resultMap.put("D睡眠效率",String.valueOf(scoreEfficiency));
-            resultMap.put("E失眠障碍",String.valueOf(scoreObstruct));
-            resultMap.put("F催眠药物",String.valueOf(scoreMedicine));
-            resultMap.put("日间工程障碍",String.valueOf(scoreDay));
-            resultMap.put("PSQI总分",String.valueOf(score));
-            fileName = fileName+"-"+Constant.SHEET_NAME_PSQI+".xlsx";
-            List<PSQIEntity> dataList = jsonArray.toJavaList(PSQIEntity.class);
-            resultMapList = new ArrayList<>();
-            resultMapList.add(resultMap);
-            ExcelUtil.createExcelFile(PSQIEntity.class,dataList,resultMapList,new ExcelClass().contentExcel(Constant.QUEST_TYPE_PSQI),fileName,Constant.SHEET_NAME_PSQI);
-            //心境状态
-        }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_SCL.equals(type)){
+         if (Constant.QUEST_TYPE_SCL.equals(type)){
             int [] scores = {0,0,0,0,0,0,0,0,0,0};
             for (int i=0;i<jsonArray.size();i++){
                 JSONObject jsonObject1 = jsonArray.getJSONObject(i);
@@ -208,91 +107,6 @@ public class ScaleResultController extends BaseController {
             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};
@@ -317,114 +131,7 @@ public class ScaleResultController extends BaseController {
             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_STATUS.equals(type)){
-            //状态焦虑
-            int [] statusScore = {0,0};
-            for (int i = 0; i < 20; i++) {
-                JSONObject jsonObject1 = jsonArray.getJSONObject(i);
-                String checked = jsonObject1.getString("checked");
-                String model = jsonObject1.getString("type");
-                if(model.equals("0")){
-                    if(checked.equals("完全没有")){
-                        statusScore[0]+=4;
-                    }else if (checked.equals("有些")){
-                        statusScore[0]+=3;
-                    }else if (checked.equals("经常")){
-                        statusScore[0]+=2;
-                    }else if (checked.equals("非常明显")){
-                        statusScore[0]+=1;
-                    }
-                }else {
-                    if(checked.equals("完全没有")){
-                        statusScore[1]+=1;
-                    }else if (checked.equals("有些")){
-                        statusScore[1]+=2;
-                    }else if (checked.equals("经常")){
-                        statusScore[1]+=3;
-                    }else if (checked.equals("非常明显")){
-                        statusScore[1]+=4;
-                    }
-                }
-            }
 
-            //状态焦虑
-            int []  particularityScore = {0,0};
-            for (int i = 20; i < jsonArray.size(); i++) {
-                JSONObject jsonObject1 = jsonArray.getJSONObject(i);
-                String checked = jsonObject1.getString("checked");
-                String model = jsonObject1.getString("type");
-                if(model.equals("0")){
-                    if(checked.equals("完全没有")){
-                        particularityScore[0]+=4;
-                    }else if (checked.equals("有些")){
-                        particularityScore[0]+=3;
-                    }else if (checked.equals("经常")){
-                        particularityScore[0]+=2;
-                    }else if (checked.equals("非常明显")){
-                        particularityScore[0]+=1;
-                    }
-                }else {
-                    if(checked.equals("完全没有")){
-                        particularityScore[1]+=1;
-                    }else if (checked.equals("有些")){
-                        particularityScore[1]+=2;
-                    }else if (checked.equals("经常")){
-                        particularityScore[1]+=3;
-                    }else if (checked.equals("非常明显")){
-                        particularityScore[1]+=4;
-                    }
-                }
-            }
-            System.out.println("状态焦虑：反向得分"+statusScore[0]+";正向得分："+statusScore[1]);
-            System.out.println("特质焦虑：反向得分"+particularityScore[0]+";正向得分："+particularityScore[1]);
-            fileName = fileName+"-"+Constant.SHEET_NAME_STATUS+".xlsx";
-            Map<String,String> resultMap = new LinkedHashMap<>();
-            resultMap.put("状态焦虑",String.valueOf(statusScore[0]+statusScore[1]));
-            resultMap.put("特质焦虑",String.valueOf(particularityScore[0]+particularityScore[1]));
-            resultMapList = new ArrayList<>();
-            resultMapList.add(resultMap);
-            ExcelUtil.createExcelFile(StatusEntity.class,jsonArray.toJavaList(StatusEntity.class),resultMapList,new ExcelClass().contentExcel(Constant.QUEST_TYPE_STATUS),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<>();

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

@@ -26,46 +26,22 @@ import java.util.List;
 @Api(tags = "(APP专用)量表数据查询：量表的问答选项")
 public class SubjectController extends BaseController {
 
-    @Autowired
-    private PSQIService psqiService;
-    @Autowired
-    private POMSService pomsService;
+
+
     @Autowired
     private SCLService sclService;
-    @Autowired
-    private ASKService askService;
+
     @Autowired
     private AviationService aviationService;
-    @Autowired
-    private SupportService supportService;
+
     @Autowired
     private DepressService depressService;
-    @Autowired
-    private MoodService moodService;
-    @Autowired
-    private StatusService statusService;
-    @Autowired
-    private LifeService lifeService;
+
     @Autowired
     private CattellService cattellService;
-    @Autowired
-    private ScaleService scaleService;
-
-
-    //@SafetyProcess
-    @PostMapping("/save/{flag}/POST")
-    public Result saveSubject(@RequestBody Object object, @PathVariable String flag){
-        if(Constant.QUEST_TYPE_PSQI.equals(flag)){
-            PSQIEntity psqiEntity = (PSQIEntity) object;
-            psqiEntity = this.psqiService.saveSubject(psqiEntity);
-            return success(psqiEntity,"保存成功");
-        }
-        return fail();
-    }
 
 
-
-    /**
+ /**
      * 查询全量检测列表
      * @param type
      * @return
@@ -74,47 +50,22 @@ public class SubjectController extends BaseController {
     @GetMapping("/{type}")
     @ApiOperation("查询量表问题选项列表：flag量表标志")
     public Result getSubjectByType(@PathVariable String type){
-        if(Constant.QUEST_TYPE_PSQI.equals(type)){
-            List<PSQIEntity> psqiEntityList = this.psqiService.findAll();
-            return success(psqiEntityList);
-        }else if(Constant.QUEST_TYPE_POMS.equals(type)){
-            List<POMSEntity> pomsEntityList = this.pomsService.findAll();
-            return success(pomsEntityList);
-        }else if(Constant.QUEST_TYPE_SCL.equals(type)){
+        if(Constant.QUEST_TYPE_SCL.equals(type)){
             List<SCLEntity> sclEntityList = this.sclService.findAll();
             return success(sclEntityList);
-        }else if(Constant.QUEST_TYPE_ASK.equals(type)){
-            List<ASKEntity> askEntityList = this.askService.findAll();
-            System.out.println(askEntityList);
-            return success(askEntityList);
         }else if(Constant.QUEST_TYPE_AVAI.equals(type)){
             List<AviationEntity> aviationEntityList = this.aviationService.findAll();
             return success(aviationEntityList);
-        }else if(Constant.QUEST_TYPE_SUPP.equals(type)){
-            List<SupportEntity> supportEntityList = this.supportService.findAll();
-            return success(supportEntityList);
         }else if(Constant.QUEST_TYPE_DEPR.equals(type)){
             List<DepressEntity> depressEntityList = this.depressService.findAll();
             return success(depressEntityList);
-        }else if(Constant.QUEST_TYPE_MOOD.equals(type)){
-            List<MoodEntity> moodEntityList = this.moodService.findAll();
-            return success(moodEntityList);
-        }else if(Constant.QUEST_TYPE_STATUS.equals(type)){
-            List<StatusEntity>statusEntityList = this.statusService.findAll();
-            return success(statusEntityList);
-        }else if (Constant.QUEST_TYPE_LIFE.equals(type)){
-            List<LifeEntity> lifeEntityList = this.lifeService.findAll();
-            return success(lifeEntityList);
         }else if (Constant.QUEST_TYPE_CATTELL.equals(type)){
             List<CattellEntity> cattellEntityList = this.cattellService.findAll();
             return success(cattellEntityList);
         }
         return fail();
 
-        /*else{
-            List<ScaleEntity> scaleEntityList = this.scaleService.findAll();
-            return success(scaleEntityList);
-        }*/
+
     }
 
 }

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/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/PSQIService.java

@@ -1,24 +0,0 @@
-package com.rf.psychological.service;
-
-import com.rf.psychological.dao.model.PSQIEntity;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:
- * @date 2021/1/19 16:54
- */
-public interface PSQIService {
-    /**
-     * 查询全量PSQI列表
-     * @return
-     */
-    List<PSQIEntity> findAll();
-
-    /**
-     * 保存
-     * @return
-     */
-    PSQIEntity saveSubject(PSQIEntity psqiEntity);
-}

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

@@ -1,18 +0,0 @@
-package com.rf.psychological.service;
-
-import com.rf.psychological.dao.model.StatusEntity;
-
-import java.util.List;
-
-/**
- * @author zzf
- * @description:状态-特质焦虑量表
- * @date 2021/1/20 18:50
- */
-public interface StatusService {
-    /**
-     * 全量查询
-     * @return
-     */
-    List<StatusEntity> 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/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/PSQIServiceImpl.java

@@ -1,40 +0,0 @@
-package com.rf.psychological.service.impl;
-
-import com.rf.psychological.dao.model.PSQIEntity;
-import com.rf.psychological.dao.repository.PSQIRepository;
-import com.rf.psychological.service.PSQIService;
-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/19 16:54
- */
-@Service
-public class PSQIServiceImpl implements PSQIService {
-    @Autowired
-    private PSQIRepository psqiRepository;
-    /**
-     * 查询全量PSQI列表
-     *
-     * @return
-     */
-    @Override
-    public List<PSQIEntity> findAll() {
-        return this.psqiRepository.findAll(Sort.by(Sort.Direction.ASC, "no"));
-    }
-
-    /**
-     * 保存
-     *
-     * @return
-     */
-    @Override
-    public PSQIEntity saveSubject(PSQIEntity psqiEntity) {
-        return this.psqiRepository.save(psqiEntity);
-    }
-}

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

@@ -1,30 +0,0 @@
-package com.rf.psychological.service.impl;
-
-import com.rf.psychological.dao.model.StatusEntity;
-import com.rf.psychological.dao.repository.StatusRepository;
-import com.rf.psychological.service.StatusService;
-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:51
- */
-@Service
-public class StatusServiceImpl implements StatusService {
-    @Autowired
-    private StatusRepository statusRepository;
-    /**
-     * 全量查询
-     *
-     * @return
-     */
-    @Override
-    public List<StatusEntity> findAll() {
-        return this.statusRepository.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/ExcelUtil.java

@@ -694,42 +694,8 @@ public class ExcelUtil {
                                     }
                                 }
                             }
-                            if (clazz.equals(ASKEntity.class) || clazz.equals(MoodEntity.class) || clazz.equals(StatusEntity.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 = "自我情绪";
-                                    }
-                                }
-                            }
+
+
                             //分量编号 0躯体化 1强迫症状 2人际关系敏感 3抑郁 4焦虑 5敌对 6恐怖 7偏执 8精神病性 9 其他
                             if (clazz.equals(SCLEntity.class)) {
                                 if (propertyName.equals("type")) {