2 Ревизии e5dba9041d ... fe1eb6005c

Автор SHA1 Съобщение Дата
  LAPTOP-KB9HII50\70708 fe1eb6005c Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev преди 1 седмица
  LAPTOP-KB9HII50\70708 b911043162 代码修改 преди 1 седмица
променени са 1 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 2 1
      svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

+ 2 - 1
svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@ -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));//项目标题