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

服务指令-请领流程、退货流程指定开始结束算法调整

This commit is contained in:
曹磊 2025-12-26 15:22:37 +08:00
parent aa9b5800b4
commit b71c812322
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java
View File

@ -1286,7 +1286,7 @@ public class QingLingServiceImpl implements IQinglingApi {
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
InvoicingOrdersEntity p_ = new InvoicingOrdersEntity(); InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
p_.setId(dto.getDirectiveOrderId());//执行指令id p_.setId(dto.getId());//执行指令id
p_.setInitiatorId(sysUser.getEmployessId()); p_.setInitiatorId(sysUser.getEmployessId());
return invoicingOrdersApi.beginOrder(p_); return invoicingOrdersApi.beginOrder(p_);
} }
@ -1305,7 +1305,7 @@ public class QingLingServiceImpl implements IQinglingApi {
map.put("msg","可以提交"); map.put("msg","可以提交");
//获取工单，请领单，判断是否可完成 //获取工单，请领单，判断是否可完成
InvoicingOrdersEntity ioe = new InvoicingOrdersEntity(); InvoicingOrdersEntity ioe = new InvoicingOrdersEntity();
ioe.setId(dto.getDirectiveOrderId()); ioe.setId(dto.getId());
InvoicingOrdersEntity entity = invoicingOrdersApi.getOrderInfo(ioe); InvoicingOrdersEntity entity = invoicingOrdersApi.getOrderInfo(ioe);
if(entity!=null){ if(entity!=null){
String qldNo = entity.getBizId();//业务单号 String qldNo = entity.getBizId();//业务单号
@ -1398,7 +1398,8 @@ public class QingLingServiceImpl implements IQinglingApi {
orderEntity.setBizId(main.getQldNo());//请领单号 orderEntity.setBizId(main.getQldNo());//请领单号
orderEntity.setNuId(main.getNuId());//护理单元id orderEntity.setNuId(main.getNuId());//护理单元id
orderEntity.setElderId(main.getElderId());//长者id orderEntity.setElderId(main.getElderId());//长者id
orderEntity.setInitiatorId(main.getTjBy());//提交人id LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
orderEntity.setInitiatorId(sysUser.getEmployessId());//提交人id
//生成请领下一步服务指令 //生成请领下一步服务指令
if(flowCode.equals("ql_sq")){ if(flowCode.equals("ql_sq")){
invoicingQlOrdersApi.flowQlsq(orderEntity); invoicingQlOrdersApi.flowQlsq(orderEntity);

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java
View File

@ -178,11 +178,11 @@ public class CareOrdersServiceImpl extends ServiceImpl<CareOrdersMapper, CareOrd
* @return * @return
*/ */
private CareOrders employeeScreening(String directiveIds, String elderId, String employeeIds, Date startTime){ private CareOrders employeeScreening(String directiveIds, String elderId, String employeeIds, Date startTime){
if (sendOrderRule.getRuleCode().equals(1)) { if (sendOrderRule.getRuleCode().equals("1")) {
//按优先级 //按优先级
return getByPriority(directiveIds, elderId, startTime, employeeIds); return getByPriority(directiveIds, elderId, startTime, employeeIds);
} }
if (sendOrderRule.getRuleCode().equals(2)) { if (sendOrderRule.getRuleCode().equals("2")) {
//专项按人头，可1v1，可NvN，全看长者配置专项护理员的设置 //专项按人头，可1v1，可NvN，全看长者配置专项护理员的设置
return getByHeadCount(directiveIds, elderId, startTime, employeeIds); return getByHeadCount(directiveIds, elderId, startTime, employeeIds);
} }

2
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml
View File

@ -293,7 +293,7 @@
<if test="izRollback != null and izRollback != ''"> <if test="izRollback != null and izRollback != ''">
and iz_rollback = #{izRollback} and iz_rollback = #{izRollback}
</if> </if>
<if test="izEmptyNo != null and izEmptyNo == 'Y'"> <if test="izEmptyNo != null and izEmptyNo != '' and izEmptyNo == 'Y'.toString()">
and ifnull(biz_id,'') = '' and ifnull(biz_id,'') = ''
</if> </if>
</where> </where>

4
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java
View File

@ -177,11 +177,11 @@ public class EmpOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Inv
@Override @Override
public InvoicingOrders employeeScreening(String directiveId, String elderId, Date startTime) { public InvoicingOrders employeeScreening(String directiveId, String elderId, Date startTime) {
getSendOrderRule(); getSendOrderRule();
if (sendOrderRule.getRuleCode().equals(1)) { if (sendOrderRule.getRuleCode().equals("1")) {
//按优先级 //按优先级
return getByPriority(directiveId, elderId, startTime); return getByPriority(directiveId, elderId, startTime);
} }
if (sendOrderRule.getRuleCode().equals(2)) { if (sendOrderRule.getRuleCode().equals("2")) {
//按人头 //按人头
return getByHeadCount(directiveId, elderId, startTime); return getByHeadCount(directiveId, elderId, startTime);
} }