|
@@ -95,23 +95,25 @@ public class DictionaryService {
|
|
|
}
|
|
|
|
|
|
private List<CodeNamePojo> deepinDiag(String method, String content, boolean accurateSearch,
|
|
|
- String responce_type, String yb_type, String treat_type) {
|
|
|
+ String responceType, String ybType, String treatType) {
|
|
|
List<CodeNamePojo> list = null;
|
|
|
- if (responce_type.equals("04"))
|
|
|
- list = search_04_n_n_diag(method, content, accurateSearch);
|
|
|
- else if (responce_type.equals("10"))
|
|
|
- if (treat_type.equals("121"))
|
|
|
+ if (responceType.equals("04")) {
|
|
|
+ return search_04_n_n_diag(method, content, accurateSearch);
|
|
|
+ } else if (responceType.equals("10")) {
|
|
|
+ if (treatType.equals("121")) {
|
|
|
list = search_n_12_121_diag(method, content, accurateSearch);
|
|
|
- else
|
|
|
+ } else {
|
|
|
list = search_10_n_n_diag(method, content, accurateSearch);
|
|
|
- switch (yb_type) {
|
|
|
+ }
|
|
|
+ }
|
|
|
+ switch (ybType) {
|
|
|
case "12":
|
|
|
- if (treat_type.equals("121"))
|
|
|
+ if (treatType.equals("121"))
|
|
|
list = search_n_12_121_diag(method, content, accurateSearch);
|
|
|
else list = search_n_12_n_diag(method, content, accurateSearch);
|
|
|
break;
|
|
|
case "42":
|
|
|
- if (responce_type.equals("02"))
|
|
|
+ if (responceType.equals("02"))
|
|
|
list = search_02_42_n_diag(method, content, accurateSearch);
|
|
|
else list = search_n_42_n_diag(method, content, accurateSearch);
|
|
|
break;
|
|
@@ -141,8 +143,8 @@ public class DictionaryService {
|
|
|
list = search_n_23or63_n_diag(method, content, accurateSearch);
|
|
|
break;
|
|
|
}
|
|
|
- if (!yb_type.equals("42") && !yb_type.equals("52")) {
|
|
|
- if (responce_type.equals("02") || responce_type.equals("10"))
|
|
|
+ if (!ybType.equals("42") && !ybType.equals("52")) {
|
|
|
+ if (responceType.equals("02") || responceType.equals("10"))
|
|
|
list = extractPureNumber(list);
|
|
|
}
|
|
|
return list;
|