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

src/Resource/Measure/MeasureSpecialImpl.json

@@ -32,7 +32,11 @@
 		"GeneralMeasureTypeNameList": [
 			"SemiManualTrace",
 			"LvSingleSimpson",
-			"LvSimpson"
+			"LvSimpson",
+			"SimpsonPath",
+			"SimpsonTrace",
+			"SimpsonAutoTrace",
+			"MultiSimpsonPath"
 		],
 		"ChildItemList": [
 			"SV Diam",
@@ -119,6 +123,22 @@
 					"Perimeter",
 					"GastricCapacity"
 				]
+			},
+			{
+				"BaseTypeName": "Tumor Uterus",
+				"BaseMeasureTypeName": "",
+				"Name": "LWH",
+				"RemoveAvailableOutputs": [
+					"Avg"
+				]
+			},
+			{
+				"BaseTypeName": "A4C LVESV Simpson",
+				"BaseMeasureTypeName": "",
+				"Name": "LWH",
+				"RemoveAvailableOutputs": [
+					"Avg"
+				]
 			}
 		]
 	}

src/Resource/Measure/MeasureUnitSetting.json

@@ -0,0 +1,370 @@
+{
+    "Version": "1.0.0.0",
+    "DataList": [
+        {
+            "Type": "None",
+            "UnitNames": [
+                "None"
+            ],
+            "Units": [
+                0
+            ]
+        },
+        {
+            "Type": "percent",
+            "UnitNames": [
+                "%",
+                " "
+            ],
+            "Units": [
+                1,
+                2
+            ]
+        },
+        {
+            "Type": "Length",
+            "UnitNames": [
+                "cm",
+                "mm",
+                "in",
+                "ft",
+                "μm"
+            ],
+            "Units": [
+                10,
+                11,
+                12,
+                13,
+                14
+            ]
+        },
+        {
+            "Type": "Time",
+            "UnitNames": [
+                "s",
+                "min",
+                "h",
+                "ms"
+            ],
+            "Units": [
+                20,
+                21,
+                22,
+                27
+            ]
+        },
+        {
+            "Type": "day",
+            "UnitNames": [
+                "Days",
+                "Wks",
+                "Wks",
+                ""
+            ],
+            "Units": [
+                23,
+                24,
+                25,
+                26
+            ]
+        },
+        {
+            "Type": "Angle",
+            "UnitNames": [
+                "°",
+                "rad"
+            ],
+            "Units": [
+                30,
+                31
+            ]
+        },
+        {
+            "Type": "Weight",
+            "UnitNames": [
+                "g",
+                "mg",
+                "ng",
+                "kg",
+                "oz",
+                "lb",
+                "lboz"
+            ],
+            "Units": [
+                40,
+                41,
+                42,
+                43,
+                44,
+                45,
+                46
+            ]
+        },
+        {
+            "Type": "Area",
+            "UnitNames": [
+                "cm²",
+                "mm²",
+                "m²"
+            ],
+            "Units": [
+                50,
+                51,
+                52
+            ]
+        },
+        {
+            "Type": "Volumn",
+            "UnitNames": [
+                "cm³",
+                "mm³",
+                "ml",
+                "L",
+                "μl"
+            ],
+            "Units": [
+                60,
+                61,
+                62,
+                63,
+                64
+            ]
+        },
+        {
+            "Type": "Velocity",
+            "UnitNames": [
+                "cm/s",
+                "mm/s",
+                "m/s"
+            ],
+            "Units": [
+                70,
+                71,
+                72
+            ]
+        },
+        {
+            "Type": "Acceleration",
+            "UnitNames": [
+                "cm/s²",
+                "mm/s²"
+            ],
+            "Units": [
+                80,
+                81
+            ]
+        },
+        {
+            "Type": "Flow",
+            "UnitNames": [
+                "cm³/s",
+                "ml/s",
+                "ml/min",
+                "L/min",
+                "μl/min"
+            ],
+            "Units": [
+                90,
+                91,
+                92,
+                93,
+                94
+            ]
+        },
+        {
+            "Type": "Density",
+            "UnitNames": [
+                "g/cm³",
+                "g/ml",
+                "ng/ml"
+            ],
+            "Units": [
+                100,
+                101,
+                102
+            ]
+        },
+        {
+            "Type": "Pressure",
+            "UnitNames": [
+                "mmHg"
+            ],
+            "Units": []
+        },
+        {
+            "Type": "voltage",
+            "UnitNames": [
+                "mV"
+            ],
+            "Units": [
+                110
+            ]
+        },
+        {
+            "Type": "Frequency",
+            "UnitNames": [
+                "Hz",
+                "kHz"
+            ],
+            "Units": [
+                130,
+                131
+            ]
+        },
+        {
+            "Type": "beats per minute",
+            "UnitNames": [
+                "bpm"
+            ],
+            "Units": [
+                132
+            ]
+        },
+        {
+            "Type": "SI",
+            "UnitNames": [
+                "cm³/m²",
+                "ml/m²"
+            ],
+            "Units": [
+                140,
+                141
+            ]
+        },
+        {
+            "Type": "CI",
+            "UnitNames": [
+                "cm³/s.m²",
+                "ml/s.m²",
+                "cm³/min.m²",
+                "ml/min.m²",
+                "L/min.m²",
+                "ml/min.cm²"
+            ],
+            "Units": [
+                150,
+                151,
+                153,
+                154,
+                155,
+                156
+            ]
+        },
+        {
+            "Type": "MVCF",
+            "UnitNames": [
+                "circ/s"
+            ],
+            "Units": [
+                160
+            ]
+        },
+        {
+            "Type": "CO",
+            "UnitNames": [
+                "ml/beat"
+            ],
+            "Units": [
+                170
+            ]
+        },
+        {
+            "Type": "PWV/CC",
+            "UnitNames": [
+                "mm²/Pa"
+            ],
+            "Units": [
+                180
+            ]
+        },
+        {
+            "Type": "DC",
+            "UnitNames": [
+                "1/MPa"
+            ],
+            "Units": [
+                181
+            ]
+        },
+        {
+            "Type": "EP",
+            "UnitNames": [
+                "kPa"
+            ],
+            "Units": [
+                182
+            ]
+        },
+        {
+            "Type": "dP/dT",
+            "UnitNames": [
+                "mmHg/s"
+            ],
+            "Units": [
+                190
+            ]
+        },
+        {
+            "Type": "AVAI",
+            "UnitNames": [
+                "cm²/m²"
+            ],
+            "Units": [
+                210
+            ]
+        },
+        {
+            "Type": "TAM/MAM",
+            "UnitNames": [
+                "cm/m²",
+                "mm/m²"
+            ],
+            "Units": [
+                220,
+                221
+            ]
+        },
+        {
+            "Type": "mmHgml",
+            "UnitNames": [
+                "mmHg/ml"
+            ],
+            "Units": [
+                270
+            ]
+        },
+        {
+            "Type": "gm2",
+            "UnitNames": [
+                "g/m²"
+            ],
+            "Units": [
+                200
+            ]
+        },
+        {
+            "Type": "pers",
+            "UnitNames": [
+                "/s"
+            ],
+            "Units": [
+                230
+            ]
+        },
+        {
+            "Type": "cmMs",
+            "UnitNames": [
+                "cm∙s",
+                "mm∙s",
+                "cm∙ms",
+                "mm∙ms"
+            ],
+            "Units": [
+                290,
+                291,
+                292,
+                293
+            ]
+        }
+    ]
+}

src/appsettings_LAN.json

@@ -5,21 +5,22 @@
     "IsMaster": false,
     "MasterUrl": "",
     "ServerID":"1",
-    "NotValidateLicense":true,
+    "NotValidateLicense":false,
     "QualityControlSwitch": false,
     "IsScreenshot": false,
     "NotVinnoServerService":false,
 	  "ApiAccessSwitch":false,
 	  "IsResearchEditionService":false,
-	  "FormatterHostAddress":false,
-    "DllKey":"vinno123"
+	  "FormatterHostAddress":true,
+    "DllKey":"vinno123",
+    "DongleValidinterval":480
   },
   "Gateway": {
     "Host": "http://192.168.6.65:8303/",
     "Domains": "http://192.168.6.65:8303/",
     "ApiPort": 0,
-    "WebDomain":"http://192.168.6.65:8303/",
-    "FISWebUrl":"http://192.168.6.65:8303/"
+    "WebDomain":"http://192.168.6.65/",
+    "FISWebUrl":"http://192.168.6.65/"
   },
   "Log": {
     "Level": "info",
@@ -29,14 +30,14 @@
     "CollectionName": "logs"
   },
   "Services": {
-    "InProcess": "WingEmailModule,WingMongoDBModule,WingSessionModule,WingSMSModule,WingNotificationModule,WingRtcService,WingRtmpService,WingDeviceForwardService",
-    "JsonRpcHttp": "WingManagementModule,WingStorageModule,WingUserModule,WingDeviceService,WingRemedicalModule,ReportService,WingLiveConsultationService,WingASRService,WingLabService,WingEducationService,WingTaskService,WingResearchEditionService,VitalMixtureService,ElectrocardiogramService,HealthExamBookingService,WingVinnoIOTService",
+    "InProcess": "WingEmailModule,WingMongoDBModule,WingSessionModule,WingSMSModule,WingNotificationModule,WingAIDiagnosisService,WingRtcService,WingRtmpService,WingDeviceForwardService",
+    "JsonRpcHttp": "WingManagementModule,VitalMixtureService,WingUserModule,WingStorageModule,WingDeviceService,WingRemedicalModule,ReportService,HealthExamBookingService,VitalRegisterService,WingDeviceListenerService,ElectrocardiogramService",
     "Remote": ""
   },
   "SMS": {
-    "CheckVerifyCodeApi": "http://127.0.0.1:8302/SmsTool/SendSms/CheckVerifyCode",
-    "SendVerifyCodeApi": "http://127.0.0.1:8302/SmsTool/SendSms/SendVerifyCode",
-    "SendMessageApi": "http://127.0.0.1:8302/SmsTool/SendSms/SendMessage",
+    "CheckVerifyCodeApi": "http://192.168.6.65:8302/SmsTool/SendSms/CheckVerifyCode",
+    "SendVerifyCodeApi": "http://192.168.6.65:8302/SmsTool/SendSms/SendVerifyCode",
+    "SendMessageApi": "http://192.168.6.65:8302/SmsTool/SendSms/SendMessage",
     "TestPhoneNumbers": "15962161351,18862108573"
   },
   "Database": {
@@ -47,7 +48,7 @@
     "ArchiveDeletionDays": 0,
     "InitMigrateBeginTime": "",
     "InitMigrateEndTime": "2023-06-26",
-    "IsWatchingDB":true
+    "IsWatchingDB":false
   },
   "DataCenterDB": {
     "Server": "127.0.0.1",
@@ -69,16 +70,16 @@
   "Notification": {
     "Host": "http://*:9301/",
     "MaxQueueCount": 10,
-    "WebSocketUrl": "ws://127.0.0.1:9301?token={0}&type={1}"
+    "WebSocketUrl": "ws://192.168.6.65:9301?token={0}&type={1}"
   },
   "Storage": {
     "ServerHost": "http://*:9303/",
-    "StorageServer": "COS",
+    "StorageServer": "VCS",
     "AppId": "AKIDMSIsADUUpvJGwJOKvsb5IDrGtGNBRzzi",
     "Sercret": "4sQhdJBl5HI7f3oLbZIlwqXOyILyLWP0",
-    "CFSServerUrl": "https://flyinsono-bj-1300984704.cos.ap-beijing.myqcloud.com",
+    "CFSServerUrl": "http://192.168.6.65:9303/vCloudStorage",
     "CDNServerUrl": "http://cdn-bj.fis.plus",
-    "VCSStorageDisk":"D:\\",
+    "VCSStorageDisk":"D:\\vCloudStorage",
     "ManualDivisionForUpload": 209715200,
 	  "AutoSliceSizeForUpload": 5242880,
 	  "ForceHttps": false
@@ -163,9 +164,9 @@
     "VCloudClientsProxyHost": "192.168.6.6:9096"
   },
   "Course": {
-    "MyCourseUrl": "http://127.0.0.1:8080/open/school/#/my_course/",
-    "CourseHomeUrl": "http://127.0.0.1:8080/open/school/#/course/",
-    "CourseAPIUrl": "http://127.0.0.1:8303",
+    "MyCourseUrl": "http://192.168.6.65:8080/open/school/#/my_course/",
+    "CourseHomeUrl": "http://192.168.6.65:8080/open/school/#/course/",
+    "CourseAPIUrl": "http://192.168.6.65:8303",
     "HeartRateSeconds": 10
   },
   "DeviceForward": {
@@ -197,24 +198,37 @@
     "UpgradeFileUrl":"https://flyinsono-bj-1300984704.cos.ap-beijing.myqcloud.com/vitalapp2.0.0.535.apk"
   },
   "VitalRegister":{
-    "ServerUrl": "http://192.168.6.65:7311",
+    "ServerUrl": "http://192.168.6.103:7311",
     "RecognitionToken": "637f02a065ad47fbbe01b956919419c2",
     "PersonManageGroupId": "ExamStationGroupId_dev"
   },
   "Vital": {
-    "ProjectType": 0,
+    "ProjectType": 2,
     "CloudServerUrl": "",
     "SyncToken": "637f02a065ad47fbbe01b956919419c2",
     "SyncPageSize": 30,
+    "CommitRecordInvervalSeconds": 60,
+    "CommitRegisterPersonInvervalSeconds": 60,
+    "CommitPatientInvervalSeconds": 60,
+    "CommitRemedicalInvervalSeconds": 60,
+    "CommitExamInvervalSeconds": 60,
+    "CommitFollowUpInvervalSeconds": 60,
+    "CommitElectrocardiogramInvervalSeconds": 60,
+    "CommitVitalReportInvervalSeconds": 60,
+    "CommitReportInvervalSeconds": 60,
+    "CommitVitalPatientInvervalSeconds": 60,
+    "CommitVitalPatientExtensionInvervalSeconds": 60,
     "ExamLabels": "[{\"Type\":\"HEIUrinalysis\",\"Title\":\"尿常规\",\"UniquedCode\":\"1\",\"Valid\":true,\"ForceExamNumber\":false},{\"Type\":\"HEIBloodRoutine\",\"Title\":\"血常规\",\"UniquedCode\":\"2\",\"Valid\":true,\"ForceExamNumber\":true},{\"Type\":\"HEIBiochemical\",\"Title\":\"生化\",\"UniquedCode\":\"3\",\"Valid\":true,\"ForceExamNumber\":true}]",
-    "HypertensionTimes": 3,
-    "HypertensionLimitDays": 7,
+		"HypertensionTimes": 3,
+		"HypertensionLimitDays": 7,
     "CrowdLabels": "RQFL_YF,CJJB_GXY,CJJB_TNB,CJJB_YZJSBZA,CJJB_FJH",
     "FaceRecognitionType":"Customize",
     "CommitInvervalSeconds": 60,
     "DoctorStatisticsSetting":"230382",
     "DoctorStatisticsSeconds" : 600,
-    "IsNeedImageReport": true
+    "IsNeedImageReport": true,
+    "JingQiServerUrl": "",
+    "JingQiHealthKeywords": ""
   },
   "HealthExamBooking":{
     "GroupExamWebUrl": "http://192.168.6.65:8408/#/groupExam?code={0}",