Merge branch 'Lasha_Kapanadze_process_import_branch' of http://192.168.1.93:8418/solocla/Moncler-Portal

This commit is contained in:
Claudio 2024-10-31 14:37:14 +01:00
commit ed4f797a59

View File

@ -141,19 +141,27 @@ foreach ($jsonEntries as $entry) {
$analysisgroupcode = 'NO_GROUPCODE';
}
$query = "SELECT idanalysisvocabulary FROM analysisvocabulary WHERE analysiscode LIKE '$analysisgroupcode'";
$query = "SELECT idanalysisvocabulary, refid FROM analysisvocabulary WHERE analysiscode LIKE '$analysisgroupcode'";
$stmt = $pdo->prepare($query);
$res = $stmt->execute();
$res = $stmt->fetchColumn();
$res = $stmt->fetchAll();
if ($res) {
$analysisCodeId = $res;
if($res[0]['refid'] == $res[0]['idanalysisvocabulary'] || $res[0]['refid'] == 0 || $res[0]['refid'] == NULL){
$analysisCodeId = $res[0]['idanalysisvocabulary'];
}else{
$analysisCodeId = $res[0]['refid'];
}
} else {
$query = "SELECT idanalysisvocabulary FROM analysisvocabulary WHERE nameanalysisvoc LIKE '$result_TestName'";
$query = "SELECT idanalysisvocabulary, refid FROM analysisvocabulary WHERE nameanalysisvoc LIKE '$result_TestName'";
$stmt = $pdo->prepare($query);
$res = $stmt->execute();
$res = $stmt->fetchColumn();
$res = $stmt->fetchAll();
if ($res) {
$analysisCodeId = $res;
if($res[0]['refid'] == $res[0]['idanalysisvocabulary'] || $res[0]['refid'] == 0 || $res[0]['refid'] == NULL){
$analysisCodeId = $res[0]['idanalysisvocabulary'];
}else{
$analysisCodeId = $res[0]['refid'];
}
} else {
$analysisCodeId = 'NO ANALYSIS ID FOUND';
}
@ -170,19 +178,27 @@ foreach ($jsonEntries as $entry) {
$cas = 'NO_CAS';
}
$query = "SELECT idcompoundsvocabulary FROM compundsvocabulary WHERE cascompoundvocabulary LIKE '%$cas%'";
$query = "SELECT idcompoundsvocabulary, refid FROM compundsvocabulary WHERE cascompoundvocabulary LIKE '%$cas%'";
$stmt = $pdo->prepare($query);
$res = $stmt->execute();
$res = $stmt->fetchColumn();
$res = $stmt->fetchAll();
if ($res) {
$compoundId = $res;
if($res[0]['refid'] == $res[0]['idcompoundsvocabulary'] || $res[0]['refid'] == 0 || $res[0]['refid'] == NULL){
$compoundId = $res[0]['idcompoundsvocabulary'];
}else{
$compoundId = $res[0]['refid'];
}
} else {
$query = "SELECT idcompoundsvocabulary FROM compundsvocabulary WHERE namecompoundsvocabulary LIKE '$result_AnalytsName'";
$query = "SELECT idcompoundsvocabulary, refid FROM compundsvocabulary WHERE namecompoundsvocabulary LIKE '$result_AnalytsName'";
$stmt = $pdo->prepare($query);
$res = $stmt->execute();
$res = $stmt->fetchColumn();
$res = $stmt->fetchAll();
if ($res) {
$compoundId = $res;
if($res[0]['refid'] == $res[0]['idcompoundsvocabulary'] || $res[0]['refid'] == 0 || $res[0]['refid'] == NULL){
$compoundId = $res[0]['idcompoundsvocabulary'];
}else{
$compoundId = $res[0]['refid'];
}
} else {
$compoundId = 'NO COMPOUND ID FOUND';
}