diff --git a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java
index da35ee80..a7f1e166 100644
--- a/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java
+++ b/tcm/src/main/java/com/ccsens/tcm/bean/vo/QuestionVo.java
@@ -89,28 +89,10 @@ public class QuestionVo {
         private String code;
         @ApiModelProperty("名称")
         private String name;
-        @ApiModelProperty("题目信息")
-        private List<TopictQuestion> questiTonVos;
         @ApiModelProperty("子类型")
         private List<subjectLists> optionVos;
     }
     @Data
-    @ApiModel("某类型下的题目信息")
-    public static class TopictQuestion{
-        @ApiModelProperty("id")
-        private Long id;
-        @ApiModelProperty("题目名称")
-        private String question;
-        @ApiModelProperty("排序")
-        private int sort;
-        @ApiModelProperty("单位例如 g/L")
-        private String units;
-        @ApiModelProperty("类型 1单行文本,2多行文本,3单选,4多选,5下拉菜单,6日期,7图片(文件),8单选+其他，9多选+其他，10下拉+其他，11多选+其他+说明，12单选+关联其他内容 13数字类型")
-        private byte type;
-        @ApiModelProperty("备注")
-        private String remark;
-    }
-    @Data
     @ApiModel("患者信息的试题类型")
     public static class PatientCode {
         @ApiModelProperty("id")
diff --git a/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java b/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java
index bc73a433..082094f5 100644
--- a/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java
+++ b/tcm/src/main/java/com/ccsens/tcm/service/QuestionService.java
@@ -57,13 +57,16 @@ public class QuestionService implements IQuestionService{
 
     @Override
     public List<QuestionVo.subjectLists> queryQuestion() {
+        //
         List<QuestionVo.subjectLists> subjectLists= questionDao.queryQuestion();
+
+
         List<QuestionVo.subjectLists> subjectLists1=  questionDao.queryQuestion1();
         if(subjectLists1.size()>0){
-            subjectLists1.forEach(subjectLists2 -> {
+            subjectLists1.forEach(subject1 -> {
                 for (int i = 0; i < subjectLists.size(); i++) {
-                    if(subjectLists.get(i).getId().equals(subjectLists2.getId())){
-                        subjectLists.get(i).setQuestiTonVos(subjectLists2.getQuestiTonVos());
+                    if(subjectLists.get(i).getId().equals(subject1.getId())){
+                        subjectLists.get(i).getOptionVos().addAll(subject1.getOptionVos());
                     }
                 }
             });
diff --git a/tcm/src/main/resources/application.yml b/tcm/src/main/resources/application.yml
index 4ecd13fd..f59084b0 100644
--- a/tcm/src/main/resources/application.yml
+++ b/tcm/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test
 
diff --git a/tcm/src/main/resources/mapper_dao/QuestionDao.xml b/tcm/src/main/resources/mapper_dao/QuestionDao.xml
index 9e0cceb9..f1bdb052 100644
--- a/tcm/src/main/resources/mapper_dao/QuestionDao.xml
+++ b/tcm/src/main/resources/mapper_dao/QuestionDao.xml
@@ -217,15 +217,11 @@
       <result column="name" property="name"/>
       <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$subjectLists">
           <id column="id1" property="id"/>
-          <result column="code" property="code"/>
-          <result column="name" property="name"/>
-          <collection property="questiTonVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$TopictQuestion">
+          <result column="code1" property="code"/>
+          <result column="name1" property="name"/>
+          <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$subjectLists">
             <id property="id" column="id2"/>
-            <result column="question" property="question"/>
-            <result column="sort" property="sort"/>
-            <result column="units" property="units"/>
-            <result column="type" property="type"/>
-            <result column="remark" property="remark"/>
+            <result property="name" column="question"/>
           </collection>
       </collection>
   </resultMap>
@@ -238,11 +234,7 @@
         trc1.`code` AS code1,
         trc1.`name` AS name1,
         tq.id AS id2,
-        tq.question,
-        tq.sort,
-        tq.units,
-        tq.type,
-        tq.remark
+        tq.question
     FROM
         t_report_code trc
         LEFT JOIN t_report_code trc1 ON trc1.parent_code = trc.CODE
@@ -253,18 +245,15 @@
     WHERE
         trc.LEVEL = 1
         AND trc.rec_status =0
+        order by trc.sort,trc1.sort,tq.sort
   </select>
     <resultMap id="queryQuestion1Map" type="com.ccsens.tcm.bean.vo.QuestionVo$subjectLists">
         <id column="id" property="id"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
-        <collection property="questiTonVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$TopictQuestion">
+        <collection property="optionVos" ofType="com.ccsens.tcm.bean.vo.QuestionVo$subjectLists">
             <id property="id" column="id2"/>
-            <result column="question" property="question"/>
-            <result column="sort" property="sort"/>
-            <result column="units" property="units"/>
-            <result column="type" property="type"/>
-            <result column="remark" property="remark"/>
+            <result column="question" property="name"/>
         </collection>
     </resultMap>
   <select id="queryQuestion1" resultMap="queryQuestion1Map">
@@ -272,11 +261,7 @@
 	trc.`code`,
 	trc.`name`,
 	tq.id AS id2,
-	tq.question,
-	tq.sort,
-	tq.units,
-	tq.type,
-	tq.remark
+	tq.question
     FROM
     t_report_code trc, t_question tq
     WHERE
@@ -284,6 +269,7 @@
         AND trc.rec_status =0
         and tq.CODE = trc.CODE
         AND tq.rec_status = 0
+    order by trc.sort,tq.sort
   </select>
 
 </mapper>
\ No newline at end of file