|
@@ -418,11 +418,13 @@ public class NeoFacade {
|
|
* @param dis
|
|
* @param dis
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- public NeoPushDTO reverseInfoMySql(String dis) {
|
|
|
|
|
|
+ public NeoPushDTO reverseInfoMySql(String dis, NeoPushVO neoPushVO) {
|
|
NeoPushDTO neoPushDTO = new NeoPushDTO();
|
|
NeoPushDTO neoPushDTO = new NeoPushDTO();
|
|
//查询疾病相关的项目
|
|
//查询疾病相关的项目
|
|
DiseaseItemVO diseaseItemVO = new DiseaseItemVO();
|
|
DiseaseItemVO diseaseItemVO = new DiseaseItemVO();
|
|
diseaseItemVO.setDiseaseName(dis);
|
|
diseaseItemVO.setDiseaseName(dis);
|
|
|
|
+ diseaseItemVO.setAge(neoPushVO.getAgeNum());
|
|
|
|
+ diseaseItemVO.setSexType(neoPushVO.getSex());
|
|
Map<Long, List<String>> items = klRelationFacade.getItemByDiseaseMap(diseaseItemVO);
|
|
Map<Long, List<String>> items = klRelationFacade.getItemByDiseaseMap(diseaseItemVO);
|
|
if (MapUtils.isNotEmpty(items)) {
|
|
if (MapUtils.isNotEmpty(items)) {
|
|
if (ListUtil.isNotEmpty(items.get(PushRelationTypeEnum.SYMPTOMMAIN.getKey()))) {
|
|
if (ListUtil.isNotEmpty(items.get(PushRelationTypeEnum.SYMPTOMMAIN.getKey()))) {
|
|
@@ -458,7 +460,7 @@ public class NeoFacade {
|
|
public NeoPushDTO getDiagInfo(NeoPushVO neoPushVO) {
|
|
public NeoPushDTO getDiagInfo(NeoPushVO neoPushVO) {
|
|
NeoPushDTO pushDTO = new NeoPushDTO();
|
|
NeoPushDTO pushDTO = new NeoPushDTO();
|
|
String term = neoPushVO.getDiagVo().getDiags().get(0).getName();
|
|
String term = neoPushVO.getDiagVo().getDiags().get(0).getName();
|
|
- pushDTO = this.reverseInfoMySql(term);
|
|
|
|
|
|
+ pushDTO = this.reverseInfoMySql(term, neoPushVO);
|
|
|
|
|
|
return pushDTO;
|
|
return pushDTO;
|
|
}
|
|
}
|
|
@@ -489,7 +491,7 @@ public class NeoFacade {
|
|
* 类型,疾病: disease,症状: symptom,手术和操作:operation,药品: drug,实验室检查:lis,辅助检查:pacs, 辅助检查:vital"
|
|
* 类型,疾病: disease,症状: symptom,手术和操作:operation,药品: drug,实验室检查:lis,辅助检查:pacs, 辅助检查:vital"
|
|
*
|
|
*
|
|
* @param standConvert
|
|
* @param standConvert
|
|
- * @return Map<String,Map<String,String>> -->Map<类型, Map<原始词, 标准词>>
|
|
|
|
|
|
+ * @return Map<String , Map < String , String>> -->Map<类型, Map<原始词, 标准词>>
|
|
*/
|
|
*/
|
|
public Map<String, Map<String, String>> standConvertCrf(StandConvert standConvert) {
|
|
public Map<String, Map<String, String>> standConvertCrf(StandConvert standConvert) {
|
|
Map<String, Map<String, String>> map = new LinkedHashMap<>();
|
|
Map<String, Map<String, String>> map = new LinkedHashMap<>();
|