丰富诊后问卷调查

pom.xml

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

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

@@ -29,16 +29,18 @@ public interface AssessmentDao {
 
     @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,suggestion) " +
+            "item13,item14,item14_input,item1002,item1002_input,item1004,item1006,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},#{suggestion})")
+            "#{item11},#{item12},#{item12Input},#{item13},#{item14},#{item14Input},#{item1002}," +
+            "#{item1002Input},#{item1004},#{item1006},#{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,suggestion) " +
+            "item13,item14,item15,item16,item17,item18,item19,item20,item21,item22,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},#{suggestion})")
+            "#{item13},#{item14},#{item15},#{item16},#{item17},#{item18},#{item19},#{item20},#{item21},#{item22},#{item1002}," +
+            "#{item1002Input},#{item1004},#{item1006},#{satisfyStaff},#{suggestion})")
     void insertInpatientSatisfiedAssessment(InpatientSatisfiedQuestionnaire questionnaire);
 
     @Select("select frequency from t_questionnaire_frequency where code=#{code} ")

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

@@ -30,6 +30,12 @@ public class ClinicSatisfiedQuestionnaire {
     private String item13;
     private String item14;
     private String item14Input;
+
+    private String item1002;
+    private String item1002Input;
+    private String item1004;
+    private Integer item1006;
+    private String satisfyStaff;
     private String suggestion;
 
     private List<String> item2Arr;
@@ -39,6 +45,7 @@ public class ClinicSatisfiedQuestionnaire {
     private List<String> item10Arr;
     private List<String> item12Arr;
     private List<String> item14Arr;
+    private List<String> item1002Arr;
 
     public String getItem2() {
         if (ListUtil.isEmpty(item2Arr)) {
@@ -116,4 +123,15 @@ public class ClinicSatisfiedQuestionnaire {
         }
         return builder.substring(0, builder.length() - 1);
     }
+
+    public String getItem1002() {
+        if (ListUtil.isEmpty(item1002Arr)) {
+            return item1002;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String item : item1002Arr) {
+            builder.append(item).append("^");
+        }
+        return builder.substring(0, builder.length() - 1);
+    }
 }

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

@@ -33,6 +33,11 @@ public class InpatientSatisfiedQuestionnaire {
     private String item20;
     private String item21;
     private String item22;
+    private String item1002;
+    private String item1002Input;
+    private String item1004;
+    private Integer item1006;
+    private String satisfyStaff;
     private String suggestion;
 
     private List<String> item2Arr;
@@ -46,6 +51,7 @@ public class InpatientSatisfiedQuestionnaire {
     private List<String> item18Arr;
     private List<String> item20Arr;
     private List<String> item22Arr;
+    private List<String> item1002Arr;
 
     public String getItem2() {
         if (ListUtil.isEmpty(item2Arr)) {
@@ -167,4 +173,15 @@ public class InpatientSatisfiedQuestionnaire {
         }
         return builder.substring(0, builder.length() - 1);
     }
+
+    public String getItem1002() {
+        if (ListUtil.isEmpty(item1002Arr)) {
+            return item1002;
+        }
+        StringBuilder builder = new StringBuilder();
+        for (String item : item1002Arr) {
+            builder.append(item).append("^");
+        }
+        return builder.substring(0, builder.length() - 1);
+    }
 }

src/main/java/thyyxxk/wxservice_server/scheduled/QuestionnaireAfterVisit.java

@@ -49,7 +49,7 @@ public class QuestionnaireAfterVisit {
     }
 
     @Scheduled(cron = "0 0 12 * * ?")
-    public void test2() {
+    public void start2() {
         if (production) {
             int frequency = dao.selectQuestionnaireFrequency("inpatient_satisfied_questionnaire");
             List<PushQuestionnaireVisit> list = dao.selectInpatientQuestionnairePatients();