Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -108,18 +108,18 @@ public class SynergyManageService extends BaseJpaService {
        }else if(userType==2){//客服
            if(isAcceptTask==1){//我接收
                whereSql +=" and w.create_user_type=1 ";//创建人为医生
                whereSql += " and e.executor_code ="+code+" ";
                whereSql += " and e.executor_code ='"+code+"' ";
            }else if(isAcceptTask==2){//我派发
                whereSql +=" and w.create_user_type=2 ";//创建人为客服
                whereSql += " and e.create_user ="+code+" ";
                whereSql += " and e.create_user ='"+code+"' ";
            }
        }else if(userType==3){//医生
            if(isAcceptTask==1){//我接收
                whereSql +=" and w.create_user_type=2 ";//创建人为客服
                whereSql += " and e.executor_code ="+code+" ";
                whereSql += " and e.executor_code ='"+code+"' ";
            }else if(isAcceptTask==2){//我派发
                whereSql +=" and w.create_user_type=2 ";//创建人为医生
                whereSql += " and e.create_user ="+code+" ";
                whereSql += " and e.create_user ='"+code+"' ";
            }
        }
@@ -136,7 +136,7 @@ public class SynergyManageService extends BaseJpaService {
        }
        //是否是我负责的
        if(isMyTask!=null){
            whereSql += " and e.executor_code ="+code+" and e.executor_type=1 ";
            whereSql += " and e.executor_code ='"+code+"' and e.executor_type=1 ";
        }
        //工单状态
        if(status!=null){

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(){