From b71c812322ffd9aee1b555e59f2b61b7dc1f9a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Fri, 26 Dec 2025 15:22:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E8=AF=B7?=
 =?UTF-8?q?=E9=A2=86=E6=B5=81=E7=A8=8B=E3=80=81=E9=80=80=E8=B4=A7=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=8C=87=E5=AE=9A=E5=BC=80=E5=A7=8B=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nu/modules/qld/service/impl/QingLingServiceImpl.java   | 7 ++++---
 .../biz/care/order/service/impl/CareOrdersServiceImpl.java | 4 ++--
 .../invoicing/order/mapper/xml/InvoicingOrdersMapper.xml   | 2 +-
 .../invoicing/order/service/impl/EmpOrdersServiceImpl.java | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java
index 9f8f8c97..3621ffd3 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java
@@ -1286,7 +1286,7 @@ public class QingLingServiceImpl implements IQinglingApi {
 
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         InvoicingOrdersEntity p_ = new InvoicingOrdersEntity();
-        p_.setId(dto.getDirectiveOrderId());//执行指令id
+        p_.setId(dto.getId());//执行指令id
         p_.setInitiatorId(sysUser.getEmployessId());
         return invoicingOrdersApi.beginOrder(p_);
     }
@@ -1305,7 +1305,7 @@ public class QingLingServiceImpl implements IQinglingApi {
         map.put("msg","可以提交");
         //获取工单，请领单，判断是否可完成
         InvoicingOrdersEntity ioe = new InvoicingOrdersEntity();
-        ioe.setId(dto.getDirectiveOrderId());
+        ioe.setId(dto.getId());
         InvoicingOrdersEntity entity = invoicingOrdersApi.getOrderInfo(ioe);
         if(entity!=null){
             String qldNo = entity.getBizId();//业务单号
@@ -1398,7 +1398,8 @@ public class QingLingServiceImpl implements IQinglingApi {
         orderEntity.setBizId(main.getQldNo());//请领单号
         orderEntity.setNuId(main.getNuId());//护理单元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")){
             invoicingQlOrdersApi.flowQlsq(orderEntity);
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java
index 5064a4ee..cd0c5988 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/service/impl/CareOrdersServiceImpl.java
@@ -178,11 +178,11 @@ public class CareOrdersServiceImpl extends ServiceImpl<CareOrdersMapper, CareOrd
      * @return
      */
     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);
         }
-        if (sendOrderRule.getRuleCode().equals(2)) {
+        if (sendOrderRule.getRuleCode().equals("2")) {
             //专项按人头，可1v1，可NvN，全看长者配置专项护理员的设置
             return getByHeadCount(directiveIds, elderId, startTime, employeeIds);
         }
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml
index fd8edb30..04473579 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/mapper/xml/InvoicingOrdersMapper.xml
@@ -293,7 +293,7 @@
             <if test="izRollback != null and izRollback != ''">
                 and iz_rollback = #{izRollback}
             </if>
-            <if test="izEmptyNo != null and izEmptyNo == 'Y'">
+            <if test="izEmptyNo != null and izEmptyNo != '' and izEmptyNo == 'Y'.toString()">
                 and ifnull(biz_id,'') = ''
             </if>
         </where>
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java
index e6ea8495..24979c3c 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/EmpOrdersServiceImpl.java
@@ -177,11 +177,11 @@ public class EmpOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMapper, Inv
     @Override
     public InvoicingOrders employeeScreening(String directiveId, String elderId, Date startTime) {
         getSendOrderRule();
-        if (sendOrderRule.getRuleCode().equals(1)) {
+        if (sendOrderRule.getRuleCode().equals("1")) {
             //按优先级
             return getByPriority(directiveId, elderId, startTime);
         }
-        if (sendOrderRule.getRuleCode().equals(2)) {
+        if (sendOrderRule.getRuleCode().equals("2")) {
             //按人头
             return getByHeadCount(directiveId, elderId, startTime);
         }