From e940b53f9d8fd9056aee2870e41a6e7932b2e8d6 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 24 Aug 2020 17:21:41 +0800
Subject: [PATCH] 1.修改获取余额的时候,将预扣费算作有效的bug 2.医院管理 增加了显示医院编号
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html | 164 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 102 insertions(+), 62 deletions(-)
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
index 34ea1de..3661453 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/diagnosisRecord.html
+++ b/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="按患者名" /> 
- <input id="diagnosticDoctorName" class="layui-input " type="text" placeholder="按诊断医生名"/> 
- <input id="hospitalId" type="hidden" />
- <input id="hospitalName" class="layui-input " type="text" placeholder="按医院名" autocomplete="off"/> 
- <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"></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" /> 至 
+ <input type="text" name="date" id="dateend" lay-verify="date" autocomplete="off"
+ class="layui-input search-input" /> 
+ <input id="childName" class="layui-input search-input" type="text" placeholder="按患者名" /> 
+ <input id="diagnosticDoctorName" class="layui-input search-input" type="text"
+ placeholder="按诊断医生名" /> 
+ <input id="hospitalName" class="layui-input search-input" type="text" placeholder="按医院名,必选条件！"
+ autocomplete="off" /></div> 
+ <button id="diagnostic-btn-search" class="layui-btn icon-btn permissions" permissions="diagnostic-get">
+ <i class="layui-icon"></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,93 @@
}
});
// 渲染表格
- 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: 'isDelete', sort: true, align: 'center', width: 100, templet: function (d) {
+ if (d.proType === 0)
+ 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 });
}
- if (!strUtil.isEmpty(datebegin) && strUtil.isEmpty(dateend)) {
- dateend = dateUtil.getNowDate();
- $('#dateend').val(dateend);
+ });
+ // 工具条点击事件
+ table.on('tool(diagnostic-table)', function (obj) {
+ var data = obj.data;
+ var layEvent = obj.event;
+ if (layEvent === "select") {
+ //查看报告 报告列数据缓存起来
+ admin.putTempData("t_diagnosis", data);
+ admin.popupCenter({
+ title: '查看报告',
+ path: 'pages/opration/recordNote.html',
+ area: '1200px',
+ offset: '10px',
+ finish: function () {
+ admin.putTempData("t_diagnosis", "");
+ }
+ });
}
- // table.reload('diagnostic-table', { where: { childName: childName, hospitalId: hospitalId, diagnosticDoctorName: diagnosticDoctorName, datebegin: datebegin, dateend: dateend } });
});
});
</script>
\ No newline at end of file
--
Gitblit v1.8.0