|
@ -586,7 +586,7 @@ public class RehabilitationManageService {
|
|
|
String planDetailResult = StringUtils.isNotEmpty(planDetailList) ? planDetailList.substring(1) : "";
|
|
|
String sql = "select i.name,i.code,i.content,d.execute_time,d.hospital_name,d.id,d.status,d.type as detailType,d.expense,d.doctor as executeDoctor," +
|
|
|
" d.doctor_name as executeDoctorName,p.patient ,p.id AS planId,p.create_user as createDoctor,p.create_user_name as createDoctorName, p.status as planStatus" +
|
|
|
" ,pa.idcard,pa.birthday " +
|
|
|
" ,pa.idcard,pa.birthday,p.disease " +
|
|
|
" from wlyy_specialist.wlyy_rehabilitation_plan_detail d " +
|
|
|
" LEFT JOIN wlyy_specialist.wlyy_rehabilitation_service_item i on i.code = d.hospital_service_item_id " +
|
|
|
" LEFT JOIN wlyy_specialist.wlyy_patient_rehabilitation_plan p on d.plan_id=p.id " +
|
|
@ -611,6 +611,7 @@ public class RehabilitationManageService {
|
|
|
String birthday = one.get("birthday")==null?"":one.get("birthday")+"";
|
|
|
resultMap.put("age", IdCardUtil.getAgeByBirthdayStrOrIdcard(one.get("idcard")+"",birthday));//年龄
|
|
|
resultMap.put("title", one.get("name"));//项目标题
|
|
|
resultMap.put("disease", one.get("disease"));//疾病类型
|
|
|
resultMap.put("planDetaiId", one.get("id"));//计划服务项目id
|
|
|
resultMap.put("planId", one.get("planId"));//计划id
|
|
|
resultMap.put("shortExecuteTime", DateUtil.dateToStr((Date) one.get("execute_time"), DateUtil.HH_MM));//项目标题
|