更改环境

src/main/java/com/ccsens/carbasics/api/DebugController.java

@@ -63,7 +63,7 @@ public class DebugController {
     })
     @RequestMapping(value="",method = {RequestMethod.GET, RequestMethod.POST},produces = {"application/json;charset=UTF-8"})
     public JsonResponse debug() throws Exception {
-        addData();
+//        addData();
         return JsonResponse.newInstance().ok("测试");
     }
 

src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java

@@ -107,7 +107,7 @@ public class QuestionnaireService implements IQuestionnaireService{
         Object o = redisUtil.get(param.getDetailId() + "" + userId);
         log.info("redis保存问卷用户{},{}",param.getDetailId() + "" + userId,o);
         if (ObjectUtil.isNull(o)) {
-            redisUtil.set(param.getDetailId() + "" + userId,userId);
+            redisUtil.set(param.getDetailId() + "" + userId,param.getCode());
             //查询是否已经提交,已提交不能保存修改
             QuestionnaireDetail questionnaireDetail = questionnaireDetailDao.selectByPrimaryKey(param.getDetailId());
             if (Constant.SubmitStatus.submit.status == questionnaireDetail.getSubmitStatus()) {
@@ -177,7 +177,7 @@ public class QuestionnaireService implements IQuestionnaireService{
         List<String> stringList = new ArrayList<>();
         stringList.add("QXXWJ");
         List<CodeVo.Basic> qxxwj = codeDictionariesDao.query(stringList);
-        if (num <= qxxwj.size()) {
+        if (num < qxxwj.size()-1) {
             throw new BaseException(DefaultCodeError.QUESTIONNAIRE_INFO_INCOMPLETE);
         }
         String answer = questionnaireDetailDao.queryXGZL(param.getDetailId());
@@ -186,7 +186,7 @@ public class QuestionnaireService implements IQuestionnaireService{
             sonCode.add("XGZL");
             List<CodeVo.Basic> xgzl = codeDictionariesDao.query(sonCode);
             Integer sonOfXGZLNum = questionnaireDetailDao.querySonOfXGZL(param.getDetailId());
-            if (sonOfXGZLNum <= xgzl.size()) {
+            if (sonOfXGZLNum < xgzl.size()) {
                 throw new BaseException(DefaultCodeError.XGZL_INCOMPLETE);
             }
         }

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: test
-    include: common, util-test
+    active: dev
+    include: common, util-dev

src/main/resources/druid-test.yml

@@ -27,7 +27,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://test.tall.wiki/carbasics_bak?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://test.tall.wiki/carbasics?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
       env: CCSENS_TALL

src/main/resources/mapper_dao/OrganizationDao.xml

@@ -830,25 +830,22 @@
         WHERE
             rec_status = 0
             AND member_id = ( SELECT id FROM t_organization_member WHERE rec_status = 0 AND user_id = #{userId} )
-            AND department_id = (
+            AND position_id = (
             SELECT
-                od.id
+                op.id
             FROM
+                t_organization_position AS op,
+                t_organization_department AS od,
                 t_organization AS o
-                LEFT JOIN t_organization_department AS od ON od.organization_id = o.id
             WHERE
-                o.rec_status = 0
+                op.department_id = od.id
+                AND od.organization_id = o.id
+                AND op.rec_status = 0
+                AND od.rec_status = 0
+                AND o.rec_status = 0
                 AND o.`name` = #{name}
                 AND od.`name` = #{departmentName}
-            )
-            AND position_id = (
-            SELECT
-                id
-            FROM
-                t_organization_position
-            WHERE
-                rec_status = 0
-            AND `name` = #{positionName}
+                AND op.`name` = #{positionName}
             )
     </select>
 

src/main/resources/mapper_dao/OrganizationMemberPositionDao.xml

@@ -20,7 +20,7 @@
     <select id="queryRole" resultType="com.ccsens.common.bean.po.ProRole">
         SELECT
             op.id,
-            op.`name`,
+            op.role_name AS `name`,
             o.id AS projectId
         FROM
             `t_organization_member_position` AS omp

src/main/resources/mapper_dao/QuestionnaireRecordDao.xml

@@ -62,6 +62,8 @@
         AND qd.rec_status = 0 AND qr.rec_status = 0
         AND qd.submit_status = 1 AND qd.user_id = #{userId}
         AND qr.question_code = 'HOS-NAME'
+        ORDER BY qd.create_at DESC
+        LIMIT 1
     </select>
 
     <select id="queryHospitalList" resultType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$HospitalName">