满意度调查问卷修改

pom.xml

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

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

@@ -27,19 +27,24 @@ public interface AssessmentDao {
             "#{item15}, #{item16}, #{item17}, #{item18}, #{item19}, #{item20}, #{score}, #{note}, getDate())")
     void insertNewDepressionAssessment(DepressionQuestionnaire pojo);
 
+    @Select("select top 1 rtrim(visit_dept_code) from mz_visit_table " +
+            "where patient_id=#{patNo} order by visit_date desc")
+    String selectLastVisitDept(String patNo);
+
     @Insert("insert into t_clinic_satisfied_assessment (patient_id,item1,item2,item2_input,item3,item4,item4_input, " +
             "item5,item6,item6_input,item7,item8,item8_input,item9,item10,item10_input,item11,item12,item12_input, " +
-            "item13,item14,item14_input,item15,item16_input,item1002,item1002_input,item1004,item1006,satisfy_staff,suggestion) " +
+            "item13,item14,item14_input,item15,item16,item16_input,item1002,item1002_input,item1004,item1006, " +
+            "jz_flag,satisfy_staff,suggestion) " +
             "values (#{patientId},#{item1},#{item2},#{item2Input},#{item3},#{item4},#{item4Input},#{item5}, " +
             "#{item6},#{item6Input},#{item7},#{item8},#{item8Input},#{item9},#{item10},#{item10Input}, " +
-            "#{item11},#{item12},#{item12Input},#{item13},#{item14},#{item14Input},#{item15},#{item16Input},#{item1002}," +
-            "#{item1002Input},#{item1004},#{item1006},#{satisfyStaff},#{suggestion})")
+            "#{item11},#{item12},#{item12Input},#{item13},#{item14},#{item14Input},#{item15},#{item16},#{item16Input},#{item1002}," +
+            "#{item1002Input},#{item1004},#{item1006},#{jzFlag},#{satisfyStaff},#{suggestion})")
     void insertClinicSatisfiedAssessment(ClinicSatisfiedQuestionnaire questionnaire);
 
     @Insert("insert into t_inpatient_satisfied_assessment (inpatient_no,admiss_times,patient_id,item1,item2,item3,item4,item5,item6,item7,item8,item9,item10,item11,item12, " +
-            "item13,item14,item15,item16,item17,item18,item19,item20,item21,item22,item23,item24_input,item1002,item1002_input,item1004,item1006,satisfy_staff,suggestion) " +
+            "item13,item14,item15,item16,item17,item18,item19,item20,item21,item22,item23,item24,item1002,item1002_input,item1004,item1006,satisfy_staff,suggestion) " +
             "values (#{inpatientNo},#{times},#{patientId},#{item1},#{item2},#{item3},#{item4},#{item5},#{item6},#{item7},#{item8},#{item9},#{item10},#{item11},#{item12}, " +
-            "#{item13},#{item14},#{item15},#{item16},#{item17},#{item18},#{item19},#{item20},#{item21},#{item22},#{item23},#{item24Input},#{item1002}," +
+            "#{item13},#{item14},#{item15},#{item16},#{item17},#{item18},#{item19},#{item20},#{item21},#{item22},#{item23},#{item24},#{item1002}," +
             "#{item1002Input},#{item1004},#{item1006},#{satisfyStaff},#{suggestion})")
     void insertInpatientSatisfiedAssessment(InpatientSatisfiedQuestionnaire questionnaire);
 

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

@@ -54,6 +54,8 @@ public class ClinicSatisfiedQuestionnaire {
 
     // 您对医保科工作人员的服务满意吗
     private String item15;
+    private String item16;
+    private List<String> item16Arr;
     private String item16Input;
 
     // 您选择我院的主要原因是什么
@@ -67,6 +69,9 @@ public class ClinicSatisfiedQuestionnaire {
     // 请您对本次就诊的医疗服务全过程给予整体评价(1-10分)
     private Integer item1006;
 
+    // 是否急诊（1-是，0-否）
+    private Integer jzFlag = 0;
+
     private String satisfyStaff;
     private String suggestion;
 
@@ -150,6 +155,17 @@ public class ClinicSatisfiedQuestionnaire {
         return builder.substring(0, builder.length() - 1);
     }
 
+    public String getItem16() {
+        if (ListUtil.isEmpty(item16Arr)) {
+            return item16;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String item : item16Arr) {
+            builder.append(item).append("^");
+        }
+        return builder.substring(0, builder.length() - 1);
+    }
+
     public String getItem1002() {
         if (ListUtil.isEmpty(item1002Arr)) {
             return item1002;

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

@@ -69,7 +69,8 @@ public class InpatientSatisfiedQuestionnaire {
 
     // 您对医保科工作人员的服务满意吗
     private String item23;
-    private String item24Input;
+    private String item24;
+    private List<String> item24Arr;
 
     // 您选择我院的主要原因是什么
     private String item1002;
@@ -209,6 +210,17 @@ public class InpatientSatisfiedQuestionnaire {
         return builder.substring(0, builder.length() - 1);
     }
 
+    public String getItem24() {
+        if (ListUtil.isEmpty(item24Arr)) {
+            return item24;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String item : item24Arr) {
+            builder.append(item).append("^");
+        }
+        return builder.substring(0, builder.length() - 1);
+    }
+
     public String getItem1002() {
         if (ListUtil.isEmpty(item1002Arr)) {
             return item1002;

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

@@ -13,6 +13,8 @@ import thyyxxk.wxservice_server.entity.assessment.InpatientSatisfiedQuestionnair
 import thyyxxk.wxservice_server.utils.ResultVoUtil;
 import thyyxxk.wxservice_server.utils.TokenUtil;
 
+import java.util.Objects;
+
 /**
  * @author dj
  */
@@ -20,6 +22,7 @@ import thyyxxk.wxservice_server.utils.TokenUtil;
 @Service
 public class AssessmentService {
     private final AssessmentDao dao;
+    private static final String EMERGENCY_CLINIC = "1070000";
 
     @Autowired
     public AssessmentService(AssessmentDao dao) {
@@ -39,6 +42,10 @@ public class AssessmentService {
 
     public ResultVo<String> submitClinicSatisfiedAssessment(ClinicSatisfiedQuestionnaire questionnaire) {
         log.info("门诊服务满意度调查：{}", questionnaire);
+        String deptCode = dao.selectLastVisitDept(questionnaire.getPatientId());
+        if (Objects.equals(deptCode, EMERGENCY_CLINIC)) {
+            questionnaire.setJzFlag(1);
+        }
         dao.insertClinicSatisfiedAssessment(questionnaire);
         return ResultVoUtil.success();
     }