Przeglądaj źródła

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

liuwenbin 7 lat temu
rodzic
commit
6b2d26f145

+ 157 - 60
patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/desizenMan/new-institutional-projects.jsp

@ -82,51 +82,36 @@
	<body>
		<div class="page-title">
			新增机构项目
			<img id="closePage" src="${ctx}/static/desizenMan/images/close.png" />
			<img class="closePage" src="${ctx}/static/desizenMan/images/close.png" />
		</div>
		<div class="page-content plr20">
			<div class="flex-box ptb10 filter-box">
				<div class="btn-group w160 mr20">
				  <button type="button" class="btn btn-default btn-group-title">请选择项目类别</button>
				  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
				    <span class="caret"></span>
				    <span class="sr-only">Toggle Dropdown</span>
				  </button>
				  <ul class="dropdown-menu">
				    <li><a href="#">Action</a></li>
				    <li><a href="#">Another action</a></li>
				    <li><a href="#">Something else here</a></li>
				    <li role="separator" class="divider"></li>
				    <li><a href="#">Separated link</a></li>
				  </ul>
				</div>
			<div class="flex-box ptb10 filter-box" style="justify-content: space-between">
				<div class="btn-group w160 mr20">
				  <button type="button" class="btn btn-default btn-group-title">请选择医院等级</button>
				  <button type="button" class="btn btn-default btn-group-title btn-grade">请选择医院等级</button>
				  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
				  <ul class="dropdown-menu">
				    <li><a href="#">Action</a></li>
				    <li><a href="#">Another action</a></li>
				    <li><a href="#">Something else here</a></li>
				    <li role="separator" class="divider"></li>
				    <li><a href="#">Separated link</a></li>
					  <li>
						  <a href="#">所有</a>
					  </li>
					  <li>
						  <a href="#">三级医院</a>
					  </li>
					  <li>
						  <a href="#">二级医院</a>
					  </li>
					  <li>
						  <a href="#">一级及以下</a>
					  </li>
				  </ul>
				</div>
				<div class="btn-group w160 mr20">
				  <button type="button" class="btn btn-default btn-group-title">请选择病案项目</button>
				  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"></button>
				  <ul class="dropdown-menu">
				    <li><a href="#">Action</a></li>
				    <li><a href="#">Another action</a></li>
				    <li><a href="#">Something else here</a></li>
				    <li role="separator" class="divider"></li>
				    <li><a href="#">Separated link</a></li>
				  </ul>
				<div class="flex-box">
					<div class="input-group w320 mr20">
						<input type="text" class="form-control hostpital-name" placeholder="请输入医院名称">
						<div class="input-group-addon"></div>
					</div>
					<button class="btn btn-primary w100" id="btn-search">查询</button>
				</div>
				<div class="input-group w320 mr20">
			      <input type="text" class="form-control" placeholder="请输入计算机编码、项目编码、服务名称">
			      <div class="input-group-addon"></div>
			    </div>
				<button class="btn btn-primary w100">查询</button>
			</div>
			<div class="flex-box fuwu-box">
				<div class="flex-box-item">
@ -168,8 +153,8 @@
			<div class="row text-center">
				<p class="ptb20 mb0"><span class="checkbox-box"><input type="checkbox" class="immediately" /><i></i>立即生效</span></p>
				<button class="btn btn-primary mr20 w100">确认</button>
				<button class="btn btn-default w100">取消</button>
				<button class="btn btn-primary mr20 w100 add">确认</button>
				<button class="btn btn-default w100 closePage">取消</button>
			</div>
		</div>
@ -181,23 +166,30 @@
		<script type="text/javascript">
			var $fuwuTable=$(".fuwu-table");
			var hospitalData = [];
            $.ajax({
                url: ctx + "/admin/specialist/hospitalServiceItem/selectByHospitals",
                method: "POST",
                dataType: "json",
                async: true,
                success:function (res) {
                    console.log('请求成功');
                    var html = ''
                    res.data.forEach(function (item) {
						html += '<li><span class="yiyuan-code" data-grade='+item.grade+' data-code='+item.code+'>'+item.name+'</span></li>'
                    })
					$('.yiyuan').html(html);
                },
                error:function (err) {
                    console.log(err)
                }
            })
//			获取机构
			function selectHospital(name,grade) {
                (name)?name:name="";
                (grade)?grade:grade="";
                $.ajax({
                    url: ctx + "/admin/specialist/hospitalServiceItem/selectHospital",
                    method: "POST",
                    dataType: "json",
                    async: true,
                    data:{hospitalName:name,grade:grade},
                    success:function (res) {
                        console.log('请求成功');
                        var html = ''
                        res.data.forEach(function (item) {
                            html += '<li><span class="yiyuan-code" data-grade='+item.grade+' data-code='+item.code+'>'+item.name+'</span></li>'
                        })
                        $('.yiyuan').html(html);
                    },
                    error:function (err) {
                        console.log(err)
                    }
                })
            }
            selectHospital();
			//获取项目
			function selectByHospital(code) {
				(code)?code:code="";
@ -207,7 +199,7 @@
                    method: "POST",
                    dataType: "json",
                    async: true,
					data:{hospital:""},
					data:{hospital:code},
                    success:function (res) {
                        console.log('请求成功');
                        console.log(res)
@ -226,7 +218,8 @@
			$("body").on('click','.yiyuan li',function(){
				var lastItem=$fuwuTable.find('.flex-box:last-child');
				lastItem.find(".hosp").html($(this).html());
				console.log(2222)
				var code = $(this).children('span')[0].dataset.code;
                selectByHospital(code)
			})
			$("body").on('click','.xiangmu li',function(){
				var lastItem=$fuwuTable.find('.flex-box:last-child');
@ -248,13 +241,13 @@
				var l = $('.fuwu-table>div').length-1;
				var t = {};
                t.code = $($('.fuwu-table>div')[l]).find('.yiyuan-code').attr('data-code');
                t.grade = $($('.fuwu-table>div')[l]).find('.yiyuan-code').attr('data-grade');
                t.id = $(this).find('span').attr('data-id');
                console.log('当前最后一个');
                console.log(t);
                hospitalData.forEach(function (item) {
                    console.log(item)
					if (item.id == t.id && item.code == t.code){
					    console.log(2222)
                        layer.msg('已选择此项目',{icon:5});
						h = false;
					}
@ -262,6 +255,16 @@
				if (h == false){
                    return false;
				}
				//输入默认价格
				var price = '';
				if(t.grade == 1){
					price = $(this).children('span')[0].dataset.one
				}else if(t.grade == 2){
                    price = $(this).children('span')[0].dataset.two;
				}else if(t.grade == 3){
                    price = $(this).children('span')[0].dataset.three;
                }
                lastItem.find("input").val(price)
				lastItem.find(".proj").html($(this).html());
				$fuwuTable.append('<div class="flex-box">\
					<div class="w300 hosp"></div>\
@ -290,7 +293,101 @@
                $(this).parents('.btn-group').find('.btn-group-title').text($(this).text())
                console.log(ctx)
            });
            $('.dropdown-toggle').dropdown()
            $('.dropdown-toggle').dropdown();
            
//            点击确认新增
			$('.add').on('click',function () {
			    console.log($('.fuwu-table>.flex-box'));
				var length = $('.fuwu-table>.flex-box').length-1;
				var data = [];
				var imediate = $('.immediately').prop('checked');
				(imediate)?imediate = 1 :imediate = 0;
				var h = true;
				for (var i = 0; i<=length;i++){
				    var item = {};
				    item.hospital=$($('.fuwu-table>.flex-box')[i]).find('.yiyuan-code').attr('data-code');
				    item.hospitalName = $($('.fuwu-table>.flex-box')[i]).find('.yiyuan-code').text();
				    item.serviceItemId = $($('.fuwu-table>.flex-box')[i]).find('.xiangmu-id').attr('data-id');
                    item.serviceItemName = $($('.fuwu-table>.flex-box')[i]).find('.xiangmu-id').text();
				    item.expense = $($('.fuwu-table>.flex-box')[i]).find('.cost').val();
				    item.status = 1;
                    if (item.hospital && item.serviceItemName == ""){
                        layer.msg('请选择项目',{icon:5});
                        h = false;
                        break;
                    }
				    if (item.hospital && item.expense == ""){
                        layer.msg('请填上金额',{icon:5});
                        h = false;
                        break;
                    }
					if (item.expense != "" && (item.hospitalName == '' || item.serviceItemName == "")){
                        layer.msg('请填上医院和项目',{icon:5});
                        h = false;
                        break;
					}
                    if(item.hospitalName == '' && item.expense == "" && item.serviceItemName == ""){
                        break;
                    }
				    data.push(item)
				};
				if (data.length < 1){
                    layer.msg('请填上需要添加的信息',{icon:5});
				    return;
				}
				//如果不满足条件,不进行ajax
				if (h == false){
				    return;
				}
                data = JSON.stringify(data);
                parms = {
                    hospitalServiceItem:data,
                    imediate:imediate
                }
                $.ajax({
                    url: ctx + "/admin/specialist/hospitalServiceItem/createHospitalServiceItem",
                    method: "POST",
                    dataType: "json",
                    async: true,
                    data:parms,
                    success:function (res) {
                        console.log(res);
                        if (res.data.status == 200){
                            layer.msg('操作成功',{icon:1});
                            setTimeout(function () {
                                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                                parent.layer.close(index); //再执行关闭
                            },3000)
						}
                    },
                    error:function (err) {
                        console.log(err)
                    }
                })
            });
			
//			点击查询医院
			$('#btn-search').on('click',function () {
				var name = $('.hostpital-name').val();
				var grade = $('.btn-grade').text();
				if (grade == '三级医院'){
				    grade = 3;
				}else if(grade == '二级医院'){
				    grade = 2
				}else if(grade == '一级及一下'){
				    grade = 1
				}else{
				    grade = '';
				}
				if(grade || name){
                    selectHospital(name,grade)
                }
            })
//			关闭弹窗
			$('.closePage').on('click',function () {
                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                parent.layer.close(index); //再执行关闭
            })
		</script>
	</body>
</html>

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

@ -13,7 +13,7 @@
			.icon-delete{background-image: url(${ctx}/static/desizenMan/images/delete.png);}
			.operation-box{font-size: 0;padding: 20px;}
			.operation-box .form-control{border-right-width: 0;font-size: 12px;height: auto;border-radius: 0;width: 290px!important;line-height: 16px;}
			.operation-box .form-control{font-size: 12px;height: auto;border-radius: 0;width: 290px!important;line-height: 16px;}
			.operation-box .input-group-addon{padding: 0;border: none;background-color: none;}
			.operation-box .form-inline .btn{float: none;}
			.operation-box .btn{margin-left: 20px;float: left;width: 90px;font-size: 12px;line-height: 16px;padding: 6px;text-align: center;}
@ -55,6 +55,12 @@
			.node-institutional_project{
				border:none!important;
			}
			.display-none{
				opacity: 0;
			}
			.webuploader-pick{
				display: initial;background-color: transparent;
			}
		</style>
	</head>
	<body>
@ -62,10 +68,13 @@
			<div class="pull-left">
				<div class="form-inline">
					<div class="input-group">
						<input type="text" class="form-control" id="input-select-node" placeholder="请输入计算机编码、项目编码、项目名称" />
						<span class="input-group-addon">
							<i class="icon icon30 icon-search"></i>
						</span>
						<div class="input-group">
							<input id="input-select-node" type="text" class="form-control" aria-label="..." style="width:270px;height:34px;" placeholder="输入医院名">
						</div>
						<%--<input type="text" class="form-control" id="input-select-node" placeholder="请输入计算机编码、项目编码、项目名称" />--%>
						<%--<span class="input-group-addon">--%>
							<%--<i class="icon icon30 icon-search"></i>--%>
						<%--</span>--%>
					</div>
					<button class="btn btn-primary search-btn">查询</button>
				</div>
@ -73,7 +82,9 @@
			<div class="pull-right text-right">
				<div class="operation-group clearfix" role="group" aria-label="...">
				  <button type="button" class="btn btn-danger delete"><i class="icon icon15 icon-delete"></i>&emsp;删除</button>
				  <button type="button" class="btn btn-warning">批量导入</button>
				  <sec:authorize url="/admin/specialist/hospitalServiceItem/importData">
				  	<button id="btn_import" type="button" class="btn btn-warning"><div id="div_file_picker">批量导入</div></button>
				  </sec:authorize>
				  <button type="button" class="btn btn-primary add">新增机构项目</button>
				</div>
			</div>
@ -102,66 +113,65 @@
							<div class="row">
								<div class="col-xs-6">
									<span class="item-name">名称</span>
									<span>院前急救箱</span>
									<span class="item-title"></span>
								</div>
								<div class="col-xs-6">
									<span class="item-name">类型</span>
									<span>康复服务</span>
									<span class="item-type"></span>
								</div>
							</div>
							<div class="row">
								<div class="col-xs-12">
									<span class="item-name">内容</span>
									<span>院前急救箱院前急救箱院前急救箱院前急救箱院前急救箱</span>
									<span class="item-content"></span>
								</div>
							</div>
							<div class="row">
								<div class="col-xs-12">
									<span class="item-name">除外内容</span>
									<span>院前急救箱院前急救箱院前急救箱院前急救箱院前急救箱</span>
									<span class="item-chuwai"></span>
								</div>
							</div>
							<div class="row">
								<div class="col-xs-12">
									<span class="item-name">说明</span>
									<span>院前急救箱院前急救箱院前急救箱院前急救箱院前急救箱</span>
									<span class="item-shuoming"></span>
								</div>
							</div>
							<div class="row">
								<div class="col-xs-6">
									<span class="item-name">病案项目</span>
									<span>急救箱</span>
									<span class="item-xiangmu"></span>
								</div>
								<div class="col-xs-6">
									<span class="item-name">医院等级</span>
									<span>三级</span>
									<span class="item-grade"></span>
								</div>
							</div>
							<div class="row">
								<div class="col-xs-6">
									<p><span class="item-name c-323232">病案项目</span><span>元</span></p>
									<p><span class="item-name">三级医院</span><span>126</span></p>
									<p><span class="item-name c-323232">收费标准</span><span class="item-biaozhun">元</span></p>
									<p><span class="item-name item-dengji">三级医院</span><span class="item-jiage"></span></p>
								</div>
								<div class="col-xs-6">
									<br />
									<p><span class="item-name mt-30">实际收费</span><span>126</span></p>
									<p><span class="item-name mt-30">实际收费</span><span class="item-shiji"></span></p>
								</div>
							</div>
							<div class="row">
								<div class="col-xs-12">
									<span class="item-name">计价单位</span>
									<span>次</span>
									<span class="item-danwei"></span>
								</div>
							</div>
							<div class="row">
								<div class="col-xs-12">
									<span class="item-name">收费项目</span>
									<span>其他检查检验器械费用</span>
									<span class="item-name">加收项目</span>
									<span class="item-jiashou"></span>
								</div>
							</div>
							<div class="row text-center">
								<p class="ptb-30 mb-0"><span class="checkbox-box"><input type="checkbox" class="immediately" /><i></i>立即生效</span></p>
								<button class="btn btn-danger mb-30">删除服务</button>
							</div>
						</td>
					</tr>
@ -208,8 +218,13 @@
                    ]
                }
            ];
            var xiangmuContent = [];
            var $selectableTree=null;
            var $institutionalProject = null;
            var initSelectableTree = function() {
				/*之前人写的方法,删除模式不一样,改了会出错,就设置成空了*/
//                var deleteStr='<span class="delete-node" data-type="1">删除</span>';
                var deleteStr='';
                return $('#medical_institution').treeview({
                    data: defaultData,
                    selectedColor:"#2d9bd2",//选择时的颜色
@ -219,62 +234,80 @@
                    showBorder: false,//是否显示边框
                    backColor:"#FFFFFF",
                    onNodeSelected: function(event, node) {
//                        nodeParent=$("#medical_institution").find('.node-selected');
//                        console.log(nodeParent);
                        var nodeParent=$("#medical_institution").find('.node-selected');
                        var unNodeId=null;
                        console.log('nodeParent')
                        console.log(nodeParent);
						if(nodeParent.length){
                            $.each(nodeParent,function(index,item){
                                var _nodeid=$(item).data('nodeid')
                                if(_nodeid!=node.nodeId){
                                    unNodeId=_nodeid;
                                }
                            })
						}
                      	unNodeId && ( $("#medical_institution").treeview("unselectNode", [unNodeId, { silent: true } ]));
                        (deleteMode && $("#medical_institution").treeview("editNode", [node.nodeId, { text: node.text.indexOf(deleteStr)===-1?node.text+=deleteStr:node.text}])) || $("#medical_institution").treeview("editNode", [node.nodeId, { text: node.text.replace(deleteStr,'')}]);
						if($("#medical_institution").find('.node-selected')[0]){
                            var code = $("#medical_institution").find('.node-selected')[0].dataset.code
                            selectByCondition(code);
						}
                    },
                    onNodeUnselected: function (event, node) {
                        $("#medical_institution").treeview("selectNode", [node.nodeId, { silent: true } ]);
                        console.log('节点未选中')
                    }
                });
            };
            $.ajax({
                url: ctx + "/admin/specialist/hospitalServiceItem/selectByHospitals",
                method: "POST",
                dataType: "json",
                async: true,
                success:function (res) {
                    console.log(res);
                    res.data.forEach(function (item) {
                        var t = {}
                        t.text = item.name;
                        if (item.townName == '思明区'){
                            defaultData[0].nodes[0].nodes.push(t)
                        }
                        if (item.townName == '海沧区'){
                            defaultData[0].nodes[1].nodes.push(t)
                        }
                        if (item.townName == '湖里区'){
                            defaultData[0].nodes[2].nodes.push(t)
                        }
                        if (item.townName == '集美区'){
                            defaultData[0].nodes[3].nodes.push(t)
                        }
                        if (item.townName == '翔安区'){
                            defaultData[0].nodes[4].nodes.push(t)
                        }
                    })
                    $selectableTree = initSelectableTree();
                    bindEvent();
                },
                error:function (err) {
                    console.log(err)
                }
            })
//            获取医疗机构
            function selectHospital() {
                $.ajax({
                    url: ctx + "/admin/specialist/hospitalServiceItem/selectHospital",
                    method: "POST",
                    dataType: "json",
                    async: true,
                    data:{hospitalName:'',grade:''},
                    success:function (res) {
                        console.log(res);
                        res.data.forEach(function (item) {
                            var t = {}
                            t.text = item.name;
                            t.code = item.code;
                            if (item.townName == '思明区'){
                                defaultData[0].nodes[0].nodes.push(t)
                            }
                            if (item.townName == '海沧区'){
                                defaultData[0].nodes[1].nodes.push(t)
                            }
                            if (item.townName == '湖里区'){
                                defaultData[0].nodes[2].nodes.push(t)
                            }
                            if (item.townName == '集美区'){
                                defaultData[0].nodes[3].nodes.push(t)
                            }
                            if (item.townName == '翔安区'){
                                defaultData[0].nodes[4].nodes.push(t)
                            }
                        })
                        $selectableTree = initSelectableTree();
                    },
                    error:function (err) {
                        console.log(err)
                    }
                })
            }
            selectHospital();
	        var serverData=[{
	            text: '检查费',
	            tags: ['4'],
	            tags: [0],
	            color: '#323232',
	            nodes: [
	              {
	                text: '浅表器官彩色多普勒超声波检查',
	              },
	              {
	                text: '彩色多普勒超声波检查',
	              }
	            ]
	        }]
	            nodes: []
	        }];
	        var deleteStr='<span class="delete-node">删除</span>';
	        var deleteMode=false;
	        $('.delete').on('click',function(){
@ -293,12 +326,14 @@
	        };
	        $('.search-btn').on('click', function (e) {
	          findSelectableNodes();//医疗机构搜索
	          findSelectableNodes1();//机构项目搜索
//	          findSelectableNodes1();//机构项目搜索
	        });
//	        	机构项目
	         var institutionalProject = function() {
	          var deleteStr='<span class="delete-node">删除</span>';
	             /*之前人写的方法,删除模式不一样,改了会出错,就设置成空了*/
//	          var deleteStr='<span class="delete-node" data-type="2">删除</span>';
 			  var deleteStr = '';
	          return $('#institutional_project').treeview({
	            data: serverData,
	            selectedColor:"#2d9bd2",//选择时的颜色
@ -308,26 +343,195 @@
          		showBorder: false,//是否显示边框
  				backColor:"#FFFFFF",
	            onNodeSelected: function(event, node) {
					(deleteMode && $("#institutional_project").treeview("editNode", [node.nodeId, { text: node.text.indexOf(deleteStr)===-1?node.text+=deleteStr:node.text}])) || $("#institutional_project").treeview("editNode", [node.nodeId, { text: node.text.replace(deleteStr,'')}]);
                    var nodeParent=$("#institutional_project").find('.node-selected');
                    var unNodeId=null;
//                    console.log('nodeParent')
//                    console.log(nodeParent);
                    if(nodeParent.length){
                        $.each(nodeParent,function(index,item){
                            var _nodeid=$(item).data('nodeid')
                            if(_nodeid!=node.nodeId){
                                unNodeId=_nodeid;
                            }
                        })
                    }
                    node.text = node.text.toString()
                    unNodeId && ( $("#institutional_project").treeview("unselectNode", [unNodeId, { silent: true } ]));
                    (deleteMode && $("#institutional_project").treeview("editNode", [node.nodeId, { text: node.text.indexOf(deleteStr)===-1?node.text+=deleteStr:node.text}])) || $("#institutional_project").treeview("editNode", [node.nodeId, { text: node.text.replace(deleteStr,'')}]);
					var id = $("#institutional_project").find('.node-selected')[0].dataset.code
					console.log(id);
					if (!id){
					    return
					}
                    console.log(xiangmuContent);
                    var t = null;
					xiangmuContent.forEach(function (item) {
						if (id == item.hospitalServiceItem.id){
                            t = item
						}
                    });
					console.log(t);
                    var grade = '',price = '',itemType='',hospitalGrade='';
					$('.item-title').text(t.itemName);
                    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);
					$('.item-shuoming').text(t.hospitalServiceItem.specialistServiceItemDO.description);
					$('.item-xiangmu').text(t.hospitalServiceItem.specialistServiceItemDO.diseaseItem);
					if(t.hospitalServiceItem.specialistServiceItemDO.hospitalGrade == 1){
                        hospitalGrade = '一级';
                        grade = '一级医院';
                        price = t.hospitalServiceItem.specialistServiceItemDO.oneHospitals;
					}else if(t.hospitalServiceItem.specialistServiceItemDO.hospitalGrade == 2){
                        hospitalGrade = '二级';
                        grade = '二级医院';
                        price = t.hospitalServiceItem.specialistServiceItemDO.twoHospitals;
					}else if(t.hospitalServiceItem.specialistServiceItemDO.hospitalGrade == 3){
                        hospitalGrade = '三级';
                        grade = '三级医院';
                        price = t.hospitalServiceItem.specialistServiceItemDO.threeHospitals;
                    }
                    console.log('医院等级'+grade,'价格'+price);
					$('.item-grade').text(hospitalGrade);
					$('.item-dengji').text(grade);
					$('.item-biaozhun').text(price);
					$('.item-jiage').text(t.hospitalServiceItem.expense);
					$('.item-danwei').text(t.hospitalServiceItem.specialistServiceItemDO.unit);
					$('.item-jiashou').text(t.hospitalServiceItem.specialistServiceItemDO.addItem);
					console.log(t.hospitalServiceItem.specialistServiceItemDO.imediate)
					if(t.hospitalServiceItem.specialistServiceItemDO.imediate == 1){
						$('.immediately').attr('checked','checked');
					}else if(t.hospitalServiceItem.specialistServiceItemDO.imediate == 0){
                        $('.immediately').attr('checked',false);
					}
	            },
	            onNodeUnselected: function (event, node) {
                    $("#institutional_project").treeview("selectNode", [node.nodeId, { silent: true } ]);
	            	console.log('节点未选中')
	            }
	          });
	        };
	        var $institutionalProject = institutionalProject();
            $institutionalProject = institutionalProject();
	        function selectNode1(e) {
	          	var selectedNodes1=$selectableTree.treeview('getSelected');
                var selectedNodes1=$selectableTree.treeview('getSelected');
                var selectedNodes2=$institutionalProject.treeview('getSelected');
                var node=selectedNodes1[0];
                var node1=selectedNodes2[0];
                console.log(node);
                console.log(node1);
                if(!node && !node1){
                    return false
				}
                if (node.code || (node1 && node1.code)) {
                    layer.confirm('您确定要删除此机构服务项目?', {
                        title: '删除提示',
                        skin: 'layui-layer-blue', //样式类名
                        anim:4,
                        btn: ['确定','取消'] //按钮
                    }, function(index){
                        var data = {};
                        var type = '';
//                        删除项目
                        if(node1 && node1.code){
                            data.id = node1.code;;
                            data.hospital = '';
                            data.serviceItem = '';
                            type = 1;
                        }else{
//                            删除机构关联下的项目
                            data.hospital = node.code;
                            type = 2;
						}
                        $.ajax({
                            url: ctx + "/admin/specialist/hospitalServiceItem/deleteHospitalItem",
                            method: "POST",
                            dataType: "json",
                            async: true,
                            data:data,
                            success:function (res) {
                                console.log(res)
                                if (res.status == 200){
                                    if (type == 1){
                                        $institutionalProject.treeview("deleteNode", [node1.nodeId, { silent: true } ])
									}else{
                                        defaultData = [
                                            {
                                                text: '厦门市',
                                                href: '#parent1',
                                                nodes: [
                                                    {
                                                        text: '思明区',
                                                        nodes: [
                                                        ]
                                                    },
                                                    {
                                                        text: '海沧区',
                                                        href: '#child2',
                                                        nodes: [
                                                        ]
                                                    }, {
                                                        text: '湖里区',
                                                        nodes: [
                                                        ]
                                                    },
                                                    {
                                                        text: '集美区',
                                                        nodes: [
                                                        ]
                                                    },
                                                    {
                                                        text: '翔安区',
                                                        nodes: [
                                                        ]
                                                    },
                                                ]
                                            }
                                        ];
                                        serverData=[{
                                            text: '检查费',
                                            tags: [0],
                                            color: '#323232',
                                            nodes: []
                                        }];
                                        $institutionalProject = null;
                                        $institutionalProject = institutionalProject();
                                        selectHospital();
									}
                                    layer.closeAll();
                                    $('.item-title').text('');
                                    $('.item-type').text('');
                                    $('.item-content').text('');
                                    $('.item-chuwai').text('');
                                    $('.item-shuoming').text('');
                                    $('.item-xiangmu').text('');
                                    $('.item-grade').text('');
//                                    $('.item-dengji').text('');
                                    $('.item-biaozhun').text('');
                                    $('.item-jiage').text('');
                                    $('.item-danwei').text('');
                                    $('.item-jiashou').text('');
                                }
                            }
                        })
					})
                }
	          	/*var selectedNodes1=$selectableTree.treeview('getSelected');
	          	console.log(selectedNodes1)
	          	var node=selectedNodes1[0];
                var deleteStr='<span class="delete-node" data-type="1">删除</span>';
				node && ((deleteMode && $selectableTree.treeview("editNode", [node.nodeId, { text: node.text.indexOf(deleteStr)===-1?node.text+=deleteStr:node.text}])) || $selectableTree.treeview("editNode", [node.nodeId, { text: node.text.replace(deleteStr,'')}]));
	        	var selectedNodes2=$institutionalProject.treeview('getSelected');
	          	var node1=selectedNodes2[0];
	          	node1 && ((deleteMode && $institutionalProject.treeview("editNode", [node1.nodeId, { text: node1.text.indexOf(deleteStr)===-1?node1.text+=deleteStr:node1.text}])) || $institutionalProject.treeview("editNode", [node1.nodeId, { text: node1.text.replace(deleteStr,'')}]));
                deleteStr='<span class="delete-node" data-type="2">删除</span>';
	          	node1 && ((deleteMode && $institutionalProject.treeview("editNode", [node1.nodeId, { text: node1.text.indexOf(deleteStr)===-1?node1.text+=deleteStr:node1.text}])) || $institutionalProject.treeview("editNode", [node1.nodeId, { text: node1.text.replace(deleteStr,'')}]));*/
	        };
	        function bindEvent(){
                $('.treeview').on('click','.delete-node',function(event){
                    console.log('err')
                    event.stopPropagation();
                    event.stopImmediatePropagation();
                    var that=this;
@ -337,7 +541,86 @@
                        anim:4,
                        btn: ['确定','取消'] //按钮
                    }, function(index){
                        layer.close(index);
                        console.log();
                        var type = $(that)[0].dataset.type
                        var code = $(that).parent()[0].dataset.code;
                        var data = {};
                        if (type == 1){
                            data.hospital = code;
						}else if(type == 2 ){
                            data.id = code;
                            data.hospital = '';
                            data.serviceItem = ''
						}
                        $.ajax({
                            url: ctx + "/admin/specialist/hospitalServiceItem/deleteHospitalItem",
                            method: "POST",
                            dataType: "json",
                            async: true,
                            data:data,
                            success:function (res) {
                                console.log(res)
								if (res.status == 200){
                                    defaultData = [
                                        {
                                            text: '厦门市',
                                            href: '#parent1',
                                            nodes: [
                                                {
                                                    text: '思明区',
                                                    nodes: [
                                                    ]
                                                },
                                                {
                                                    text: '海沧区',
                                                    href: '#child2',
                                                    nodes: [
                                                    ]
                                                }, {
                                                    text: '湖里区',
                                                    nodes: [
                                                    ]
                                                },
                                                {
                                                    text: '集美区',
                                                    nodes: [
                                                    ]
                                                },
                                                {
                                                    text: '翔安区',
                                                    nodes: [
                                                    ]
                                                },
                                            ]
                                        }
                                    ];
                                    serverData=[{
                                        text: '检查费',
                                        tags: [0],
                                        color: '#323232',
                                        nodes: []
                                    }];
                                    $institutionalProject = null;
                                    $institutionalProject = institutionalProject();
                                    selectHospital();
                                    layer.closeAll();
                                    $('.item-title').text('');
                                    $('.item-type').text('');
                                    $('.item-content').text('');
                                    $('.item-chuwai').text('');
                                    $('.item-shuoming').text('');
                                    $('.item-xiangmu').text('');
                                    $('.item-grade').text('');
//                                    $('.item-dengji').text('');
                                    $('.item-biaozhun').text('');
                                    $('.item-jiage').text('');
                                    $('.item-danwei').text('');
                                    $('.item-jiashou').text('');
								}
                            }
                        })
                        /*layer.close(index);
                        var nodeId=$($(that).parent()).data('nodeid');
                        console.log($(that).parents('.treeview'));
                        var pid=$(that).parents('.treeview')[0].id;
@ -345,24 +628,80 @@
                            $institutionalProject.treeview("deleteNode", [nodeId, { silent: true } ])
                        }else{
                            $selectableTree.treeview("deleteNode", [nodeId, { silent: true } ])
                        }
                        }*/
                    }, function(){
                    });
                })
			}
//			点击新增机构项目
			$('.add').on('click',function(){
			    layer.open({
                    type: 2,
                    title: 'layer mobile页',
                    title: false,
                    closeBtn:0,
                    shadeClose: true,
                    shade: 0.8,
                    area: ['1020px', '90%'],
                    area: ['1020px', '80%'],
                    content: '/admin/specialist/hospitalServiceItem/initial1' //iframe的url
				})
			})
//			获取检查费(项目机构)
			function selectByCondition(code) {
	            if(code) {
                    $.ajax({
                        url: ctx + "/admin/specialist/hospitalServiceItem/selectByCondition",
                        method: "POST",
                        dataType: "json",
                        async: true,
                        data: {hospital: code},
                        success: function (res) {
                            $institutionalProject = null;
                            serverData[0].nodes = [];
                            xiangmuContent = res.data.detailModelList[0];
                            res.data.detailModelList[0].forEach(function (item) {
                                var t = {};
                                t.text = item.itemName;
                                t.code = item.hospitalServiceItem.id
                                serverData[0].nodes.push(t)
                            });
                            $institutionalProject = institutionalProject();
                        }
                    })
                }
            }
//            上传文件
            var uploader = $("#btn_import").webupload({
                server: ctx + "/admin/specialist/hospitalServiceItem/importData",
                pick: {id: '#div_file_picker'},
                accept: {
                    title: 'Excel',
                    extensions: 'xls',
                    mimeTypes: '.xls'
                },
                auto: true
            });
            uploader.on('beforeSend', function (file, data, headers) {
                console.log(file, data, headers)
            });
            uploader.on('uploadProgress', function (file, percentage) {
                console.log('正在保存中,请稍候...')
                $.ligerDialog.waitting('正在保存中,请稍候...');
            });
            uploader.on('uploadError', function (file) {
                console.log(file);
                $.ligerDialog.closeWaitting();
                $.Notice.error("上传失败!");
            });
            uploader.on('uploadSuccess', function (file, resp) {
                console.log(file, resp)
                $.ligerDialog.closeWaitting();
                $.Notice.success("上传成功。");
            });
		</script>
	</body>
</html>

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

@ -16,7 +16,7 @@
        <div class="lay">
            <div class="title flex flex-sp-b flex-cz-c">
                <span>新增项目</span>
                <img src="images/Close_btn.png" alt="">
                <img class="closePage" src="${ctx}/static/specialty/images/Close_btn.png" alt="">
            </div>
            <form action="">
                <div class="info">
@ -24,11 +24,11 @@
                    <p class="info-title">项目信息</p>
                    <div class="info-left">
                        <div class="input">
                            <label for="">项目名称:</label>
                            <label class="required" for="">项目名称:</label>
                            <input class="title_" type="text">
                        </div>
                        <div class="input flex flex-sp-end">
                            <label for="">项目内涵:</label>
                            <label for="" class="required">项目内涵:</label>
                            <textarea class="content" style="margin-left: 4px" name="" id="" cols="30" rows="10"></textarea>
                        </div>
                        <div class="input flex flex-sp-end">
@ -39,13 +39,15 @@
                            <label for="">说明:</label>
                            <textarea class="description" style="margin-left: 4px" name="" id="" cols="30" rows="10"></textarea>
                        </div>
                        <div class="input">
                            <label for="">病案项目:</label>
                            <input class="disease_item" type="text">
                        <div class="input layui-form flex flex-cz-c" style="padding-left: 30px;">
                            <label class="required" for="" style="margin-right: 10px;right: -6px;">病案项目:</label>
                            <%--<input class="hospital_grade" type="text">--%>
                            <select name="disease_item" lay-verify="">
                            </select>
                        </div>
                        <div class="radio layui-form">
                            <div class="layui-form-item">
                                <label class="layui-form-label">需要预约:</label>
                                <label class="layui-form-label required-1">需要预约:</label>
                                <div class="layui-input-block">
                                    <input type="radio" name="reserve" value="0" title="是">
                                    <input type="radio" name="reserve" value="1" title="否">
@ -54,7 +56,7 @@
                        </div>
                        <div class="radio layui-form">
                            <div class="layui-form-item">
                                <label class="layui-form-label">完成方式:</label>
                                <label class="layui-form-label required-1">完成方式:</label>
                                <div class="layui-input-block flex">
                                    <input type="radio" name="type" value="0" title="扫码">
                                    <input type="radio" name="type" value="1" title="按钮">
@ -64,7 +66,7 @@
                        </div>
                        <div class="radio layui-form">
                            <div class="layui-form-item">
                                <label class="layui-form-label">项目评价:</label>
                                <label class="layui-form-label required-1">项目评价:</label>
                                <div class="layui-input-block">
                                    <input type="radio" name="evaluation" value="0" title="是">
                                    <input type="radio" name="evaluation" value="1" title="否">
@ -75,45 +77,51 @@
                    <div class="info-right">
                        <div class="layui-form">
                            <div class="layui-form-item">
                                <div class="layui-input-block ml40">
                                <div class="layui-input-block ml40 required-2">
                                    <input type="radio" name="item_type" value="0" title="康复服务">
                                    <input type="radio" name="item_type" value="1" title="健康管理">
                                </div>
                            </div>
                        </div>
                        <div class="input">
                            <label for="">医院等级:</label>
                            <input class="hospital_grade" type="text">
                        <div class="input layui-form flex flex-cz-c" style="padding-left: 30px;">
                            <label class="required" for="" style="margin-right: 12px">医院等级:</label>
                            <%--<input class="hospital_grade" type="text">--%>
                            <select name="hospital_grade" lay-verify="">
                                <option value="0">所有</option>
                                <option value="3">三级医院</option>
                                <option value="2">二级医院</option>
                                <option value="1">一级及以下</option>
                            </select>
                        </div>
                        <div class="info-right-title flex flex-cz-c flex-sp-b">
                            <span>收费标准</span>
                            <span>元</span>
                        </div>
                        <div class="input">
                            <label for="">三级医院:</label>
                            <input class="three_hospitals" type="text">
                            <label class="required" for="">三级医院:</label>
                            <input class="three_hospitals" type="text" value="0.00">
                        </div>
                        <div class="input">
                            <label for="">二级医院:</label>
                            <input class="two_hospitals" type="text">
                            <label class="required" for="">二级医院:</label>
                            <input class="two_hospitals" type="text" value="0.00">
                        </div>
                        <div class="input flex flex-sp-end flex-cz-c">
                            <label for="">一级及一级以下<br>医疗机构:</label>
                            <input class="one_hospitals" style="margin-left: 4px;" type="text">
                            <label class="required" for="">一级及以下:</label>
                            <input class="one_hospitals" style="margin-left: 4px;" type="text" value="0.00">
                        </div>
                        <div class="input">
                            <label for="">计价单位:</label>
                            <label class="required" for="">计价单位:</label>
                            <input class="unit" type="text">
                        </div>
                        <div class="input flex flex-sp-end">
                            <label for="">加收项目:</label>
                            <label for="" style="margin-right: 4px">加收项目:</label>
                            <textarea class="add_item" name="" id="" cols="30" rows="10"></textarea>
                        </div>
                    </div>
                    <div class="info-bottom layui-form">
                        <input type="checkbox" name="imediate" title="立即生效" lay-skin="primary">
                        <input type="checkbox" name="imediate" checked title="立即生效" lay-skin="primary">
                        <div style="margin-top: 20px;">
                            <button style="background-color: #2d9bd2;" class="layui-btn layui-btn-primary addSubmit" onclick="addSubmit(event,this)">确认</button>
                            <input type="submit" style="background-color: #2d9bd2;" class="layui-btn layui-btn-primary addSubmit" onclick="addSubmit(event,this)" value="确认">
                            <button style="background-color: #d9c8b2;" class="layui-btn layui-btn-primary" onclick="cancel(event)">取消</button>
                        </div>
                    </div>
@ -122,18 +130,39 @@
            
        </div>
    </div>
    
    <div class="lay-box-2" style="display: none;">
        <div class="lay">
            <div class="title flex flex-sp-b flex-cz-c">
                <span>修改、失效历史</span>
                <img class="closePage" src="${ctx}/static/specialty/images/Close_btn.png" alt="">
            </div>
            <div class="content-box">
                <div class="content-text">
                    <div class="flex flex-sp-b">
                        <span class="number"></span>
                        <span class="time"></span>
                    </div>
                    <ul>
                        <li></li>
                    </ul>
                </div>
            </div>
        </div>
    </div>
    <div class="content">
        <!-- 请选择项目类型 -->
        <div class="btn-group">
            <button type="button" class="btn btn-default btn-hover-none btn-radius-none w130 h30 text-align-left">请选择项目类型</button>
            <button type="button" class="btn btn-default btn-hover-none btn-radius-none w130 h30 text-align-left xiangmu">请选择项目类型</button>
            <button type="button" class="btn dropdown-toggle btn-radius-none  w30 h30" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                <span class="caret"></span>
                <span class="sr-only">Toggle Dropdown</span>
            </button>
            <ul class="dropdown-menu">
                <li>
                    <a href="#">康健服务</a>
                    <a href="#">所有</a>
                </li>
                <li>
                    <a href="#">康复服务</a>
                </li>
                <li>
                    <a href="#">健康管理</a>
@ -142,12 +171,15 @@
        </div>
        <!-- 请选择医院等级 -->
        <div class="btn-group">
            <button type="button" class="btn btn-default btn-hover-none btn-radius-none w130 h30 text-align-left">请选择医院等级</button>
            <button type="button" class="btn btn-default btn-hover-none btn-radius-none w130 h30 text-align-left yiyuan">请选择医院等级</button>
            <button type="button" class="btn dropdown-toggle btn-radius-none  w30 h30" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                <span class="caret"></span>
                <span class="sr-only">Toggle Dropdown</span>
            </button>
            <ul class="dropdown-menu">
                <li>
                    <a href="#">所有</a>
                </li>
                <li>
                    <a href="#">三级医院</a>
                </li>
@ -161,43 +193,27 @@
        </div>
        <!-- 请选择病案项目 -->
        <div class="btn-group">
            <button type="button" class="btn btn-default btn-hover-none btn-radius-none w130 h30 text-align-left">请选择病案项目</button>
            <button type="button" class="btn btn-default btn-hover-none btn-radius-none w130 h30 text-align-left bingan-xiangmu">请选择病案项目</button>
            <button type="button" class="btn dropdown-toggle btn-radius-none  w30 h30" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                <span class="caret"></span>
                <span class="sr-only">Toggle Dropdown</span>
            </button>
            <ul class="dropdown-menu">
                <li>
                    <a href="#">Action</a>
                </li>
                <li>
                    <a href="#">Another action</a>
                </li>
                <li>
                    <a href="#">Something else here</a>
                </li>
            <ul class="dropdown-menu bingan">
            </ul>
        </div>
        <!-- 搜索 -->
        <div class="search form-inline">
            <div class="input-group h30 font-12" style="width: 379px;">
            <div class="input-group h30 font-12" style="width: 270px;">
                <div class="input-group">
                    <div class="input-group-btn">
                        <button type="button" style="height: 34px;width: 90px" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">计算机编码 <span class="caret"></span></button>
                        <ul class="dropdown-menu">
                            <li><a href="#">计算机编码</a></li>
                            <li><a href="#">项目编码</a></li>
                            <li><a href="#">项目名称</a></li>
                        </ul>
                    </div><!-- /btn-group -->
                    <input type="text" class="form-control" aria-label="..." style="width:270px;border-radius: 0;" placeholder="输入计算机编码、项目编码、项目名称">
                    <input type="text" class="form-control xiangmu-name" aria-label="..." style="width:270px;border-radius: 0;" placeholder="输入项目名称">
                </div>
                <%--搜索图标--%>
                <%--<span class="input-group-addon">--%>
                    <%--<i class="icon icon30 icon-search"></i>--%>
                <%--</span>--%>
            </div>
            <button class="btn btn-primary h30 font-12">查询</button>
            <button class="btn btn-primary h30 font-12 search-btn">查询</button>
        </div>
        <div class="pull-right text-right">
            <div class="operation-group clearfix" role="group" aria-label="...">
@ -214,6 +230,16 @@
    <%--<%@ include  file="./js/ligerui.all_js.jsp"%>--%>
    <script type="text/javascript">
        var form,grid;
        var diseaseItem = ['不统计','治疗费','检查费','其它费用','床位费','护理费','婴儿费','输氧费','放射费','化验费','手术费','麻醉费','接生费','非手术治疗项目费','治疗费','康复费'];
        var diseaseItemHtml = '';
        var binganHtml = '';
        var modityRow = null;
        diseaseItem.forEach(function (item) {
            diseaseItemHtml += '<option value='+item+'>'+item+'</option>';
            binganHtml += '<li><a href="#">'+item+'</a></li>'
        })
        $('select[name="disease_item"]').html(diseaseItemHtml);
        $('.bingan').html(binganHtml)
        layui.use(['layer','laydate','form'],function(){
            var layer = layui.layer;  //layer初始化
            form = layui.form;
@ -238,7 +264,6 @@
                    async: true,
                    data: {serviceItem: data},
                    success:function (res) {
                        console.log(res)
                        if (res.status == 200){
                            layer.alert('操作成功!', {
                                icon: 1,
@ -279,10 +304,12 @@
//        修改行
        function modify(rowindex) {
            var row = grid.getRow(rowindex);
            modityRow = row;
            console.log(row)
            layer.open({
                type:1,
                title:'',
                closeBtn:false,
                content: $('.lay-box').html(),
                area: ['680px', '750px']
            });
@ -292,13 +319,24 @@
            $('.lay .content').val(row.content);
            $('.lay .exclude_content').val(row.excludeContent);
            $('.lay .description').val(row.description);
            $('.lay .disease_item').val(row.diseaseItem);
            console.log($('.lay select[name="disease_item"]'));
            $('.lay select[name="disease_item"]').val(row.diseaseItem);
            $($('.lay input[name="reserve')[row.reserve+2]).prop("checked",true);
            $($('.lay input[name="type')[row.type+3]).prop("checked",true);
            $($('.lay input[name="evaluation')[row.evaluation+2]).prop("checked",true);
            row.itemType == '康健服务' ? row.itemType = 0: row.itemType = 1;
            row.itemType == '康复服务' ? row.itemType = 0: row.itemType = 1;
            $($('.lay input[name="item_type')[row.itemType+2]).prop("checked",true);
            $('.lay .hospital_grade').val(row.hospitalGrade);
            if (row.hospitalGrade == '三级医院'){
                row.hospitalGrade = 3
            }else if(row.hospitalGrade == '二级医院'){
                row.hospitalGrade = 2
            }else if(row.hospitalGrade == '一级及一级以下医疗机构'){
                row.hospitalGrade = 1
            }
            else if(row.hospitalGrade == '所有'){
                row.hospitalGrade = 0
            }
            $('select[name="hospital_grade"]').find('option[value='+row.hospitalGrade+']').attr('selected','selected')
            $('.lay .three_hospitals').val(row.threeHospitals);
            $('.lay .two_hospitals').val(row.twoHospitals);
            $('.lay .one_hospitals').val(row.oneHospitals);
@ -308,17 +346,157 @@
            $($('.lay input[name="imediate')[1]).prop("checked",row.imediate);
            form.render();
        }
//      历史
        function history(rowindex) {
            var row = grid.getRow(rowindex);
            console.log(row.id);
            var data = {
                serviceItemId:row.id,
            }
            data = JSON.stringify(data);
            $.ajax({
                url: ctx + "/admin/specialist/serviceItem/selectOperate",
                method: "POST",
                dataType: "json",
                async: true,
                data: {serviceItem: data,page:1,size:1000},
                success:function (res) {
                    var Arr = res.data.detailModelList;
                    var html = '';
                    if (Arr.length < 1){
                        layer.msg('该条记录没有历史',{icon:5})
                        return false
                    }
                    Arr.forEach(function (item,index,arr) {
                        var operateLog = [
                            {
                                name:'项目名称',
                                key:'title旧',
                                text:''
                            },{
                                name:'项目内涵',
                                key:'content旧',
                                text:''
                            },{
                                name:'除外内容',
                                key:'excludeContent旧',
                                text:''
                            },{
                                name:'说明',
                                key:'description旧',
                                text:''
                            },{
                                name:'病案项目',
                                key:'diseaseItem旧',
                                text:''
                            },{
                                name:'是否预约',
                                key:'reserve旧',
                                text:''
                            },{
                                name:'完成方式',
                                key:'type旧',
                                text:''
                            },{
                                name:'项目评价',
                                key:'evaluation旧',
                                text:''
                            },{
                                name:'项目类型',
                                key:'itemType旧',
                                text:''
                            },{
                                name:'医院等级',
                                key:'hospitalGrade旧',
                                text:''
                            },{
                                name:'三级医院收费标准',
                                key:'threeHospitals旧',
                                text:''
                            },{
                                name:'二级医院收费标准',
                                key:'twoHospitals旧',
                                text:''
                            },{
                                name:'一级以及以下',
                                key:'oneHospitals旧',
                                text:''
                            },{
                                name:'计价单位',
                                key:'unit旧',
                                text:''
                            },{
                                name:'加收项目',
                                key:'addItem旧',
                                text:''
                            },{
                                name:'立即生效',
                                key:'imediate旧',
                                text:''
                            }
                        ]
                        var title = '第'+(arr.length-index)+'次';
                        var time = new Date(item.createTime).Format('yyyy/MM/dd');
                        var log = JSON.parse(item.operateLog);
/*                        console.log(arr.length,index,title);
                        console.log(time);
                        console.log(log)*/
                        var ul = '';
                        log.forEach(function (t,k) {
                            if(t['itemType旧']){
                                t['itemType旧'] == '0'? t['itemType旧'] = "康复服务":t['itemType旧'] = "健康管理";
                            }
                            if (t['hospitalGrade旧']){
                                if (t['hospitalGrade旧'] == 3){
                                    t['hospitalGrade旧'] = '三级医院'
                                }else if(t['hospitalGrade旧']==2){
                                    t['hospitalGrade旧'] = '二级医院'
                                }else if(t['hospitalGrade旧'] == 1){
                                    t['hospitalGrade旧'] = '一级及一级以下医疗机构'
                                }
                            }
                            if (t['imediate旧']){
                                t['imediate旧'] == '0'? t['imediate旧'] = "否":t['imediate旧'] = "是";
                            }
                            for(var key in t){
                                operateLog.forEach(function (w,i) {
                                    if(key==w.key){
                                        var li = '<li>'+w.name + ':' + t[key] + '</li>'
                                        ul += li
                                    }
                                })
                            }
                        })
                        html += '<div class="content-text">\
                            <div class="flex flex-sp-b">\
                            <span class="number">'+title+'</span>\
                            <span class="time">'+time+'</span>\
                            </div>\
                            <ul>'+ul+'</ul>\
                        </div>'
//                        console.log(html);
                    })
                    $('.content-box').html(html)
                    layer.open({
                        type:1,
                        title:'',
                        closeBtn:false,
                        content: $('.lay-box-2').html(),
                        area: ['680px', '750px']
                    });
                }
            })
        }
        $('#add').on('click',function(){
            layer.open({
                type:1,
                title:'',
                closeBtn:false,
                content: $('.lay-box').html(),
                area: ['680px', '750px']
            })
            $('.lay .title span').text('新增项目');
            form.render();
        });
        $('#delete').on('click',function(){
            var rows = grid.getSelectedRows();
@ -375,12 +553,12 @@
            data.content = $.trim($(_this).parents('.lay').find('.content').val());
            data.excludeContent = $.trim($(_this).parents('.lay').find('.exclude_content').val());
            data.description = $.trim($(_this).parents('.lay').find('.description').val());
            data.diseaseItem = $.trim($(_this).parents('.lay').find('.disease_item').val());
            data.diseaseItem = $.trim($(_this).parents('.lay').find('select[name="disease_item"]').val());
            data.reserve = $.trim($(_this).parents('.lay').find('input[name="reserve"]:checked').val());
            data.type = $.trim($(_this).parents('.lay').find('input[name="type"]:checked').val());
            data.evaluation = $.trim($(_this).parents('.lay').find('input[name="evaluation"]:checked').val());
            data.itemType = $.trim($(_this).parents('.lay').find('input[name="item_type"]:checked').val());
            data.hospitalGrade = $.trim($(_this).parents('.lay').find('.hospital_grade').val());
            data.hospitalGrade = $.trim($(_this).parents('.lay').find('select[name="hospital_grade"]').val());
            data.threeHospitals = $.trim($(_this).parents('.lay').find('.three_hospitals').val());
            data.twoHospitals = $.trim($(_this).parents('.lay').find('.two_hospitals').val());
            data.oneHospitals = $.trim($(_this).parents('.lay').find('.one_hospitals').val());
@ -388,13 +566,16 @@
            data.addItem = $.trim($(_this).parents('.lay').find('.add_item').val());
            data.imediate = $.trim($(_this).parents('.lay').find('input[name="imediate"]').prop("checked"));
            data.imediate == "true" ?data.imediate = 1:data.imediate = 0;
            if(!(data.title && data.content && data.diseaseItem && data.reserve && data.type && data.evaluation && data.itemType && data.hospitalGrade && data.threeHospitals && data.twoHospitals && data.oneHospitals && data.unit)){
                layer.msg('请将信息补充完整',{icon:5});
                return falses
            }
            if ($(_this).parents('.lay').find('.title span').text() == "新增项目"){
                data = JSON.stringify(data);
                console.log(data);
                $.ajax({
                    url: ctx + "/admin/specialist/serviceItem/createServiceItem",
                    method: "get",
                    method: "POST",
                    dataType: "json",
                    async: true,
                    data: {serviceItem: data},
@ -411,15 +592,21 @@
                    }
                })
            }else{
                data.id = $.trim($(_this).parents('.lay').find('.id').val());
                data = JSON.stringify(data);
                console.log(data);
                var r = {};
                for (var key in data){
                    if (data[key] != modityRow[key]){
                        r[key] = data[key]
                    }
                }
                console.log(r)
                r.id = $.trim($(_this).parents('.lay').find('.id').val());
                r = JSON.stringify(r);
                $.ajax({
                    url: ctx + "/admin/specialist/serviceItem/updateServiceItem",
                    method: "post",
                    dataType: "json",
                    async: true,
                    data: {serviceItem: data},
                    data: {serviceItem: r},
                    success:function (res) {
                        console.log(res)
                        if (res.status == 200){
@ -435,112 +622,183 @@
            }
        }
        function init() {
            $.ajax({
            grid = $("#maingrid").ligerGrid({
                url: ctx + "/admin/specialist/serviceItem/selectServiceItem",
                method: "POST",
                dataType: "json",
                async: true,
                data: {serviceItem: '{"status":1}',page:'1',pageSize:'10'},
                success:function (res) {
                    console.log(res)
                    griddata = res.data.detailModelList;
                    griddata.forEach(function (item,index) {
                        item.imediate == '0'? item.imediate = "否":item.imediate = "是";
                        item.itemType == '0'? item.itemType = "康健服务":item.itemType = "健康管理";
                        return item;
                    })
                    grid = $("#maingrid").ligerGrid({
                        columns: [
                            {
                                name: 'title',
                                display: '项目名称',
                                width: 80
                            },
                            {
                                name:"diseaseItem",
                                display:"病案项目",
                                width:80
                            },
                            {
                                name:'itemType',
                                display:"项目类型",
                                width:80
                            },
                            {
                                name:'hospitalGrade',
                                display:"医院等级",
                                width:80
                            },
                            {
                                name:"content",
                                display:"项目内涵",
                                width:290
                            },
                            {
                                name:"excludeContent",
                                display:"除外内容",
                                width:200
                            },
                            {
                                name:'unit',
                                display:"计价单位",
                                width:80
                            },
                            {
                                name:'biaozhun',
                                display:'费用标准',
                                columns:[
                                    {
                                        name:'threeHospitals',
                                        display:'三级医院',
                                        width:75
                                    },
                                    {
                                        name:'twoHospitals',
                                        display:"二级医院",
                                        width:75
                                    },
                                    {
                                        name:'oneHospitals',
                                        display:"一级及一级以</br>下医疗机构",
                                        width:75
                                    }
                                ],
                            },
                            {
                                name:'addItem',
                                display:'加收项目',
                                width:130
                            },
                parms: {serviceItem: '{"status":1}'},
                method: 'get',
                root:'detailModelList',
                columns: [
                    {
                        name: 'title',
                        display: '项目名称',
                        width: 80
                    },
                    {
                        name:"diseaseItem",
                        display:"病案项目",
                        width:80
                    },
                    {
                        name:'itemType',
                        display:"项目类型",
                        width:80,
                        render:function (row) {
                            row.itemType == '0'? row.itemType = "康复服务":row.itemType = "健康管理";
                            return row.itemType;
                        }
                    },
                    {
                        name:'hospitalGrade',
                        display:"医院等级",
                        width:80,
                        rander:function (row) {
                            if (row.hospitalGrade == 3){
                                row.hospitalGrade = '三级医院'
                            }else if(row.hospitalGrade==2){
                                row.hospitalGrade = '二级医院'
                            }else if(row.hospitalGrade == 1){
                                row.hospitalGrade = '一级及一级以下医疗机构'
                            }else if(row.hospitalGrade == 0){
                                row.hospitalGrade = '所有'
                            }
                            return row.hospitalGrade;
                        }
                    },
                    {
                        name:"content",
                        display:"项目内涵",
                        width:290
                    },
                    {
                        name:"excludeContent",
                        display:"除外内容",
                        width:200
                    },
                    {
                        name:'unit',
                        display:"计价单位",
                        width:80
                    },
                    {
                        name:'biaozhun',
                        display:'费用标准',
                        columns:[
                            {
                                name:'description',
                                display:"说明",
                                width:100
                                name:'threeHospitals',
                                display:'三级医院',
                                width:75
                            },
                            {
                                name:"imediate",
                                display:"是否生效",
                                width:60
                                name:'twoHospitals',
                                display:"二级医院",
                                width:75
                            },
                            {
                                name:"caozuo",
                                display:"操作",
                                width:160,
                                render: function (record, rowindex, value, column) {
                                    return '<input type="button" onclick="invalid('+rowindex+')" value="失效"/><input type="button" onclick="modify('+rowindex+')" value="修改"/><input type="button" class="delete" onclick="deleteRow('+rowindex+')" value="删除"/><input type="button" value="查看历史"/>';
                                }
                                name:'oneHospitals',
                                display:"一级及一级以</br>下医疗机构",
                                width:75
                            }
                        ],
                        data: {
                            Rows: griddata
                        },
                        checkbox:"true",
                        alternatingRow:false
                    });
                }
            })
                    },
                    {
                        name:'addItem',
                        display:'加收项目',
                        width:130
                    },
                    {
                        name:'description',
                        display:"说明",
                        width:100
                    },
                    {
                        name:"imediate",
                        display:"是否生效",
                        width:60,
                        render:function (row) {
                            row.imediate == '0'? row.imediate = "否":row.imediate = "是";
                            return row.imediate;
                        }
                    },
                    {
                        name:"caozuo",
                        display:"操作",
                        width:160,
                        render: function (record, rowindex, value, column) {
                            return '<input type="button" onclick="invalid('+rowindex+')" value="失效"/><input type="button" onclick="modify('+rowindex+')" value="修改"/><input type="button" class="delete" onclick="deleteRow('+rowindex+')" value="删除"/><input type="button" onclick="history('+rowindex+')" value="查看历史"/>';
                        }
                    }
                ],
                checkbox:"true",
                alternatingRow:false
            });
        }
        init();
//        更新ligerui
        function reloadGrid(url, params, curPage){
            if(curPage)
                this.options.newPage = curPage;
            if(url && url!='')
                this.setOptions({parms: params, url: url});
            else{
                this.setOptions({parms: params});
                this.loadData(true);
            }
        }
//        查询动作
        $('.search-btn').on('click',function (e) {
            e.stopPropagation()
            var data = {};
            if ($('.xiangmu').text() == '康复服务'){
                data.itemType = 0
            }else if($('.xiangmu').text() == '健康管理'){
                data.itemType = 1
            }else if($('.xiangmu').text() == '所有'){
                data.itemType = ''
            }
            if ($('.yiyuan').text()=='三级医院'){
                data.hospitalGrade = 3
            }else if($('.yiyuan').text()=='二级医院'){
                data.hospitalGrade = 2
            }else if($('.yiyuan').text()=='一级及以下'){
                data.hospitalGrade = 1
            }else if($('.yiyuan').text()=='所有'){
                data.hospitalGrade = ''
            }
            if($('.bingan-xiangmu').text() != '请选择病案项目'){
                data.diseaseItem = $('.bingan-xiangmu').text();
            }
            data.title = $('.xiangmu-name').val();
            data.status = 1;
            console.log(data);
            data = JSON.stringify(data);
            parms = {
                serviceItem:data
            }
            reloadGrid.call(grid,ctx + "/admin/specialist/serviceItem/selectServiceItem", parms);
        })
//        关闭弹窗
        $(document).on('click','.closePage',function () {
            layer.closeAll()
        })
        Date.prototype.Format = function (fmt) { //author: meizz
            var o = {
                "M+": this.getMonth() + 1, //月份
                "d+": this.getDate(), //日
                "h+": this.getHours(), //小时
                "m+": this.getMinutes(), //分
                "s+": this.getSeconds(), //秒
                "q+": Math.floor((this.getMonth() + 3) / 3), //季度
                "S": this.getMilliseconds() //毫秒
            };
            if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
            for (var k in o)
                if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) :
                    (("00" + o[k]).substr(("" + o[k]).length)));
            return fmt;
        }
    </script>
</body>

+ 3 - 3
patient-co-manage/wlyy-manage/src/main/webapp/static/desizenMan/js/bootstrap-treeview.js

@ -514,14 +514,14 @@
		var _this = this;
		$.each(nodes, function addNodes(id, node) {
			var treeItem = $(_this.template.item)
				.addClass('node-' + _this.elementId)
				.addClass(node.state.checked ? 'node-checked' : '')
				.addClass(node.state.disabled ? 'node-disabled': '')
				.addClass(node.state.selected ? 'node-selected' : '')
				.addClass(node.searchResult ? 'search-result' : '') 
				.attr('data-nodeid', node.nodeId)
				.addClass(node.searchResult ? 'search-result' : '')
                .attr('data-nodeid', node.nodeId)
                .attr('data-code', node.code)
				.attr('style', _this.buildStyleOverride(node));
			// Add indent/spacer to mimic tree structure

+ 74 - 7
patient-co-manage/wlyy-manage/src/main/webapp/static/specialty/css/index.css

@ -193,16 +193,16 @@
    font-size: 12px;color: #323232;
}
.lay .info .info-left .input input{
    width: 267px;height: 30px;
    width: 267px;height: 30px;border: solid 1px #d0d0d0;
}
.lay .info .info-right .input input{
    width: 180px;height: 30px;
    width: 180px;height: 30px;border: solid 1px #d0d0d0;
}
.lay .info .info-left .input textarea{
    width: 267px;height: 100px;resize:none
    width: 267px;height: 100px;resize:none;border: solid 1px #d0d0d0;
}
.lay .info .info-right .input textarea{
    width: 180px;height: 116px;resize:none
    width: 180px;height: 116px;resize:none;border: solid 1px #d0d0d0;
}
.layui-form-label{
    font-size: 12px!important;color: #323232!important;font-weight: bold!important;
@ -212,7 +212,7 @@
    margin-left: 95px;
}
.lay .info .info-right .info-right-title{
    font-size: 12px;color: #323232;font-weight: bold;padding-left: 40px;margin-bottom: 10px;
    font-size: 12px;color: #323232;font-weight: bold;padding-left: 32px;margin-bottom: 10px;
}
.lay .info .info-bottom{
    text-align: center;
@ -226,6 +226,73 @@
.l-grid-header-table{
    height: 100%;
}
.lay .content{
    padding: 0!important;
.lay input{
    text-indent: 1em;
}
.lay textarea{
    padding: 10px;
    -webkit-box-sizing: border-box;
    -moz-box-sizing: border-box;
    box-sizing: border-box;
}
.pl-30{
    padding-left: 30px;
}
.l-grid-row-cell-inner{
    height: auto!important;
}
.required{
    position: relative;
}
.required::after{
    content:'*';
    position:absolute;
    left:-10px;
    top:1px;
    color:red;
    font-size:20px;
}
.required-1::after{
    content:'*';
    position:absolute;
    left:10px;
    top:4px;
    color:red;
    font-size:20px;
}
.required-2::after{
    content:'*';
    position:absolute;
    left:-10px;
    top:12px;
    color:red;
    font-size:22px;
}
.lay .layui-input, .layui-textarea{
    padding-left:0;
}
.lay .content-text{
    padding:20px 10px 20px 20px;
    border-bottom: 1px dashed #999;
}
.lay .content-text .number{
    font-size: 14px;
    color: #333;
    margin-bottom:20px;
    font-weight: bold;
}
.lay .content-text .time{
    color: #999;
    font-size:10px;
}
.lay .content-text ul{
    list-style: none;
    padding: 0;
    margin: 0;
}
.lay .content-text ul li{
    font-size:12px;
    color: #333;
    line-height: 20px;
    word-wrap: break-word;
}

+ 1 - 1
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistEvaluateSevice.java

@ -154,7 +154,7 @@ public class SpecialistEvaluateSevice extends BaseService {
            message.setState(1);
            message.setCzrq(new Date());
            message.setReceiverName(receiverDoctor.getName());
            message.setReason(patientCode);
            message.setData(patientCode);
            messageDao.save(message);
        }catch (Exception e){
            e.printStackTrace();