浏览代码

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

liuwenbin 7 年之前
父节点
当前提交
c573cc9b15

+ 4 - 4
patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/specialist/ServiceItemController.java

@ -78,19 +78,19 @@ public class ServiceItemController  extends BaseController {
     *
     * @param serviceItem
     * @param page
     * @param pageSize
     * @param pagesize
     * @return
     */
    @RequestMapping(value = "selectServiceItem", method = RequestMethod.GET)
    @ResponseBody
    public String selectServiceItem(@RequestParam(name = "serviceItem") String serviceItem,
                                    @RequestParam(name = "page",defaultValue = "1")Integer page,
                                    @RequestParam(name = "pageSize",defaultValue = "10")Integer pageSize){
                                    @RequestParam(name = "pagesize",defaultValue = "10")Integer pagesize){
        try {
            JSONObject jsonObject = serviceItemService.selectServiceItem(serviceItem,page,pageSize);
            JSONObject jsonObject = serviceItemService.selectServiceItem(serviceItem,page,pagesize);
            String totalCount = String.valueOf(jsonObject.get("totalCount"));
            Long total = Long.parseLong(totalCount);
            return write(200, "操作成功", page,pageSize,total,(List< SpecialistServiceItemDO>)jsonObject.get("detailModelList"));
            return write(200, "操作成功", page,pagesize,total,(List< SpecialistServiceItemDO>)jsonObject.get("detailModelList"));
        } catch (Exception ex) {
            error(ex);
            return error(-1, "操作失败");

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

@ -82,7 +82,7 @@
	<body>
		<div class="page-title">
			新增机构项目
			<img class="closePage" src="${ctx}/static/desizenMan/images/close.png" />
			<img id="closePage" class="closePage" src="${ctx}/static/desizenMan/images/close.png" />
		</div>
		<div class="page-content plr20">
			<div class="flex-box ptb10 filter-box" style="justify-content: space-between">
@ -289,9 +289,9 @@
			})
            //        点击选择下拉框内容
            $('.btn-group').on('click','.dropdown-menu a',function (e){
                console.log($(this))
                // console.log($(this))
                $(this).parents('.btn-group').find('.btn-group-title').text($(this).text())
                console.log(ctx)
                // console.log(ctx)
            });
            $('.dropdown-toggle').dropdown();
            
@ -368,13 +368,14 @@
			
//			点击查询医院
			$('#btn-search').on('click',function () {
				debugger
				var name = $('.hostpital-name').val();
				var grade = $('.btn-grade').text();
				if (grade == '三级医院'){
				    grade = 3;
				}else if(grade == '二级医院'){
				    grade = 2
				}else if(grade == '一级及一下'){
				}else if(grade == '一级及以下'){
				    grade = 1
				}else{
				    grade = '';

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

@ -638,12 +638,13 @@
//			点击新增机构项目
			$('.add').on('click',function(){
			    layer.open({
                    offset: '40px',
                    type: 2,
                    title: false,
                    closeBtn:0,
                    shadeClose: true,
                    shade: 0.8,
                    area: ['1020px', '80%'],
                    area: ['1020px', '700px'],
                    content: '/admin/specialist/hospitalServiceItem/initial1' //iframe的url
				})
			})
@ -663,7 +664,7 @@
                            xiangmuContent = res.data.detailModelList[0];
                            res.data.detailModelList[0].forEach(function (item) {
                                var t = {};
                                t.text = item.itemName;
                                t.text = item.hospitalServiceItem.specialistServiceItemDO.diseaseItem;
                                t.code = item.hospitalServiceItem.id
                                serverData[0].nodes.push(t)
                            });

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

@ -8,10 +8,74 @@
    <link href="${ctx}/static/specialty/css/bootstrap-treeview.min.css" rel="stylesheet" />
    <link rel="stylesheet" href="${ctx}/static/specialty/layui/css/layui.css">
    <link rel="stylesheet" href="${ctx}/static/specialty/css/index.css">
    <style>
        .lay-box-3 .lay{
            width: 420px!important;
            height: 260px;
        }
        .lay-box-3 .lay .title{
            width: 100%;
        }
        .lay-box-3 .lay .file{
            width: 370px;height: 30px;margin: 20px auto;position: relative;
        }
        .lay-box-3 .lay .file span{
            font-size: 12px;color: #333;
        }
        .lay-box-3 .lay .file input:nth-of-type(1){
            width: 200px;height: 30px;border: solid 1px #d0d0d0;background-color: #fff!important;
        }
        .lay-box-3 .lay .file input:nth-of-type(2){
            width: 90px;
            height: 30px;
            background-color: #2d9bd2;
            border-radius: 2px;
            font-size: 12px;
            color: #fff;
            opacity: 0;
            z-index: 99;
        }
        .lay-box-3 .lay .file button{
            width: 90px;
            height: 30px;
            background-color: #2d9bd2;
            border: none;
            border-radius: 2px;
            font-size: 12px;
            color: #fff;
            position: absolute;
            right: 0;
            z-index: 1;
        }
        .lay-box-3 .lay a{
            display: block;
            margin-left: 87px;
            font-size: 12px;color: #2d9bd2;
        }
        .lay-box-3 .lay p {
            font-size: 12px;color: #eb4b3c;text-align: center;
        }
        .lay-box-3 .lay .lay-button{
            text-align: center;margin-top: 40px;
        }
        .lay-box-3 .lay .lay-button button{
            width: 99px;
            height: 35px;
            background-color: #2d9bd2;
            border-radius: 2px;
            border: none;
            color:#fff;
            font-size: 14px;
        }
        .lay-box-3 .lay .lay-button button:nth-of-type(2){
            background-color: #b9c8d2;
        }
    </style>
    <script src="${ctx}/static/specialty/layui/layui.js"></script>
</head>
<body>
    <div class="lay-box" style="display:none">
        <div class="lay">
            <div class="title flex flex-sp-b flex-cz-c">
@ -55,12 +119,14 @@
                            </div>
                        </div>
                        <div class="radio layui-form">
                            <div class="layui-form-item">
                            <div class="layui-form-item" style="position: relative;width: max-content;">
                                <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="按钮">
                                    <input type="radio" name="type" value="2" title="关联记录">
                                    <input type="radio" name="type" value="1" title="上传附件">
                                    <input type="radio" name="type" value="2" title="健康教育">
                                    <input type="radio" name="type" value="3" title="健康指导">
                                    <input type="radio" name="type" value="4" title="随访">
                                </div>
                            </div>
                        </div>
@ -149,6 +215,26 @@
            </div>
        </div>
    </div>
    <div class="lay-box-3" 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="file flex flex-sp-b flex-cz-c">
                <span>导入文件:</span>
                <input type="text" class="fileName" disabled>
                <input id="uploadfile" type="file" value="选择" onchange="auploadFile(event)">
                <button>选择</button>
            </div>
            <a href="">模板下载</a>
            <p>请核对导入数据,若导入项目信息已存在,将会更新项目表中的数据。</p>
            <div class="lay-button">
                <button onclick="submitFile()">确认</button>
                <button>取消</button>
            </div>
        </div>
    </div>
    <div class="content">
        <!-- 请选择项目类型 -->
        <div class="btn-group">
@ -307,6 +393,7 @@
            modityRow = row;
            console.log(row)
            layer.open({
                offset: '20px',
                type:1,
                title:'',
                closeBtn:false,
@ -321,8 +408,8 @@
            $('.lay .description').val(row.description);
            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="reserve"]')[row.reserve+2]).prop("checked",true);
            $($('.lay input[name="type"]')[row.type+5]).prop("checked",true);
            $($('.lay input[name="evaluation')[row.evaluation+2]).prop("checked",true);
            row.itemType == '康复服务' ? row.itemType = 0: row.itemType = 1;
            $($('.lay input[name="item_type')[row.itemType+2]).prop("checked",true);
@ -446,6 +533,19 @@
                            if(t['itemType旧']){
                                t['itemType旧'] == '0'? t['itemType旧'] = "康复服务":t['itemType旧'] = "健康管理";
                            }
                            if(t['type旧']){
                                if (t['type旧'] == 0){
                                    t['type旧'] = '扫码'
                                }else if (t['type旧'] == 1){
                                    t['type旧'] = '上传附件'
                                }else if (t['type旧'] == 2){
                                    t['type旧'] = '健康教育'
                                }else if (t['type旧'] == 3){
                                    t['type旧'] = '健康指导'
                                }else if (t['type旧'] == 4){
                                    t['type旧'] = '随访'
                                }
                            }
                            if (t['hospitalGrade旧']){
                                if (t['hospitalGrade旧'] == 3){
                                    t['hospitalGrade旧'] = '三级医院'
@ -489,6 +589,7 @@
        }
        $('#add').on('click',function(){
            layer.open({
                offset: '20px',
                type:1,
                title:'',
                closeBtn:false,
@ -626,6 +727,7 @@
                url: ctx + "/admin/specialist/serviceItem/selectServiceItem",
                parms: {serviceItem: '{"status":1}'},
                method: 'get',
                record:'totalCount',
                root:'detailModelList',
                columns: [
                    {
@ -651,14 +753,14 @@
                        name:'hospitalGrade',
                        display:"医院等级",
                        width:80,
                        rander:function (row) {
                            if (row.hospitalGrade == 3){
                        render:function (row) {
                            if (row.hospitalGrade == '3'){
                                row.hospitalGrade = '三级医院'
                            }else if(row.hospitalGrade==2){
                            }else if(row.hospitalGrade== '2'){
                                row.hospitalGrade = '二级医院'
                            }else if(row.hospitalGrade == 1){
                            }else if(row.hospitalGrade == '1'){
                                row.hospitalGrade = '一级及一级以下医疗机构'
                            }else if(row.hospitalGrade == 0){
                            }else if(row.hospitalGrade == '0'){
                                row.hospitalGrade = '所有'
                            }
                            return row.hospitalGrade;
@ -729,7 +831,16 @@
                    }
                ],
                checkbox:"true",
                alternatingRow:false
                alternatingRow:false,
                onAfterShowData:function () {
                    var table = $('.l-grid-body-table')[0];
                    var table2 = $('.l-grid-body-table')[1];
                    var arr =  $(table).find('tr');
                    var arr2 =  $(table2).find('tr');
                    arr2.each(function(index,item){
                        $(arr[index]).height($(this).height())
                    })
                }
            });
        }
        init();
@ -798,7 +909,23 @@
                    (("00" + o[k]).substr(("" + o[k]).length)));
            return fmt;
        }
        // 选择上传文件
        function auploadFile(e){
            console.log(e);
            var file = ''
            var arr =e.target && e.target.files;
            file= arr[0].name
            console.log(file)
            $('.fileName').val(file)
        }
        // 上传文件
        function submitFile(){
            debugger
            var file = document.getElementById("uploadfile").files[0];
            var formData = new FormData()
			formData.append('file', file)
            console.log(formData)
        }
    </script>
</body>

+ 278 - 0
patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/specialty/upload.jsp

@ -0,0 +1,278 @@
<%--
  Created by IntelliJ IDEA.
  User: 72482
  Date: 2018/9/10
  Time: 10:17
  To change this template use File | Settings | File Templates.
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<html>
<head>
    <title>Title</title>
    <style>
        #app{
            width: 100%;
        }
        .m-form-group label.w-50 {
            width: 50px;
        }
        .m-form-group label.w-80 {
            width: 80px;
        }
        hr {
            height: 1px;
            border: none;
            border-top: 1px solid #898989;
            margin-top: 15px;
        }
        .m-form-group label {
            font-size: 14px;
            color: #666666;
            padding-left: 0px;
            text-align: left;
            width: auto;
        }
        .l-text-wrapper {
            margin-left: 10px;
        }
        .c-30a9de {
            color: #30a9de;
        }
        .ml130 {
            margin-left: 130px;
        }
        .ml320{
            margin-left: 320px;
        }
        .mt26 {
            margin-top: 26px;
        }
        .ml160 {
            margin-left: 80px;
        }
        .ml60 {
            margin-left: 60px;
        }
        .mr70 {
            margin-right: 70px;
        }
        .tac {
            text-align: center;
        }
        .div-upload-title {
            display: inline-block;
            width: 100px;
            text-align: right;
            margin-right: 30px;
            margin-top: 10px;
        }
        .div-title {
            display: inline-block;
            width: 138px;
            text-align: right;
        }
        /* #btnNew {
            float: right;
        } */
        #dataUpload,#dataUpload1 {
            margin-left: 580px;
        }
        #btnreceivesSave {
            margin-left: 380px;
        }
        #dataSel,.fc1eaaff {
            color: #1eaaff;
            cursor: pointer;
            font-size: 14px;
        }
        .leftBtn {
            width: 200px;
            margin: 30px auto;
        }
        .div-dialog-content {
            height: 90%;
            height: -moz-calc(100% - 100px);
            /*Firefox*/
            height: -webkit-calc(100% - 100px);
            /*chrome safari*/
            height: calc(100% - 100px);
            /*Standard */
            overflow: auto;
        }
        .edit-input {
            padding: 8px;
            border: 1px solid #ccc;
            margin-right: 20px;
            width: 151px;
        }
        .edit-tip{
            display: inline-table;
        }
        #div_upload_detail_grid,
        #div_upload_detail_edit_grid,
        #div_receive_detail_grid,
        #div_receive_detail_edit_grid {
            width: 600px;
            margin: 20px 20px 50px 225px;
        }
        .yj-nav {
            width: 350px;
            text-align: center;
            margin: 10px auto 30px;
        }
        .yj-nav div {
            width: 110px;
            height: 40px;
            line-height: 40px;
            font-size: 14px;
            color: #333;
            border: solid 1px #1eaaff;
            float: left;
            display: inline-block;
            cursor: pointer;
        }
        .yj-nav div.active,
        .yj-nav div:hover {
            color: #fff;
            background-color: #1eaaff;
        }
        .yj-nav-l {
            border-top-left-radius: 20px;
            border-bottom-left-radius: 20px;
            border-right: none !important;
        }
        .yj-nav-r {
            border-top-right-radius: 20px;
            border-bottom-right-radius: 20px;
            border-left: none !important;
        }
        .see-detail-btn,
        .edit-detail-btn {
            color: #1eaaff;
            padding: 0px 10px;
        }
        .del-detail-btn {
            color: darkred;
            padding: 0px 10px;
        }
        .del-detail-btn:hover {
            color: red;
            padding: 0px 10px;
        }
        #div_databse_grid,
        #div_databse_tosel_grid {
            width: 400px;
            height: 378px;
        }
        #div_databse_tosel_grid tbody{
            display:block;
            height:338px;
            overflow-y:scroll;
        }
        #div_databse_tosel_grid thead, #div_databse_tosel_grid tbody tr, .detail_grid thead, .detail_grid tbody tr{
            display:table;
            width:100%;
            table-layout:fixed;
            border-bottom: 1px solid #e7e7e7;
        }
        .div_databse_tosel_grid table{
            border: 1px solid #e7e7e7;
        }
        #div_databse_tosel_grid th,#div_databse_tosel_grid td,.detail_grid  th,.detail_grid td{
            text-align: center;
            height: 40px;
            line-height: 40px;
            white-space: nowrap;text-overflow: ellipsis;overflow: hidden;
        }
        #div_databse_tosel_grid th,.detail_grid th{
            font-weight: bold;
        }
        #div_databse_tosel_grid table thead {
            width: calc( 100% - 1em )
        }
        #touploadfile {
            margin-left: -20px;
            width: 50px;
            border-radius: 0;
            height: 31.5px;
        }
        .upload-p{
            color:red;
            width:280px;
            margin: 30px auto;
        }
        .has-error input,.has-error .l-text-combobox{
            border-color:#a94442;
        }
        .has-success input,.has-success .l-text-combobox{
            border-color:#3c763d;
        }
        label.help-block{
            display: none!important;
        }
        input.help-block{
            display: inline-block!important;
        }
        #receive_edit_medicalOrg,#resource_edit_medicalOrg,#upload_edit_medicalOrg{
            display: none;
        }
        .fileBox{
            width: 100px;
            height: 30px;
            display: inline-block;
            border: 1px solid #ccc;
            white-space: nowrap;
            text-overflow: ellipsis;
            -o-text-overflow: ellipsis;
            overflow: hidden;
        }
    </style>
</head>
<body style="overflow: hidden;">
</body>
</html>

+ 3 - 0
patient-co-manage/wlyy-manage/src/main/webapp/static/specialty/css/index.css

@ -295,4 +295,7 @@
    color: #333;
    line-height: 20px;
    word-wrap: break-word;
}
.addSubmit{
    text-indent: 0!important;
}