Merge branch 'dev' of wangzhinan/wlyy2.0 into dev

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -176,9 +176,15 @@ public class StatisticsEsService {
            for (SaveModel saveModel:syngySaveModels){
                if (level2_type.equals(SaveModel.deptLevel)){
                    list.add(saveModel.getDept());
                    if (StringUtils.isNoneBlank(saveModel.getDept())){
                        list.add(saveModel.getDept());
                    }
                }else if (level2_type.equals(SaveModel.doctorLevel)){
                    list.add(saveModel.getDoctor());
                    if (StringUtils.isNoneBlank(saveModel.getDoctor())){
                        list.add(saveModel.getDoctor());
                    }
                }
            }
            for (int i=0;i<list.size();i++){
@@ -193,7 +199,7 @@ public class StatisticsEsService {
                }else if (index.equalsIgnoreCase("1")){
                    for (SaveModel saveModel:specialistSaveModels){
                        if (level2_type.equals(SaveModel.deptLevel)){
                            if (code.equalsIgnoreCase(saveModel.getDept())){
                            if (StringUtils.isNoneBlank(saveModel.getDept())&&code.equalsIgnoreCase(saveModel.getDept())){
                                jsonObject.put("code",code);
                                jsonObject.put("name",saveModel.getDeptName());
                                jsonObject.put("specialist",saveModel.getResult1());
@@ -201,7 +207,7 @@ public class StatisticsEsService {
                                break;
                            }
                        }else if (level2_type.equals(SaveModel.doctorLevel)){
                            if (code.equalsIgnoreCase(saveModel.getDoctor())){
                            if (StringUtils.isNoneBlank(saveModel.getDoctor())&&code.equalsIgnoreCase(saveModel.getDoctor())){
                                if (level==6){
                                    List<BaseDoctorHospitalDO> doctorHospitalDOS = doctorHospitalDao.findByDoctorCode(area);
@@ -234,7 +240,7 @@ public class StatisticsEsService {
                for (SaveModel saveModel:syngySaveModels){
                    if (level2_type.equals(SaveModel.deptLevel)){
                        if (code.equalsIgnoreCase(saveModel.getDept())){
                        if (StringUtils.isNoneBlank(saveModel.getDept())&&code.equalsIgnoreCase(saveModel.getDept())){
                            jsonObject.put("code",code);
                            jsonObject.put("name",saveModel.getDeptName());
                            jsonObject.put("synegy",saveModel.getResult1());
@@ -242,7 +248,7 @@ public class StatisticsEsService {
                            break;
                        }
                    }else if (level2_type.equals(SaveModel.doctorLevel)){
                        if (code.equalsIgnoreCase(saveModel.getDoctor())){
                        if (StringUtils.isNoneBlank(saveModel.getDoctor())&&code.equalsIgnoreCase(saveModel.getDoctor())){
                            if (level==6){
                                List<BaseDoctorHospitalDO> doctorHospitalDOS = doctorHospitalDao.findByDoctorCode(area);
                                if (doctorHospitalDOS!=null&&doctorHospitalDOS.size()!=0){
@@ -272,7 +278,7 @@ public class StatisticsEsService {
                }
                for (SaveModel saveModel:topicSaveModels){
                    if (level2_type.equals(SaveModel.deptLevel)){
                        if (code.equalsIgnoreCase(saveModel.getDept())){
                        if (StringUtils.isNoneBlank(saveModel.getDept())&&code.equalsIgnoreCase(saveModel.getDept())){
                            jsonObject.put("code",code);
                            jsonObject.put("name",saveModel.getDeptName());
                            jsonObject.put("topic",saveModel.getResult1());
@@ -280,7 +286,7 @@ public class StatisticsEsService {
                            break;
                        }
                    }else if (level2_type.equals(SaveModel.doctorLevel)){
                        if (code.equalsIgnoreCase(saveModel.getDoctor())){
                        if (StringUtils.isNoneBlank(saveModel.getDoctor())&&code.equalsIgnoreCase(saveModel.getDoctor())){
                            if (level==6){
                                List<BaseDoctorHospitalDO> doctorHospitalDOS = doctorHospitalDao.findByDoctorCode(area);
                                if (doctorHospitalDOS!=null&&doctorHospitalDOS.size()!=0){
@@ -309,7 +315,7 @@ public class StatisticsEsService {
                }
                for (SaveModel saveModel:vedioSaveModels){
                    if (level2_type.equals(SaveModel.deptLevel)){
                        if (code.equalsIgnoreCase(saveModel.getDept())){
                        if (StringUtils.isNoneBlank(saveModel.getDept())&&code.equalsIgnoreCase(saveModel.getDept())){
                            jsonObject.put("code",code);
                            jsonObject.put("name",saveModel.getDeptName());
                            jsonObject.put("vedio",saveModel.getResult1());
@@ -317,7 +323,7 @@ public class StatisticsEsService {
                            break;
                        }
                    }else if (level2_type.equals(SaveModel.doctorLevel)){
                        if (code.equalsIgnoreCase(saveModel.getDoctor())){
                        if (StringUtils.isNoneBlank(saveModel.getDoctor())&&code.equalsIgnoreCase(saveModel.getDoctor())){
                            if (level==6){
                                List<BaseDoctorHospitalDO> doctorHospitalDOS = doctorHospitalDao.findByDoctorCode(area);
                                if (doctorHospitalDOS!=null&&doctorHospitalDOS.size()!=0){

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

@@ -167,6 +167,7 @@ public class RehabilitationManageService {
                Integer allCount = rehabilitationDetailDao.findAllByPlanId(one.get("id").toString());
                resultMap.put("allCount",allCount);//总数
                resultMap.put("allFinishCount",allFinishCount);//全部已完成数
                resultMap.put("createTime",one.get("create_time"));
                resultList.add(resultMap);
            }