From 61c81d7dbeb68a8a548175de40e0f8b8bc33f6c2 Mon Sep 17 00:00:00 2001
From: hanxueqing <1045352474@qq.com>
Date: Sun, 5 Jan 2020 19:52:51 +0800
Subject: [PATCH] Merge branch 'master' of
 http://bdgit.educoder.net/p01643725/paz2s9bc5

# Conflicts:
#	cmkg/pom.xml
#	cmkg/src/main/java/com/cmkg/cmkg/CmkgApplication.java
#	cmkg/src/main/java/com/cmkg/cmkg/Controller/QuestionController.java
#	cmkg/src/main/java/com/cmkg/cmkg/database/ReturnData.java
#	cmkg/src/main/java/com/cmkg/cmkg/node/medicine.java
#	cmkg/src/main/java/com/cmkg/cmkg/process/ModelProcess.java
#	cmkg/src/main/java/com/cmkg/cmkg/repository/MedicineRespository.java
#	cmkg/src/main/java/com/cmkg/cmkg/repository/QuestionRespository.java
#	cmkg/src/main/java/com/cmkg/cmkg/server/QuestionService.java
#	cmkg/src/main/java/com/cmkg/cmkg/server/impl/QuestionServiceImpl.java
#	cmkg/src/main/resources/application.properties
---
 .../com/example/SearchCenter/SearchEntryActivity.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/example/SearchCenter/SearchEntryActivity.java b/app/src/main/java/com/example/SearchCenter/SearchEntryActivity.java
index 5efcf98..ebfa967 100644
--- a/app/src/main/java/com/example/SearchCenter/SearchEntryActivity.java
+++ b/app/src/main/java/com/example/SearchCenter/SearchEntryActivity.java
@@ -9,7 +9,6 @@ import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.example.PersonalCenter.SearchServiceGet;
 import com.example.Util.ConditionCode;
 import com.example.Util.ReturnData;
 import com.example.cmknowledgegraph.R;
@@ -206,7 +205,7 @@ public class SearchEntryActivity extends AppCompatActivity implements CardStackV
             textView_1.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    SearchServiceGet.executeSearchGet(response.getMsg()+"吃什么药");
+
                 }
             });
         }else if(response.getCode()==DiseaseToMedicines){
@@ -222,7 +221,7 @@ public class SearchEntryActivity extends AppCompatActivity implements CardStackV
                 textView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        SearchServiceGet.executeSearchGet(content.get(index) + "能治什么病");
+
                     }
                 });
             }
@@ -241,19 +240,19 @@ public class SearchEntryActivity extends AppCompatActivity implements CardStackV
             textView_1.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    SearchServiceGet.executeSearchGet(response.getMsg() + "能治什么病");
+
                 }
             });
             textView_2.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    SearchServiceGet.executeSearchGet(response.getMsg() + "的证候");
+
                 }
             });
             textView_3.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
-                    SearchServiceGet.executeSearchGet(response.getMsg() + "的功能");
+
                 }
             });
         }else if(response.getCode()==MedicineToSymptom){