Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

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

@@ -77,27 +77,25 @@
            page: true,
            cols: [
                [
                    {
                        field: 'hospitalId',
                        width: 80,
                        title: '医院编号',
                        fixed: 'left'
                    },
                   
                    {
                        field: 'hospitalName',
                        width: 100,
                        width: "10%",
                        title: '医院名称',
                        fixed: 'left'
                    },
                    {
                        field: 'departmentName',
                        width: 100,
                        width: "6%",
                        title: '科室/部门',
                        fixed: 'left'
                    },
                    {
                        field: 'hospitalId',width: '12%',title: '医院编号',
                    },
                    {
                        field: 'hospitalArea',
                        width: 200,
                        width: "10%",
                        title: '所在地区',
                        templet: function (d) {
                            return ((d.hospitalProvince == null) ? "" : d.hospitalProvince) +
@@ -108,22 +106,35 @@
                    },
                    {
                        field: 'hospitalLink',
                        width: 100,
                        width: "7%",
                        title: '联系人'
                    },
                    {
                        field: 'hospitalTel',
                        width: 150,
                        width: "8%",
                        title: '联系方式'
                    },
                    // {
                    //     field: 'enabled', width: 80,  title: '状态', templet: function (d) {
                    //         return d.hospitalState == 0 ? "试用" : "正式"
                    //     }
                    // },
                    {
                        field: 'departmentLink',
                        width: "6%",
                        title: '科室联系人'
                    },
                    {
                        field: 'departmentTel',
                        width: "8%",
                        title: '科室联系方式'
                    },
                    {
                        field: 'orderType', width: 80,  title: '状态', templet: function (d) {
                            if(d.orderType==null){
                                return "";
                            }
                            return d.orderType ? "正式" : "试用"
                        }
                    },
                    {
                        field: 'isScreen',
                        width: 80,
                        width: "4%",
                        title: '筛查',
                        templet: function (d) {
                            return d.isScreen ? "是" : "否"
@@ -134,12 +145,12 @@
                    // } },
                    {
                        field: 'serverUserName',
                        width: 100,
                        width: "6%",
                        title: '服务人员'
                    },
                    {
                        field: 'createTime',
                        width: 150,
                        width: "10%",
                        title: '创建时间',
                        templet: function (d) {
                            return new Date(d.createTime).dateFormat("yyyy-MM-dd hh:mm");
@@ -147,15 +158,15 @@
                    },
                    {
                        field: 'enabled',
                        width: 80,
                        width: "7%",
                        templet: '#hospital-tpl-state',
                        title: '状态',
                        align: 'center',
                        fixed: 'right'
                    },
                    {
                        field: 'hospitalId',
                        width: 240,
                        // field: 'hospitalId',
                        width: "20%",
                        align: 'center',
                        toolbar: '#businessRecords-table-bar',
                        title: '操作',
@@ -225,7 +236,7 @@
                    }
                });
            } else if(layEvent=="health"){
                //充值
                //运动处方服务
                admin.putTempData("t_hospital", data);
                admin.popupCenter({
                    title: '运动处方服务',
@@ -259,10 +270,14 @@
                hospitalName: hospitalName,
                hospitalProvince: hospitalProvince,
                hospitalCity: hospitalCity,
                hospitalArea: hospitalArea
                hospitalArea: hospitalArea,
                // page: 1,
            };
            table.reload('hospital-table', {
                where: whereModel
                where: whereModel,
                page: {
                    curr: 1 
                }
            });
        });

@@ -335,7 +350,8 @@
                        method: 'GET',
                        where: {
                            'hospitalId': data.hospitalId,
                            'departmentId': data.departmentId
                            'departmentId': data.departmentId,
                            'enabled': true
                        },
                        headers: {
                            'Authorization': 'Bearer ' + config.getToken().access_token
@@ -355,6 +371,14 @@
                                    title: '读片量(剩余)'
                                },
                                {
                                    field: 'ailightCount',
                                    width: 150,
                                    title: '读片使用量',
                                    templet: function (d) {
                                        return d.orderAilightCount-d.ailightCount;
                                    }
                                },
                                {
                                    field: 'recordCount',
                                    width: 150,
                                    title: '报告量(剩余)'