|
@ -1579,6 +1579,7 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
" f.id," +
|
|
|
" f.type," +
|
|
|
" f.doctor," +
|
|
|
" f.status," +
|
|
|
" f.doctor_health," +
|
|
|
" f.admin_team_code," +
|
|
|
" t.id teamCode," +
|
|
@ -1601,6 +1602,7 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
pJson.put("photo", p.get("photo") != null ? p.get("photo") : "");
|
|
|
pJson.put("id", p.get("id") != null ? p.get("id") : "");
|
|
|
pJson.put("doctor", p.get("doctor") != null ? p.get("doctor") : "");
|
|
|
pJson.put("status",p.get("status").equals("1")?p.get("status"):"0");
|
|
|
pJson.put("doctorHealth", p.get("doctor_health") != null ? p.get("doctor_health") : "");
|
|
|
if (p.get("id") != null && (doctorCode.equals(pJson.get("doctor")) || doctorCode.equals(pJson.get("doctorHealth")))) {
|
|
|
if (p.get("teamCode") != null && StringUtils.isNotEmpty(p.get("teamCode").toString())) {
|
|
@ -1631,6 +1633,7 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
" f.id," +
|
|
|
" f.type," +
|
|
|
" f.doctor," +
|
|
|
" f.status," +
|
|
|
" f.doctor_health," +
|
|
|
" f.admin_team_code," +
|
|
|
" t.id teamCode," +
|
|
@ -1653,6 +1656,7 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
pJson.put("photo", p.get("photo") != null ? p.get("photo") : "");
|
|
|
pJson.put("id", p.get("id") != null ? p.get("id") : "");
|
|
|
pJson.put("doctor", p.get("doctor") != null ? p.get("doctor") : "");
|
|
|
pJson.put("isSign",p.get("status").equals("1")?p.get("status"):"0");
|
|
|
pJson.put("doctorHealth", p.get("doctor_health") != null ? p.get("doctor_health") : "");
|
|
|
if (p.get("id") != null && (doctorCode.equals(pJson.get("doctor")) || doctorCode.equals(pJson.get("doctorHealth")))) {
|
|
|
if (p.get("teamCode") != null && StringUtils.isNotEmpty(p.get("teamCode").toString())) {
|