浏览代码

更新实验室检查套餐名开单合理性

MarkHuang 4 年之前
父节点
当前提交
a9794b1dfc

+ 2 - 0
src/main/java/com/diagbot/entity/node/Group.java

@@ -40,4 +40,6 @@ public class Group extends BaseNode  {
 	@Relationship(type = "药品注册名称禁忌禁忌人群", direction = Relationship.INCOMING)
 	private Set<MedRegName> medRegNames = new HashSet<>();
 
+	@Relationship(type = "实验室检查套餐名禁忌禁忌人群", direction = Relationship.INCOMING)
+	private Set<LisSet> lisSets = new HashSet<>();
 }

+ 3 - 0
src/main/java/com/diagbot/entity/node/LisSet.java

@@ -30,6 +30,9 @@ public class LisSet extends BaseNode  {
 	@Relationship(type = "实验室检查套餐名禁忌性别", direction = Relationship.OUTGOING)
 	private Gender gender;
 
+	@Relationship(type = "实验室检查套餐名禁忌禁忌人群", direction = Relationship.OUTGOING)
+	private Set<Group> groups = new HashSet<>();
+
 	@Relationship(type = "实验室检查名称相关实验室检查套餐名", direction = Relationship.INCOMING)
 	private Set<LisName> lisnames = new HashSet<>();
 

+ 5 - 2
src/main/java/com/diagbot/repository/LisSetNode.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.LisBillNeoDTO;
 import com.diagbot.dto.NeoEntityDTO;
 import com.diagbot.entity.node.Gender;
 import com.diagbot.entity.node.LisSet;
+import com.diagbot.entity.node.Group;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.NeoUtil;
 
@@ -12,6 +13,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class LisSetNode {
 
@@ -92,14 +94,15 @@ public class LisSetNode {
 			nodeInfo.setName(disease.getName());
 			lisBillNeoDTO.getDisease().add(NeoUtil.updateNodeInfo(nodeInfo));
 		}
+		*/
 
-		Set<Group> groups = lispack.getGroups();
+		Set<Group> groups = lisset.getGroups();
 		for (Group group : groups) {
 			nodeInfo = new NodeInfo();
 			nodeInfo.setName(group.getName());
+			nodeInfo.setTypeval(Constants.group);
 			lisBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
 		}
-*/
 
 		return lisBillNeoDTO;
 	}