Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/base/team/BaseTeamDO.java

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

@@ -133,7 +133,7 @@ public class SpecialistHospitalServiceItemService extends EnvelopRestEndpoint {
                    if (hospitalServiceItemDO.getServiceItemId().equals(hospitalServiceItemDO1.getServiceItemId())){
                        if (isTrue==false){
                            hospitalServiceItemDO1.setFlag(3);
                            hospitalServiceItemDOS1.add(hospitalServiceItemDO);
                            hospitalServiceItemDOS1.add(hospitalServiceItemDO1);
                            flag = true;
                            break;
                        }

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

@@ -177,12 +177,13 @@ public class SpecialistServiceItemService {
            String sql1 = "select * from wlyy_hospital_service_item where 1=1 AND status = 1 AND service_item_id = '"+specialistServiceItemDO.getId()+"'"+sqlUtil;
            List<HospitalServiceItemDO> hospitalServiceItemDOS = jdbcTemplate.query(sql1,new BeanPropertyRowMapper(HospitalServiceItemDO.class));
            if (StringUtils.isNoneBlank(hospital)){
                if (hospitalServiceItemDOS.size() != 0 && hospitalServiceItemDOS != null){
                if (hospitalServiceItemDOS.size() == 0 || hospitalServiceItemDOS == null){
                    specialistServiceItemDOList.add(specialistServiceItemDO);
                }
            }else {
                if (hospitalServiceItemDOS.size() == 0 || hospitalServiceItemDOS == null){
                    specialistServiceItemDOList.add(specialistServiceItemDO);
                }
            }
            if (hospitalServiceItemDOS.size() == 0 || hospitalServiceItemDOS == null){
               specialistServiceItemDOList.add(specialistServiceItemDO);
            }
        }
        envelop.setDetailModelList(specialistServiceItemDOList);