|
|
@@ -33,7 +33,7 @@ public class SearchService {
|
|
|
iPage = deepinIcd10Diag(params.getMethod(), params.getContent(), iPage);
|
|
|
break;
|
|
|
case "tcmDiag":
|
|
|
- iPage = deepinTcmDiag(params.getMethod(), params.getContent(), iPage);
|
|
|
+ iPage = deepinTcmDiag(params.getZyType(), params.getMethod(), params.getContent(), iPage);
|
|
|
break;
|
|
|
case "diag":
|
|
|
iPage = deepinSiDiag(params.getMethod(), params.getContent(), iPage);
|
|
|
@@ -120,6 +120,7 @@ public class SearchService {
|
|
|
break;
|
|
|
default:
|
|
|
column = "yb_name";
|
|
|
+ break;
|
|
|
}
|
|
|
return dao.searchSiDiagnose(iPage, column, content);
|
|
|
}
|
|
|
@@ -136,11 +137,22 @@ public class SearchService {
|
|
|
return dao.searchIcd10Diagnose(iPage, column, content);
|
|
|
}
|
|
|
|
|
|
- private IPage<CodeName> deepinTcmDiag(String method, String content, IPage<CodeName> iPage) {
|
|
|
+ private IPage<CodeName> deepinTcmDiag(String type, String method, String content, IPage<CodeName> iPage) {
|
|
|
content = '%' + content.toUpperCase() + '%';
|
|
|
- String column = filterCommonColumn(method);
|
|
|
- // todo 换成 查询中医诊断表
|
|
|
- return dao.searchIcd10Diagnose(iPage, column, content);
|
|
|
+ String column;
|
|
|
+ switch (method) {
|
|
|
+ case "alpha":
|
|
|
+ column = "py_code";
|
|
|
+ break;
|
|
|
+ case "code":
|
|
|
+ column = "class_code";
|
|
|
+ break;
|
|
|
+ default:
|
|
|
+ column = "sick_name";
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ String table = type.equals("B") ? "zy_jb_name_class" : "zy_zh_name_class";
|
|
|
+ return dao.searchTcmDiag(iPage, table, column, content);
|
|
|
}
|
|
|
|
|
|
private IPage<CodeName> deepinSlwSpcDiag(String content, Integer perstype, IPage<CodeName> iPage) {
|