diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java
index 620d2069..147a626a 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java
@@ -2,11 +2,8 @@ package com.xinelu.manage.service.specialdiseasenode.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.xinelu.common.core.domain.AjaxResult;
-<<<<<<< HEAD
 import com.xinelu.common.enums.PatientSexEnum;
-=======
 import com.xinelu.common.enums.ReleaseStatusEnum;
->>>>>>> a9d88907476e81d075325ea216bb7f53e0817377
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.BaseUtil;
 import com.xinelu.common.utils.SecurityUtils;