Explorar o código

修改开单合理性返回项目名称的处理方法

MarkHuang %!s(int64=4) %!d(string=hai) anos
pai
achega
f6b1971a46

+ 6 - 6
src/main/java/com/diagbot/repository/CombiOperationNode.java

@@ -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));
 		}
 

+ 1 - 1
src/main/java/com/diagbot/repository/LisSetNode.java

@@ -21,7 +21,7 @@ public class LisSetNode {
 		if (null!=gender) {
 			nodeInfo = new NodeInfo();
 			nodeInfo.setName(gender.getName());
-			nodeInfo.setTypeval("性别");
+			nodeInfo.setTypeval(Constants.gender);
 			lisBillNeoDTO.setGender(NeoUtil.updateNodeInfo(nodeInfo));
 		}
 

+ 3 - 2
src/main/java/com/diagbot/repository/PacsSubNameNode.java

@@ -22,7 +22,7 @@ public class PacsSubNameNode {
         for (Group group : groups) {
             nodeInfo = new NodeInfo();
             nodeInfo.setName(group.getName());
-
+            nodeInfo.setTypeval(Constants.group);
             pacsBillNeoDTO.getGroup().add(NeoUtil.updateNodeInfo(nodeInfo));
         }
 
@@ -31,7 +31,7 @@ public class PacsSubNameNode {
         for (Disease disease : diseases) {
             nodeInfo = new NodeInfo();
             nodeInfo.setName(disease.getName());
-
+            nodeInfo.setTypeval(Constants.disease);
             pacsBillNeoDTO.getDisease().add(NeoUtil.updateNodeInfo(nodeInfo));
         }
 
@@ -40,6 +40,7 @@ public class PacsSubNameNode {
         for (MedAllergen medAllergen : medAllergens) {
             nodeInfo = new NodeInfo();
             nodeInfo.setName(medAllergen.getName());
+            nodeInfo.setTypeval(Constants.medallergen);
             pacsBillNeoDTO.getOperations().add(NeoUtil.updateNodeInfo(nodeInfo));
         }