diff --git a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdMainEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdMainEntity.java
index fe1c0e8..b672428 100644
--- a/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdMainEntity.java
+++ b/nursing-unit-common/src/main/java/com/nu/entity/InvoicingThdMainEntity.java
@@ -77,6 +77,11 @@ public class InvoicingThdMainEntity implements Serializable {
*/
private String searchContent;
+ /**
+ * 前后台交互用字段
+ */
+ private String refreshDataKey;
+
/**
* 发起人姓名
*/
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdMainMapper.xml
index 6e8c412..6434d7e 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdMainMapper.xml
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdMainMapper.xml
@@ -26,6 +26,13 @@
or baseInfo.nu_name LIKE CONCAT('%', #{dto.searchContent}, '%')
or main.nu_id LIKE CONCAT('%', #{dto.searchContent}, '%')
or main.thd_no LIKE CONCAT('%', #{dto.searchContent}, '%')
+ or main.id = #{dto.searchContent}
+ )
+
+
+ AND (
+ main.thd_no = #{dto.refreshDataKey}
+ or main.id = #{dto.refreshDataKey}
)
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 848a525..4847e3b 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
@@ -78,7 +78,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl list = baseMapper.pageList(configServiceDirective, list_.getRecords());
//处理服务标签字段
if (list != null && !list.isEmpty()) {
@@ -375,11 +375,11 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl directives = baseMapper.getActiveDirectivesWithTags();
+// List directives = baseMapper.getActiveDirectivesWithTags();
// 按 typeId 分组
- Map> directiveMap = directives.stream()
- .collect(Collectors.groupingBy(ConfigServiceDirective::getTypeId));
+// Map> directiveMap = directives.stream()
+// .collect(Collectors.groupingBy(ConfigServiceDirective::getTypeId));
// 获取被引用的各级分类
List instructions = baseMapper.getUsedInstructionTags();
@@ -414,29 +414,29 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl typeList = typeMap.get(cat.getId());
if (typeList != null) {
typeList.sort(Comparator.comparingInt(ConfigServiceType::getSort));
- for (ConfigServiceType tp : typeList) {
- typUsing = "Y".equals(tp.getIzEnabled());
- if ("enabled".equals(filterIzEnabled) && !typUsing) {
- continue;
- }
- TreeNode typeNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), tp.getId(), tp.getTypeName(), 3, "", tp.getIzEnabled(), tp.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing,"");
- List dirList = directiveMap.get(tp.getId());
- if (dirList != null) {
- dirList.sort(Comparator.comparingInt(ConfigServiceDirective::getSort));
- for (ConfigServiceDirective dir : dirList) {
- if ("enabled".equals(filterIzEnabled) && "N".equals(dir.getIzEnabled())) {
- continue;
- }
- TreeNode dirNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), dir.getId(), dir.getDirectiveName(), 4, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing && typUsing,"");
-// TreeNode tagNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), IdUtil.simpleUUID(), "标签", 5, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing,insUsing && catUsing && typUsing);
-// tagNode.setBodyTagList(dir.getBodyTagList());
-// tagNode.setEmotionTagList(dir.getEmotionTagList());
- typeNode.addChild(dirNode);
-// dirNode.addChild(tagNode);
- }
- }
- catNode.addChild(typeNode);
- }
+// for (ConfigServiceType tp : typeList) {
+// typUsing = "Y".equals(tp.getIzEnabled());
+// if ("enabled".equals(filterIzEnabled) && !typUsing) {
+// continue;
+// }
+// TreeNode typeNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), tp.getId(), tp.getTypeName(), 3, "", tp.getIzEnabled(), tp.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing,"");
+// List dirList = directiveMap.get(tp.getId());
+// if (dirList != null) {
+// dirList.sort(Comparator.comparingInt(ConfigServiceDirective::getSort));
+// for (ConfigServiceDirective dir : dirList) {
+// if ("enabled".equals(filterIzEnabled) && "N".equals(dir.getIzEnabled())) {
+// continue;
+// }
+// TreeNode dirNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), dir.getId(), dir.getDirectiveName(), 4, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing, insUsing && catUsing && typUsing,"");
+//// TreeNode tagNode = new TreeNode(inst.getId(), cat.getId(), tp.getId(), IdUtil.simpleUUID(), "标签", 5, cycleTypeMap.get(dir.getCycleType()), dir.getIzEnabled(), dir.getSort(), insUsing && catUsing && typUsing,insUsing && catUsing && typUsing);
+//// tagNode.setBodyTagList(dir.getBodyTagList());
+//// tagNode.setEmotionTagList(dir.getEmotionTagList());
+// typeNode.addChild(dirNode);
+//// dirNode.addChild(tagNode);
+// }
+// }
+// catNode.addChild(typeNode);
+// }
}
instNode.addChild(catNode);
}