diff --git a/HealthMonitor.WebApi/Controllers/HealthMonitor/HmFetalController.cs b/HealthMonitor.WebApi/Controllers/HealthMonitor/HmFetalController.cs index 1405642..b857d56 100644 --- a/HealthMonitor.WebApi/Controllers/HealthMonitor/HmFetalController.cs +++ b/HealthMonitor.WebApi/Controllers/HealthMonitor/HmFetalController.cs @@ -25,12 +25,12 @@ namespace HealthMonitor.WebApi.Controllers.HealthMonitor } - [HttpGet] - public async Task GetMode(string sn) - { - var res= await _serviceTDengine.GetBySerialNoAsync(sn); - return View(res); - } + //[HttpGet] + //public async Task GetMode(string sn) + //{ + // var res= await _serviceTDengine.GetBySerialNoAsync(sn); + // return View(res); + //} //[HttpPost] //public async Task SetMockMode([FromBody] PregnancyCommonHeartRateModel pchr) @@ -42,15 +42,22 @@ namespace HealthMonitor.WebApi.Controllers.HealthMonitor // return View(pchr); //} + [HttpGet] + public async Task> GetMode(string sn) + { + var res = await _serviceTDengine.GetBySerialNoAsync(sn); + return res; + } + [HttpPost] - public async Task SetMockMode([FromBody] string sn, int mockMax,int mockMin,string remark="mock") + public async Task SetMockMode(string sn, int mockMax,int mockMin,string remark="mock") { var res= await _serviceTDengine.GetBySerialNoAsync(sn); var pchr = res.FirstOrDefault(); if (pchr == null) { - return View("NULL"); + return "NULL"; } pchr.MaxValue = mockMax; pchr.MinValue = mockMin; @@ -58,10 +65,10 @@ namespace HealthMonitor.WebApi.Controllers.HealthMonitor pchr.Timestamp = DateTime.Now; await _serviceTDengine.InsertAsync("hm_pchr", pchr); var flag=await _serviceIotApi.SetFetalConfig(pchr.SerialNumber, 1, pchr.MaxValue, pchr.MinValue); - return View(new { + return new { flag, pchr - }); + }; } }