|
@ -2379,7 +2379,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
"patient.sex AS sex," +
|
|
"patient.sex AS sex," +
|
|
"patient.idcard AS idcard," +
|
|
"patient.idcard AS idcard," +
|
|
"patient.photo AS photo," +
|
|
"patient.photo AS photo," +
|
|
"outpatient.photo AS outpatient_photo," +
|
|
|
|
|
|
"outpatient.mobile AS mobile," +
|
|
"patient.birthday AS birthday," +
|
|
"patient.birthday AS birthday," +
|
|
"room.consult_type AS consult_type," +
|
|
"room.consult_type AS consult_type," +
|
|
"date_format(room.reservation_time ,'%Y-%m-%d %H:%i:%S' ) AS timedate_format," +
|
|
"date_format(room.reservation_time ,'%Y-%m-%d %H:%i:%S' ) AS timedate_format," +
|
|
@ -2429,11 +2429,6 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
for(Map<String,Object> outpatient :list){
|
|
for(Map<String,Object> outpatient :list){
|
|
String idcard = (String)outpatient.get("idcard");
|
|
String idcard = (String)outpatient.get("idcard");
|
|
outpatient.put("age",DateUtil.getAgeForIdcard(idcard));
|
|
outpatient.put("age",DateUtil.getAgeForIdcard(idcard));
|
|
|
|
|
|
String outpatient_photo = (String)outpatient.get("outpatient_photo");
|
|
|
|
if(StringUtils.isNoneBlank(outpatient_photo)){
|
|
|
|
outpatient.put("phone",outpatient_photo);
|
|
|
|
}
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@ -3126,6 +3121,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
"patient.photo AS photo," +
|
|
"patient.photo AS photo," +
|
|
"patient.birthday AS birthday," +
|
|
"patient.birthday AS birthday," +
|
|
"patient.mobile AS mobile," +
|
|
"patient.mobile AS mobile," +
|
|
|
|
"outpatient.mobile AS outpatient_mobile," +
|
|
"room.consult_type AS consult_type," +
|
|
"room.consult_type AS consult_type," +
|
|
"date_format(room.reservation_time ,'%Y-%m-%d %H:%i:%S' ) AS time," +
|
|
"date_format(room.reservation_time ,'%Y-%m-%d %H:%i:%S' ) AS time," +
|
|
"date_format(room.reservation_time ,'%Y-%m-%d' ) AS group_date," +
|
|
"date_format(room.reservation_time ,'%Y-%m-%d' ) AS group_date," +
|
|
@ -3181,6 +3177,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
}
|
|
}
|
|
|
|
|
|
outpatient.put("online_tag",0);//在线状态
|
|
outpatient.put("online_tag",0);//在线状态
|
|
|
|
|
|
|
|
String outpatient_mobile = (String)outpatient.get("outpatient_mobile");
|
|
|
|
if(StringUtils.isNoneBlank(outpatient_mobile)){
|
|
|
|
outpatient.put("mobile",outpatient_mobile);//复诊有手机号,传递复诊手机号
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|