Merge branch 'dev' of humingfen/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/survey/ManagerQuestionnaireService.java

@@ -1957,6 +1957,9 @@ public class ManagerQuestionnaireService extends BaseService {
                    " from wlyy_sign_family w ,wlyy_admin_team t, dm_hospital h ,wlyy_patient p  " +
                    whereSql + ") AND t. STATUS = 1 GROUP BY t.patient ) s LEFT JOIN wlyy_sign_family f on s.patient=f.patient AND f.`status`> 0 AND f.expenses_status = 1 " +
                    " LEFT JOIN dm_hospital h on f.hospital=h.`code` where 1=1 ";
            if (StringUtils.isNotBlank(labelServerType)) {
                sql = sql.replace("dm_hospital h ,wlyy_patient p", "dm_hospital h ,wlyy_patient p, wlyy_sign_family_server s" );
            }
            if (StringUtils.isNotBlank(labelHealthType)) {
                String[] aa = labelHealthType.split(",");
                String bb = "";