|
@@ -20,7 +20,7 @@ public class CombiOperationNode {
|
|
|
if (null!=gender) {
|
|
|
nodeInfo = new NodeInfo();
|
|
|
nodeInfo.setName(gender.getName());
|
|
|
- nodeInfo.setTypeval("性别");
|
|
|
+ nodeInfo.setTypeval(Constants.gender);
|
|
|
combiOpBillNeoDTO.setGender(NeoUtil.updateNodeInfo(nodeInfo));
|
|
|
}
|
|
|
|
|
@@ -29,7 +29,7 @@ public class CombiOperationNode {
|
|
|
for (Group group : groups) {
|
|
|
nodeInfo = new NodeInfo();
|
|
|
nodeInfo.setName(group.getName());
|
|
|
-
|
|
|
+ nodeInfo.setTypeval(Constants.group);
|
|
|
combiOpBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
|
|
|
}
|
|
|
|
|
@@ -38,7 +38,7 @@ public class CombiOperationNode {
|
|
|
for (Lis lis : lislist) {
|
|
|
nodeInfo = new NodeInfo();
|
|
|
nodeInfo.setName(lis.getName());
|
|
|
-
|
|
|
+ nodeInfo.setTypeval(Constants.lis);
|
|
|
combiOpBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
|
|
|
}
|
|
|
|
|
@@ -47,7 +47,7 @@ public class CombiOperationNode {
|
|
|
for (PacsDescribe pacsdesc : pacsDescribes) {
|
|
|
nodeInfo = new NodeInfo();
|
|
|
nodeInfo.setName(pacsdesc.getName());
|
|
|
-
|
|
|
+ nodeInfo.setTypeval(Constants.pacsdesc);
|
|
|
combiOpBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
|
|
|
}
|
|
|
|
|
@@ -56,7 +56,7 @@ public class CombiOperationNode {
|
|
|
for (Disease dis : diseases) {
|
|
|
nodeInfo = new NodeInfo();
|
|
|
nodeInfo.setName(dis.getName());
|
|
|
-
|
|
|
+ nodeInfo.setTypeval(Constants.disease);
|
|
|
combiOpBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
|
|
|
}
|
|
|
|
|
@@ -65,7 +65,7 @@ public class CombiOperationNode {
|
|
|
for (MedAllergen medallergen : medAllergens) {
|
|
|
nodeInfo = new NodeInfo();
|
|
|
nodeInfo.setName(medallergen.getName());
|
|
|
-
|
|
|
+ nodeInfo.setTypeval(Constants.medallergen);
|
|
|
combiOpBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
|
|
|
}
|
|
|
|