|
@@ -48,30 +48,30 @@ class PatientServies
|
|
|
public function makeMappingData($params, $mpKey='0', $action='save', $type=1): array
|
|
|
{
|
|
|
$return = [];
|
|
|
- $mapping = $this->patientModel->getMapping(['mpKey'=>$mpKey,'action'=>$action,'param_type'=>$type]);
|
|
|
- $all = $this->patientModel->getAllMapping(['action'=>$action,'param_type'=>$type]);
|
|
|
+ $mapping = $this->patientModel->getMapping(['MPKEY'=>$mpKey,'ACTION'=>$action,'PARAM_TYPE'=>$type]);
|
|
|
+ $all = $this->patientModel->getAllMapping(['ACTION'=>$action,'PARAM_TYPE'=>$type]);
|
|
|
$allMapping = [];
|
|
|
foreach ($all as $k=>$v)
|
|
|
{
|
|
|
- $allMapping[$v['mpKey']][] = $v;
|
|
|
+ $allMapping[$v['MPKEY']][] = $v;
|
|
|
}
|
|
|
$mappingArr = [];
|
|
|
foreach ($mapping as $v)
|
|
|
{
|
|
|
$childMapping = [];
|
|
|
- if($v['type'] == 'object' || $v['type'] == 'array')
|
|
|
+ if($v['TYPE'] == 'object' || $v['TYPE'] == 'array')
|
|
|
{
|
|
|
- $childMapping = $allMapping[$v['mKey']] ?? [];
|
|
|
+ $childMapping = $allMapping[$v['MKEY']] ?? [];
|
|
|
}
|
|
|
$child = [];
|
|
|
if(!empty($childMapping))
|
|
|
{
|
|
|
foreach ($childMapping as $value)
|
|
|
{
|
|
|
- $child[$value['mKey']] = ['key'=>$value['key'],'mpKey'=>$value['mpKey'],'mKey'=>$v['mKey'],'type'=>$value['type'],'action'=>$v['action']];
|
|
|
+ $child[$value['MKEY']] = ['KEY'=>$value['KEY'],'MPKEY'=>$value['MPKEY'],'MKEY'=>$v['MKEY'],'TYPE'=>$value['TYPE'],'action'=>$v['ACTION']];
|
|
|
}
|
|
|
}
|
|
|
- $mappingArr[$v['mKey']] = ['key'=>$v['key'],'mpKey'=>$v['mpKey'],'mKey'=>$v['mKey'],'type'=>$v['type'],'child'=>$child,'action'=>$v['action']];
|
|
|
+ $mappingArr[$v['MKEY']] = ['KEY'=>$v['KEY'],'MPKEY'=>$v['MPKEY'],'MKEY'=>$v['MKEY'],'TYPE'=>$v['TYPE'],'CHILD'=>$child,'ACTION'=>$v['ACTION']];
|
|
|
}
|
|
|
foreach ($params as $k=>$v)
|
|
|
{
|
|
@@ -81,22 +81,22 @@ class PatientServies
|
|
|
{
|
|
|
if(is_array($value))
|
|
|
{
|
|
|
- $returnArr = $this->makeMappingData($value,$mappingArr[$k]['mKey'],$mappingArr[$k]['action'],$type);
|
|
|
- $return[$mappingArr[$k]['key']][] = $returnArr;
|
|
|
+ $returnArr = $this->makeMappingData($value,$mappingArr[$k]['MKEY'],$mappingArr[$k]['ACTION'],$type);
|
|
|
+ $return[$mappingArr[$k]['KEY']][] = $returnArr;
|
|
|
}else{
|
|
|
- if(!empty($mappingArr[$k]['child']))
|
|
|
+ if(!empty($mappingArr[$k]['CHILD']))
|
|
|
{
|
|
|
- if(isset($mappingArr[$k]['child'][$key]['key']))
|
|
|
+ if(isset($mappingArr[$k]['CHILD'][$key]['KEY']))
|
|
|
{
|
|
|
- $return[$mappingArr[$k]['key']][$mappingArr[$k]['child'][$key]['key']] = $value;
|
|
|
+ $return[$mappingArr[$k]['KEY']][$mappingArr[$k]['CHILD'][$key]['KEY']] = $value;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}else{
|
|
|
- if(isset($mappingArr[$k]['key']))
|
|
|
+ if(isset($mappingArr[$k]['KEY']))
|
|
|
{
|
|
|
- $return[$mappingArr[$k]['key']] = $v;
|
|
|
+ $return[$mappingArr[$k]['KEY']] = $v;
|
|
|
}
|
|
|
}
|
|
|
}
|