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

@@ -160,6 +160,7 @@ public class SpecialistHospitalServiceItemService extends EnvelopRestEndpoint {
                }
            }
        }
        for (HospitalServiceItemDO hospitalServiceItemDO:hospitalServiceItemDOS1){
            SpecialistServiceItemDO specialistServiceItemDO = specialistServiceItemDao.findOne(hospitalServiceItemDO.getServiceItemId());
            hospitalServiceItemDO.setSpecialistServiceItemDO(specialistServiceItemDO);
@@ -185,33 +186,44 @@ public class SpecialistHospitalServiceItemService extends EnvelopRestEndpoint {
                SpecialistServiceItemDO specialistServiceItemDO = hospitalServiceItemDOS1.get(j).getSpecialistServiceItemDO();
                if (itemType.get(i).equals(specialistServiceItemDO.getItemType())){
            type.add(specialistServiceItemDO.getDiseaseItem());
            }
        }
    }
            JSONArray itemArray = new JSONArray();
            if (type != null && type.size() != 0){
                for (int z =0 ;z<type.size();z++){
                    List<HospitalServiceItemDO> hospitalServiceItemDOS2 = new ArrayList<>();
                    JSONObject object1 =new JSONObject();
                    object1.put("itemName",type.get(z));
                    for (int j = 0;j<hospitalServiceItemDOS1.size();j++){
                        SpecialistServiceItemDO specialistServiceItemDO = hospitalServiceItemDOS1.get(j).getSpecialistServiceItemDO();
                        if (type.get(z).equals(specialistServiceItemDO.getDiseaseItem())){
        JSONArray itemArray = new JSONArray();
        List<String> serviceItems = new ArrayList<>();
        if (type != null && type.size() != 0){
            for (int z =0 ;z<type.size();z++){
                List<HospitalServiceItemDO> hospitalServiceItemDOS2 = new ArrayList<>();
                JSONObject object1 =new JSONObject();
                for (int j = 0;j<hospitalServiceItemDOS1.size();j++){
                    SpecialistServiceItemDO specialistServiceItemDO = hospitalServiceItemDOS1.get(j).getSpecialistServiceItemDO();
                        if (type.get(z).equals(specialistServiceItemDO.getDiseaseItem())) {
                            hospitalServiceItemDOS2.add(hospitalServiceItemDOS1.get(j));
                        }
                }
                if (serviceItems!=null && serviceItems.size()!=0){
                    if (!serviceItems.contains(type.get(z))){
                        serviceItems.add(type.get(z));
                        object1.put("itemName",type.get(z));
                        object1.put("hospitalServiceItems",hospitalServiceItemDOS2);
                        itemArray.add(object1);
                    }
                }else {
                    serviceItems.add(type.get(z));
                    object1.put("itemName",type.get(z));
                    object1.put("hospitalServiceItems",hospitalServiceItemDOS2);
                    itemArray.add(object1);
                }
            }
            object.put("itemType",itemType.get(i));
            object.put("item",itemArray);
            array.add(object);
        }
        List<JSONArray> list = new ArrayList<>();
        list.add(array);
        envelop.setDetailModelList(list);
        return envelop;
        object.put("itemType",itemType.get(i));
        object.put("item",itemArray);
        array.add(object);
    }
    List<JSONArray> list = new ArrayList<>();
    list.add(array);
    envelop.setDetailModelList(list);
    return envelop;
    }
    /**