Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html

@@ -8,22 +8,29 @@
    </div>
    <div class="layui-card-body">
        <div class="layui-form toolbar">
            <input id="childName" class="layui-input" type="text" placeholder="按患者名" />&emsp;
            <input id="diagnosticDoctorName" class="layui-input " type="text" placeholder="按诊断医生名"/>&emsp;
            <input id="hospitalId" type="hidden" />
            <input id="hospitalName" class="layui-input " type="text" placeholder="按医院名" autocomplete="off"/>&emsp;
            <input type="text" name="date" id="datebegin" lay-verify="date" autocomplete="off"
                class="layui-input search-input"/>至
            <input type="text" name="date" id="dateend" lay-verify="date"  autocomplete="off"
                class="layui-input search-input"/>
            <button id="diagnostic-btn-search" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
            <div class="layui-form-item">
                <div class="layui-inline">
                    <input type="text" name="date" id="datebegin" lay-verify="date" autocomplete="off"
                        class="layui-input search-input" />&emsp;至&emsp;
                    <input type="text" name="date" id="dateend" lay-verify="date" autocomplete="off"
                        class="layui-input search-input" />&emsp;
                    <input id="childName" class="layui-input search-input" type="text" placeholder="按患者名" />&emsp;
                    <input id="diagnosticDoctorName" class="layui-input search-input" type="text"
                        placeholder="按诊断医生名" />&emsp;
                    <input id="hospitalName" class="layui-input  search-input" type="text" placeholder="按医院名,必选条件！"
                        autocomplete="off" /></div>&emsp;
                <button id="diagnostic-btn-search" class="layui-btn icon-btn permissions"  permissions="diagnostic-get">
                    <i class="layui-icon">&#xe615;</i>搜索</button>

                <table class="layui-table" id="diagnostic-table" lay-filter="diagnostic-table"></table>
            </div>
        </div>
        <table class="layui-table" id="diagnostic-table" lay-filter="diagnostic-table"></table>
    </div>
</div>
<input id="hospitalId" type="hidden" />
<!-- 表格操作列 -->
<script type="text/html" id="diagnostic-table-bar">
    <a class="layui-btn layui-btn-xs" lay-event="select"">查看报告</a>
    <a class="layui-btn layui-btn-xs permissions"  permissions="diagnostic-get" lay-event="select">查看报告</a>
</script>

<script>
@@ -33,7 +40,7 @@
        let admin = layui.admin;
        let form = layui.form;
        let config = layui.config;
        let laydate=layui.laydate;
        let laydate = layui.laydate;
        var autocomplete = layui.autocomplete;
        var $ = layui.jquery;

@@ -56,60 +63,100 @@
            }
        });
        // 渲染表格
        var renderTable = function () {
            table.render({
                elem: '#diagnostic-table',
                url: config.base_server + 'api-opration/productorderdetail/all',
                method: 'GET',
                where: { enabled: 2},
                headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
                page: true,
                cols: [[
                    { field: 'hospitalName', width: 300, title: '医院名称' },
                    { field: 'departmentName', width: 100, title: '科室名称' },
                    { field: 'diagnosticDoctorName', width: 100, title: '医生姓名' },
                    { field: 'childName', width: 100, title: '患者姓名' },
                    { field: 'childSex', width: 80, title: '性别' },
                    { field: 'childBirthday', width: 100, title: '出生日期' },
                    { field: 'childPhone', width: 150, title: '联系电话' },
                    {
                        field: 'isDelete', sort: true, align: 'center', width: 80, templet: function (d) {
                            if (d.proType === 0)
                                return "正常"
                            else
                                return "已删除"
                        }, title: '状态'
                    },
                    {
                        field: 'createTime', width: 160, sort: true, title: '创建时间', templet: function (d) {
                            return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
                        }
                    },
                    {
                        field: 'updateTime', width: 160, sort: true, title: '修改时间', templet: function (d) {
                            return new Date(d.createTime).dateFormat("yyyy/MM/dd hh:mm:ss");
                        }
                    },
                    { field: 'enabled', width: 100, templet: '#diagnostic-table-bar', title: '查看' }
                ]]
            });
        }
        table.render({
            elem: '#diagnostic-table',
            url: config.base_server + 'api-opration/productorderrecord/alldata',
            method: 'POST',
            headers: { 'Authorization': 'Bearer ' + config.getToken().access_token },
            page: true,
            cols: [[
                { field: 'diagnosticHospitalName',width: "10%", title: '医院名称' },
                { field: 'diagnosticDepartName', width: "10%", title: '科室名称' },
                { field: 'diagnosticDoctorName', width: "10%", title: '医生姓名' },
                { field: 'childName', width: "10%", title: '患者姓名' },
                { field: 'childSex', width: "10%", title: '性别' },
                { field: 'childBirthday', width: "10%", title: '出生日期',templet:function(d){
                    return new Date(d.createTime).dateFormat("yyyy-MM-dd");
                }},
                { field: 'childPhone', width: "10%", title: '联系电话' },
                {
                    field: 'isDeleted', sort: true, align: 'center', width: 100, templet: function (d) {
                        if (!d.isDeleted)
                            return "正常"
                        else
                            return "已删除"
                    }, title: '状态'
                },
                {
                    field: 'createTime', width: "10%", sort: true, title: '创建时间', templet: function (d) {
                        return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                    }
                },{
                    field: 'diagnosticDiagnoseTime',width: "10%", sort: true, title: '诊断时间', templet: function (d) {
                        return new Date(d.diagnosticDiagnoseTime).dateFormat("yyyy-MM-dd");
                    }
                },
                {
                    field: 'updateTime', width: "10%", sort: true, title: '修改时间', templet: function (d) {
                        return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
                    }
                },
                { field: 'enabled', width: "10%", templet: '#diagnostic-table-bar', title: '查看' }
            ]],
            done:function(res){
                permissionsInput(res,config);
            }
        });
        // 搜索按钮点击事件
        $('#diagnostic-btn-search').click(function () {
            var childName = $('#childName').val();
            var hospitalId = $('#hospitalId').val();
            var diagnosticDoctorName = $("#diagnosticDoctorName").val();
            var datebegin = $('#datebegin').val();
            var dateend = $('#dateend').val();
            if (strUtil.isEmpty(datebegin) && !strUtil.isEmpty(dateend)) {
                datebegin = dateUtil.getNowDate();
                $('#datebegin').val(datebegin);
            var diagnosticHospitalId = $('#hospitalId').val();
            if (!strUtil.isEmpty(diagnosticHospitalId)) {
                var childName = $('#childName').val();
                var diagnosticDoctorName = $("#diagnosticDoctorName").val();
                var datebegin = $('#datebegin').val();
                var dateend = $('#dateend').val();
                if (strUtil.isEmpty(datebegin) && !strUtil.isEmpty(dateend)) {
                    datebegin = dateUtil.getNowDate();
                    $('#datebegin').val(datebegin);
                }
                if (!strUtil.isEmpty(datebegin) && strUtil.isEmpty(dateend)) {
                    dateend = dateUtil.getNowDate();
                    $('#dateend').val(dateend);
                }
                var whereData = {
                    childName: childName,
                    diagnosticHospitalId: diagnosticHospitalId,
                    diagnosticDoctorName: diagnosticDoctorName,
                    startTime: datebegin,
                    endTime: dateend
                };
                table.reload('diagnostic-table', { where: whereData,page: {curr: 1  }});
            }else{
                layer.msg('请输入医院');
                return false;
            }
            if (!strUtil.isEmpty(datebegin) && strUtil.isEmpty(dateend)) {
                dateend = dateUtil.getNowDate();
                $('#dateend').val(dateend);
        });
        //获取软件的服务周期
        var getCycleTime = function (departmentId) {
            
        }
        // 工具条点击事件
        table.on('tool(diagnostic-table)', function (obj) {
            var data = obj.data;
            var layEvent = obj.event;
            if (layEvent === "select") {
                admin.req('api-opration/productorderrecord/pdfname/'+data.diagnosticId+"/0/"+data.diagnosticHospitalId+"/"+data.diagnosticDepartId, {},
                function (data) {
                    if (data.code == 0) {
                        //打开新的窗口
                       window.open(data.data)
                    }else{
                        layer.msg("查询报告失败")
                    }

                }, "post")
                admin.re
            }
            // table.reload('diagnostic-table', { where: { childName: childName, hospitalId: hospitalId, diagnosticDoctorName: diagnosticDoctorName, datebegin: datebegin, dateend: dateend } });
        });
    });
</script>