kisame/PIBD-22_Denisov_V.D_ProjectPolyclinic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

фикс слияния

Browse Source
This commit is contained in:
Денисов Вячеслав Денисович 2024-12-17 20:43:41 +04:00
parent 90853a78c7
commit f8a0a206d9
6 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ProjectPolyclinic/ProjectPolyclinic/Forms/DrugsCountReport.resx
View File

@ -59,7 +59,9 @@
: using a System.ComponentModel.TypeConverter : using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http:
www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType> <xsd:complexType>

7
ProjectPolyclinic/ProjectPolyclinic/Forms/FormDirectoryReport.Designer.cs generated
View File

@ -2,7 +2,12 @@
{ {
partial class FormDirectoryReport partial class FormDirectoryReport
{ {
/// <summary>
/ <summary>
/// Required designer variable. /// Required designer variable.
/// </summary> /// </summary>
private System.ComponentModel.IContainer components = null; private System.ComponentModel.IContainer components = null;

6
ProjectPolyclinic/ProjectPolyclinic/Forms/FormDirectoryReport.resx
View File

@ -59,7 +59,11 @@
: using a System.ComponentModel.TypeConverter : using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding. : and then encoded with base64 encoding.
--> -->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http:
www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType> <xsd:complexType>

3
ProjectPolyclinic/ProjectPolyclinic/Forms/FormDoctor.Designer.cs generated
View File

@ -2,7 +2,8 @@
{ {
partial class FormDoctor partial class FormDoctor
{ {
/// <summary>
/ <summary>
/// Required designer variable. /// Required designer variable.
/// </summary> /// </summary>
private System.ComponentModel.IContainer components = null; private System.ComponentModel.IContainer components = null;

1
ProjectPolyclinic/ProjectPolyclinic/Repositories/Implementations/DoctorRepository.cs
View File

@ -54,7 +54,6 @@ public class DoctorRepository : IDoctorRepository
{ {
using var connection = new NpgsqlConnection(_connectionString.ConnectionString); using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
// Проверяем, существует ли запись
var existingDoctor = connection.QueryFirstOrDefault<Doctor>("SELECT * FROM Doctors WHERE id = @Id", new { doctor.Id }); var existingDoctor = connection.QueryFirstOrDefault<Doctor>("SELECT * FROM Doctors WHERE id = @Id", new { doctor.Id });
if (existingDoctor == null) if (existingDoctor == null)
{ {

7
ProjectPolyclinic/ProjectPolyclinic/Repositories/Implementations/MedicalHistoryRepository.cs
View File

@ -169,11 +169,4 @@ public class MedicalHistoryRepository : IMedicalHistoryRepository
throw; throw;
} }
} }
} }