diff --git a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/CleanAdvisoryMapper.java b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/CleanAdvisoryMapper.java
index 3b96f87..e92f176 100644
--- a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/CleanAdvisoryMapper.java
+++ b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/CleanAdvisoryMapper.java
@@ -13,4 +13,10 @@ public interface CleanAdvisoryMapper extends BaseMapper<CleanAdvisory> {
     void deleteOrgApply(CleanAdvisory cleanAdvisory);
     void deleteEmployeesAdvisory(CleanAdvisory cleanAdvisory);
     void deleteBizAdvisory(CleanAdvisory cleanAdvisory);
+
+    void deleteBill(CleanAdvisory cleanAdvisory);
+
+    void updateBaseInfo(CleanAdvisory cleanAdvisory);
+
+    void deleteBizEmployeesOrg(CleanAdvisory cleanAdvisory);
 }
diff --git a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml
index e068b59..7299325 100644
--- a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml
+++ b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml
@@ -17,8 +17,7 @@
             '' as comName
         from nu_biz_advisory_info a inner join nu_employees_advisory_info b on a.open_id = b.open_id
         <where>
-            a.advisory_type = '1'
-            and a.iz_js = '1'
+            a.iz_js = '1'
             <if test="params.tel != null and params.tel != ''">
                 AND a.tel = #{params.tel}
             </if>
@@ -42,8 +41,7 @@
             '' as comName
         from nu_biz_advisory_info a inner join nu_employees_advisory_info b on a.open_id = b.open_id
         <where>
-            a.advisory_type = '2'
-            and a.iz_yg = '1'
+            a.iz_yg = '1'
             <if test="params.tel != null and params.tel != ''">
                 AND a.tel = #{params.tel}
             </if>
@@ -67,8 +65,7 @@
             ifnull(b.com_name,'') as comName
         from nu_biz_advisory_info a inner join nu_org_apply_info b on a.open_id = b.open_id
         <where>
-            a.advisory_type = '3'
-            and a.iz_jg = '1'
+            a.iz_jg = '1'
             <if test="params.tel != null and params.tel != ''">
                 AND a.tel = #{params.tel}
             </if>
@@ -87,8 +84,18 @@
         delete from nu_employees_advisory_info where open_id = #{openId}
     </delete>
 
+    <delete id="deleteBizEmployeesOrg">
+        delete from nu_biz_employees_org where open_id = #{openId}
+    </delete>
+
     <delete id="deleteBizAdvisory">
         delete from nu_biz_advisory_info where open_id = #{openId}
     </delete>
 
+    <delete id="deleteBill">
+        delete from nu_nu_bill where open_id = #{openId}
+    </delete>
+    <update id="updateBaseInfo">
+        update nu_base_info set open_id = null , elder_id = null,status = 0 where open_id = #{openId}
+    </update>
 </mapper>
diff --git a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java
index 369d19b..8db4470 100644
--- a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java
+++ b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java
@@ -8,11 +8,20 @@ import com.nu.modules.cleanadvisory.mapper.CleanAdvisoryMapper;
 import com.nu.modules.cleanadvisory.service.ICleanAdvisoryService;
 import com.nu.modules.cleanadvisory.entity.CleanAdvisory;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
 
 @Service
 @Slf4j
 public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, CleanAdvisory> implements ICleanAdvisoryService {
+    @Lazy
+    @Autowired
+    private CleanAdvisoryServiceImpl onlycleanAdvisoryServiceImpl;
 
     @Override
     @DS("ope")
@@ -24,18 +33,23 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
     @DS("ope")
     public void clean(CleanAdvisory cleanAdvisory){
         String advisoryType = cleanAdvisory.getAdvisoryType();
+        //清除长者咨询信息
         if(advisoryType.equals("1")){
             cleanAdvisory.setIzJs("0");
             cleanAdvisory.setAdvisoryType("0");
             updateById(cleanAdvisory);
             //预留删除长者表数据
+            clearBill(cleanAdvisory);
         }
+        //清除员工咨询信息
         if(advisoryType.equals("2")){
             cleanAdvisory.setIzYg("0");
             cleanAdvisory.setAdvisoryType("0");
             updateById(cleanAdvisory);
             baseMapper.deleteEmployeesAdvisory(cleanAdvisory);
+            baseMapper.deleteBizEmployeesOrg(cleanAdvisory);
         }
+        //清除机构咨询信息
         if(advisoryType.equals("3")){
             cleanAdvisory.setIzJg("0");
             cleanAdvisory.setAdvisoryType("0");
@@ -43,20 +57,27 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
             baseMapper.deleteOrgApply(cleanAdvisory);
         }
     }
+    //清除长者信息
+    public void clearBill(CleanAdvisory cleanAdvisory){
+        //预留删除长者表数据
+        onlycleanAdvisoryServiceImpl.deleteBill("101",cleanAdvisory);
+        onlycleanAdvisoryServiceImpl.deleteBill("102",cleanAdvisory);
+        onlycleanAdvisoryServiceImpl.deleteBill("103",cleanAdvisory);
+    }
+
+    @DS("#dataSourceCode")
+    public void deleteBill(@RequestParam("dataSourceCode") String dataSourceCode,CleanAdvisory cleanAdvisory) {
+        baseMapper.deleteBill(cleanAdvisory);
+        baseMapper.updateBaseInfo(cleanAdvisory);
+    }
 
     @Override
     @DS("ope")
     public void delete(CleanAdvisory cleanAdvisory){
-        String advisoryType = cleanAdvisory.getAdvisoryType();
-        if(advisoryType.equals("1")){
-            //预留删除长者表数据
-        }
-        if(advisoryType.equals("2")){
-            baseMapper.deleteEmployeesAdvisory(cleanAdvisory);
-        }
-        if(advisoryType.equals("3")){
-            baseMapper.deleteOrgApply(cleanAdvisory);
-        }
+        clearBill(cleanAdvisory);
+        baseMapper.deleteEmployeesAdvisory(cleanAdvisory);
+        baseMapper.deleteBizEmployeesOrg(cleanAdvisory);
+        baseMapper.deleteOrgApply(cleanAdvisory);
         baseMapper.deleteBizAdvisory(cleanAdvisory);
     }