From 774ba572b85bf6209d44ba46b87a1180c65201b9 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Sun, 31 Jul 2022 21:25:42 +0800
Subject: [PATCH] 1

---
 application/api/controller/Journal.php       | 1 +
 application/common.php                       | 9 +++++++++
 application/master/controller/Medicament.php | 5 ++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php
index 4c04737..e8f1ca2 100644
--- a/application/api/controller/Journal.php
+++ b/application/api/controller/Journal.php
@@ -631,6 +631,7 @@ class Journal extends Controller {
 
             $list[$k]['topic'] = $cache_topic;
             $list[$k]['cite'] = $cite;
+            $list[$k]['journal_title'] = choiseti1($v['article_id'],$journal_info['title']);
             $list[$k]['authortitle'] = $this->getAuthor($v);
         }
 
diff --git a/application/common.php b/application/common.php
index b420b98..0cb65bd 100644
--- a/application/common.php
+++ b/application/common.php
@@ -61,6 +61,9 @@ function choiseJabbr($article_id,$jabbr){
     if($article_id<1981&&$jabbr=="Toxicol Commun"){
         return "Asian Toxicol Res";
     }
+    if($article_id<2190&&$jabbr=="Food Health"){
+        return "Food Ther Health Care";
+    }
     return $jabbr;
 }
 
@@ -93,6 +96,9 @@ function choiseti($v){
     if($v['article_id']<1981&&$v['journal_title']=="Toxicology Communications"){
         return "Asian Toxicology Research";
     }
+    if($v['article_id']<2190&&$v['journal_title']=="Food and Health"){
+        return "Food Therapy and Health Care";
+    }
     return $v['journal_title'];
 }
 
@@ -118,6 +124,9 @@ function choiseti1($article_id,$journal_title){
     if($article_id<1981&&$journal_title=="Toxicology Communications"){
         return "TMR Integrative Nursing";
     }
+    if($article_id<2190&&$journal_title=="Food and Health"){
+        return "Food Therapy and Health Care";
+    }
     return $journal_title;
 }
 
diff --git a/application/master/controller/Medicament.php b/application/master/controller/Medicament.php
index a180927..2f52fec 100644
--- a/application/master/controller/Medicament.php
+++ b/application/master/controller/Medicament.php
@@ -40,7 +40,10 @@ class Medicament extends Controller
         $article_info = $this->article_obj->where('article_id', $data['article_id'])->find();
 
         //检测当前药剂是否存在
-        $med_check = $this->medicament_obj->where('med_title', trim($data['med_title']))->whereOr('med_ename',trim($data['med_ename']))->where('med_state',0)->find();
+        $med_check = $this->medicament_obj
+            ->where("med_title = '".trim($data['med_title'])."' or med_ename = '".trim($data['med_ename'])."'")
+            ->where('med_state',0)
+            ->find();
         if($med_check){
             return json(['code'=>2,'data'=>$med_check]);
         }