|
|
@ -594,7 +594,7 @@ public class RehabilitationManageService {
|
|
|
planDetailList +=",'"+one+"'";
|
|
|
}
|
|
|
String planDetailResult = StringUtils.isNotEmpty(planDetailList)?planDetailList.substring(1):"";
|
|
|
String sql = "select i.name,i.code,d.execute_time,d.hospital_name,d.id,d.status,d.type as detailType,d.expense,d.doctor as executeDoctor," +
|
|
|
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.create_user as createDoctor,p.create_user_name as createDoctorName, p.status as planStatus " +
|
|
|
" 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 " +
|
|
|
@ -624,7 +624,7 @@ public class RehabilitationManageService {
|
|
|
resultMap.put("title",one.get("name"));//项目标题
|
|
|
resultMap.put("planDetaiId",one.get("id"));//计划服务项目id
|
|
|
resultMap.put("shortExecuteTime",DateUtil.dateToStr((Date) one.get("execute_time"),DateUtil.HH_MM));//项目标题
|
|
|
resultMap.put("content",one.get("name"));//项目内容
|
|
|
resultMap.put("content",one.get("content"));//项目内容
|
|
|
resultMap.put("hospitalName",one.get("hospital_name"));//地点
|
|
|
resultMap.put("executeTime",one.get("execute_time"));//执行时间
|
|
|
DecimalFormat df = new DecimalFormat("0.00");
|
|
|
@ -1452,17 +1452,16 @@ public class RehabilitationManageService {
|
|
|
" d.plan_id," +
|
|
|
" d.hospital," +
|
|
|
" d.hospital_name," +
|
|
|
" i.service_item_id," +
|
|
|
" i.service_item_name," +
|
|
|
" i.code as service_item_id," +
|
|
|
" i.name as service_item_name," +
|
|
|
" d.expense," +
|
|
|
" r.doctor_code," +
|
|
|
" r.doctor_name," +
|
|
|
" r.complete_time, " +
|
|
|
" s.item_type " +
|
|
|
" i.code as item_type " +
|
|
|
" FROM" +
|
|
|
" wlyy_rehabilitation_plan_detail d" +
|
|
|
" LEFT JOIN wlyy_hospital_service_item i ON d.hospital_service_item_id = i.id " +
|
|
|
" LEFT JOIN wlyy_service_item s ON i.service_item_id = s.id " +
|
|
|
" LEFT JOIN wlyy_rehabilitation_service_item i ON d.hospital_service_item_id = i.code "+
|
|
|
" LEFT JOIN wlyy_rehabilitation_operate_records r ON d.id = r.rehabilitation_detail_id" +
|
|
|
" WHERE" +
|
|
|
" r.`status` = 1" +
|
