Update app.py

app.py

@@ -162,7 +162,7 @@ def group_by_entity(raw):
                     #LOINC
                     g11 = g1['LOINC_NUM'].to_string().replace(","," ").replace("\n"," ")
                     g12 = g1['COMPONENT'].to_string().replace(","," ").replace("\n"," ")
-                    s1 = ("LOINC," + myEntityGroup + "," + eterm + "," + g11 + ", and LOINC questions of ," + g12 + ", Label,Value, Label,Value, Label,Value  ")
+                    s1 = ("LOINC," + myEntityGroup + "," + eterm + ", and LOINC questions of ," + g12 + "," + g11 + ", Label,Value, Label,Value, Label,Value  ")
                     if g11 != 'Series([]  )': SaveResult(s1, outputFile)
 
                     #LOINC Panels
@@ -170,13 +170,13 @@ def group_by_entity(raw):
                     g22 = g2['LoincName'].to_string().replace(","," ").replace("\n"," ")
                     g23 = g2['ParentLoinc'].to_string().replace(","," ").replace("\n"," ")
                     g24 = g2['ParentName'].to_string().replace(","," ").replace("\n"," ")
-                    s2 = ("LOINC Panel," + myEntityGroup + "," + eterm + "," + g21 + ", and LOINC name of ," + g22 + ", and Parent codes of ," + g23 + ", with Parent names of ," + g24 + ", Label,Value  ")
+                    s2 = ("LOINC Panel," + myEntityGroup + "," + eterm + ", and LOINC name of ," + g22 + "," + g21 + ", and Parent codes of ," + g23 + ", with Parent names of ," + g24 + ", Label,Value  ")
                     if g21 != 'Series([]  )': SaveResult(s2, outputFile)
 
                     #SNOMED
                     g31 = g3['conceptId'].to_string().replace(","," ").replace("\n"," ").replace("\l"," ").replace("\r"," ")
                     g32 = g3['term'].to_string().replace(","," ").replace("\n"," ").replace("\l"," ").replace("\r"," ")
-                    s3 = ("SNOMED Concept," + myEntityGroup + "," + eterm + "," + g31 + ", and SNOMED terms of ," + g32 + ", Label,Value, Label,Value, Label,Value  ")
+                    s3 = ("SNOMED Concept," + myEntityGroup + "," + eterm + ", and SNOMED terms of ," + g32 + "," + g31 + ", Label,Value, Label,Value, Label,Value  ")
                     if g31 != 'Series([]  )': SaveResult(s3, outputFile)
 
                     #OMS
@@ -185,13 +185,13 @@ def group_by_entity(raw):
                     g43 = g4['SNOMED CT'].to_string().replace(","," ").replace("\n"," ")
                     g44 = g4['PR'].to_string().replace(","," ").replace("\n"," ")
                     g45 = g4['S&S'].to_string().replace(","," ").replace("\n"," ")
-                    s4 = ("OMS," + myEntityGroup + "," + eterm + "," + g41 + ", and SNOMED concepts of ," + g42 + ", and SNOMED codes of ," + g43 + ", and OMS problem of ," + g44 + ", and OMS Sign Symptom of ," + g45)
+                    s4 = ("OMS," + myEntityGroup + "," + eterm + ", and SNOMED concepts of ," + g42 + "," + g41 + ", and SNOMED codes of ," + g43 + ", and OMS problem of ," + g44 + ", and OMS Sign Symptom of ," + g45)
                     if g41 != 'Series([]  )': SaveResult(s4, outputFile)
 
                     #ICD10
                     g51 = g5['Code'].to_string().replace(","," ").replace("\n"," ")
                     g52 = g5['Description'].to_string().replace(","," ").replace("\n"," ")
-                    s5 = ("ICD10," + myEntityGroup + "," + eterm + "," + g51 + ", and descriptions of ," + g52 + ", Label,Value, Label,Value, Label,Value  ")
+                    s5 = ("ICD10," + myEntityGroup + "," + eterm + ", and descriptions of ," + g52 + "," + g51 + ", Label,Value, Label,Value, Label,Value  ")
                     if g51 != 'Series([]  )': SaveResult(s5, outputFile)
 
                 except ValueError as err: