|
@@ -397,7 +397,8 @@ public class MedRuleConvertFacade {
|
|
|
if (result.getRuleBaseLibType() != null
|
|
|
&& (result.getRuleBaseLibType().equals(LexiconEnum.MedChemClass.getKey())
|
|
|
|| result.getRuleBaseLibType().equals(LexiconEnum.MedZhiLiaoClass.getKey())
|
|
|
- || result.getRuleBaseLibType().equals(LexiconEnum.MedYaoLiClass.getKey()))) {
|
|
|
+ || result.getRuleBaseLibType().equals(LexiconEnum.MedYaoLiClass.getKey())
|
|
|
+ || result.getRuleBaseLibType().equals(LexiconEnum.MedJiePouClass.getKey()))) {
|
|
|
List<String> medicines = medClassMedMap.get(result.getRuleBaseLibName());
|
|
|
if (ListUtil.isNotEmpty(medicines)) {
|
|
|
for (String med : medicines) {
|
|
@@ -1164,11 +1165,11 @@ public class MedRuleConvertFacade {
|
|
|
if (StringUtil.isNotBlank(resultRule.getRuleBaseInputValue())) {
|
|
|
content += trimZero(resultRule.getRuleBaseInputValue());
|
|
|
}
|
|
|
- billMsg = MsgUtil.getCommonBillMsg(resultRule.getRuleHisName(),
|
|
|
+ /*billMsg = MsgUtil.getCommonBillMsg(resultRule.getRuleHisName(),
|
|
|
resultRule.getRuleLibName(),
|
|
|
content,
|
|
|
conType,
|
|
|
- orderType);
|
|
|
+ orderType);*/
|
|
|
}
|
|
|
}
|
|
|
} else if (resultRule.getRuleType().equals(2)) {
|
|
@@ -1537,11 +1538,11 @@ public class MedRuleConvertFacade {
|
|
|
if (StringUtil.isNotBlank(resultRule.getRuleBaseInputValue())) {
|
|
|
content += trimZero(resultRule.getRuleBaseInputValue());
|
|
|
}
|
|
|
- billMsg = MsgUtil.getCommonBillMsg(resultRule.getRuleLibName(),
|
|
|
+ /*billMsg = MsgUtil.getCommonBillMsg(resultRule.getRuleLibName(),
|
|
|
resultRule.getRuleLibName(),
|
|
|
content,
|
|
|
conType,
|
|
|
- orderType);
|
|
|
+ orderType);*/
|
|
|
}
|
|
|
}
|
|
|
} else if (resultRule.getRuleType().equals(2)) {
|