修改认知干预系统量表信息字段提交

src/main/java/com/rf/kjb/scale/dao/model/ScaleEntry.java

@@ -41,6 +41,9 @@ public class ScaleEntry extends BaseEntry {
     @Column(name = "question_type", columnDefinition = "varchar(10) comment '类型：0-单选 1-多选 2-填空'")
     private String questionType;
 
+    @Column(name = "question_param", columnDefinition = "text comment '题目类型对应参数'")
+    private String questionParam;
+
     @Column(name = "weight", columnDefinition = "varchar(10) comment '分量'")
     private String weight;
 

src/main/java/com/rf/kjb/scale/dao/model/ScaleMarksEntity.java

@@ -69,4 +69,7 @@ public class ScaleMarksEntity extends BaseEntry {
 
     @Column(name = "is_total_score_explain", columnDefinition = "varchar(50) default '否' comment '是否为总分解读'")
     private String isTotalScoreExplain;
+
+    @Column(name = "scoring_type", columnDefinition = "varchar(2) default '0' comment '计分类型：0---求和，1---求平均值保留两位小数，2---求平均值四舍五入'")
+    private String scoringType;
 }

src/main/java/com/rf/kjb/scale/dao/model/SubjectEntity.java

@@ -78,4 +78,13 @@ public class SubjectEntity extends BaseEntry {
     @Column(name = "report_version", columnDefinition = "int default 1 comment '报告版本信息，默认为1---第一版本报告，详见SubjectConstant.class'")
     private Integer reportVersion;
 
+    @Column(name = "reference", columnDefinition = "varchar(1000) comment '参考文献'")
+    private String reference;
+
+    @Column(name = "report_reference", columnDefinition = "varchar(1000) comment '报告参考文献'")
+    private String reportReference;
+
+    @Column(name = "report_keyboarder", columnDefinition = "varchar(50) comment '报告录入人'")
+    private String reportKeyboarder;
+
 }

src/main/java/com/rf/kjb/scale/dao/repository/ScaleMarksRepository.java

@@ -21,7 +21,7 @@ public interface ScaleMarksRepository extends BaseRepository<ScaleMarksEntity,St
      * @param flag
      * @return
      */
-    @Query(value = "select id, flag, improvement_suggestions, score_end, score_start, symptom, name, name_explain, reference,standard_deviation,suggestion, is_total_score_explain,create_time,update_time from t_scale_marks where flag = :flag", nativeQuery = true)
+    @Query(value = "select * from t_scale_marks where flag = :flag", nativeQuery = true)
     List<ScaleMarksEntity> getScaleMarksByFlag(@Param("flag") String flag);
 
     /**

src/main/java/com/rf/kjb/scale/dao/repository/ScaleRepository.java

@@ -21,7 +21,7 @@ public interface ScaleRepository extends BaseRepository<ScaleEntry,String> {
      * @param flag
      * @return
      */
-    @Query(value="select id,check_item,content,flag,question_no,question_type,score,score_direction,serial_no,weight,create_time,update_time from t_scale_info where flag = :flag order by question_no+0,serial_no+0 ",nativeQuery=true)
+    @Query(value="select * from t_scale_info where flag = :flag order by question_no+0,serial_no+0 ",nativeQuery=true)
     List<ScaleEntry> getScaleByFlag(@Param("flag")String flag);
 
     @Transactional

src/main/java/com/rf/kjb/scale/dao/repository/SubjectRepository.java

@@ -36,7 +36,7 @@ public interface SubjectRepository extends BaseRepository<SubjectEntity, String>
      * @param searchName
      * @return
      */
-    @Query(value = "select id,flag,name,no,type,is_hot,test_num,description,is_new,image_url,uploader,ename,file_name ,scoring_principle,status,scale_limit,men,icon_info from t_subject_info tsi where name like %:searchName% or ename like %:searchName%  order by flag desc  limit :pageNum ,:pageSize ", nativeQuery = true)
+    @Query(value = "select * from t_subject_info tsi where name like %:searchName% or ename like %:searchName%  order by flag desc  limit :pageNum ,:pageSize ", nativeQuery = true)
     List<SubjectEntity> findByNameOrUploader(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize, @Param("searchName") String searchName);
 
     /**
@@ -46,7 +46,7 @@ public interface SubjectRepository extends BaseRepository<SubjectEntity, String>
      * @param pageSize
      * @return
      */
-    @Query(value = "select id,flag,name,no,type,is_hot,test_num,description,is_new,image_url,uploader,ename,file_name,scoring_principle,status,scale_limit,men,icon_info from t_subject_info order by status,flag desc  limit :pageNum ,:pageSize ", nativeQuery = true)
+    @Query(value = "select * from t_subject_info order by status,flag desc  limit :pageNum ,:pageSize ", nativeQuery = true)
     List<SubjectEntity> findAll(@Param("pageNum") int pageNum, @Param("pageSize") int pageSize);
 
     /**
@@ -54,7 +54,7 @@ public interface SubjectRepository extends BaseRepository<SubjectEntity, String>
      *
      * @return
      */
-    @Query(value = "select id,flag,name,no,type,is_hot,test_num,description,is_new,image_url,uploader,ename,file_name,scoring_principle,status,scale_limit,men,icon_info,create_time,update_time,report_version from t_subject_info where flag = :flag ", nativeQuery = true)
+    @Query(value = "select * from t_subject_info where flag = :flag ", nativeQuery = true)
     SubjectEntity getSubjectByFlag(@Param("flag") String flag);
 
     /**