fix
parent
157d467d80
commit
753215d1af
|
|
@ -84,7 +84,7 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||||
return $rt;*/
|
return $rt;*/
|
||||||
$finance = FinanceServiceCharge::find()
|
$finance = FinanceServiceCharge::find()
|
||||||
->joinWith(['charge'])
|
->joinWith(['charge'])
|
||||||
->where(['from_id' => $model->id, 'const_service_charge.lab' => 'immuno', 'id_case' => $model->id_case])
|
->where(['from_id' => $model->id, 'const_service_charge.lab' => 'special', 'id_case' => $model->id_case])
|
||||||
->one();
|
->one();
|
||||||
if($finance){
|
if($finance){
|
||||||
return (isset($finance->charge) ? $finance->charge->code : '') . ' ' . (isset($finance->charge) ? $finance->charge->name : '');
|
return (isset($finance->charge) ? $finance->charge->code : '') . ' ' . (isset($finance->charge) ? $finance->charge->name : '');
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||||
return $rt;*/
|
return $rt;*/
|
||||||
$finance = FinanceServiceCharge::find()
|
$finance = FinanceServiceCharge::find()
|
||||||
->joinWith(['charge'])
|
->joinWith(['charge'])
|
||||||
->where(['from_id' => $model->id, 'const_service_charge.lab' => 'immuno', 'id_case' => $model->id_case])
|
->where(['from_id' => $model->id, 'const_service_charge.lab' => 'special', 'id_case' => $model->id_case])
|
||||||
->one();
|
->one();
|
||||||
if($finance){
|
if($finance){
|
||||||
return (isset($finance->charge) ? $finance->charge->code : '') . ' ' . (isset($finance->charge) ? $finance->charge->name : '');
|
return (isset($finance->charge) ? $finance->charge->code : '') . ' ' . (isset($finance->charge) ? $finance->charge->name : '');
|
||||||
|
|
|
||||||
|
|
@ -303,10 +303,10 @@ $('#patient-detail').on('click', '.select-patient-btn', function() {
|
||||||
]) ?>
|
]) ?>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<?= $form->field($model, 'collected_at')->widget(DateTimePicker::class, [
|
<?= $form->field($model, 'collected_at')->widget(DatePicker::class, [
|
||||||
'options' => ['placeholder' => 'เลือกวันที่เก็บสิ่งส่งตรวจ ...'],
|
'options' => ['placeholder' => 'เลือกวันที่เก็บสิ่งส่งตรวจ ...'],
|
||||||
'pluginOptions' => [
|
'pluginOptions' => [
|
||||||
'format' => 'dd/mm/yyyy hh:ii:ss',
|
'format' => 'dd/mm/yyyy',
|
||||||
'allowClear' => true,
|
'allowClear' => true,
|
||||||
'autoclose' => true,
|
'autoclose' => true,
|
||||||
'todayHighlight' => true,
|
'todayHighlight' => true,
|
||||||
|
|
|
||||||
|
|
@ -290,10 +290,10 @@ $('#patient-detail').on('click', '.select-patient-btn', function() {
|
||||||
<?php // $form->field($model, 'clinician')->textInput()
|
<?php // $form->field($model, 'clinician')->textInput()
|
||||||
?>
|
?>
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
<?= $form->field($model, 'collected_at')->widget(DateTimePicker::class, [
|
<?= $form->field($model, 'collected_at')->widget(DatePicker::class, [
|
||||||
'options' => ['placeholder' => 'เลือกวันที่เก็บสิ่งส่งตรวจ ...'],
|
'options' => ['placeholder' => 'เลือกวันที่เก็บสิ่งส่งตรวจ ...'],
|
||||||
'pluginOptions' => [
|
'pluginOptions' => [
|
||||||
'format' => 'dd/mm/yyyy hh:ii:ss',
|
'format' => 'dd/mm/yyyy',
|
||||||
'allowClear' => true,
|
'allowClear' => true,
|
||||||
'autoclose' => true,
|
'autoclose' => true,
|
||||||
'todayHighlight' => true,
|
'todayHighlight' => true,
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||||
<h5 class="card-title"> <?= Html::encode($this->title) ?>
|
<h5 class="card-title"> <?= Html::encode($this->title) ?>
|
||||||
</h5>
|
</h5>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
|
|
||||||
<?php echo $this->render('_search', ['model' => $searchModel]);
|
<?php echo $this->render('_search', ['model' => $searchModel]);
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,8 @@ $this->params['breadcrumbs'][] = $this->title;
|
||||||
<div class="table-responsive">
|
<div class="table-responsive">
|
||||||
<?= GridView::widget([
|
<?= GridView::widget([
|
||||||
'pager' => ['class' => 'yii\bootstrap5\LinkPager'],
|
'pager' => ['class' => 'yii\bootstrap5\LinkPager'],
|
||||||
'tableOptions' => ['class' => 'table align-middle truncate m-0'],
|
'tableOptions' => ['class' => 'table align-middle table-hover m-0 truncate'],
|
||||||
|
'layout' => "{summary}<div class='table-outer'><div class='table-responsive'>\n{items}\n</div></div><div class='d-flex justify-content-between align-items-center mt-4'>{pager}</div>",
|
||||||
'dataProvider' => $dataProvider,
|
'dataProvider' => $dataProvider,
|
||||||
'filterModel' => $searchModel,
|
'filterModel' => $searchModel,
|
||||||
'columns' => [
|
'columns' => [
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue