Merge branch 'dev' of zhanghaoyu/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/desizenMan/service_project_management.jsp

@@ -498,7 +498,7 @@
					console.log(t);
                    var grade = '',price = '',itemType='',hospitalGrade='';
					$('.item-title').text(t.hospitalServiceItem.serviceItemName);
                    t.hospitalServiceItem.specialistServiceItemDO.itemType == 0 ? itemType = '康健服务':itemType = '健康管理';
                    t.hospitalServiceItem.specialistServiceItemDO.itemType == 0 ? itemType = '诊疗服务':itemType = '健康服务';
					$('.item-type').text(itemType);
					$('.item-content').text(t.hospitalServiceItem.specialistServiceItemDO.content);
					$('.item-chuwai').text(t.hospitalServiceItem.specialistServiceItemDO.excludeContent);
@@ -863,7 +863,7 @@
                            xiangmuContent = res.data.detailModelList[0];
                            res.data.detailModelList[0].forEach(function (item) {
                                var t = {};
                                t.text = item.hospitalServiceItem.specialistServiceItemDO.diseaseItem;
                                t.text = item.hospitalServiceItem.serviceItemName;
                                t.code = item.hospitalServiceItem.id
                                serverData[0].nodes.push(t)
                            });

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/specialty/index.jsp

@@ -387,7 +387,7 @@
                    success:function (res) {
                        console.log(res)
                        layer.msg('删除成功', {icon: 1});
                        grid.deleteRow(rowindex)
                        init();
                    }
                })
            }, function(){