From 6f29c9b8302f47848665a97924efae2d3832fe1a Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 19 Dec 2025 10:08:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AB=AF=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4=EF=BC=9A?= =?UTF-8?q?=20=091=EF=BC=89=E5=8E=BB=E9=99=A4=E6=A0=87=E5=87=86=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=E5=BA=93=E3=80=81=E5=B7=AE=E5=BC=82=E6=AF=94=E5=AF=B9?= =?UTF-8?q?=E3=80=81=E5=B7=AE=E5=BC=82=E6=8C=87=E4=BB=A4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20=092=EF=BC=89=E5=8E=BB=E9=99=A4=E6=89=80=E6=9C=89=E6=A0=87?= =?UTF-8?q?=E5=87=86=E6=8C=87=E4=BB=A4=E5=BA=93=E6=A6=82=E5=BF=B5=E5=85=88?= =?UTF-8?q?=E5=85=B3=E6=93=8D=E4=BD=9C=E5=8F=8A=E4=BB=A3=E7=A0=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91=20=093=EF=BC=89=E4=BB=BB=E4=B8=80=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E5=9D=87=E5=8F=AF=E5=88=9B=E5=BB=BA=E4=BB=BB=E6=84=8F=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E6=A0=87=E7=AD=BE=E3=80=81=E6=9C=8D=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E3=80=81=E6=9C=8D=E5=8A=A1=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E4=BB=A5=E5=8F=8A=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=BB=BB=E6=84=8F=E5=AD=97=E6=AE=B5=20=094=EF=BC=89?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=95=9C=E5=83=8F=E7=A0=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9A=E6=9C=AA=E7=94=9F=E6=88=90=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E7=A0=81=E6=9C=BA=E6=9E=84=E8=87=AA=E5=8A=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E9=95=9C=E5=83=8F=E7=A0=81=EF=BC=8C=E5=8F=AF=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=95=9C=E5=83=8F=E7=A0=81=EF=BC=8C=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=90=8E=E6=97=A7=E7=9A=84=E9=95=9C=E5=83=8F=E7=A0=81=E5=B0=86?= =?UTF-8?q?=E5=A4=B1=E6=95=88=EF=BC=9B=E5=8F=AF=E9=80=9A=E8=BF=87=E5=A4=8D?= =?UTF-8?q?=E5=88=B6=E6=8C=89=E9=92=AE=E5=BF=AB=E9=80=9F=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E7=A0=81=20=095=EF=BC=89=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=BA=93=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9A=E9=9C=80=E8=A6=81=E5=85=88=E8=BE=93=E5=85=A5=E5=91=A8?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=95=9C=E5=83=8F=E7=A0=81=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E6=9F=A5=E7=9C=8B=E5=AF=B9=E5=BA=94=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E6=89=80=E6=9C=89=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=8F=AF=E2=80=9C=E9=95=9C=E5=83=8F=E2=80=9D?= =?UTF-8?q?=E5=88=B0=E6=9C=AC=E6=9C=BA=E6=9E=84=E4=B8=AD=EF=BC=8C=E5=A6=82?= =?UTF-8?q?=E6=9E=9C=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE=E3=80=81=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=88=AB=E3=80=81=E6=9C=8D=E5=8A=A1=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=9C=8D=E5=8A=A1=E5=90=8D=E7=A7=B0=E6=B1=89?= =?UTF-8?q?=E5=AD=97=E5=AE=8C=E5=85=A8=E4=B8=80=E8=87=B4=EF=BC=8C=E5=88=99?= =?UTF-8?q?=E8=AE=A4=E5=AE=9A=E4=B8=BA=E5=90=8C=E4=B8=80=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8C=87=E4=BB=A4=EF=BC=8C=E4=B8=8D=E4=BC=9A=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/NuInvoicingThdGwcMapper.xml | 8 ++- .../controller/InstructionTagController.java | 9 +-- .../ConfigServiceDirectiveController.java | 66 ++++++++++++------- .../entity/ConfigServiceDirective.java | 4 +- .../xml/ConfigServiceDirectiveMapper.xml | 2 +- .../IConfigServiceDirectiveService.java | 2 + .../ConfigServiceDirectiveServiceImpl.java | 37 +++++++++-- .../listener/DirectiveMQListener.java | 6 +- 8 files changed, 94 insertions(+), 40 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdGwcMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdGwcMapper.xml index 52f49735..edc5349e 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdGwcMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdGwcMapper.xml @@ -42,9 +42,15 @@ material.lower_limit AS "materialInfo.lowerLimit", material.tag_type AS "materialInfo.tagType", material.iz_ybbx AS "materialInfo.izYbbx", - material.iz_jgyh AS "materialInfo.izJgyh" + material.iz_jgyh AS "materialInfo.izJgyh", + maca.category_name as "materialInfo.categoryName", + maty.type_name as "materialInfo.typeName", + mame.medication_name as "materialInfo.medicationName" from nu_invoicing_thd_gwc thc LEFT JOIN nu_config_material_info material ON thc.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 and thc.pk_id = #{pkId} diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/controller/InstructionTagController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/controller/InstructionTagController.java index 21b448d4..6bf0290d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/controller/InstructionTagController.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/instructiontag/controller/InstructionTagController.java @@ -79,12 +79,13 @@ public class InstructionTagController extends JeecgController add(@RequestBody InstructionTag instructionTag) { JSONObject deptInfo = sysBaseAPI.getDeptInfo(); - instructionTag.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); +// instructionTag.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); + instructionTag.setId(instructionTag.getInstructionType()); instructionTag.setSysOrgCode(deptInfo.getString("code")); instructionTagService.save(instructionTag); - InstructionTagMQDto instructionTagMQDto = new InstructionTagMQDto(); - BeanUtils.copyProperties(instructionTag,instructionTagMQDto); - rabbitMQUtil.sendToExchange("hldy.instructionTag.add.fanout", "", instructionTagMQDto); +// InstructionTagMQDto instructionTagMQDto = new InstructionTagMQDto(); +// BeanUtils.copyProperties(instructionTag,instructionTagMQDto); +// rabbitMQUtil.sendToExchange("hldy.instructionTag.add.fanout", "", instructionTagMQDto); return Result.OK("添加成功！"); } 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 484c61fa..4350423c 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 @@ -236,35 +236,35 @@ public class ConfigServiceDirectiveController extends JeecgController canAddList; - try { - canAddList = canAddDirectiveService.list(); - } finally { - //恢复数据源 - DynamicDataSourceContextHolder.clear(); - } - boolean needSetId = true; - for (int i = 0; i < canAddList.size(); i++) { - CanAddDirective canAddDirective = canAddList.get(i); - if ( - canAddDirective.getInstructionTag().equals(configServiceDirective.getInstructionName()) && - canAddDirective.getCategory().equals(configServiceDirective.getCategoryName()) && - canAddDirective.getType().equals(configServiceDirective.getTypeName()) && - canAddDirective.getDirectiveName().equals(configServiceDirective.getDirectiveName()) && - canAddDirective.getCycleType().equals(configServiceDirective.getCycleTypeName()) - ) { - needSetId = false; - configServiceDirective.setId(canAddDirective.getDirectiveId()); - } - } +// DynamicDataSourceContextHolder.push("ope"); +// List canAddList; +// try { +// canAddList = canAddDirectiveService.list(); +// } finally { +// //恢复数据源 +// DynamicDataSourceContextHolder.clear(); +// } +// boolean needSetId = true; +// for (int i = 0; i < canAddList.size(); i++) { +// CanAddDirective canAddDirective = canAddList.get(i); +// if ( +// canAddDirective.getInstructionTag().equals(configServiceDirective.getInstructionName()) && +// canAddDirective.getCategory().equals(configServiceDirective.getCategoryName()) && +// canAddDirective.getType().equals(configServiceDirective.getTypeName()) && +// canAddDirective.getDirectiveName().equals(configServiceDirective.getDirectiveName()) && +// canAddDirective.getCycleType().equals(configServiceDirective.getCycleTypeName()) +// ) { +// needSetId = false; +// configServiceDirective.setId(canAddDirective.getDirectiveId()); +// } +// } //存储机构编码 JSONObject deptInfo = sysBaseAPI.getDeptInfo(); - if (needSetId) { - configServiceDirective.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); - } +// if (needSetId) { + configServiceDirective.setId(deptInfo.getString("code") + IdUtil.simpleUUID()); +// } configServiceDirective.setSysOrgCode(deptInfo.getString("code")); //设置为“未授权” configServiceDirective.setStatus("1"); @@ -531,4 +531,20 @@ public class ConfigServiceDirectiveController extends JeecgController updateSyncCode(@RequestParam("orgCode") String orgCode) { return Result.OK(configServiceDirectiveService.updateSyncCode(orgCode)); } + + /** + * 根据镜像码获取机构编码 + * 存储在管理平台 + * + * @param syncCode + * @return + */ + @ApiOperation(value = "服务指令-根据镜像码获取机构编码", notes = "服务指令-根据镜像码获取机构编码") + @GetMapping(value = "/getOrgCodeBySyncCode") + public Result getOrgCodeBySyncCode(@RequestParam(value = "syncCode", required = false) String syncCode) { + if (StringUtils.isBlank(syncCode)) { + return Result.ok(null); + } + return Result.OK(configServiceDirectiveService.getOrgCodeBySyncCode(syncCode)); + } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java index 7d143861..3d0fb64a 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/entity/ConfigServiceDirective.java @@ -48,14 +48,14 @@ public class ConfigServiceDirective implements Serializable { */ @Excel(name = "服务类型", width = 15) @ApiModelProperty(value = "服务类型") - @Dict(dicCode = "id", dictTable = "nu_config_service_type", dicText = "type_name") + @Dict(dicCode = "id,", dictTable = "nu_config_service_type", dicText = "type_name") private java.lang.String typeId; /** * 分类标签 */ @Excel(name = "分类标签", width = 15) @ApiModelProperty(value = "分类标签") - @Dict(dicCode = "id", dictTable = "nu_config_service_instruction_tag", dicText = "instruction_name") + @Dict(dicCode = "item_value", dictTable = "view_instruction_tag", dicText = "item_text") private java.lang.String instructionTagId; /** * 服务指令名称 diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml index bdbd18e7..7e558f5b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/servicedirective/mapper/xml/ConfigServiceDirectiveMapper.xml @@ -102,7 +102,7 @@ #{item.id} - + and c.iz_enabled = #{directive.izEnabled} 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 eb0faeb9..964ddbaf 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 @@ -74,4 +74,6 @@ public interface IConfigServiceDirectiveService extends IService result = Maps.newHashMap(); + if(StringUtils.isNotBlank(orgCode) && orgCode.equals(deptInfo.getString("code"))){ + return "-1"; + } + + return orgCode; + } } diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java index f303428b..c8dfde8f 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/mq/directive/listener/DirectiveMQListener.java @@ -690,10 +690,10 @@ public class DirectiveMQListener { //分类标签 if (dto.getInstructionList() != null) { //需要排除的分类标签id - List existedIds = Lists.newArrayList(); + List existedTypes = Lists.newArrayList(); if (dto.isIzInc()) { List list = instructionTagService.list(); - existedIds = list.stream().map(InstructionTag::getId).collect(Collectors.toList()); + existedTypes = list.stream().map(InstructionTag::getInstructionType).collect(Collectors.toList()); } //传过来的所有数据 List allData = BeanUtil.copyToList(dto.getInstructionList(), InstructionTag.class); @@ -701,7 +701,7 @@ public class DirectiveMQListener { //需要新增的数据 List needAddData = Lists.newArrayList(); for (InstructionTag instruction : allData) { - if (!existedIds.contains(instruction.getId())) { + if (!existedTypes.contains(instruction.getInstructionType())) { needAddData.add(instruction); } }