diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java
index e657303..8e733a6 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServer.java
@@ -26,7 +26,7 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("nu_biz_nu_customer_server")
+@TableName("nu_biz_nu_customer_care_server")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="nu_biz_nu_customer_server对象", description="护理单元客户配置服务指令")
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java
index afbe8ca..538b706 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/entity/NuBizNuCustomerServerInstant.java
@@ -23,7 +23,7 @@ import java.util.Date;
  * @Version: V1.0
  */
 @Data
-@TableName("nu_biz_nu_customer_server_instant")
+@TableName("nu_biz_nu_customer_care_server_instant")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="nu_biz_nu_customer_server_instant对象", description="护理单元客户配置服务指令即时指令")
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml
index 913d9f3..2500a44 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml
+++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerElderTagMapper.xml
@@ -14,7 +14,7 @@
             a.pic_focus as picFocus,
             a.sys_org_code as sysOrgCode,
             (case when ifnull(b.id,'') = '' then '0' else '1' end) as izSelected
-        from nu_elder_tag a
+        from nu_config_elder_tag a
         left join nu_biz_nu_customer_elder_tag b
             on a.id = b.tag_id
             and b.nu_id = #{nuId}
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml
index 5c8a1e7..c5e3f80 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml
+++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerInstantMapper.xml
@@ -3,6 +3,6 @@
 <mapper namespace="com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerInstantMapper">
 
     <delete id="deleteByIdPhysic">
-        delete from nu_biz_nu_customer_server_instant where id = #{id}
+        delete from nu_biz_nu_customer_care_server_instant where id = #{id}
     </delete>
 </mapper>
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml
index 6af68f6..9dbb58f 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml
+++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nu.modules.NuBizNuCustomerServer.mapper.NuBizNuCustomerServerMapper">
     <delete id="deleteByIdPhysic">
-        delete from nu_biz_nu_customer_server where id = #{id}
+        delete from nu_biz_nu_customer_care_server where id = #{id}
     </delete>
 
     <select id="getGroupPositioning" resultType="com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer">
@@ -15,7 +15,7 @@
             package_name as packageName,
             total_duration as serviceDuration,
             description
-        from nu_directive_package
+        from nu_config_directive_package
         where del_flag = '0'
           and iz_enabled = '0'
     </select>
@@ -26,7 +26,7 @@
         d.type_name AS type_name,
         e.instruction_name AS instruction_name,
         f.item_text AS cycle_type_name
-        from nu_package_directive a
+        from nu_config_package_directive a
         left join nu_config_service_directive b on a.directive_id = b.id
         left join nu_config_service_category c on b.category_id = c.id
         left join nu_config_service_type d on b.type_id = d.id
diff --git a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml
index f5c3a67..269d7a4 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml
+++ b/nursing-unit-api/src/main/java/com/nu/modules/directive/datapool/mapper/xml/DataPoolMapper.xml
@@ -19,7 +19,7 @@
             cycle_type_id as cycleTypeId,
             cycle_type as cycleType,
             cycle_value as cycleValue
-        from nu_biz_nu_customer_server
+        from nu_biz_nu_customer_care_server
         <where>
             <if test="nuId != null and nuId != ''">
                 AND nu_id = #{nuId}
@@ -119,4 +119,4 @@
         </where>
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java
index 7320cd5..40131f1 100644
--- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java
+++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/canaddeldertag/entity/CanAddElderTag.java
@@ -36,8 +36,8 @@ public class CanAddElderTag implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     private java.lang.String id;
-	/**nu_elder_tag.id*/
-    @ApiModelProperty(value = "nu_elder_tag.id")
+	/**nu_config_elder_tag.id*/
+    @ApiModelProperty(value = "nu_config_elder_tag.id")
     private java.lang.String tagId;
     /**所属机构*/
     @ApiModelProperty(value = "所属机构")
diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml
index 92f81a8..f864872 100644
--- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml
+++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/mapper/xml/ElderInfoMapper.xml
@@ -19,7 +19,7 @@
                b.preview_file_small,
                b.immediate_file,
                b.immediate_file_focus
-        from nu_biz_nu_customer_server a
+        from nu_biz_nu_customer_care_server a
                  left join nu_config_service_directive b on a.directive_id = b.id
         where a.nu_id = #{params.nuId}
           and a.customer_id = #{params.id}
diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java
index beabe78..72f47d5 100644
--- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java
+++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/entity/ElderTag.java
@@ -25,7 +25,7 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("nu_elder_tag")
+@TableName("nu_config_elder_tag")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="nu_elder_tag对象", description="长者标签")
diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/mapper/xml/ElderTagMapper.xml b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/mapper/xml/ElderTagMapper.xml
index 822ba2e..92446ca 100644
--- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/mapper/xml/ElderTagMapper.xml
+++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/mapper/xml/ElderTagMapper.xml
@@ -3,6 +3,6 @@
 <mapper namespace="com.nu.modules.eldertag.mapper.ElderTagMapper">
 
     <select id="allDataIds" resultType="com.nu.modules.eldertag.entity.ElderTag">
-        select id from nu_elder_tag
+        select id from nu_config_elder_tag
     </select>
 </mapper>
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java
index e33aaa9..5a553a9 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java
@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
  * @Version: V1.0
  */
 @Data
-@TableName("nu_directive_package")
+@TableName("nu_config_directive_package")
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = false)
 @ApiModel(value="nu_directive_package对象", description="服务指令包")
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml
index 191efbc..a1c90c9 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml
@@ -78,7 +78,7 @@
         </collection>
     </resultMap>
     <update id="updateTotalDurationInt">
-        update nu_directive_package set total_duration = #{duration} where id = #{id}
+        update nu_config_directive_package set total_duration = #{duration} where id = #{id}
     </update>
 
     <!-- 分页查询 -->
@@ -148,14 +148,14 @@
         cst.type_name AS cst_type_name,
         insTag.instruction_name AS instruction_name
         FROM
-        (SELECT * FROM nu_directive_package
+        (SELECT * FROM nu_config_directive_package
         <where>
             del_flag = '0' and id in
             <foreach collection="ids" item="item" open="(" separator="," close=")">
                 #{item.id}
             </foreach>
         </where>) dp
-        LEFT JOIN nu_package_directive pd ON dp.id = pd.package_id
+        LEFT JOIN nu_config_package_directive pd ON dp.id = pd.package_id
         LEFT JOIN nu_config_service_directive csd ON pd.directive_id = csd.id
         LEFT JOIN nu_directive_body_tag bdt ON csd.id = bdt.directive_id
         LEFT JOIN nu_config_body_tag cdbt ON bdt.tag_id = cdbt.id
@@ -170,7 +170,7 @@
     <!-- 查询总记录数 -->
     <select id="queryTotal" resultType="java.lang.Long">
         SELECT COUNT(*)
-        FROM nu_directive_package
+        FROM nu_config_directive_package
         <where>
             del_flag = '0'
             <if test="directivePackage.packageName != null and directivePackage.packageName != ''">
@@ -183,11 +183,11 @@
     </select>
 
     <delete id="deleteDirectives">
-        delete from nu_package_directive where package_id = #{package.id}
+        delete from nu_config_package_directive where package_id = #{package.id}
     </delete>
 
     <insert id="saveDirectives">
-        INSERT INTO nu_package_directive (package_id, directive_id, sort,cycle_type,cycle_value)
+        INSERT INTO nu_config_package_directive (package_id, directive_id, sort,cycle_type,cycle_value)
         VALUES
         <foreach collection="package.getDirectives()" item="directive" separator=",">
             (#{package.id}, #{directive.id}, #{directive.sort}, #{directive.cycleTypeShow}, #{directive.cycleTypeValue})