From 7d3ad8af79ab104ea5d97251fbf3273012b19f21 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Thu, 18 Dec 2025 09:43:40 +0800 Subject: [PATCH] =?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