Merge branch 'master' of http://106.225.187.159:8081/jiankun/GY_zhishiku

neo4jApi/app/controller/Cdss.php

@@ -47,6 +47,7 @@ use app\model\Cdsss;
 use app\model\CdssSelect;
 use app\model\CdssAdvisory;
 use app\model\Symptom;
+use app\model\ZhSymptom;
 use app\model\DiseasesKeyword;
 use app\model\DiseaseCategoryProperties;
 use app\model\XyZskDisease;
@@ -1039,6 +1040,17 @@ class Cdss extends CommonTwoController
                         }
                         break;
 
+                    case 'ZhSymptom':
+                        $data = ZhSymptom::field('name')
+                            ->where("name", "like", "%$keyword%")
+                            ->limit($limit, $pagesize)
+                            ->select()
+                            ->toArray();
+                        $count = ZhSymptom::field('name')
+                            ->where("name", "like", "%$keyword%")
+                            ->count();
+                        break;
+
                 }
 
                 foreach ($data as $key => $val) {
@@ -1453,6 +1465,25 @@ class Cdss extends CommonTwoController
                     $data = GetZhGuide::where('documentName', 'like', "%$keyword%")->limit($limit, $pagesize)->select()->toArray();
                     $count = GetZhGuide::where('documentName', 'like', "%$keyword%")->count();
                     break;
+                /**
+                 * 症状
+                 */
+                case 'ZhSymptom':
+                    if ($keyword) {
+                        $data = ZhSymptom::field('name')
+                            ->where("name", "like", "%$keyword%")
+                            ->limit($limit, $pagesize)
+                            ->select()
+                            ->toArray();
+                        $count = ZhSymptom::field('name')->where("name", "like", "%$keyword%")->count();
+                    } else {
+                        $data = ZhSymptom::field('name')
+                            ->limit($limit, $pagesize)
+                            ->select()
+                            ->toArray();
+                        $count = ZhSymptom::field('name')->count();
+                    }
+                    break;
             }
             //return $this->_json_succ($data);
             $baseurl = Config::get('app.base_url');
@@ -1877,6 +1908,11 @@ class Cdss extends CommonTwoController
                 $table = 'jm_zh_zyfywlf';
                 $field = 'name';
                 break;
+            case 'ZhSymptom':
+                $model = '\app\model\ZhSymptom';
+                $table = 'jm_zh_symptom';
+                $field = 'name';
+                break;
         }
 
         if (stripos($value, ',') !== false) {

neo4jApi/app/model/DiseaseCategoryProperties.php

@@ -60,7 +60,7 @@ class DiseaseCategoryProperties extends Model
             'zyfywlf' => '中医非药物疗法',
             'zhguide' => '中医诊疗指南',
             //'Disease'               => '医疗疾病'
-            //'Symptom'               => '症状'
+            'ZhSymptom'               => '症状'
         ];
 
         // 工号列表，只返回国家医保药品目录（西医）

neo4jApi/app/model/ZhSymptom.php

@@ -0,0 +1,10 @@
+<?php
+namespace app\model;
+
+use think\Model;
+
+
+class ZhSymptom extends Model
+{
+    protected $table = "jm_zh_symptom";
+}