Merge branch 'master' of http://git.ius.plus/Project-Wing/WingCloudServer

src/Resource/Measure/Items.xml

@@ -5293,10 +5293,10 @@
       <Item Id="Distance" BaseType="Distance" BriefAnnotation="D" IsGeneralItem="true"/>
       <Item Id="Depth" BaseType="Depth" CanCrossRegion="false" IsGeneralItem="true"/>
       <Item Id="Curve Length" BaseType="CurveLength" AvailableMethods="Spline;Trace;Polygon" BriefAnnotation="Curve" IsGeneralItem="true"/>
-      <Item Id="Perimeter" BaseType="AreaPerimeter" IsGeneralItem="true" EasySetMethods="true">
+      <Item Id="Perimeter" BaseType="AreaPerimeter" WorkingMethod="Trace">
         <Calculator Outputs="Perimeter" PrimaryOutput="Perimeter" />
       </Item>
-      <Item Id="Area" BaseType="AreaPerimeter" IsGeneralItem="true" EasySetMethods="true">
+      <Item Id="Area" BaseType="AreaPerimeter" WorkingMethod="Trace">
         <Calculator Outputs="Area" PrimaryOutput="Area" />
       </Item>
       <Item Id="Volume" BaseType="Volume" AvailableMethods="L;Ellipse;LW;LWH;AreaStraightLine;AreaPerimeterTrace" Repetition="AlwaysRepeat" Repetition_Meta="[NotRepeat AlwaysRepeat]" IsGeneralItem="true" EasySetMethods="true"/>

src/Resource/Measure/MeasureSpecialImpl.json

@@ -76,12 +76,36 @@
 			"D19",
 			"D20"
 		],
-		"PerimeterMultiMethodItemsOutputs": [
-			"AreaPerimeterTwoDistance",
-			"AreaPerimeterEllipse",
-			"AreaPerimeterPolyline",
-			"AreaPerimeterSpline",
-			"AreaPerimeterTrace"
+		"SortMultiMethodItemsOutputs": {
+			"MeasureTypeNames": [
+				"AreaPerimeterTwoDistance",
+				"AreaPerimeterEllipse",
+				"AreaPerimeterPolyline",
+				"AreaPerimeterSpline",
+				"AreaPerimeterTrace"
+			],
+			"BaseTypeNames": [
+				"ThC",
+				"Perimeter"
+			]
+		},
+		"AvailableOutputsRemoveList": [
+			{
+				"BaseTypeName": "",
+				"BaseMeasureTypeName": "",
+				"Name": "Thyroid Width",
+				"RemoveAvailableOutputs": [
+					"Avg"
+				]
+			},
+			{
+				"BaseTypeName": "",
+				"BaseMeasureTypeName": "",
+				"Name": "LV Study",
+				"RemoveAvailableOutputs": [
+					"SV"
+				]
+			}
 		]
 	}
 }