From 311f10db2baff8db6f1cbdf1c35d3bfb9699a5e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 17 Dec 2025 10:03:56 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E6=B5=81=E7=A8=8B=E5=AE=8C=E6=88=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/InvoicingOrdersServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java index 8f021908..8b4ea20d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/InvoicingOrdersServiceImpl.java @@ -329,7 +329,7 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl Date: Wed, 17 Dec 2025 10:07:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=9F=E6=88=90=E6=8A=A4=E7=90=86=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/modules/biz/care/order/mapper/xml/CareOrdersMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/CareOrdersMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/CareOrdersMapper.xml index ab41fc8a..57956be1 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/CareOrdersMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/mapper/xml/CareOrdersMapper.xml @@ -104,7 +104,7 @@ from nu_biz_employees_info a inner join nu_biz_employees_servcie_tags b on a.id = b.employees_id inner join nu_service_tag c on c.id = b.tags_id - inner join nu_servtag_directive d on d.tags_id = c.id + inner join nu_servtag_directive d on d.tag_id = c.id where d.directive_id in From cc4e6c4d17044deae499e523f4f143c8e8017f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Wed, 17 Dec 2025 10:38:26 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-?= =?UTF-8?q?=E8=AF=B7=E9=A2=86=E6=B5=81=E7=A8=8B=E5=A2=9E=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/QlOrdersServiceImpl.java | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java index f6ab122b..562d5272 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java @@ -48,11 +48,21 @@ public class QlOrdersServiceImpl extends ServiceImpl flowList = baseMapper.getFlowList(invoicingOrdersEntity); if(flowList!=null){ Calendar c = Calendar.getInstance(); InvoicingOrders flow = flowList.get(0); + + log.info("DirectiveId:"+flow.getDirectiveId()); + log.info("NuId:"+invoicingOrdersEntity.getNuId()); + log.info("ElderId:"+invoicingOrdersEntity.getElderId()); + QueryWrapper ioQw = new QueryWrapper<>(); ioQw.eq("directive_id", flow.getDirectiveId()); ioQw.eq("nu_id", invoicingOrdersEntity.getNuId()); @@ -62,7 +72,9 @@ public class QlOrdersServiceImpl extends ServiceImpl flowList = baseMapper.getFlowList(invoicingOrdersEntity); if(flowList!=null){ Calendar c = Calendar.getInstance(); InvoicingOrders flow = flowList.get(0); + + log.info("DirectiveId:"+flow.getDirectiveId()); + log.info("NuId:"+invoicingOrdersEntity.getNuId()); + log.info("ElderId:"+invoicingOrdersEntity.getElderId()); + QueryWrapper ioQw = new QueryWrapper<>(); ioQw.eq("directive_id", flow.getDirectiveId()); ioQw.eq("nu_id", invoicingOrdersEntity.getNuId()); @@ -133,9 +165,15 @@ public class QlOrdersServiceImpl extends ServiceImpl flowList = baseMapper.getFlowList(flowCode); if(flowList!=null){ InvoicingOrders flow = flowList.get(0); + + log.info("DirectiveId:"+flow.getDirectiveId()); + log.info("NuId:"+invoicingOrdersEntity.getNuId()); + log.info("ElderId:"+invoicingOrdersEntity.getElderId()); + QueryWrapper ioQw = new QueryWrapper<>(); ioQw.eq("directive_id", flow.getDirectiveId()); ioQw.eq("nu_id", invoicingOrdersEntity.getNuId()); @@ -177,7 +225,9 @@ public class QlOrdersServiceImpl extends ServiceImpl flowList = baseMapper.getFlowList(flowCode); if(flowList!=null){ InvoicingOrders flow = flowList.get(0); + + log.info("DirectiveId:"+flow.getDirectiveId()); + log.info("NuId:"+invoicingOrdersEntity.getNuId()); + log.info("ElderId:"+invoicingOrdersEntity.getElderId()); + QueryWrapper ioQw = new QueryWrapper<>(); ioQw.eq("directive_id", flow.getDirectiveId()); ioQw.eq("nu_id", invoicingOrdersEntity.getNuId()); @@ -218,7 +278,9 @@ public class QlOrdersServiceImpl extends ServiceImpl flowList = baseMapper.getFlowList(flowCode); if(flowList!=null){ InvoicingOrders flow = flowList.get(0); + + log.info("DirectiveId:"+flow.getDirectiveId()); + log.info("NuId:"+invoicingOrdersEntity.getNuId()); + log.info("ElderId:"+invoicingOrdersEntity.getElderId()); + QueryWrapper ioQw = new QueryWrapper<>(); ioQw.eq("directive_id", flow.getDirectiveId()); ioQw.eq("nu_id", invoicingOrdersEntity.getNuId()); @@ -257,7 +329,9 @@ public class QlOrdersServiceImpl extends ServiceImpl Date: Wed, 17 Dec 2025 11:05:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-?= =?UTF-8?q?=E8=AF=B7=E9=A2=86=E6=B5=81=E7=A8=8B=E9=80=80=E5=9B=9E=E4=BD=9C?= =?UTF-8?q?=E5=BA=9Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/QlOrdersServiceImpl.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java index 562d5272..69412ded 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/invoicing/order/service/impl/QlOrdersServiceImpl.java @@ -239,9 +239,15 @@ public class QlOrdersServiceImpl extends ServiceImpl htFlowList = baseMapper.getFlowList(invoicingOrdersEntity); - for(int i=0;i Date: Wed, 17 Dec 2025 15:12:09 +0800 Subject: [PATCH 5/6] =?UTF-8?q?tplink-=E8=AE=BE=E5=A4=87=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tplink/camera/service/impl/CameraInfoServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java index a83ba4f2..62988610 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java @@ -286,7 +286,7 @@ public class CameraInfoServiceImpl extends ServiceImpl Date: Thu, 18 Dec 2025 09:43:40 +0800 Subject: [PATCH 6/6] =?UTF-8?q?1=E3=80=81pad=E6=8E=A5=E5=8F=A3-=E8=AF=B7?= =?UTF-8?q?=E9=A2=86=E5=8D=95=E3=80=81=E9=80=80=E8=B4=A7=E5=8D=95=E7=89=A9?= =?UTF-8?q?=E6=96=99=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E4=B8=89=E7=BA=A7?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nu/mapper/xml/NuInvoicingNuKcslMapper.xml | 7 ++- .../mapper/xml/NuInvoicingQldInfoMapper.xml | 3 +- .../ConfigServiceDirectiveController.java | 13 ++++++ .../IConfigServiceDirectiveService.java | 2 + .../ConfigServiceDirectiveServiceImpl.java | 46 +++++++++++++++++-- 5 files changed, 65 insertions(+), 6 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml index 3d8204b8..61daa37a 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/nu/mapper/xml/NuInvoicingNuKcslMapper.xml @@ -43,11 +43,13 @@ if(gwc.wl_id is null, '0', '1') as isAdd, gwc.th_num AS thNum, maca.category_name as "materialInfo.categoryName", - maty.type_name as "materialInfo.typeName" + maty.type_name as "materialInfo.typeName", + mame.medication_name as "materialInfo.medicationName" from nu_invoicing_nu_kcsl nukcsl LEFT JOIN nu_config_material_info material ON nukcsl.wl_id = material.id LEFT JOIN nu_config_material_category maca ON material.category_id = maca.id LEFT JOIN nu_config_material_type maty ON material.type_id = maty.id + LEFT JOIN nu_config_material_medication mame on material.medication_id = mame.id LEFT JOIN nu_invoicing_thd_gwc gwc ON nukcsl.wl_id = gwc.wl_id and pk_id = #{id} nukcsl.wl_num is not null @@ -68,7 +70,8 @@ info.material_units AS "materialInfo.materialUnits", info.material_img AS "materialInfo.materialImg", info.material_category_name as "materialInfo.categoryName", - info.material_type_name as "materialInfo.typeName" + info.material_type_name as "materialInfo.typeName", + info.material_medication_name as "materialInfo.medicationName" from nu_invoicing_thd_info info diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml index f99a5e4d..4d473da8 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldInfoMapper.xml @@ -14,7 +14,8 @@ ANY_VALUE(info.material_units) AS "materialInfo.materialUnits", ANY_VALUE(info.material_img) AS "materialInfo.materialImg", ANY_VALUE(info.material_category_name) as "materialInfo.categoryName", - ANY_VALUE(info.material_type_name) as "materialInfo.typeName" + ANY_VALUE(info.material_type_name) as "materialInfo.typeName", + ANY_VALUE(info.material_medication_name) as "materialInfo.materialMedicationName" FROM nu_invoicing_qld_info info WHERE info.qld_no IN diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java index bc75f1e7..a5ceafa4 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/controller/ConfigServiceDirectiveController.java @@ -505,4 +505,17 @@ public class ConfigServiceDirectiveController extends JeecgController> compareList(ConfigServiceDirective configServiceDirective) { return Result.OK(configServiceDirectiveService.compareList(configServiceDirective)); } + + /** + * 获取镜像码 + * 存储在管理平台 + * + * @param orgCode + * @return + */ + @ApiOperation(value = "服务指令-获取镜像码", notes = "服务指令-获取镜像码") + @GetMapping(value = "/getSyncCode") + public Result getSyncCode(@RequestParam("orgCode") String orgCode) { + return Result.OK(configServiceDirectiveService.getSyncCode(orgCode)); + } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java index 2c1651ff..269d3126 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/IConfigServiceDirectiveService.java @@ -70,4 +70,6 @@ public interface IConfigServiceDirectiveService extends IService compareList(ConfigServiceDirective configServiceDirective); + + String getSyncCode(String orgCode); } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index eb27aae0..074eab2b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -30,8 +30,11 @@ import com.nu.utils.HttpRequestUtil; import com.nu.utils.NuFileUtils; import com.nu.utils.RabbitMQUtil; import org.apache.commons.compress.utils.Lists; +import org.apache.commons.lang.StringUtils; +import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.vo.DictModel; +import org.jeecg.common.system.vo.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -401,7 +404,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl catList = catMap.get(inst.getId()); if (catList != null) { catList.sort(Comparator.comparingInt(ConfigServiceCategory::getSort)); @@ -410,7 +413,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl typeList = typeMap.get(cat.getId()); if (typeList != null) { typeList.sort(Comparator.comparingInt(ConfigServiceType::getSort)); @@ -419,7 +422,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl dirList = directiveMap.get(tp.getId()); // if (dirList != null) { // dirList.sort(Comparator.comparingInt(ConfigServiceDirective::getSort)); @@ -641,4 +644,41 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl