添加门诊满意度调查问卷

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>wxservice-server</artifactId>
-    <version>10.6</version>
+    <version>10.7</version>
     <name>wxservice-server</name>
     <description>server for wxservice-web</description>
 

src/main/java/thyyxxk/wxservice_server/controller/AssessmentController.java

@@ -0,0 +1,35 @@
+package thyyxxk.wxservice_server.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import thyyxxk.wxservice_server.entity.ResultVo;
+import thyyxxk.wxservice_server.entity.assessment.ClinicSatisfiedQuestionnaire;
+import thyyxxk.wxservice_server.entity.assessment.DepressionQuestionnaire;
+import thyyxxk.wxservice_server.service.AssessmentService;
+
+/**
+ * @author dj
+ */
+@RestController
+@RequestMapping("/assessment")
+public class AssessmentController {
+    private final AssessmentService service;
+
+    @Autowired
+    public AssessmentController(AssessmentService service) {
+        this.service = service;
+    }
+
+    @PostMapping("/submitDepressionAssessment")
+    public ResultVo<String> submitDepressionAssessment(@RequestBody DepressionQuestionnaire pojo) {
+        return service.submitDepressionAssessment(pojo);
+    }
+
+    @PostMapping("/submitClinicSatisfiedAssessment")
+    public ResultVo<String> submitClinicSatisfiedAssessment(@RequestBody ClinicSatisfiedQuestionnaire questionnaire) {
+        return service.submitClinicSatisfiedAssessment(questionnaire);
+    }
+}

src/main/java/thyyxxk/wxservice_server/controller/DepressionAssessmentController.java

@@ -1,30 +0,0 @@
-package thyyxxk.wxservice_server.controller;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import thyyxxk.wxservice_server.entity.ResultVo;
-import thyyxxk.wxservice_server.entity.assessment.DepressionQuestionnaire;
-import thyyxxk.wxservice_server.service.DepressionAssessmentService;
-
-/**
- * @author dj
- */
-@RestController
-@RequestMapping("/depressionAssessment")
-public class DepressionAssessmentController {
-    private final DepressionAssessmentService service;
-
-    @Autowired
-    public DepressionAssessmentController(DepressionAssessmentService service) {
-        this.service = service;
-    }
-
-    @PostMapping("/submit")
-    public ResultVo<String> submit(@RequestBody DepressionQuestionnaire pojo) {
-        return service.submit(pojo);
-    }
-
-}

src/main/java/thyyxxk/wxservice_server/dao/DepressionAssessmentDao.java → src/main/java/thyyxxk/wxservice_server/dao/AssessmentDao.java

@@ -4,13 +4,14 @@ import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import thyyxxk.wxservice_server.entity.assessment.ClinicSatisfiedQuestionnaire;
 import thyyxxk.wxservice_server.entity.assessment.DepressionQuestionnaire;
 
 /**
  * @author dj
  */
 @Mapper
-public interface DepressionAssessmentDao {
+public interface AssessmentDao {
 
     @Select("select top 1 datediff(day, date, getdate()) from " +
             "t_depression_assessment with(nolock) where idcard=#{idcard} order by id desc")
@@ -23,4 +24,8 @@ public interface DepressionAssessmentDao {
             "#{item6}, #{item7}, #{item8}, #{item9}, #{item10}, #{item11}, #{item12}, #{item13}, #{item14}, " +
             "#{item15}, #{item16}, #{item17}, #{item18}, #{item19}, #{item20}, #{score}, #{note}, getDate())")
     void insertNewDepressionAssessment(DepressionQuestionnaire pojo);
+
+    @Insert("insert into t_clinic_satisfied_assessment (patient_id,item1,item2,item3,item4,item5,item6,item7,item8,item9,item10,item11,item12) " +
+            "values (#{patientId},#{item1},#{item2},#{item3},#{item4},#{item5},#{item6},#{item7},#{item8},#{item9},#{item10},#{item11},#{item12})")
+    void insertClinicSatisfiedAssessment(ClinicSatisfiedQuestionnaire questionnaire);
 }

src/main/java/thyyxxk/wxservice_server/entity/assessment/ClinicSatisfiedQuestionnaire.java

@@ -0,0 +1,97 @@
+package thyyxxk.wxservice_server.entity.assessment;
+
+import lombok.Data;
+import thyyxxk.wxservice_server.utils.ListUtil;
+
+import java.util.List;
+
+@Data
+public class ClinicSatisfiedQuestionnaire {
+    private Integer id;
+    private String patientId;
+    private String item1;
+    private String item2;
+    private String item3;
+    private String item4;
+    private String item5;
+    private String item6;
+    private String item7;
+    private String item8;
+    private String item9;
+    private String item10;
+    private String item11;
+    private String item12;
+
+    private List<String> item2Arr;
+    private List<String> item4Arr;
+    private List<String> item6Arr;
+    private List<String> item8Arr;
+    private List<String> item10Arr;
+    private List<String> item12Arr;
+
+    public String getItem2() {
+        if (ListUtil.isEmpty(item2Arr)) {
+            return item2;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String item : item2Arr) {
+            builder.append(item).append("^");
+        }
+        return builder.substring(0, builder.length() - 1);
+    }
+
+    public String getItem4() {
+        if (ListUtil.isEmpty(item4Arr)) {
+            return item4;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String item : item4Arr) {
+            builder.append(item).append("^");
+        }
+        return builder.substring(0, builder.length() - 1);
+    }
+
+    public String getItem6() {
+        if (ListUtil.isEmpty(item6Arr)) {
+            return item6;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String item : item6Arr) {
+            builder.append(item).append("^");
+        }
+        return builder.substring(0, builder.length() - 1);
+    }
+
+    public String getItem8() {
+        if (ListUtil.isEmpty(item8Arr)) {
+            return item8;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String item : item8Arr) {
+            builder.append(item).append("^");
+        }
+        return builder.substring(0, builder.length() - 1);
+    }
+
+    public String getItem10() {
+        if (ListUtil.isEmpty(item10Arr)) {
+            return item10;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String item : item10Arr) {
+            builder.append(item).append("^");
+        }
+        return builder.substring(0, builder.length() - 1);
+    }
+
+    public String getItem12() {
+        if (ListUtil.isEmpty(item12Arr)) {
+            return item12;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String item : item12Arr) {
+            builder.append(item).append("^");
+        }
+        return builder.substring(0, builder.length() - 1);
+    }
+}

src/main/java/thyyxxk/wxservice_server/service/DepressionAssessmentService.java → src/main/java/thyyxxk/wxservice_server/service/AssessmentService.java

@@ -3,9 +3,10 @@ package thyyxxk.wxservice_server.service;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import thyyxxk.wxservice_server.dao.DepressionAssessmentDao;
+import thyyxxk.wxservice_server.dao.AssessmentDao;
 import thyyxxk.wxservice_server.config.exception.ExceptionEnum;
 import thyyxxk.wxservice_server.entity.ResultVo;
+import thyyxxk.wxservice_server.entity.assessment.ClinicSatisfiedQuestionnaire;
 import thyyxxk.wxservice_server.entity.assessment.DepressionQuestionnaire;
 import thyyxxk.wxservice_server.utils.ResultVoUtil;
 
@@ -14,15 +15,15 @@ import thyyxxk.wxservice_server.utils.ResultVoUtil;
  */
 @Slf4j
 @Service
-public class DepressionAssessmentService {
-    private final DepressionAssessmentDao dao;
+public class AssessmentService {
+    private final AssessmentDao dao;
 
     @Autowired
-    public DepressionAssessmentService(DepressionAssessmentDao dao) {
+    public AssessmentService(AssessmentDao dao) {
         this.dao = dao;
     }
 
-    public ResultVo<String> submit(DepressionQuestionnaire depressionQuestionnaire) {
+    public ResultVo<String> submitDepressionAssessment(DepressionQuestionnaire depressionQuestionnaire) {
         log.info("SDS抑郁自评量：{}", depressionQuestionnaire);
         Integer dateDiff = dao.getDateDiff(depressionQuestionnaire.getIdcard());
         if (null == dateDiff || dateDiff > 0) {
@@ -32,4 +33,10 @@ public class DepressionAssessmentService {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "您今天已提交过此问卷，请明天再试。");
         }
     }
+
+    public ResultVo<String> submitClinicSatisfiedAssessment(ClinicSatisfiedQuestionnaire questionnaire) {
+        log.info("门诊服务满意度调查：{}", questionnaire);
+        dao.insertClinicSatisfiedAssessment(questionnaire);
+        return ResultVoUtil.success();
+    }
 }