|
@ -1793,13 +1793,13 @@ public class FamilyContractService extends BaseService {
|
|
|
" WHERE " +
|
|
|
" sf.type = 2 " +
|
|
|
" AND sf. STATUS >= 0 " +
|
|
|
" and sf.doctor = ? " +
|
|
|
// " and sf.doctor = ? " +
|
|
|
" and sf.admin_team_code = ? " +
|
|
|
" AND ( sf.doctor_health is null or sf.doctor_health ='' ) ) a where 1=1";
|
|
|
if (!org.springframework.util.StringUtils.isEmpty(params)) {
|
|
|
addressSql += " AND a.address like '%" + params + "%'";
|
|
|
}
|
|
|
List<Map<String, Object>> datas = jdbcTemplate.queryForList(addressSql, doctorCode,teamCode);
|
|
|
List<Map<String, Object>> datas = jdbcTemplate.queryForList(addressSql,teamCode);
|
|
|
if (datas != null && datas.size() > 0) {
|
|
|
JSONArray jsonArray=new JSONArray();
|
|
|
for (Map<String, Object> map : datas) {
|
|
@ -1830,14 +1830,14 @@ public class FamilyContractService extends BaseService {
|
|
|
" WHERE " +
|
|
|
" sf.type = 2 " +
|
|
|
" AND sf. STATUS >= 0 " +
|
|
|
" and sf.doctor = ? " +
|
|
|
//" and sf.doctor = ? " +
|
|
|
" and sf.admin_team_code = ? " +
|
|
|
" AND ( sf.doctor_health is null or sf.doctor_health ='' ) ) a where 1=1";
|
|
|
|
|
|
if (!org.springframework.util.StringUtils.isEmpty(params)) {
|
|
|
patientNameSql += " AND a.name like '%" + params + "%'";
|
|
|
}
|
|
|
datas = jdbcTemplate.queryForList(patientNameSql, doctorCode,teamCode);
|
|
|
datas = jdbcTemplate.queryForList(patientNameSql,teamCode);
|
|
|
if (datas != null && datas.size() > 0) {
|
|
|
JSONArray jsonArray=new JSONArray();
|
|
|
for (Map<String, Object> map : datas) {
|