|
@@ -317,9 +317,9 @@ public class KlDiagnoseImportFacade {
|
|
String type = imd.getType();
|
|
String type = imd.getType();
|
|
String rule = imd.getRule();
|
|
String rule = imd.getRule();
|
|
String orderNo = imd.getOrderNo();
|
|
String orderNo = imd.getOrderNo();
|
|
- String eq = imd.getEq();
|
|
|
|
- String maxSymbol = imd.getMaxSymbol();
|
|
|
|
- String minSymbol = imd.getMinSymbol();
|
|
|
|
|
|
+ String eq = imd.getEqValue();
|
|
|
|
+ String maxSymbol = imd.getMaxOperator();
|
|
|
|
+ String minSymbol = imd.getMinOperator();
|
|
String parentRule = imd.getParentRule();
|
|
String parentRule = imd.getParentRule();
|
|
if (StringUtil.isBlank(type) && StringUtil.isBlank(orderNo)) {
|
|
if (StringUtil.isBlank(type) && StringUtil.isBlank(orderNo)) {
|
|
continue;
|
|
continue;
|
|
@@ -364,7 +364,7 @@ public class KlDiagnoseImportFacade {
|
|
}
|
|
}
|
|
if ((LexiconExtEnum.Vital.getName().equals(type) || LexiconExtEnum.Age.getName().equals(type))
|
|
if ((LexiconExtEnum.Vital.getName().equals(type) || LexiconExtEnum.Age.getName().equals(type))
|
|
&& StringUtils.isNotBlank(rule)
|
|
&& StringUtils.isNotBlank(rule)
|
|
- && StringUtils.isBlank(imd.getMin()) && StringUtils.isBlank(imd.getMax())) {
|
|
|
|
|
|
+ && StringUtils.isBlank(imd.getMinValue()) && StringUtils.isBlank(imd.getMaxValue())) {
|
|
currentErrMsg.add(String.format("第%d行%s【最大值】和【最小值】至少有一个不能为空", rowNum, rule));
|
|
currentErrMsg.add(String.format("第%d行%s【最大值】和【最小值】至少有一个不能为空", rowNum, rule));
|
|
}
|
|
}
|
|
if (StringUtils.isBlank(type)) {
|
|
if (StringUtils.isBlank(type)) {
|
|
@@ -593,29 +593,29 @@ public class KlDiagnoseImportFacade {
|
|
case Vital: // 体格检查项目
|
|
case Vital: // 体格检查项目
|
|
case Age: // 年龄
|
|
case Age: // 年龄
|
|
klDiagnoseDetailVO.setBasConceptId(current.getConceptId());
|
|
klDiagnoseDetailVO.setBasConceptId(current.getConceptId());
|
|
- if (StringUtil.isNotBlank(current.getMin())) {
|
|
|
|
- klDiagnoseDetailVO.setMinVal(current.getMin());
|
|
|
|
|
|
+ if (StringUtil.isNotBlank(current.getMinValue())) {
|
|
|
|
+ klDiagnoseDetailVO.setMinVal(current.getMinValue());
|
|
}
|
|
}
|
|
- if (StringUtil.isNotBlank(current.getMinSymbol())) {
|
|
|
|
- klDiagnoseDetailVO.setMinOperator(current.getMinSymbol());
|
|
|
|
|
|
+ if (StringUtil.isNotBlank(current.getMinOperator())) {
|
|
|
|
+ klDiagnoseDetailVO.setMinOperator(current.getMinOperator());
|
|
}
|
|
}
|
|
if (StringUtil.isNotBlank(current.getUnit())) {
|
|
if (StringUtil.isNotBlank(current.getUnit())) {
|
|
klDiagnoseDetailVO.setMinUnit(current.getUnit());
|
|
klDiagnoseDetailVO.setMinUnit(current.getUnit());
|
|
klDiagnoseDetailVO.setMaxUnit(current.getUnit());
|
|
klDiagnoseDetailVO.setMaxUnit(current.getUnit());
|
|
}
|
|
}
|
|
- if (StringUtil.isNotBlank(current.getMax())) {
|
|
|
|
- klDiagnoseDetailVO.setMaxVal(current.getMax());
|
|
|
|
|
|
+ if (StringUtil.isNotBlank(current.getMaxValue())) {
|
|
|
|
+ klDiagnoseDetailVO.setMaxVal(current.getMaxValue());
|
|
}
|
|
}
|
|
- if (StringUtil.isNotBlank(current.getMaxSymbol())) {
|
|
|
|
- klDiagnoseDetailVO.setMaxOperator(String.valueOf(current.getMaxSymbol()));
|
|
|
|
|
|
+ if (StringUtil.isNotBlank(current.getMaxOperator())) {
|
|
|
|
+ klDiagnoseDetailVO.setMaxOperator(String.valueOf(current.getMaxOperator()));
|
|
}
|
|
}
|
|
klDiagnoseDetailVO.setBasDescription(current.getRule());
|
|
klDiagnoseDetailVO.setBasDescription(current.getRule());
|
|
klDiagnoseDetailVO.setBasType(2);
|
|
klDiagnoseDetailVO.setBasType(2);
|
|
break;
|
|
break;
|
|
case LisSubName: // 实验室检查子项目
|
|
case LisSubName: // 实验室检查子项目
|
|
klDiagnoseDetailVO.setBasConceptId(current.getConceptId());
|
|
klDiagnoseDetailVO.setBasConceptId(current.getConceptId());
|
|
- klDiagnoseDetailVO.setEqValue(current.getEq());
|
|
|
|
- klDiagnoseDetailVO.setBasDescription(current.getRule() + current.getEq());
|
|
|
|
|
|
+ klDiagnoseDetailVO.setEqValue(current.getEqValue());
|
|
|
|
+ klDiagnoseDetailVO.setBasDescription(current.getRule() + current.getEqValue());
|
|
klDiagnoseDetailVO.setBasType(2);
|
|
klDiagnoseDetailVO.setBasType(2);
|
|
break;
|
|
break;
|
|
}
|
|
}
|