hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

Merge branch 'develop' into working

Browse source 
# Conflicts:
#	BMA.EHR.Discipline.Service/Controllers/DisciplineInvestigateController.cs
This commit is contained in:
Kittapath 2023-11-24 15:29:02 +07:00
commit 37d9a5d7f5
61 changed files with 74888 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

28
BMA.EHR.Discipline.Service/Controllers/DisciplineComplaintController.cs
View file

@ -130,7 +130,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
.Where(x => x.Id == id)
.FirstOrDefaultAsync();
if (_data == null)
return Error(new Exception(GlobalMessages.DataNotFound), (int)StatusCodes.Status404NotFound);
return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
var disciplineComplaintDocs = new List<dynamic>();
foreach (var doc in _data.DisciplineComplaintDocs)
@ -242,9 +242,9 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
{
var data = await _context.DisciplineComplaints.Include(x => x.DisciplineComplaint_Profiles).Where(x => x.Id == id).FirstOrDefaultAsync();
if (data == null)
return Error(new Exception(GlobalMessages.DataNotFound), (int)StatusCodes.Status404NotFound);
return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
if (data.Status.Trim().ToUpper() != "NEW")
return Error(new Exception("ไม่สามารถแก้ไขข้อมูลนี้ได้"), (int)StatusCodes.Status500InternalServerError);
return Error(new Exception("ไม่สามารถแก้ไขข้อมูลนี้ได้"), StatusCodes.Status500InternalServerError);
data.RespondentType = req.respondentType.Trim().ToUpper();
data.Organization = req.organizationId;
@ -310,7 +310,7 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
.Where(x => x.Id == id)
.FirstOrDefaultAsync();
if (data == null)
return Error(new Exception(GlobalMessages.DataNotFound), (int)StatusCodes.Status404NotFound);
return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
_context.DisciplineComplaints.Remove(data);
// var _docId = data.Document.Id;
// await _context.SaveChangesAsync();
@ -334,9 +334,9 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
.Where(x => x.Id == id)
.FirstOrDefaultAsync();
if (data == null)
return Error(new Exception(GlobalMessages.DataNotFound), (int)StatusCodes.Status404NotFound);
return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
if (data.Status.Trim().ToUpper() != "NEW")
return Error(new Exception("ไม่สามารถยุติเรื่องได้"), (int)StatusCodes.Status500InternalServerError);
return Error(new Exception("ไม่สามารถยุติเรื่องได้"), StatusCodes.Status500InternalServerError);
data.Status = "STOP";
await _context.SaveChangesAsync();
@ -362,9 +362,9 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
.Where(x => x.Id == id)
.FirstOrDefaultAsync();
if (data == null)
return Error(new Exception(GlobalMessages.DataNotFound), (int)StatusCodes.Status404NotFound);
return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
if (data.Status.Trim().ToUpper() != "NEW")
return Error(new Exception("ไม่สามารถส่งต่อไปสืบสวนได้"), (int)StatusCodes.Status500InternalServerError);
return Error(new Exception("ไม่สามารถส่งต่อไปสืบสวนได้"), StatusCodes.Status500InternalServerError);
data.Status = "SEND_INVESTIGATE";
var disciplineInvestigate = new Domain.Models.Discipline.DisciplineInvestigate
@ -450,9 +450,9 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
.Where(x => x.Id == id)
.FirstOrDefaultAsync();
if (data == null)
return Error(new Exception(GlobalMessages.DataNotFound), (int)StatusCodes.Status404NotFound);
return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
if (data.Status.Trim().ToUpper() != "STOP")
return Error(new Exception("รายการนี้ยังไม่ถูกยุติเรื่อง"), (int)StatusCodes.Status500InternalServerError);
return Error(new Exception("รายการนี้ยังไม่ถูกยุติเรื่อง"), StatusCodes.Status500InternalServerError);
data.Status = "NEW";
await _context.SaveChangesAsync();
@ -474,9 +474,9 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
.Where(x => x.Id == id)
.FirstOrDefaultAsync();
if (data == null)
return Error(new Exception(GlobalMessages.DataNotFound), (int)StatusCodes.Status404NotFound);
return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
if (data.Status.Trim().ToUpper() != "NEW")
return Error(new Exception("ไม่สามารถแก้ไขข้อมูลนี้ได้"), (int)StatusCodes.Status500InternalServerError);
return Error(new Exception("ไม่สามารถแก้ไขข้อมูลนี้ได้"), StatusCodes.Status500InternalServerError);
if (Request.Form.Files != null && Request.Form.Files.Count != 0)
{
@ -524,9 +524,9 @@ namespace BMA.EHR.DisciplineComplaint.Service.Controllers
.Where(x => x.Id == id)
.FirstOrDefaultAsync();
if (data == null)
return Error(new Exception(GlobalMessages.DataNotFound), (int)StatusCodes.Status404NotFound);
return Error(new Exception(GlobalMessages.DataNotFound), StatusCodes.Status404NotFound);
if (data.Status.Trim().ToUpper() != "NEW")
return Error(new Exception("ไม่สามารถแก้ไขข้อมูลนี้ได้"), (int)StatusCodes.Status500InternalServerError);
return Error(new Exception("ไม่สามารถแก้ไขข้อมูลนี้ได้"), StatusCodes.Status500InternalServerError);
var dataDoc = data.DisciplineComplaint_Docs.Where(x => x.Document.Id == docId).FirstOrDefault();
if (dataDoc != null)
{