yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

服务指令-指令包删除周期类型，还有网络地址

This commit is contained in:
曹磊 2026-01-21 15:35:39 +08:00
parent 3c1634c9c0
commit 418af78e1b
7 changed files with 5 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/common/entity/BizConfigServiceDirective.java
View File

@ -76,11 +76,6 @@ public class BizConfigServiceDirective implements Serializable {
@Excel(name = "收费频次 1按次收费 2按天收费", width = 15)
@ApiModelProperty(value = "收费频次 1按次收费 2按天收费")
private String chargingFrequency;
/**指令类型 1日常护理 2周期护理 3即时护理*/
@Excel(name = "指令类型 1日常护理 2周期护理 3即时护理", width = 15)
@ApiModelProperty(value = "指令类型 1日常护理 2周期护理 3即时护理")
@TableField(exist = false)
private String cycleTypeName;
/**排序*/
@Excel(name = "排序", width = 15)
@ApiModelProperty(value = "排序")

6
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml
View File

@ -138,17 +138,11 @@
cycle_type varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '指令类型',
cycle_value varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周期值',
preview_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令图片大图',
net_preview_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令图片大图-网络地址',
preview_file_small varchar(300) CHARACTER SET utf32 COLLATE utf32_general_ci NULL DEFAULT NULL COMMENT '服务指令图片小图',
net_preview_file_small varchar(300) CHARACTER SET utf32 COLLATE utf32_general_ci NULL DEFAULT NULL COMMENT '服务指令图片小图-网络地址',
mp3_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语音文件',
net_mp3_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '语音文件-网络地址',
mp4_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '视频文件',
net_mp4_file varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '视频文件-网络地址',
service_duration varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务时长（分钟）',
service_content varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务说明',
package_id varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令包ID',
package_name varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '服务指令包名称',
iz_package varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '是否是服务指令包 Y是 N否',
toll_price decimal(12,4) NULL DEFAULT NULL COMMENT '收费价格',
com_price decimal(12,4) NULL DEFAULT NULL COMMENT '提成价格',

20
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/plan/care/mapper/xml/CareDirectivePlanMapper.xml
View File

@ -115,26 +115,6 @@
where id = #{id}
</delete>
<select id="getGroupPositioning" resultType="com.nu.modules.biz.plan.care.entity.CareDirectivePlan">
</select>
<select id="getNcDirectiveList" resultType="com.nu.modules.biz.plan.care.entity.CareDirectivePlan">
select a.package_id,a.cycle_type,a.cycle_value,b.*,
c.category_name AS category_name,
d.type_name AS type_name,
e.instruction_name AS instruction_name
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
left join nu_config_service_instruction_tag e on b.instruction_tag_id = e.id
<where>
<if test="params.packageId != null and params.packageId != ''">
AND a.package_id = #{params.packageId}
</if>
</where>
</select>
<select id="queryTotal" resultType="java.lang.Integer">
SELECT COUNT(p.id) as total_count
FROM nu_biz_nu_care_directive_plan p

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/customercaretemp/mapper/xml/NuBizCustomerCareTempInfoMapper.xml
View File

@ -6,7 +6,7 @@
</delete>
<select id="getNcDirectiveList" resultType="com.nu.modules.config.customercaretemp.entity.NuBizCustomerCareTempInfo">
select a.package_id,a.cycle_type,a.cycle_value,b.*,
select a.package_id,b.*,
c.category_name AS category_name,
d.type_name AS type_name,
e.instruction_name AS instruction_name

9
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml
View File

@ -32,7 +32,6 @@
<result property="izReimbursement" column="iz_reimbursement"/>
<result property="izPreferential" column="iz_preferential"/>
<result property="chargingFrequency" column="charging_frequency"/>
<result property="cycleType" column="cycle_type"/>
<result property="serviceContent" column="service_content"/>
<result property="serviceDuration" column="service_duration"/>
<result property="izEnabled" column="directive_iz_enabled"/>
@ -48,8 +47,6 @@
<result property="typeName" column="cst_type_name"/>
<result property="previewFile" column="preview_file"/>
<result property="immediateFile" column="immediate_file"/>
<result property="cycleTypeShow" column="cycleTypeShow"/>
<result property="cycleTypeValue" column="cycleTypeValue"/>
<!-- 关联的体型标签列表 -->
<collection property="bodyTagList" ofType="com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag">
<id property="id" column="tag_id"/>
@ -101,8 +98,6 @@
dp.start_time_str,
dp.end_time_str,
dp.instruction_tag_id,
pd.cycle_type AS cycleTypeShow,
pd.cycle_value AS cycleTypeValue,
dp.total_duration,
dp.timeout_duration,
csd.id AS directive_id,
@ -198,10 +193,10 @@
</delete>
<insert id="saveDirectives">
INSERT INTO nu_config_package_directive (package_id, directive_id, sort,cycle_type,cycle_value)
INSERT INTO nu_config_package_directive (package_id, directive_id, sort)
VALUES
<foreach collection="package.getDirectives()" item="directive" separator=",">
(#{package.id}, #{directive.id}, #{directive.sort}, #{directive.cycleTypeShow}, #{directive.cycleTypeValue})
(#{package.id}, #{directive.id}, #{directive.sort})
</foreach>
</insert>
</mapper>

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java
View File

@ -323,8 +323,8 @@ public class ConfigServiceDirective implements Serializable {
private boolean ownExist;//本平台是否存在该指令
@TableField(exist = false)
private boolean targetExist;//目标平台是否存在该指令
@TableField(exist = false)
private String cycleTypeShow;
// @TableField(exist = false)
// private String cycleTypeShow;
// @TableField(exist = false)
// private String cycleTypeValue;
@TableField(exist = false)

1
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml
View File

@ -26,7 +26,6 @@
<result property="izReimbursement" column="iz_reimbursement"/>
<result property="izPreferential" column="iz_preferential"/>
<result property="chargingFrequency" column="charging_frequency"/>
<result property="cycleType" column="cycle_type"/>
<result property="serviceContent" column="service_content"/>
<result property="serviceDuration" column="service_duration"/>
<result property="izEnabled" column="directive_iz_enabled"/>