修改调查问卷相关接口

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

@@ -69,4 +69,14 @@ public class QuestionnaireController {
         log.info("保存调查问卷结束{}",writeStatusList);
         return JsonResponse.newInstance().ok(writeStatusList);
     }
+
+    @MustLogin
+    @ApiOperation(value = "查询职位", notes = "")
+    @RequestMapping(value = "/queryPosition", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<List<QuestionnaireVo.PositionInfo>> queryPosition(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{
+        log.info("查询职位开始{}",params);
+        List<QuestionnaireVo.PositionInfo> positionInfoList = questionnaireService.queryPosition(params.getUserId());
+        log.info("查询职位结束{}",positionInfoList);
+        return JsonResponse.newInstance().ok(positionInfoList);
+    }
 }

src/main/java/com/ccsens/carbasics/bean/vo/QuestionnaireVo.java

@@ -5,8 +5,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 @Data
@@ -64,4 +62,12 @@ public class QuestionnaireVo {
 
     }
 
+    @Data
+    @ApiModel("职位信息")
+    public static class PositionInfo {
+        @ApiModelProperty("职位id")
+        private Long id;
+        @ApiModelProperty("职位名称")
+        private String name;
+    }
 }

src/main/java/com/ccsens/carbasics/persist/dao/OrganizationPositionDao.java

@@ -0,0 +1,15 @@
+package com.ccsens.carbasics.persist.dao;
+
+import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
+import com.ccsens.carbasics.persist.mapper.OrganizationPositionMapper;
+
+import java.util.List;
+
+public interface OrganizationPositionDao extends OrganizationPositionMapper {
+
+    /**
+     * 查询问卷调查的职位
+     * @return 职位列表
+     */
+    List<QuestionnaireVo.PositionInfo> queryPosition();
+}

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

@@ -39,4 +39,11 @@ public interface IQuestionnaireService {
      * @return 问卷状态列表
      */
     List<QuestionnaireVo.WriteStatus> queryNotWrite(QuestionnaireDto.QueryNotWrite param, Long userId);
+
+    /**
+     * 查询职位
+     * @param userId 用户id
+     * @return
+     */
+    List<QuestionnaireVo.PositionInfo> queryPosition(Long userId);
 }

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

@@ -1,20 +1,14 @@
 package com.ccsens.carbasics.service;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import com.ccsens.carbasics.bean.dto.QuestionnaireDto;
 import com.ccsens.carbasics.bean.po.Organization;
-import com.ccsens.carbasics.bean.po.Questionnaire;
 import com.ccsens.carbasics.bean.po.QuestionnaireDetail;
 import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
-import com.ccsens.carbasics.persist.dao.AreaDao;
+import com.ccsens.carbasics.persist.dao.*;
-import com.ccsens.carbasics.persist.dao.OrganizationDao;
+import com.ccsens.carbasics.persist.mapper.OrganizationPositionMapper;
-import com.ccsens.carbasics.persist.dao.QuestionnaireDao;
-import com.ccsens.carbasics.persist.dao.QuestionnaireDetailDao;
-import com.ccsens.carbasics.persist.mapper.OrganizationProjectMapper;
-import com.ccsens.carbasics.util.Constant;
 import com.ccsens.carbasics.util.DefaultCodeError;
 import com.ccsens.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
@@ -44,6 +38,8 @@ public class QuestionnaireService implements IQuestionnaireService{
     private OrganizationDao organizationDao;
     @Resource
     private IAsyncService asyncService;
+    @Resource
+    private OrganizationPositionDao positionDao;
 
     @Override
     public List<QuestionnaireVo.AreaInfo> queryArea(QuestionnaireDto.QueryArea param, Long userId) {
@@ -61,7 +57,27 @@ public class QuestionnaireService implements IQuestionnaireService{
 
     @Override
     public void saveQuestionnaire(QuestionnaireDto.SaveQuestionnaire param, Long userId) throws Exception {
-        // TODO 校验介入治疗字段
+        //校验介入治疗字段
+        if (1 == param.getPciStatus()) {
+            if (ObjectUtil.isNull(param.getAisNumberSix())){
+                throw new BaseException(DefaultCodeError.PCI_NOT_NULL);
+            }
+            if (ObjectUtil.isNull(param.getShouldDirectly())) {
+                throw new BaseException(DefaultCodeError.PCI_NOT_NULL);
+            }
+            if (ObjectUtil.isNull(param.getDptMedianNumber())) {
+                throw new BaseException(DefaultCodeError.PCI_NOT_NULL);
+            }
+            if (ObjectUtil.isNull(param.getPrtMedianNumber())) {
+                throw new BaseException(DefaultCodeError.PCI_NOT_NULL);
+            }
+            if (ObjectUtil.isNull(param.getJmrsNumberTwo())) {
+                throw new BaseException(DefaultCodeError.PCI_NOT_NULL);
+            }
+            if (ObjectUtil.isNull(param.getDetailId())) {
+                throw new BaseException(DefaultCodeError.PCI_NOT_NULL);
+            }
+        }
 
         //查询是否有已提交的,如果有只能保存
         Long time = System.currentTimeMillis();
@@ -139,7 +155,7 @@ public class QuestionnaireService implements IQuestionnaireService{
 
 
         //如果医院/部门/用户不存在,则创建对应内容
-//        asyncService.createHospitalOfNotExit(param,userId);
+        asyncService.createHospitalOfNotExit(param,userId);
     }
 
 
@@ -164,4 +180,9 @@ public class QuestionnaireService implements IQuestionnaireService{
         return new ArrayList<>();
     }
 
+    @Override
+    public List<QuestionnaireVo.PositionInfo> queryPosition(Long userId) {
+        return positionDao.queryPosition();
+    }
+
 }

src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java

@@ -42,6 +42,7 @@ public class DefaultCodeError extends CodeError {
     public static final Code DATA_STATUS_SAME = new Code(33,"状态一致无需修改", true);
     public static final Code NOT_APPLY_FOR = new Code(34,"未申请修改，无法修改状态", true);
     public static final Code HOSPITAL_REPEAT_SUBMIT = new Code(35,"数据已提交,无法修改", true);
+    public static final Code PCI_NOT_NULL = new Code(36,"介入治疗相关信息不能为空", true);
 
 
 

src/main/resources/mapper_dao/OrganizationPositionDao.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.carbasics.persist.dao.OrganizationPositionDao">
+
+    <select id="queryPosition" resultType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$PositionInfo">
+        SELECT
+            id,
+            `name`
+        FROM
+            t_organization_position
+        WHERE
+            rec_status = 0
+        AND `code` IN (
+            'ZhiKong',
+            'KeZhuRen',
+            'FuZhuRen',
+            'YiSheng'
+        )
+    </select>
+
+</mapper>

src/main/resources/mapper_dao/QuestionnaireDao.xml

@@ -12,6 +12,7 @@
             <result column="detailId" property="id"/>
             <result column="city" property="city"/>
             <result column="county" property="county"/>
+            <result column="province" property="province"/>
             <result column="hospital_level" property="hospitalLevel"/>
             <result column="hospital_name" property="hospitalName"/>
             <result column="departments" property="departments"/>
@@ -36,6 +37,7 @@
             <result column="jmrs_number_two" property="jmrsNumberTwo"/>
             <result column="death_number" property="deathNumber"/>
             <result column="submit_status" property="submitStatus"/>
+            <result column="pciStatus" property="pciStatus"/>
         </collection>
     </resultMap>
     
@@ -73,7 +75,8 @@
             qd.prt_median_number,
             qd.jmrs_number_two,
             qd.death_number,
-            qd.submit_status
+            qd.submit_status,
+            qd.pci_status AS pciStatus
         FROM
             t_qcp_questionnaire AS q
             LEFT JOIN t_qcp_questionnaire_detail AS qd ON q.id = qd.questionnaire_id
@@ -144,10 +147,10 @@
             t_qcp_questionnaire AS q
         LEFT JOIN t_qcp_questionnaire_detail AS qd ON q.id = qd.questionnaire_id
         AND qd.rec_status = 0
+        AND qd.hospital_name = #{name}
+        AND qd.submit_status = 1
         WHERE
             q.rec_status = 0
-        AND	qd.hospital_name = #{name}
-        AND submit_status = 1
         AND q.id = #{qid}
     </select>