diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java index 8b9d2c3b..9f0757ad 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java @@ -335,6 +335,8 @@ public class ConfigServiceDirective implements Serializable { private String syncCode; @TableField(exist = false) private String notId; + @TableField(exist = false) + private String serviceAttributeName; // /** // * 指令类型 1日常护理 2周期护理 3即时护理 // */ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index f9d42ffb..0324aa90 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -68,6 +68,7 @@ c.sort, c.service_content, c.service_attribute, + case c.service_attribute when 'ds' then '定时' when 'js' then '计时' else null end as serviceAttributeName, c.service_duration, c.timeout_duration, c.status, diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml index 7abdbaf1..13e2e28b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicetag/mapper/xml/ServiceTagMapper.xml @@ -21,6 +21,8 @@ + + @@ -90,6 +92,8 @@ csd.category_id, csd.type_id, csd.instruction_tag_id, + csd.service_attribute, + case csd.service_attribute when 'ds' then '定时' when 'js' then '计时' else null end as serviceAttributeName, csd.toll_price, csd.com_price, csd.iz_reimbursement,