开单合理项维护

src/main/java/com/diagbot/facade/BillManFacade.java

@@ -326,9 +326,19 @@ public class BillManFacade {
         BillConcept concept = billSaveVO.getConcept();
         BillCondition condition = billSaveVO.getCondition();
 
-        String conditionName = billSaveVO.getRuleType().equals(2)
-                ? concept.getName() + "禁忌" + condition.getName()
-                : condition.getName();
+        String conditionName = "";
+        //数值类型规则编辑时名称不拼接
+        if (billSaveVO.getRuleType().equals(2)
+                && billSaveVO.getRelationId() != null
+                && existRelation != null
+                && billSaveVO.getRelationId().equals(existRelation.getRelationId())) {
+            conditionName = condition.getName();
+
+        } else {
+            conditionName = billSaveVO.getRuleType().equals(2)
+                    ? concept.getName() + "禁忌" + condition.getName()
+                    : condition.getName();
+        }
 
         //条件明细节点更新
         //数值类型可新增或更新条件明细节点，文本类型不允许新增或修改