From 6da534c93d68aa12ba7c0287ce3dfbf5b23ffc4d Mon Sep 17 00:00:00 2001
From: haown <454902499@qq.com>
Date: Fri, 24 May 2024 16:17:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java | 3 ---
 1 file changed, 3 deletions(-)

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;