|
@ -905,10 +905,11 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
Calendar today = Calendar.getInstance();
|
|
|
Calendar startDate = Calendar.getInstance();
|
|
|
SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
sql = "select count(DISTINCT patient) count" +
|
|
|
sql = "select count(DISTINCT t1.patient) count" +
|
|
|
" from " +
|
|
|
" wlyy_sign_family " +
|
|
|
" where status > 0 " +
|
|
|
" wlyy_sign_family t1," +
|
|
|
" wlyy_patient t3" +
|
|
|
" where t1.patient = t3.code AND status > 0 " +
|
|
|
" and admin_team_code = ? ";
|
|
|
|
|
|
if (label.getLabelCode().equals("1")) {
|
|
@ -940,9 +941,11 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
" wlyy_sign_family t1 " +
|
|
|
" left join " +
|
|
|
" (select repl.patient,repl.label,repl.label_type,repl.label_name from wlyy_sign_family repf left join wlyy_sign_patient_label_info repl on repf.patient = repl.patient where repf.admin_team_code = ? and repf.status > 0 and repl.label_type = ? and repl.status = 1) t2 " +
|
|
|
" on t1.patient = t2.patient " +
|
|
|
" on t1.patient = t2.patient ," +
|
|
|
" wlyy_patient t3 " +
|
|
|
" WHERE" +
|
|
|
" t2.patient is null " +
|
|
|
" AND t1.patient = t3.code" +
|
|
|
" AND t1.status > 0 " +
|
|
|
" AND t1.admin_team_code = ? ";
|
|
|
|
|
@ -952,9 +955,11 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
" count(DISTINCT t1.patient) count" +
|
|
|
" FROM" +
|
|
|
" wlyy_sign_family t1, " +
|
|
|
" wlyy_sign_patient_label_info t2 " +
|
|
|
" wlyy_sign_patient_label_info t2, " +
|
|
|
" wlyy_patient t3 " +
|
|
|
" WHERE" +
|
|
|
" t1.patient = t2.patient " +
|
|
|
" AND t1.patient = t3.code " +
|
|
|
" AND t2.label = ? " +
|
|
|
" AND t2.label_type = ? " +
|
|
|
" AND t2.status = 1 " +
|
|
@ -974,7 +979,7 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
json.put("amount", amount);
|
|
|
|
|
|
int focusAmount = 0;
|
|
|
sql += labelType.equals("5") ? " AND LENGTH(TRIM(IFNULL(openid,''))) > 0 " : " AND LENGTH(TRIM(IFNULL(t1.openid,''))) > 0 ";
|
|
|
sql += labelType.equals("5") ? " AND LENGTH(TRIM(IFNULL(t3.openid,''))) > 0 " : " AND LENGTH(TRIM(IFNULL(t3.openid,''))) > 0 ";
|
|
|
List<Map<String, Object>> focusCount = jdbcTemplate.queryForList(sql, args);
|
|
|
|
|
|
if (focusCount != null && focusCount.size() > 0 && focusCount.get(0).containsKey("count")) {
|