问卷字段

postdischarge-manage/src/main/java/com/xinelu/manage/controller/questioninfo/QuestionInfoController.java

@@ -110,7 +110,7 @@ public class QuestionInfoController extends BaseController {
      * 科室问卷数量
      */
     @GetMapping("/departmentQuestionCount")
-    public AjaxResult departmentQuestionCount(String departmentName, String questionnaireStatus) {
+    public AjaxResult departmentQuestionCount(String departmentName, String questionnaireStatus,String questionType) {
-        return questionInfoService.departmentQuestionCount(departmentName, questionnaireStatus);
+        return questionInfoService.departmentQuestionCount(departmentName, questionnaireStatus,questionType);
     }
 }

postdischarge-manage/src/main/java/com/xinelu/manage/domain/questioninfo/QuestionInfo.java

@@ -123,6 +123,12 @@ public class QuestionInfo extends BaseEntity {
     @Excel(name = "问卷备注信息")
     private String questionnaireRemark;
 
+    /**
+     * 问卷类型，普通问卷：REGULAR_QUESTIONNAIRE,满意度问卷：SATISFACTION_QUESTIONNAIRE
+     */
+    @ApiModelProperty(value = "问卷类型")
+    @Excel(name = "问卷类型")
+    private String questionType;
 
     @Override
     public String toString() {

postdischarge-manage/src/main/java/com/xinelu/manage/mapper/questioninfo/QuestionInfoMapper.java

@@ -69,5 +69,5 @@ public interface QuestionInfoMapper {
      * @param questionnaireStatus 问卷状态
      * @return DepartmentVO
      */
-    List<DepartmentVO> departmentQuestionByDepartmentName(@Param("departmentName") String departmentName, @Param("questionnaireStatus") String questionnaireStatus);
+    List<DepartmentVO> departmentQuestionByDepartmentName(@Param("departmentName") String departmentName, @Param("questionnaireStatus") String questionnaireStatus, @Param("questionType") String questionType);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/IQuestionInfoService.java

@@ -75,5 +75,5 @@ public interface IQuestionInfoService {
      * @param departmentName 科室名称
      * @return AjaxResult
      */
-    AjaxResult departmentQuestionCount(String departmentName, String questionnaireStatus);
+    AjaxResult departmentQuestionCount(String departmentName, String questionnaireStatus,String questionType);
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java

@@ -255,6 +255,7 @@ public class QuestionInfoServiceImpl implements IQuestionInfoService {
      * @param questionInfo 问卷基本信息
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public AjaxResult updateQuestionByDepartment(QuestionInfo questionInfo) {
         if (Objects.isNull(questionInfo) || Objects.isNull(questionInfo.getId())) {
@@ -294,12 +295,12 @@ public class QuestionInfoServiceImpl implements IQuestionInfoService {
      * @return AjaxResult
      */
     @Override
-    public AjaxResult departmentQuestionCount(String departmentName, String questionnaireStatus) {
+    public AjaxResult departmentQuestionCount(String departmentName, String questionnaireStatus, String questionType) {
         DepartmentVO departmentVO = new DepartmentVO();
         List<DepartmentVO> department = new ArrayList<>();
         departmentVO.setDepartmentName("全部");
         departmentVO.setCountNum(0);
-        List<DepartmentVO> departmentVOS = questionInfoMapper.departmentQuestionByDepartmentName(departmentName, questionnaireStatus);
+        List<DepartmentVO> departmentVOS = questionInfoMapper.departmentQuestionByDepartmentName(departmentName, questionnaireStatus, questionType);
         if (CollectionUtils.isNotEmpty(departmentVOS)) {
             Integer result = departmentVOS.stream().mapToInt(DepartmentVO::getCountNum).sum();
             departmentVO.setCountNum(result);

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java

@@ -95,6 +95,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
      * @param signPatientManageRoute 签约患者管理任务路径
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public AjaxResult insertSignPatientManageRoute(SignPatientManageRouteVO signPatientManageRoute) {
         //新增主表
@@ -138,6 +139,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
      * @param signPatientManageRoute 签约患者管理任务路径
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public AjaxResult updateSignPatientManageRoute(SignPatientManageRouteVO signPatientManageRoute) {
         int deleteRouteNodeCount = signPatientManageRouteNodeMapper.deleteRouteNodeByManageRouteId(signPatientManageRoute.getSignPatientManageRouteId());
@@ -186,6 +188,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
      * @param ids 需要删除的签约患者管理任务路径主键
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public int deleteSignPatientManageRouteByIds(Long[] ids) {
         return signPatientManageRouteMapper.deleteSignPatientManageRouteByIds(ids);

postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java

@@ -163,6 +163,7 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService
      * @param specialDiseaseNode 节点信息
      * @return AjaxResult
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public AjaxResult updateRouteCheckStatus(SpecialDiseaseNode specialDiseaseNode) {
         if (Objects.isNull(specialDiseaseNode) || Objects.isNull(specialDiseaseNode.getId())) {

postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java

@@ -77,6 +77,7 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi
      * @param specialDiseaseRoute 专病路径信息
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public AjaxResult insertSpecialDiseaseRoute(SpecialDiseaseRouteVO specialDiseaseRoute) {
         specialDiseaseRoute.setCreateTime(LocalDateTime.now());
@@ -111,6 +112,7 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi
      * @param specialDiseaseRoute 专病路径信息
      * @return 结果
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public AjaxResult updateSpecialDiseaseRoute(SpecialDiseaseRouteVO specialDiseaseRoute) {
         int deleteRoutePackageCount = specialDiseaseRoutePackageMapper.deleteSpecialDiseaseRoutePackageByRouteId(specialDiseaseRoute.getId());
@@ -209,6 +211,7 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi
      * @param specialDiseaseRoute 路径信息
      * @return AjaxResult
      */
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public AjaxResult editReleaseStatus(SpecialDiseaseRoute specialDiseaseRoute) {
         if (Objects.isNull(specialDiseaseRoute) || StringUtils.isBlank(specialDiseaseRoute.getReleaseStatus())) {

postdischarge-manage/src/main/resources/mapper/manage/questioninfo/QuestionInfoMapper.xml

@@ -19,6 +19,7 @@
         <result property="questionnaireStatus" column="questionnaire_status"/>
         <result property="questionnaireSort" column="questionnaire_sort"/>
         <result property="questionnaireRemark" column="questionnaire_remark"/>
+        <result property="questionType" column="question_type"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
@@ -40,6 +41,7 @@
                questionnaire_status,
                questionnaire_sort,
                questionnaire_remark,
+               question_type,
                create_by,
                create_time,
                update_by,
@@ -89,6 +91,9 @@
             <if test="questionnaireRemark != null  and questionnaireRemark != ''">
                 and questionnaire_remark = #{questionnaireRemark}
             </if>
+            <if test="questionType != null  and questionType != ''">
+                and question_type = #{questionType}
+            </if>
         </where>
     </select>
 
@@ -128,6 +133,8 @@
             </if>
             <if test="questionnaireRemark != null">questionnaire_remark,
             </if>
+            <if test="questionType != null">question_type,
+            </if>
             <if test="createBy != null">create_by,
             </if>
             <if test="createTime != null">create_time,
@@ -164,6 +171,8 @@
             </if>
             <if test="questionnaireRemark != null">#{questionnaireRemark},
             </if>
+            <if test="questionType != null">#{questionType},
+            </if>
             <if test="createBy != null">#{createBy},
             </if>
             <if test="createTime != null">#{createTime},
@@ -217,6 +226,9 @@
             <if test="questionnaireRemark != null">questionnaire_remark =
                 #{questionnaireRemark},
             </if>
+            <if test="questionType != null">question_type =
+                #{questionType},
+            </if>
             <if test="createBy != null">create_by =
                 #{createBy},
             </if>
@@ -259,6 +271,9 @@
             <if test="questionnaireStatus != null  and questionnaireStatus != ''">
                 qi.questionnaire_status =#{questionnaireStatus}
             </if>
+            <if test="questionType != null  and questionType != ''">
+                qi.question_type =#{questionType}
+            </if>
         </where>
         GROUP BY dt.id
     </select>