|
|
@ -692,7 +692,7 @@ public class RehabilitationManageService {
|
|
|
public ObjEnvelop serviceItem(String planDetailId,String doctorCode,String recordId) throws Exception{
|
|
|
String sql = "select h.name as title,h.content as content,h.code as itemType,d.id,d.execute_time,d.hospital_name,d.status,d.type,d.expense,d.doctor as executeDoctor, " +
|
|
|
" d.doctor_name as executeDoctorName,p.patient ,p.name as patientName,p.create_user as createDoctor,p.create_user_name as createDoctorName, p.status as planStatus," +
|
|
|
" p.disease,p.disease_name as diseaseName,p.title as planTitle,d.plan_id as planId,d.relation_code as relationCode "+
|
|
|
" p.disease,p.disease_name as diseaseName,p.title as planTitle,d.plan_id as planId,d.relation_code as relationCode,d.frequency_code as frequencyCode "+
|
|
|
" from wlyy_specialist.wlyy_rehabilitation_plan_detail d " +
|
|
|
" LEFT JOIN wlyy_specialist.wlyy_rehabilitation_service_item h on d.hospital_service_item_id = h.code "+
|
|
|
" LEFT JOIN wlyy_specialist.wlyy_patient_rehabilitation_plan p on d.plan_id=p.id " +
|
|
|
@ -706,6 +706,7 @@ public class RehabilitationManageService {
|
|
|
if(StringUtils.isNotEmpty(doctorCode)&&doctorCode.equals(one.get("executeDoctor")+"")){
|
|
|
isMyTask=1;
|
|
|
}
|
|
|
resultMap.put("frequencyCode",one.get("frequencyCode")+"");
|
|
|
resultMap.put("isMyTask",isMyTask);//0不是自己的任务，1是自己的任务
|
|
|
// if(!(one.get("specialistDoctor")+"").equals((one.get("create_user")+""))){
|
|
|
// executeDoctorList.add(one.get("create_user_name")+"");
|
|
|
@ -748,6 +749,7 @@ public class RehabilitationManageService {
|
|
|
map.put("adminTeamName",one2.getAdminTeamName());
|
|
|
map.put("content",one2.getContent());
|
|
|
map.put("contentType",one2.getContentType());
|
|
|
map.put("doctorType",one2.getDoctorType());//医生类型
|
|
|
map.put("createTime",DateUtil.dateToStr(one2.getCreateTime(),"MM-dd HH:mm"));
|
|
|
messageMapList.add(map);
|
|
|
}
|
|
|
@ -773,6 +775,10 @@ public class RehabilitationManageService {
|
|
|
resultMap.put("completeTime",completeTimeStr);//完成时间
|
|
|
resultMap.put("operatorDoctorName",temp.getDoctorName());//执行医生名称
|
|
|
resultMap.put("node",temp.getNode());
|
|
|
resultMap.put("recordStatus",temp.getStatus());//操作记录
|
|
|
resultMap.put("recordRelationCode",temp.getRelationCode());
|
|
|
resultMap.put("recordFlag",temp.getFlag());
|
|
|
resultMap.put("recordId",temp.getId());
|
|
|
resultMap.put("relationRecordImg",(temp.getRelationRecordImg()!=null&&StringUtils.isNotEmpty(temp.getRelationRecordImg()))?(new JSONArray(temp.getRelationRecordImg())):null);//json格式
|
|
|
/* if(itemType!=1&&itemType!=0){*/
|
|
|
resultMap.put("relationRecordCode",temp.getRelationRecordCode());
|
|
|
@ -986,13 +992,14 @@ public class RehabilitationManageService {
|
|
|
String planDetailSql = " select d.*,h.name,h.code,s.complete_time from wlyy_specialist.wlyy_rehabilitation_plan_detail d LEFT JOIN wlyy_rehabilitation_service_item h on d.hospital_service_item_id=h.code" +
|
|
|
" LEFT JOIN wlyy_specialist.wlyy_patient_rehabilitation_plan p on d.plan_id=p.id" +
|
|
|
" left join wlyy_rehabilitation_operate_records s on s.rehabilitation_detail_id=d.id " +
|
|
|
" where d.status=1 and p.patient='"+patientCode+"' ";
|
|
|
" where d.status=1 and p.patient='"+patientCode+"' and (d.frequency_code IS NOT NULL OR d.frequency_code <>'')";
|
|
|
if(StringUtils.isNotEmpty(startTime)){
|
|
|
planDetailSql += " and d.execute_Time>='"+startTime+"' ";
|
|
|
}
|
|
|
if(StringUtils.isNotEmpty(endTime)){
|
|
|
planDetailSql += " and d.execute_time<='"+endTime+"' ";
|
|
|
}
|
|
|
|
|
|
// List<Map<String,Object>> planDetailsCount = jdbcTemplate.queryForList(planDetailSql);
|
|
|
// int count = 0;
|
|
|
// if(planDetailsCount!=null&&planDetailsCount.size()>0){
|
wangzhinan