Главная Обзор Помощь
Регистрация Вход
trick9191
/
wlyy2.0
ответвлено от Amoy2/wlyy2.0
Следить 1
В избранное 0
Ответвить 0
Файлы
Просмотр исходного кода

pc管理端居民签约管理添加查看预约记录功能

humingfen 7 лет назад
Родитель
8306b59a64
Сommit
3d84317353
8 измененных файлов с 150 добавлено и 172 удалено
Единый вид Показать статистику Diff
  1. 20 5
      patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/sign/SignFamilyController.java
  2. 9 0
      patient-co-manage/wlyy-manage/src/main/resources/application.yml
  3. 33 0
      patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/patient_reservation_list.jsp
  4. 87 0
      patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/patient_reservation_list_js.jsp
  5. 1 12
      patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/sign_family_list_js.jsp
  6. 0 80
      patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/sign_reservation_modify.jsp
  7. 0 71
      patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/sign_reservation_modify_js.jsp
  8. 0 4
      patient-co-service/wlyy_service/src/main/resources/application.yml

Разница между файлами не показана из-за своего большого размера
+ 20 - 5
patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/sign/SignFamilyController.java


+ 9 - 0
patient-co-manage/wlyy-manage/src/main/resources/application.yml
Просмотреть файл 

@ -97,6 +97,9 @@ sign:
 
  check_upload: http://172.19.103.87:8011/wlyy_service
 
  check_upload: http://172.19.103.87:8011/wlyy_service
 
server:
 
server:
 
  server_url: http://weixin.xmtyw.cn/wlyy-dev/
 
  server_url: http://weixin.xmtyw.cn/wlyy-dev/
 
#智业预约记录接口
 
reservation:
 
  zyurl: http://59.61.92.90:8072/wlyy_service
 
wechat:
 
wechat:
 
  appId: wxd03f859efdf0873d
 
  appId: wxd03f859efdf0873d
 
  appSecret: 2935b54b53a957d9516c920a544f2537
 
  appSecret: 2935b54b53a957d9516c920a544f2537
 
@ -198,6 +201,9 @@ sign:
 
  check_upload: http://172.19.103.88:8011/wlyy_service
 
  check_upload: http://172.19.103.88:8011/wlyy_service
 
server:
 
server:
 
  server_url: http://ehr.yihu.com/wlyy/
 
  server_url: http://ehr.yihu.com/wlyy/
 
#智业预约记录接口
 
reservation:
 
  zyurl: http://59.61.92.90:8072/wlyy_service
 
wechat:
 
wechat:
 
  appId: wx1f129f7b51701428
 
  appId: wx1f129f7b51701428
 
  appSecret: 988f005d8309ed1795939e0f042431fb
 
  appSecret: 988f005d8309ed1795939e0f042431fb
 
@ -299,6 +305,9 @@ sign:
 
  #check_upload: http://59.61.92.90:8072/wlyy_service
 
  #check_upload: http://59.61.92.90:8072/wlyy_service
 
server:
 
server:
 
  server_url: http://www.xmtyw.cn/wlyy/
 
  server_url: http://www.xmtyw.cn/wlyy/
 
#智业预约记录接口
 
reservation:
 
  zyurl: http://59.61.92.90:8072/wlyy_service
 
wechat:
 
wechat:
 
  appId: wxad04e9c4c5255acf
 
  appId: wxad04e9c4c5255acf
 
  appSecret: ae77c48ccf1af5d07069f5153d1ac8d3
 
  appSecret: ae77c48ccf1af5d07069f5153d1ac8d3

+ 33 - 0
patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/patient_reservation_list.jsp
Просмотреть файл 

@ -0,0 +1,33 @@
 
<%@ page language="java" contentType="text/html; charset=UTF-8"
 
         pageEncoding="UTF-8"%>
 
<!DOCTYPE html>
 
<html lang="en">
 
<head>
 
    <%@ include file="../head/page_head.jsp"%>
 
    <title>预约记录</title>
 
    <style type="text/css">
 
        .input {
 
            height: 30px;
 
            width: 90px;
 
        }
 
        li {width: 100px; }
 
    </style>
 
</head>
 
<body>
 
<div id="div_wrapper">
 
	<input type="hidden" id="patient" value="${patient}"/>
 
	<div class="m-retrieve-area f-h50 f-dn f-pr m-form-inline" data-role-form style='display: block;'>
 
		<div class="m-form-group f-mt10">
 
			<div class="m-form-control f-ml10 f-h30">
 
			</div>
 
		</div>
 
	</div>
 
	<!--######预约记录表######-->
 
	<div id="div_patient_reservation_grid"></div>
 
</div>
 
</body>
 
<%@ include file="../head/page_foot.jsp"%>
 
<%@ include file="patient_reservation_list_js.jsp" %>
 
<%--<script src="${ctx}/static/js/team/doctor/team_member_list.js"></script>--%>
 
</html>

+ 87 - 0
patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/patient_reservation_list_js.jsp
Просмотреть файл 

@ -0,0 +1,87 @@
 
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
 
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
 
<script>
 
	(function ($, win) {
 
		$(function () {
 
			/* ************************** 变量定义 ******************************** */
 
			// 通用工具类库
 
			var Util = $.Util;
 
			var master = null;
 
			var patient = $('#patient').val();
 
			/* *************************** 函数定义 ******************************* */
 
			function pageInit() {
 
				master.init();
 
			}
 
			/* *************************** 模块初始化 ***************************** */
 
			master = {
 
				grid: null,
 
				init: function () {
 
					this.grid = $("#div_patient_reservation_grid").ligerGrid($.LigerGridEx.config(
 
							{
 
								url: ctx + "/admin/sign/reservationInfo",
 
								parms: {patient: patient},
 
								ajaxHeader: ajaxHeaderName,
 
								ajaxHeaderValue: ajaxHeaderValue,
 
								root: "data",
 
								columns: [
 
                                    {display: '预约号', name: 'code', width: '20%', align: "left"},
 
                                    {
 
                                        display: '预约时间段',
 
                                        name: 'sectionType',
 
                                        width: '5%',
 
                                        minColumnWidth: 20,
 
                                        render: function (row) {
 
                                            if (Util.isStrEquals(row.sectionType, "a")) {
 
                                                return "上午";
 
                                            } else if (Util.isStrEquals(row.available, "p")) {
 
                                                return "下午";
 
                                            }
 
                                            return "";
 
                                        }
 
                                    },
 
									{display: '开始时间', name: 'startTime', width: '12%', align: "left"},
 
									{display: '结束时间', name: 'endTime', width: '12%', align: "center"},
 
									{display: '医院名称', name: 'orgName', width: '10%', align: "left"},
 
									{display: '预约科室', name: 'deptName', width: '10%', align: "center"},
 
									{display: '专家名称', name: 'doctorName', width: '10%', align: "center"},
 
									{display: '专家职位', name: 'doctorJob', width: '10%', align: "left"},
 
                                    {
 
                                        display: '状态',
 
                                        name: 'status',
 
                                        width: '10%',
 
                                        minColumnWidth: 20,
 
                                        render: function (row) {
 
                                            if (Util.isStrEquals(row.status, "0")) {
 
                                                return "取消预约";
 
                                            } else if (Util.isStrEquals(row.status, "1")) {
 
                                                return "预约成功";
 
                                            } else if (Util.isStrEquals(row.status, "2")) {
 
                                                return "已诊";
 
                                            } else if (Util.isStrEquals(row.status, "3")) {
 
                                                return "停诊";
 
                                            }
 
                                            return "";
 
                                        }
 
                                    },
 
                                ],
 
                                enabledEdit: true,
 
                                validate: true,
 
                                unSetValidateAttr: false,
 
                                usePager: false, //是否分页
 
                                rownumbers: true, //是否显示行号
 
                                alternatingRow: false, //是否附加奇偶行效果行
 
                            }));
 
                    // 自适应宽度
 
                    this.grid.adjustToWidth();
 
                },
 
            };
 
            /* *************************** 页面初始化 **************************** */
 
            pageInit();
 
        });
 
    })(jQuery, window);
 
</script>

+ 1 - 12
patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/sign_family_list_js.jsp
Просмотреть файл 

@ -152,7 +152,7 @@
 
								render: function (row) {
 
								render: function (row) {
 
									var html = '';
 
									var html = '';
 
									html += '<a  href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "sign:info:view", row.id) + '">明细</a>';
 
									html += '<a  href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "sign:info:view", row.id) + '">明细</a>';
 
									html += '<a style="margin-left:10px;" href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "sign:info:reservation", row.patient) + '">预约记录</a>';
 
									html += '<a style="margin-left:10px;" href="' + ctx + '/admin/sign/reservation/' + row.patient + '" target="centerFrame" >预约记录</a>';
 
									//html += '<a  style="margin-left:10px;"href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "patient:info:edit", row.id) + '">编辑</a>';
 
									//html += '<a  style="margin-left:10px;"href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "patient:info:edit", row.id) + '">编辑</a>';
 
									//html += '<a  style="margin-left:10px;" title="删除" href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}','{2}'])", "patient:info:del", row.id,row.code) + '">删除</a>';
 
									//html += '<a  style="margin-left:10px;" title="删除" href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}','{2}'])", "patient:info:del", row.id,row.code) + '">删除</a>';
 
									if (row.adminTeamId) {
 
									if (row.adminTeamId) {
 
@ -194,17 +194,6 @@
 
							url: ctx + '/admin/sign/infoInit/' + id
 
							url: ctx + '/admin/sign/infoInit/' + id
 
						})
 
						})
 
					});
 
					});
 
					//查看预约记录
 
                    $.subscribe('sign:info:reservation', function (event, patient) {
 
                        var title = '查看预约记录';
 
                        self.signInfoDialog = $.ligerDialog.open({
 
                            height: 550,
 
                            width: 550,
 
                            // urlParms: {"id": id, "type": "view"},
 
                            title: title,
 
                            url: ctx + '/admin/sign/reservation/' + patient
 
                        })
 
                    });
 
				}
 
				}
 
			};
 
			};

+ 0 - 80
patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/sign_reservation_modify.jsp
Просмотреть файл 

@ -1,80 +0,0 @@
 
<%--
 
  Created by IntelliJ IDEA.
 
  User: Administrator
 
  Date: 2018/5/29 0029
 
  Time: 下午 2:01
 
  To change this template use File | Settings | File Templates.
 
--%>
 
<%@ page contentType="text/html; charset=UTF-8" language="java" pageEncoding="UTF-8" %>
 
<html>
 
<head>
 
    <%@ include file="../head/page_head.jsp"%>
 
    <title>预约记录</title>
 
    <style type="text/css">
 
        .m-form-group label.label_title{width: 100px}
 
        ul#nav{ width:100%; height:30px; background:#00A2CA;margin:0 auto}
 
        ul#nav li{display:inline; height:30px}
 
        ul#nav li a{display:inline-block; padding:5px 10px; height:30px;
 
            color:#FFF; font-family:"\5FAE\8F6F\96C5\9ED1"; font-size:16px}
 
        ul#nav li a:hover{background:#0095BB;}/*设置鼠标滑过或悬停时变化的背景颜色*/
 
    </style>
 
</head>
 
<body>
 
<ul id="nav">
 
    <li><a href="#" onclick="opens(1)">基本信息</a></li>
 
    <li><a href="#" onclick="opens(2)">预约记录</a></li>
 
</ul>
 
<div id="div_reservation_info_form" data-role-form class="m-form-inline f-mt20 f-ml30" data-role-form style="overflow-y: scroll;height: 450px">
 
    <input type="hidden" id="patient" value='${patient}' data-attr-scan="id"/>
 
    <%-- ##################################基本信息div 开始###############################--%>
 
    <div id="div_base_info">
 
        <div class="m-form-group" style="">
 
            <label class="label_title" style="width:120px">居民标识符</label>
 
            <div class="l-text-wrapper m-form-control">
 
                <input type="text"  id="inp_patient" class="f-w240" data-attr-scan="patient"/>
 
            </div>
 
        </div>
 
        <div class="m-form-group" style="">
 
            <label class="label_title" style="width:120px">居民姓名</label>
 
            <div class="l-text-wrapper m-form-control">
 
                <input type="text"  id="inp_name" class="f-w240" data-attr-scan="name"/>
 
            </div>
 
        </div>
 
        <div class="m-form-group" style="">
 
            <label class="label_title" style="width:120px">身份证号</label>
 
            <div class="l-text-wrapper m-form-control">
 
                <input type="text"  id="inp_idcard" class="f-w240" data-attr-scan="idcard"/>
 
            </div>
 
        </div>
 
        <div class="m-form-group" style="">
 
            <label class="label_title" style="width:120px">社保卡号</label>
 
            <div class="l-text-wrapper m-form-control">
 
                <input type="text"  id="inp_ssc" class="f-w240" data-attr-scan="ssc"/>
 
            </div>
 
        </div>
 
        <div class="m-form-group" style="">
 
            <label class="label_title" style="width:120px">手机号</label>
 
            <div class="l-text-wrapper m-form-control">
 
                <input type="text"  id="inp_mobile" class="f-w240" data-attr-scan="mobile"/>
 
            </div>
 
        </div>
 
    </div>
 
    <%-- ##################################基本信息div 结束###############################--%>
 
</div>
 
</body>
 
<script>
 
    function opens(obj){
 
        if(obj == 1){
 
            document.getElementById("div_base_info").style.display="block";
 
            document.getElementById("div_reservation_info").style.display="none";
 
        }
 
        if(obj == 2){
 
            document.getElementById("div_base_info").style.display="none";
 
            document.getElementById("div_reservation_info").style.display="block";
 
        }
 
    }
 
</script>
 
<%@ include file="../head/page_foot.jsp"%>
 
<%@ include file="sign_reservation_modify_js.jsp" %>
 
</html>

+ 0 - 71
patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/sign_reservation_modify_js.jsp
Просмотреть файл 

@ -1,71 +0,0 @@
 
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
 
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
 
<script>
 
    (function ($, win) {
 
        $(function () {
 
            var Util = $.Util;
 
            var patient = $('#patient').val();
 
            var reservationInfo = "";
 
            function pageInit() {
 
                reservationInfo.init();
 
                reservationInfo.initForm();
 
            }
 
            reservationInfo = {
 
                //变量
 
                $form: $("#div_reservation_info_form"),
 
                //费用信息
 
                init: function () {
 
                    this.$form.attrScan();
 
                    //基本信息
 
                    $('#inp_patient').ligerTextBox({width: 240});
 
                    $('#inp_name').ligerTextBox({width: 240});
 
                    $('#inp_idcard').ligerTextBox({width: 240});
 
                    $('#inp_mobile').ligerTextBox({width: 240});
 
                    $('#inp_ssc').ligerTextBox({width: 240});
 
                },
 
                initForm: function () {
 
                    if (isNoEmpty(patient) && patient != 0) {
 
                        $.ajax({
 
                            url: ctx + "/admin/sign/reservationInfo/" + patient,
 
                            data: {"patient" : patient},
 
                            method: "post",
 
                            dataType: "json",
 
                            async: false,
 
                            success: function (result) {
 
                                if (result.status == '200') {
 
                                    //通过patient查信息
 
                                    var data = result.data;
 
                                    var status = data.status;
 
                                    reservationInfo.$form.Fields.fillValues({
 
                                        //基本信息填值
 
                                        patient: data.patient,
 
                                        name: data.name,
 
                                        idcard: data.idcard,
 
                                        mobile: data.mobile,
 
                                        ssc: data.ssc,
 
                                    });
 
                                } else {
 
                                    $.Notice.error(result.msg);
 
                                }
 
                            },
 
                            error: function (data) {
 
                                $.Notice.error("系统异常,请联系管理员！");
 
                            }
 
                        });
 
                    }
 
                    this.$form.addClass("m-form-readonly"); //表单只读
 
                    this.bindEvents();
 
                },
 
                //绑定事件
 
                bindEvents: function () {
 
                    $("#btn_cancel").click(function () {
 
                        parent.window.closePatientInfoDialog();
 
                    });
 
                }
 
            }
 
            pageInit();
 
        });
 
    })(jQuery, window)
 
</script>

+ 0 - 4
patient-co-service/wlyy_service/src/main/resources/application.yml
Просмотреть файл 

@ -166,7 +166,3 @@ zyapi:
 
#    i健康项目地址
 
#    i健康项目地址
 
wlyy:
 
wlyy:
 
  api: http://www.xmtyw.cn/wlyy
 
  api: http://www.xmtyw.cn/wlyy
 
#智业预约记录接口
 
reservation:
 
  zyurl: http://59.61.92.90:8072/wlyy_service