20220609

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

@@ -90,7 +90,7 @@ public class ScreeningService implements IScreeningService {
             if("WeiShengYuan".equals(shareQuestionnaire.getPositionCode())){
                 screeningQrCode = ScreeningQrCodeUtil.getScreeningQrCode(PropUtil.path, qrCode, shareQuestionnaire.getHospitalName(),"");
             }else {
-                screeningQrCode = ScreeningQrCodeUtil.getScreeningQrCode(PropUtil.path, qrCode, shareQuestionnaire.getHospitalName(),shareQuestionnaire.getDoctorName());
+                screeningQrCode = ScreeningQrCodeUtil.getScreeningQrCode(PropUtil.path, qrCode, shareQuestionnaire.getHospitalName(),shareQuestionnaire.getDoctorName() + "医生");
             }
             shareQuestionnaire.setQrCode(PropUtil.imgDomain + screeningQrCode);
         }

src/main/resources/mapper_dao/QuestionnaireDao.xml

@@ -203,44 +203,48 @@
         )a
     </select>
     <select id="villageGetWorkload" resultType="com.ccsens.carbasics.bean.vo.QuestionnaireVo$WorkloadList">
+    SELECT
+    *
+    FROM
+        (
         SELECT
         a.id as detailId,
         r1.answer as `name`,
         r2.answer as phone,
         r3.answer as illnessType,
-        r4.answer as submitTime
+        r4.answer as submitTime,
+        CASE 1
+                WHEN IF(LENGTH(r3.answer) - LENGTH(REPLACE(r3.answer,",","")) >= 2, 1, 0 ) THEN '1'
+                WHEN IF((FIND_IN_SET('09',r3.answer) > 0) or (FIND_IN_SET('10',r3.answer) > 0), 1, 0) THEN '1'
+                WHEN IF((FIND_IN_SET('01',r3.answer) > 0) or (FIND_IN_SET('03',r3.answer) > 0) or (FIND_IN_SET('04',r3.answer) > 0), 1, 0) THEN '2'
+                WHEN IF((FIND_IN_SET('02',r3.answer) > 0) or (FIND_IN_SET('05',r3.answer) > 0) or (FIND_IN_SET('06',r3.answer) > 0) or (FIND_IN_SET('07',r3.answer) > 0) or (FIND_IN_SET('08',r3.answer) > 0) , 1, 0) THEN '3'
+                ELSE '0'
+        END as type
         FROM
         (
-            SELECT
-            q.id,
-            CASE 1
-                WHEN IF(LENGTH(r1.answer) - LENGTH(REPLACE(r1.answer,",","")) >= 2, 1, 0 ) THEN '1'
-                WHEN IF((FIND_IN_SET('09',r1.answer) > 0) or (FIND_IN_SET('10',r1.answer) > 0), 1, 0) THEN '1'
-                WHEN IF((FIND_IN_SET('01',r1.answer) > 0) or (FIND_IN_SET('03',r1.answer) > 0) or (FIND_IN_SET('04',r1.answer) > 0), 1, 0) THEN '2'
-                WHEN IF((FIND_IN_SET('02',r1.answer) > 0) or (FIND_IN_SET('05',r1.answer) > 0) or (FIND_IN_SET('06',r1.answer) > 0) or (FIND_IN_SET('07',r1.answer) > 0) or (FIND_IN_SET('08',r1.answer) > 0) , 1, 0) THEN '3'
-                ELSE '0'
-            END as type
-            FROM
-            (
-                SELECT
-                qd.id
-                FROM
-                t_qcp_questionnaire q,
-                t_qcp_questionnaire_detail qd
-                WHERE
-                q.id = qd.questionnaire_id
-                and q.type = 1
-                and q.start_time &lt; #{now}
-                and q.end_time > #{now}
-                and q.rec_status = 0
-                and qd.rec_status = 0
-                and qd.user_id = #{userId}
-                and qd.submit_status = 1
-            ) q
-            LEFT JOIN t_qcp_questionnaire_record r1
-            on q.id = r1.questionnaire_detail_id and r1.rec_status = 0
-            LEFT JOIN t_qcp_questionnaire_record r2 ON q.id = r2.questionnaire_detail_id
-            AND r2.rec_status = 0
+        SELECT
+        q.id
+        FROM
+        (
+        SELECT
+        qd.id
+        FROM
+        t_qcp_questionnaire q,
+        t_qcp_questionnaire_detail qd
+        WHERE
+        q.id = qd.questionnaire_id
+        and q.type = 1
+        and q.start_time &lt; #{now}
+        and q.end_time > #{now}
+        and q.rec_status = 0
+        and qd.rec_status = 0
+        and qd.user_id = #{userId}
+        and qd.submit_status = 1
+        ) q
+        LEFT JOIN t_qcp_questionnaire_record r1
+        on q.id = r1.questionnaire_detail_id and r1.rec_status = 0
+        LEFT JOIN t_qcp_questionnaire_record r2 ON q.id = r2.questionnaire_detail_id
+        AND r2.rec_status = 0
             <where>
                 <if test="name != null and name != ''">
                     and r2.question_code = 'SCWJ-NAME'
@@ -253,10 +257,11 @@
         LEFT JOIN t_qcp_questionnaire_record r2 on a.id = r2.questionnaire_detail_id and r2.question_code = 'SCWJ-PHONE'and r2.rec_status = 0
         LEFT JOIN t_qcp_questionnaire_record r3 on a.id = r3.questionnaire_detail_id and r3.question_code = 'SCWJ-ILLNESS'and r3.rec_status = 0
         LEFT JOIN t_qcp_questionnaire_record r4 on a.id = r4.questionnaire_detail_id and r4.question_code = 'SCWJ-SUBMIT'and r4.rec_status = 0
-        <if test="type != 0">
-            where
-            a.type = #{type}
-        </if>
+    )t
+    <if test="type != 0">
+        where
+        t.type = #{type}
+    </if>
 
     </select>
     <select id="queryDoctorIdByRoleId" resultType="java.lang.Long">
@@ -389,7 +394,7 @@
                 and t.idCard = #{param.idCard}
             </if>
             <if test="param.name != null and param.name != ''">
-                and t.`name` like count('%',#{param.name},'%')
+                and t.`name` like CONCAT('%',#{param.name},'%')
             </if>
             <if test="param.sex != null and param.sex != ''">
                 and t.sex = #{param.sex}