zhangyan
/
YiJiYuYue_Common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

Browse Source
main
yanzai 1 year ago
parent 440b436c76
commit 488f077e56
5 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
Laravel/app/Services/Xml/ShenQingDanService.php
Unescape Escape View File

@ -76,7 +76,7 @@ class ShenQingDanService
if ($insertListId) { if ($insertListId) {
if(config('app.globals.自动预约')==1){ if(config('app.globals.自动预约')==1){
$planser=new PlanListService(); $planser=new PlanListService();
$yuyue= $planser->AutoYuYue($params['reg_num'],[$params['entrust_id']],$params['episodeid'],1); $yuyue= $planser->AutoYuYue($params['reg_num'],[$params['entrust_id']],$params['episodeid'],4);
if($yuyue['status']==false){ if($yuyue['status']==false){
DB::rollBack(); DB::rollBack();
return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], -1, '自动预约失败，'.$yuyue['msg'].'，推送失败'); return \Yz::XMLReturn($Header['SourceSystem'], $Header['MessageID'], -1, '自动预约失败，'.$yuyue['msg'].'，推送失败');

38
Laravel/public/jq_page/appointment.html
Unescape Escape View File

@ -15,7 +15,7 @@
</head> </head>
<body> <body>
<script> <script>
//let BaseUrl='http://10.50.120.166/YiJiYuYue/Laravel/public' // let BaseUrl='http://10.50.120.166/YiJiYuYue/Laravel/public'
let BaseUrl='http://YiJiYuYue-Common' let BaseUrl='http://YiJiYuYue-Common'
let entrust_ids=[]; //选中的entrust_id let entrust_ids=[]; //选中的entrust_id
let today_date='' let today_date=''
@ -24,6 +24,7 @@
let PrintInfo=null;//打印信息 let PrintInfo=null;//打印信息
let YuYueSuccessInfo='';//预约成功后返回的信息 let YuYueSuccessInfo='';//预约成功后返回的信息
let MainInfo_period_ids=[];//选中的检查项目对应的reservation_time let MainInfo_period_ids=[];//选中的检查项目对应的reservation_time
let MainInfo_date=[];//选中的检查项目对应的日期
//获取url参数 //获取url参数
function getParameterByName(name, url) { function getParameterByName(name, url) {
if (!url) url = decodeURIComponent(window.location.href) if (!url) url = decodeURIComponent(window.location.href)
@ -88,7 +89,7 @@
bj_color="lanse_bg" bj_color="lanse_bg"
} }
$('#yizhulist').append( $('#yizhulist').append(
'<div class="yiyuInfo '+ bj_color+' "data-entrustid='+ item.maininfo.entrust_id +' data-id='+ key +' data-mainid='+ item.maininfo.id +' data-status='+ item.maininfo.list_status +' data-name='+ item.maininfo.entrust+ ' data-periodid='+ item.maininfo.reservation_time +'>' + '<div class="yiyuInfo '+ bj_color+' "data-entrustid='+ item.maininfo.entrust_id +' data-id='+ key +' data-mainid='+ item.maininfo.id +' data-status='+ item.maininfo.list_status +' data-name='+ item.maininfo.entrust+ ' data-periodid='+ item.maininfo.reservation_time + ' data-yuyuedate='+ item.maininfo.reservation_date +'>' +
'<div>医嘱项：<span >'+item.maininfo.entrust +'</span></div>' + '<div>医嘱项：<span >'+item.maininfo.entrust +'</span></div>' +
'<div>当前状态：<span >'+zhuangtai+'</span></div>' +msg+ '<div>当前状态：<span >'+zhuangtai+'</span></div>' +msg+
'<div>医生：<span >'+ item.maininfo.docotr+' </span> 是否空腹：<span >'+ kongfu+'</span></div>' + '<div>医生：<span >'+ item.maininfo.docotr+' </span> 是否空腹：<span >'+ kongfu+'</span></div>' +
@ -115,9 +116,9 @@
if(getParameterByName('dotype')==2 && YuYueSuccessInfo==''){//如果是改约，默认定位到预约的日期 if(getParameterByName('dotype')==2 && YuYueSuccessInfo==''){//如果是改约，默认定位到预约的日期
console.log(data.data.info[0].maininfo.reservation_date); console.log(data.data.info[0].maininfo.reservation_date);
today_date=data.data.info[0].maininfo.reservation_date today_date=data.data.info[0].maininfo.reservation_date
add=0; add=1;
} }
var currentDate = new Date(data.data.today_date) var currentDate = new Date(today_date)
currentDate.setDate(currentDate.getDate() + add) currentDate.setDate(currentDate.getDate() + add)
tomorrowDate = currentDate.toISOString().split('T')[0] tomorrowDate = currentDate.toISOString().split('T')[0]
@ -126,7 +127,6 @@
} }
} else { } else {
MsgAlert(data.msg) MsgAlert(data.msg)
} }
@ -160,7 +160,7 @@
}else{ }else{
zhuangtai="class='table_row '" zhuangtai="class='table_row '"
} }
if(getParameterByName('dotype')==2 && YuYueSuccessInfo=='') {//如果是改约，默认定位到预约的日期 if(getParameterByName('dotype')==2 && YuYueSuccessInfo=='' && v.date==MainInfo_date[0]) {//如果是改约，默认定位到预约的日期
if(MainInfo_period_ids[0]==v.period_id){ if(MainInfo_period_ids[0]==v.period_id){
zhuangtai="class='table_row row_selected'" zhuangtai="class='table_row row_selected'"
}else{ }else{
@ -176,12 +176,12 @@
' <td class=\'usecount\' onclick=\'test('+v.id+')\'>' + v.used_count + '/' + v.count + '</td>\n' + ' <td class=\'usecount\' onclick=\'test('+v.id+')\'>' + v.used_count + '/' + v.count + '</td>\n' +
' </tr>') ' </tr>')
}) })
if(getParameterByName('dotype')==2 && YuYueSuccessInfo=='') {//如果是改约，默认定位到预约的日期 // if(getParameterByName('dotype')==2 && YuYueSuccessInfo=='') {//如果是改约，默认定位到预约的日期
console.log($('.row_selected').position()) // console.log($('.row_selected').position())
$('.table_k').animate({ // $('.table_k').animate({
scrollTop: $('.row_selected').position().top-200 // scrollTop: $('.row_selected').position().top-200
}, 200); // 动画持续时间为1000毫秒 // }, 200); // 动画持续时间为1000毫秒
} // }
@ -203,6 +203,13 @@
}else{ }else{
zhuangtai="class='table_row '" zhuangtai="class='table_row '"
} }
if(getParameterByName('dotype')==2 && YuYueSuccessInfo=='' && v.date==MainInfo_date[0] ) {//如果是改约，默认定位到预约的日期
if(MainInfo_period_ids[0]==v.period_id){
zhuangtai="class='table_row row_selected'"
}else{
zhuangtai="class='table_row '"
}
}
$('#table2 tbody').append('<tr data-resource='+v.department_resources_name+' data-timerange='+v.begin_time+'-'+v.end_time +' data-date='+v.date +' data-id=' + v.id + ' '+zhuangtai+'>\n' + $('#table2 tbody').append('<tr data-resource='+v.department_resources_name+' data-timerange='+v.begin_time+'-'+v.end_time +' data-date='+v.date +' data-id=' + v.id + ' '+zhuangtai+'>\n' +
' <td>' + v.date + '</td>\n' + ' <td>' + v.date + '</td>\n' +
' <td>' + v.weekname + '</td>\n' + ' <td>' + v.weekname + '</td>\n' +
@ -419,11 +426,16 @@
entrust_ids.push($(this).data('entrustid')) entrust_ids.push($(this).data('entrustid'))
MainInfo_ids.push($(this).data('mainid')) MainInfo_ids.push($(this).data('mainid'))
MainInfo_period_ids.push($(this).data('periodid')) MainInfo_period_ids.push($(this).data('periodid'))
MainInfo_date.push($(this).data('yuyuedate'))
}) })
$('#input_appointment_item').val(input_itemname); $('#input_appointment_item').val(input_itemname);
console.log(entrust_ids); console.log(entrust_ids);
if($(".lanse_bg").length>0){ if($(".lanse_bg").length>0){
await NearestEnablePlanDate(); console.log(getParameterByName('dotype'))
if(getParameterByName('dotype')!=2){
await NearestEnablePlanDate();
}
//日历设置日期，支持查询计划 //日历设置日期，支持查询计划
$('#datetimepicker1 input').val(today_date) $('#datetimepicker1 input').val(today_date)
$('#datetimepicker2 input').val(tomorrowDate) $('#datetimepicker2 input').val(tomorrowDate)

4
h5/api/index.js
Unescape Escape View File

@ -5,8 +5,8 @@ import {
isLoading, isLoading,
sendRequest sendRequest
} = useHttp(); } = useHttp();
//let Url='https://yiji.yuluo.online/Laravel/public' let Url='https://yiji.yuluo.online/Laravel/public'
let Url='http://YiJiYuYue-Common' //let Url='http://YiJiYuYue-Common'
let BaseUrl=Url+'/api/' let BaseUrl=Url+'/api/'
export const BaseFileUrl=()=>{ export const BaseFileUrl=()=>{

4
h5/pages/CheckItemMainList.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template> <template>
<view class="CheckItemMain"> <view class="CheckItemMain">
<view class="head"></view> <view class="head"></view>
<view class="userInfo"> <view class="userInfo" v-if="List.length>0">
<view class="title">患者信息</view> <view class="title">患者信息</view>
<view class="row"> <view class="row">
<view class="label" >姓名：</view> <view class="label" >姓名：</view>
@ -9,7 +9,7 @@
</view> </view>
<view class="row"> <view class="row">
<view class="label">性别：</view> <view class="label">性别：</view>
<view class="value">女</view> <view class="value"><span v-if="List[0].user_sex==1">男</span><span v-if="List[0].user_sex==2">女</span></view>
</view> </view>
<view class="row"> <view class="row">

2
h5/unpackage/dist/build/web/index.html vendored
Unescape Escape View File

@ -14,7 +14,7 @@
<title>h5</title> <title>h5</title>
<!--preload-links--> <!--preload-links-->
<!--app-context--> <!--app-context-->
<script type="module" crossorigin src="/h5/assets/index-72785bcf.js"></script> <script type="module" crossorigin src="/h5/assets/index-efa985d2.js"></script>
<link rel="stylesheet" href="/h5/assets/index-d16efac4.css"> <link rel="stylesheet" href="/h5/assets/index-d16efac4.css">
</head> </head>
<body> <body>

Write Preview
Loading…
Cancel
Save