diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java index 51d7b855..c5b5b0f4 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveplan/api/CareDirectiveApi.java @@ -290,7 +290,7 @@ public class CareDirectiveApi { Date ygkssj = item.getStartTime(); // 应该开始时间 Date sjkssj = item.getBeginTime(); // 实际开始时间 Date sjjssj = item.getFinishTime(); // 实际结束时间 - String rcsc = item.getServiceAllowedTimeout(); // 容错时长（分钟） + String rcsc = item.getTimeoutDuration(); // 容错时长（分钟） String fwsc = item.getServiceDuration(); // 服务时长（分钟） // 判断是否超时（实际开始时间 > 应该开始时间 + 容错时长） diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java index 0ba80adf..0ce218b5 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java @@ -34,8 +34,6 @@ public class DirectiveOrderEntity implements Serializable { /**执行类型 1单人 2协助 3转单*/ private String optType; private String optTypeName; - /**服务容错时长（end_time + 这个时间） 小于 begin_time算超时*/ - private String serviceAllowedTimeout; /**是否超时 Y超时 N未超时*/ private String izTimeout; /**实际执行人id（多个）； 主要执行人+协助人*/ @@ -90,6 +88,8 @@ public class DirectiveOrderEntity implements Serializable { private String serviceDuration; /**服务说明*/ private String serviceContent; + /**超时时长（分钟）*/ + private String timeoutDuration; /**服务指令包ID*/ private String packageId; /**服务指令包名称*/ diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java index 740a94a2..fdefba40 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderSubEntity.java @@ -89,6 +89,8 @@ public class DirectiveOrderSubEntity implements Serializable { private String serviceDuration; /**服务说明*/ private String serviceContent; + /**超时时长（分钟）*/ + private String timeoutDuration; /**收费价格*/ private BigDecimal tollPrice; /**提成价格*/ @@ -137,8 +139,7 @@ public class DirectiveOrderSubEntity implements Serializable { /**执行类型 1单人 2协助 3转单*/ private String optType; private String optTypeName; - /**服务容错时长（end_time + 这个时间） 小于 begin_time算超时*/ - private String serviceAllowedTimeout; + /**是否超时 Y超时 N未超时*/ private String izTimeout; /**实际执行人id（多个）； 主要执行人+协助人*/ diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml index 558db4a0..1dc7302f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/mapper/xml/DirectiveDataPoolMapper.xml @@ -177,7 +177,12 @@ iz_start from nu_biz_nu_directive_order where pool_id = #{id} - AND iz_start = #{izStart} + + AND iz_start = #{izStart} + + + AND start_time >= #{startTime} + diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java index 7f51125b..baa9a874 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/datapool/service/impl/CareDataPoolServiceImpl.java @@ -219,7 +219,7 @@ public class CareDataPoolServiceImpl extends ServiceImpl { List queryCurrent(@Param("dto") CareDirectiveEntity dto); + DirectiveOrder getInstantById(DirectiveOrder orders); + DirectiveOrder getDirectiveById(DirectiveOrder orders); + DirectiveOrder getPackageById(DirectiveOrder orders); + DirectiveOrder getEmployeeById(@Param("employeeId") String employeeId); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml index 65e26606..766807da 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderMapper.xml @@ -53,7 +53,7 @@ - + @@ -114,6 +114,30 @@ + + - select m.id as bizId, m.nu_id as nuId, - m.nu_name as nuName, - elder_id as elderId, - elder_name as elderName, + b.nu_name as nuName, + c.id as elderId, + c.name as elderName, directive_id as directiveId, - directive_name as directiveName, - '3' as cycleTypeId, - (select item_text from sys_dict_item where dict_id = '1900374791386140674' and item_value = '3') as cycleType, - preview_file as previewFile, - net_preview_file as netPreviewFile, - preview_file_small as previewFileSmall, - net_preview_file_small as netPreviewFileSmall, - mp3_file as mp3File, - net_mp3_file as netMp3File, - mp4_file as mp4File, - net_mp4_file as netMp4File, - service_duration as serviceDuration, - service_content as serviceContent, + '2' as cycleTypeId, + (select item_text from view_sys_dict where dict_code = 'period_type' and item_value = '2') as cycleType, iz_package, - (case when b.orderly is null then 2 else 1 end) as orderEmp + (case when c.orderly is null then 2 else 1 end) as orderEmp from ${tableName} m - left join nu_biz_elder_info b on m.elder_id = b.id + inner join nu_base_info b on m.nu_id = b.nu_id and b.del_flag = '0' + left join nu_biz_elder_info c on m.nu_id = c.nu_id and c.del_flag = '0' where m.id = #{id} + + + +