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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -1589,7 +1589,7 @@ public class SignPatientLabelInfoService extends BaseService {
                    " LEFT JOIN wlyy_sign_family f ON p.CODE = f.patient" +
                    " LEFT JOIN wlyy_admin_team t ON f.admin_team_code = t.id" +
                    " where" +
                    " p. idcard = ? AND (f.id IS NULL || f.status > 0)";
                    " p. idcard = ? AND (f.id IS NULL)";
            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, filter);
            for (Map<String, Object> p : list) {
                JSONObject pJson = new JSONObject();
@@ -1643,7 +1643,7 @@ public class SignPatientLabelInfoService extends BaseService {
                    " LEFT JOIN wlyy_sign_family f ON p.CODE = f.patient" +
                    " LEFT JOIN wlyy_admin_team t ON f.admin_team_code = t.id" +
                    " where" +
                    " p. name = ? AND (f.id IS NULL || f.status > 0)";
                    " p. name = ? AND (f.id IS NULL)";
            List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, filter);
            for (Map<String, Object> p : list) {
                JSONObject pJson = new JSONObject();