fix null attachment not updating
This commit is contained in:
parent
be5d391b64
commit
66c76b696f
@ -77,7 +77,7 @@ class Patient extends Controller {
|
|||||||
->join('ethnic', 'ethnic.EthnicID = patient.EthnicID', 'left')
|
->join('ethnic', 'ethnic.EthnicID = patient.EthnicID', 'left')
|
||||||
->join('patcom', 'patcom.InternalPID = patient.InternalPID', 'left')
|
->join('patcom', 'patcom.InternalPID = patient.InternalPID', 'left')
|
||||||
->join('patidt', 'patidt.InternalPID = patient.InternalPID', 'left')
|
->join('patidt', 'patidt.InternalPID = patient.InternalPID', 'left')
|
||||||
->join('patatt', 'patatt.InternalPID = patient.InternalPID', 'left')
|
->join('patatt', 'patatt.InternalPID = patient.InternalPID and patatt.DelDate is null', 'left')
|
||||||
->where('patient.InternalPID', (int) $InternalPID)
|
->where('patient.InternalPID', (int) $InternalPID)
|
||||||
->get()
|
->get()
|
||||||
->getResultArray();
|
->getResultArray();
|
||||||
@ -427,7 +427,9 @@ class Patient extends Controller {
|
|||||||
}
|
}
|
||||||
$this->db->table('patatt')->upsertBatch($dataPatatt);
|
$this->db->table('patatt')->upsertBatch($dataPatatt);
|
||||||
$addresses = array_column($dataPatatt, 'Address');
|
$addresses = array_column($dataPatatt, 'Address');
|
||||||
$this->db->table('patatt')->where('InternalPID', $InternalPID)->WhereNotIn('Address', $addresses)->delete();
|
$this->db->table('patatt')->where('InternalPID', $InternalPID)->WhereNotIn('Address', $addresses)->update(['DelDate' => date('Y-m-d H:i:s')]);
|
||||||
|
} else {
|
||||||
|
$this->db->table('patatt')->where('InternalPID', $InternalPID)->update(['DelDate' => date('Y-m-d H:i:s')]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!empty($dataPatcom['Comment'])) {
|
if(!empty($dataPatcom['Comment'])) {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user