术前小结/术前讨论更新

structure-center/src/main/java/com/lantone/structure/facade/tran/PreoperativeDiscussionTran.java

@@ -86,7 +86,8 @@ public class PreoperativeDiscussionTran extends TargetTran {
             "防范措施=注意事项",
             "防范措施=手术要点",
             "主持人总结=讨论结论",
-            "讨论摘要=讨论意见"
+            "讨论摘要=讨论意见",
+            "药物、食物过敏史=过敏史"
     );
 
     public void pDContrast(Boolean flag,List<OperationDoc> operationDocs,Map<String, String> retMap) {
@@ -347,7 +348,7 @@ public class PreoperativeDiscussionTran extends TargetTran {
             String allergyRecord = preoperativeDiscussionDoc.getPreoperativeDiscussionLabel().getAllergyRecord();
             String opBottomName = preoperativeDiscussionDoc.getPreoperativeDiscussionLabel().getOpBottomName();
             String opContraindication = preoperativeDiscussionDoc.getPreoperativeDiscussionLabel().getOpContraindication();
-            if(StringUtil.isNotEmpty(allergyRecord)){
+            if(StringUtil.isEmpty(rep.get("药物、食物过敏史")) && StringUtil.isNotEmpty(allergyRecord)){
                 rep.put("过敏史",allergyRecord);
             }
             if(StringUtil.isNotEmpty(opBottomName)){