Version 2018-05-25

2018-05-25 09:16:37 +02:00
parent 482a2ae3ce
commit 7c22a2e6d1
76 changed files with 3035 additions and 1105 deletions
--- a/DPM2016/Patient/Patient.Designer.vb
+++ b/DPM2016/Patient/Patient.Designer.vb
@@ -41,35 +41,36 @@ Partial Class Patient
        Me.SuperTabControl1 = New DevComponents.DotNetBar.SuperTabControl()
        Me.SuperTabControlPanel1 = New DevComponents.DotNetBar.SuperTabControlPanel()
        Me.btnVTX = New System.Windows.Forms.Button()
-        Me.PatientDetails1 = New DPM2016.PatientDetails()
        Me.Stammdaten = New DevComponents.DotNetBar.SuperTabItem()
        Me.SuperTabControlPanel3 = New DevComponents.DotNetBar.SuperTabControlPanel()
-        Me.Behandlung1 = New DPM2016.Behandlung()
        Me.Behandlungen = New DevComponents.DotNetBar.SuperTabItem()
        Me.SuperTabControlPanel2 = New DevComponents.DotNetBar.SuperTabControlPanel()
-        Me.PatientAbrechnung1 = New DPM2016.PatientAbrechnung()
        Me.Abrechnung = New DevComponents.DotNetBar.SuperTabItem()
+        Me.SuperTabControlPanel5 = New DevComponents.DotNetBar.SuperTabControlPanel()
+        Me.Finanzen = New DevComponents.DotNetBar.SuperTabItem()
        Me.SuperTabControlPanel4 = New DevComponents.DotNetBar.SuperTabControlPanel()
-        Me.Krankengeschichte1 = New DPM2016.Krankengeschichte()
        Me.Krankengeschichte = New DevComponents.DotNetBar.SuperTabItem()
        Me.SuperTabControlPanel6 = New DevComponents.DotNetBar.SuperTabControlPanel()
-        Me.Recall1 = New DPM2016.Recall()
        Me.Recall = New DevComponents.DotNetBar.SuperTabItem()
-        Me.SuperTabControlPanel5 = New DevComponents.DotNetBar.SuperTabControlPanel()
-        Me.Finanzen1 = New DPM2016.Finanzen()
-        Me.Finanzen = New DevComponents.DotNetBar.SuperTabItem()
        Me.MenuStrip1 = New System.Windows.Forms.MenuStrip()
        Me.DateiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.BeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.PatientDetails1 = New DPM2016.PatientDetails()
+        Me.Behandlung1 = New DPM2016.Behandlung()
+        Me.PatientAbrechnung1 = New DPM2016.PatientAbrechnung()
+        Me.Finanzen1 = New DPM2016.Finanzen()
+        Me.Krankengeschichte1 = New DPM2016.Krankengeschichte()
+        Me.Recall1 = New DPM2016.Recall()
        Me.ToolStrip1.SuspendLayout()
        CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuperTabControl1.SuspendLayout()
        Me.SuperTabControlPanel1.SuspendLayout()
        Me.SuperTabControlPanel3.SuspendLayout()
        Me.SuperTabControlPanel2.SuspendLayout()
+        Me.SuperTabControlPanel5.SuspendLayout()
        Me.SuperTabControlPanel4.SuspendLayout()
        Me.SuperTabControlPanel6.SuspendLayout()
-        Me.SuperTabControlPanel5.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.SuspendLayout()
        '
@@ -219,9 +220,9 @@ Partial Class Patient
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel1)
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel3)
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel2)
+        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel5)
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel4)
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel6)
-        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel5)
        Me.SuperTabControl1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.SuperTabControl1.Location = New System.Drawing.Point(0, 49)
        Me.SuperTabControl1.Name = "SuperTabControl1"
@@ -254,17 +255,6 @@ Partial Class Patient
        Me.btnVTX.TabIndex = 18
        Me.btnVTX.UseVisualStyleBackColor = True
        '
-        'PatientDetails1
-        '
-        Me.PatientDetails1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.PatientDetails1.HasChanges = False
-        Me.PatientDetails1.Location = New System.Drawing.Point(0, 0)
-        Me.PatientDetails1.Name = "PatientDetails1"
-        Me.PatientDetails1.Patientname = "   "
-        Me.PatientDetails1.PatientNr = 0
-        Me.PatientDetails1.Size = New System.Drawing.Size(1278, 612)
-        Me.PatientDetails1.TabIndex = 17
-        '
        'Stammdaten
        '
        Me.Stammdaten.AttachedControl = Me.SuperTabControlPanel1
@@ -282,16 +272,6 @@ Partial Class Patient
        Me.SuperTabControlPanel3.TabIndex = 0
        Me.SuperTabControlPanel3.TabItem = Me.Behandlungen
        '
-        'Behandlung1
-        '
-        Me.Behandlung1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Behandlung1.HasChanges = False
-        Me.Behandlung1.Location = New System.Drawing.Point(0, 0)
-        Me.Behandlung1.Name = "Behandlung1"
-        Me.Behandlung1.PatientNr = 0
-        Me.Behandlung1.Size = New System.Drawing.Size(1278, 612)
-        Me.Behandlung1.TabIndex = 0
-        '
        'Behandlungen
        '
        Me.Behandlungen.AttachedControl = Me.SuperTabControlPanel3
@@ -305,20 +285,10 @@ Partial Class Patient
        Me.SuperTabControlPanel2.Dock = System.Windows.Forms.DockStyle.Fill
        Me.SuperTabControlPanel2.Location = New System.Drawing.Point(0, 25)
        Me.SuperTabControlPanel2.Name = "SuperTabControlPanel2"
-        Me.SuperTabControlPanel2.Size = New System.Drawing.Size(1006, 803)
+        Me.SuperTabControlPanel2.Size = New System.Drawing.Size(1278, 612)
        Me.SuperTabControlPanel2.TabIndex = 0
        Me.SuperTabControlPanel2.TabItem = Me.Abrechnung
        '
-        'PatientAbrechnung1
-        '
-        Me.PatientAbrechnung1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.PatientAbrechnung1.HasChanges = False
-        Me.PatientAbrechnung1.Location = New System.Drawing.Point(0, 0)
-        Me.PatientAbrechnung1.Name = "PatientAbrechnung1"
-        Me.PatientAbrechnung1.PatientNr = 0
-        Me.PatientAbrechnung1.Size = New System.Drawing.Size(1006, 803)
-        Me.PatientAbrechnung1.TabIndex = 0
-        '
        'Abrechnung
        '
        Me.Abrechnung.AttachedControl = Me.SuperTabControlPanel2
@@ -326,25 +296,33 @@ Partial Class Patient
        Me.Abrechnung.Name = "Abrechnung"
        Me.Abrechnung.Text = "Abrechnung"
        '
+        'SuperTabControlPanel5
+        '
+        Me.SuperTabControlPanel5.Controls.Add(Me.Finanzen1)
+        Me.SuperTabControlPanel5.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SuperTabControlPanel5.Location = New System.Drawing.Point(0, 25)
+        Me.SuperTabControlPanel5.Name = "SuperTabControlPanel5"
+        Me.SuperTabControlPanel5.Size = New System.Drawing.Size(1278, 612)
+        Me.SuperTabControlPanel5.TabIndex = 0
+        Me.SuperTabControlPanel5.TabItem = Me.Finanzen
+        '
+        'Finanzen
+        '
+        Me.Finanzen.AttachedControl = Me.SuperTabControlPanel5
+        Me.Finanzen.GlobalItem = False
+        Me.Finanzen.Name = "Finanzen"
+        Me.Finanzen.Text = "Finanzen"
+        '
        'SuperTabControlPanel4
        '
        Me.SuperTabControlPanel4.Controls.Add(Me.Krankengeschichte1)
        Me.SuperTabControlPanel4.Dock = System.Windows.Forms.DockStyle.Fill
        Me.SuperTabControlPanel4.Location = New System.Drawing.Point(0, 25)
        Me.SuperTabControlPanel4.Name = "SuperTabControlPanel4"
-        Me.SuperTabControlPanel4.Size = New System.Drawing.Size(1006, 803)
+        Me.SuperTabControlPanel4.Size = New System.Drawing.Size(1278, 612)
        Me.SuperTabControlPanel4.TabIndex = 0
        Me.SuperTabControlPanel4.TabItem = Me.Krankengeschichte
        '
-        'Krankengeschichte1
-        '
-        Me.Krankengeschichte1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Krankengeschichte1.Location = New System.Drawing.Point(0, 0)
-        Me.Krankengeschichte1.Name = "Krankengeschichte1"
-        Me.Krankengeschichte1.Patientnr = 0
-        Me.Krankengeschichte1.Size = New System.Drawing.Size(1006, 803)
-        Me.Krankengeschichte1.TabIndex = 0
-        '
        'Krankengeschichte
        '
        Me.Krankengeschichte.AttachedControl = Me.SuperTabControlPanel4
@@ -359,19 +337,10 @@ Partial Class Patient
        Me.SuperTabControlPanel6.Dock = System.Windows.Forms.DockStyle.Fill
        Me.SuperTabControlPanel6.Location = New System.Drawing.Point(0, 25)
        Me.SuperTabControlPanel6.Name = "SuperTabControlPanel6"
-        Me.SuperTabControlPanel6.Size = New System.Drawing.Size(1006, 803)
+        Me.SuperTabControlPanel6.Size = New System.Drawing.Size(1278, 612)
        Me.SuperTabControlPanel6.TabIndex = 0
        Me.SuperTabControlPanel6.TabItem = Me.Recall
        '
-        'Recall1
-        '
-        Me.Recall1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Recall1.Location = New System.Drawing.Point(0, 0)
-        Me.Recall1.Name = "Recall1"
-        Me.Recall1.Patientnr = 0
-        Me.Recall1.Size = New System.Drawing.Size(1006, 803)
-        Me.Recall1.TabIndex = 0
-        '
        'Recall
        '
        Me.Recall.AttachedControl = Me.SuperTabControlPanel6
@@ -379,32 +348,6 @@ Partial Class Patient
        Me.Recall.Name = "Recall"
        Me.Recall.Text = "Recall"
        '
-        'SuperTabControlPanel5
-        '
-        Me.SuperTabControlPanel5.Controls.Add(Me.Finanzen1)
-        Me.SuperTabControlPanel5.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SuperTabControlPanel5.Location = New System.Drawing.Point(0, 25)
-        Me.SuperTabControlPanel5.Name = "SuperTabControlPanel5"
-        Me.SuperTabControlPanel5.Size = New System.Drawing.Size(1006, 803)
-        Me.SuperTabControlPanel5.TabIndex = 0
-        Me.SuperTabControlPanel5.TabItem = Me.Finanzen
-        '
-        'Finanzen1
-        '
-        Me.Finanzen1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Finanzen1.Location = New System.Drawing.Point(0, 0)
-        Me.Finanzen1.Name = "Finanzen1"
-        Me.Finanzen1.Patientnr = 0
-        Me.Finanzen1.Size = New System.Drawing.Size(1006, 803)
-        Me.Finanzen1.TabIndex = 0
-        '
-        'Finanzen
-        '
-        Me.Finanzen.AttachedControl = Me.SuperTabControlPanel5
-        Me.Finanzen.GlobalItem = False
-        Me.Finanzen.Name = "Finanzen"
-        Me.Finanzen.Text = "Finanzen"
-        '
        'MenuStrip1
        '
        Me.MenuStrip1.AllowMerge = False
@@ -428,11 +371,81 @@ Partial Class Patient
        Me.BeendenToolStripMenuItem.Size = New System.Drawing.Size(120, 22)
        Me.BeendenToolStripMenuItem.Text = "&Beenden"
        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.Location = New System.Drawing.Point(928, 0)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(63, 20)
+        Me.Label1.TabIndex = 20
+        Me.Label1.Text = "Label1"
+        Me.Label1.TextAlign = System.Drawing.ContentAlignment.TopRight
+        '
+        'PatientDetails1
+        '
+        Me.PatientDetails1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.PatientDetails1.HasChanges = False
+        Me.PatientDetails1.Location = New System.Drawing.Point(0, 0)
+        Me.PatientDetails1.Name = "PatientDetails1"
+        Me.PatientDetails1.Patientname = "0   "
+        Me.PatientDetails1.PatientNr = 0
+        Me.PatientDetails1.Size = New System.Drawing.Size(1278, 612)
+        Me.PatientDetails1.TabIndex = 17
+        '
+        'Behandlung1
+        '
+        Me.Behandlung1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Behandlung1.HasChanges = False
+        Me.Behandlung1.Location = New System.Drawing.Point(0, 0)
+        Me.Behandlung1.Name = "Behandlung1"
+        Me.Behandlung1.PatientNr = 0
+        Me.Behandlung1.Size = New System.Drawing.Size(1278, 612)
+        Me.Behandlung1.TabIndex = 0
+        '
+        'PatientAbrechnung1
+        '
+        Me.PatientAbrechnung1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.PatientAbrechnung1.HasChanges = False
+        Me.PatientAbrechnung1.Location = New System.Drawing.Point(0, 0)
+        Me.PatientAbrechnung1.Name = "PatientAbrechnung1"
+        Me.PatientAbrechnung1.PatientNr = 0
+        Me.PatientAbrechnung1.Size = New System.Drawing.Size(1278, 612)
+        Me.PatientAbrechnung1.TabIndex = 0
+        '
+        'Finanzen1
+        '
+        Me.Finanzen1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Finanzen1.Location = New System.Drawing.Point(0, 0)
+        Me.Finanzen1.Name = "Finanzen1"
+        Me.Finanzen1.Patientnr = 0
+        Me.Finanzen1.Size = New System.Drawing.Size(1278, 612)
+        Me.Finanzen1.TabIndex = 0
+        '
+        'Krankengeschichte1
+        '
+        Me.Krankengeschichte1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Krankengeschichte1.Location = New System.Drawing.Point(0, 0)
+        Me.Krankengeschichte1.Name = "Krankengeschichte1"
+        Me.Krankengeschichte1.Patientnr = 0
+        Me.Krankengeschichte1.Size = New System.Drawing.Size(1278, 612)
+        Me.Krankengeschichte1.TabIndex = 0
+        '
+        'Recall1
+        '
+        Me.Recall1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Recall1.Location = New System.Drawing.Point(0, 0)
+        Me.Recall1.Name = "Recall1"
+        Me.Recall1.Patientnr = 0
+        Me.Recall1.Size = New System.Drawing.Size(1278, 612)
+        Me.Recall1.TabIndex = 0
+        '
        'Patient
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(1278, 686)
+        Me.Controls.Add(Me.Label1)
        Me.Controls.Add(Me.SuperTabControl1)
        Me.Controls.Add(Me.ToolStrip1)
        Me.Controls.Add(Me.MenuStrip1)
@@ -448,9 +461,9 @@ Partial Class Patient
        Me.SuperTabControlPanel1.ResumeLayout(False)
        Me.SuperTabControlPanel3.ResumeLayout(False)
        Me.SuperTabControlPanel2.ResumeLayout(False)
+        Me.SuperTabControlPanel5.ResumeLayout(False)
        Me.SuperTabControlPanel4.ResumeLayout(False)
        Me.SuperTabControlPanel6.ResumeLayout(False)
-        Me.SuperTabControlPanel5.ResumeLayout(False)
        Me.MenuStrip1.ResumeLayout(False)
        Me.MenuStrip1.PerformLayout()
        Me.ResumeLayout(False)
@@ -495,4 +508,5 @@ Partial Class Patient
    Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
    Friend WithEvents tsbtnVTX As ToolStripButton
    Friend WithEvents btnVTX As Button
+    Friend WithEvents Label1 As Label
 End Class
--- a/DPM2016/Patient/Patient.vb
+++ b/DPM2016/Patient/Patient.vb
@@ -6,6 +6,7 @@
            Return m_nrpatient
        End Get
        Set(value As Integer)
+            Cursor = Cursors.WaitCursor
            Globals.OnLoad = True
            m_nrpatient = value
            Me.PatientDetails1.PatientNr = value
@@ -14,7 +15,7 @@
            Me.Finanzen1.Patientnr = value
            Me.Recall1.Patientnr = value
            Globals.OnLoad = False
-
+            Cursor = Cursors.Default
        End Set
    End Property

@@ -54,6 +55,11 @@
    End Function

    Private Sub Patient_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        Select Case Globals.Funktionsstufe
+            Case 2
+                Me.Behandlungen.Visible = False
+                Me.Finanzen.Visible = False
+        End Select
        Me.tsbtnfirst_Click(sender, e)
        Dim db As New clsDB
        If db.Get_Option(9999) = "" Then
@@ -85,6 +91,8 @@

    Private Sub evh_PatName_Changed(name As String, nr As Integer) Handles evh.PatName_Changed
        If nr = Me.PatientNr Then Me.Text = name
+        Me.Label1.Text = PatientDetails1.Patientname
+        Me.Label1.Left = Me.Width / 2 - 8 - Me.Label1.Width / 2
    End Sub

    Private Sub BeendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BeendenToolStripMenuItem.Click
@@ -97,13 +105,14 @@

    Private Sub evh_PatSaved(Nr As Integer) Handles evh.PatSaved
        Me.Text = PatientDetails1.Patientname
+        Me.Label1.Text = PatientDetails1.Patientname
    End Sub

 
    Private Sub tsbtnfirst_Click(sender As Object, e As EventArgs) Handles tsbtnfirst.Click
        If detail_has_changes() = False Then Return
        Dim db As New clsDB
-        db.Get_Tabledata("Patient", "", db.Get_SQL(9))
+        db.Get_Tabledata("Patient", "", "Select top 1 * from privat where nrprivat>0 order by name, vorname, ort,nrprivat")
        Me.PatientNr = db.dsDaten.Tables(0).Rows(0).Item(0)
        db.Dispose()
    End Sub
@@ -118,26 +127,46 @@

    Private Sub tsbtnnext_Click(sender As Object, e As EventArgs) Handles tsbtnnext.Click
        If detail_has_changes() = False Then Return
+        Dim xx As Integer = 0
        Dim db As New clsDB
        Try
-            db.Get_Tabledata("Patient", "", db.Get_SQL(11), Me.m_nrpatient.ToString)
+            Me.Cursor = Cursors.WaitCursor
+            db.Get_Tabledata("Patient", "", "select * from privat where nrprivat=" + Me.PatientNr.ToString)
+            Dim searchstring As String = ""
+            searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("Name").ToString
+            searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("Vorname").ToString
+            searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("ort").ToString
+            db.Get_Tabledata("Patient", "", "Select top 1 * from privat where name <>'' and nrprivat>0 and name+vorname+ort>='" + searchstring + "' and nrprivat<>" + Me.PatientNr.ToString + " order by name, vorname, ort, nrprivat")
+            '            db.Get_Tabledata("Patient", "", db.Get_SQL(11), Me.m_nrpatient.ToString)
            Me.PatientNr = db.dsDaten.Tables(0).Rows(0).Item(0)
-        Catch
+        Catch ex As Exception
+            'MsgBox(ex.Message)
            Me.PatientNr = Me.PatientNr
        End Try
        db.Dispose()
+        Me.Cursor = Cursors.Default
    End Sub

    Private Sub tsbtprev_Click(sender As Object, e As EventArgs) Handles tsbtprev.Click
        If detail_has_changes() = False Then Return
+        Dim xx As Integer = 0
        Dim db As New clsDB
        Try
-            db.Get_Tabledata("Patient", "", db.Get_SQL(12), Me.m_nrpatient.ToString)
+            Me.Cursor = Cursors.WaitCursor
+            db.Get_Tabledata("Patient", "", "select * from privat where nrprivat=" + Me.PatientNr.ToString)
+            Dim searchstring As String = ""
+            searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("Name").ToString
+            searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("Vorname").ToString
+            searchstring = searchstring + db.dsDaten.Tables(0).Rows(0).Item("ort").ToString
+            db.Get_Tabledata("Patient", "", "Select top 1 * from privat where name <>'' and nrprivat>0 and name+vorname+ort<='" + searchstring + "' and nrprivat<>" + Me.PatientNr.ToString + " order by name desc, vorname desc, ort desc , nrprivat desc")
+            '            db.Get_Tabledata("Patient", "", db.Get_SQL(11), Me.m_nrpatient.ToString)
            Me.PatientNr = db.dsDaten.Tables(0).Rows(0).Item(0)
-        Catch
+        Catch ex As Exception
+            'MsgBox(ex.Message)
            Me.PatientNr = Me.PatientNr
        End Try
        db.Dispose()
+        Me.Cursor = Cursors.Default
    End Sub

    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles tsbtnnew.Click
@@ -219,7 +248,7 @@
        PrintLine(1, "ERRORTEXT=0")
        FileClose(1)
        Try
-            MsgBox(vddsmodule + " " + filename)
+            ' MsgBox(vddsmodule + " " + filename)
            Process.Start(vddsmodule, filename)
        Catch
        End Try
@@ -229,4 +258,12 @@
    Private Sub tnVTX_Click(sender As Object, e As EventArgs) Handles btnVTX.Click
        Me.tsbtnVTX_Click(sender, e)
    End Sub
+
+    Private Sub Patient_Resize(sender As Object, e As EventArgs) Handles Me.Resize
+        Me.Label1.Left = Me.Width / 2 - 8 - Me.Label1.Width / 2
+    End Sub
+
+    Private Sub ToolStrip1_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) Handles ToolStrip1.ItemClicked
+
+    End Sub
 End Class
--- a/DPM2016/Patient/PatientDetails.Designer.vb
+++ b/DPM2016/Patient/PatientDetails.Designer.vb
@@ -77,17 +77,17 @@ Partial Class PatientDetails
        Me.dtgebdat = New System.Windows.Forms.DateTimePicker()
        Me.dtGueltigab = New System.Windows.Forms.DateTimePicker()
        Me.dtgueltigbis = New System.Windows.Forms.DateTimePicker()
-        Me.cbboxNRArbeitgeber = New DPM2016.MyCombobox()
-        Me.cbboxNrGeschlecht = New DPM2016.MyCombobox()
-        Me.cbboxSprache = New DPM2016.MyCombobox()
-        Me.cbboxStatus = New DPM2016.MyCombobox()
-        Me.cbboxNRTitel = New DPM2016.MyCombobox()
-        Me.cbboxNrAnrede = New DPM2016.MyCombobox()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.cbtxtboxKanton = New System.Windows.Forms.ComboBox()
        Me.lblGLN = New System.Windows.Forms.Label()
        Me.txtGLN = New System.Windows.Forms.TextBox()
        Me.txtZSR = New System.Windows.Forms.TextBox()
+        Me.cbboxNRArbeitgeber = New DPM2016.MyCombobox()
+        Me.cbboxGeschlecht = New DPM2016.MyCombobox()
+        Me.cbboxSprache = New DPM2016.MyCombobox()
+        Me.cbboxStatus = New DPM2016.MyCombobox()
+        Me.cbboxNRTitel = New DPM2016.MyCombobox()
+        Me.cbboxNrAnrede = New DPM2016.MyCombobox()
        Me.SuspendLayout()
        '
        'txtnrprivat
@@ -578,6 +578,49 @@ Partial Class PatientDetails
        Me.dtgueltigbis.Size = New System.Drawing.Size(162, 20)
        Me.dtgueltigbis.TabIndex = 28
        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.BackColor = System.Drawing.Color.Transparent
+        Me.Label3.Location = New System.Drawing.Point(3, 225)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(41, 13)
+        Me.Label3.TabIndex = 208
+        Me.Label3.Text = "Kanton"
+        '
+        'cbtxtboxKanton
+        '
+        Me.cbtxtboxKanton.FormattingEnabled = True
+        Me.cbtxtboxKanton.Items.AddRange(New Object() {"AG", "AR", "AI", "BL", "BS", "BE", "FR", "GE", "GL", "GR", "JU", "LU", "NE", "NW", "OW", "SG", "SH", "SZ", "SO", "TG", "TI", "UR", "VD", "VS", "ZG", "ZH"})
+        Me.cbtxtboxKanton.Location = New System.Drawing.Point(74, 221)
+        Me.cbtxtboxKanton.Name = "cbtxtboxKanton"
+        Me.cbtxtboxKanton.Size = New System.Drawing.Size(162, 21)
+        Me.cbtxtboxKanton.TabIndex = 9
+        '
+        'lblGLN
+        '
+        Me.lblGLN.AutoSize = True
+        Me.lblGLN.BackColor = System.Drawing.Color.Transparent
+        Me.lblGLN.Location = New System.Drawing.Point(272, 174)
+        Me.lblGLN.Name = "lblGLN"
+        Me.lblGLN.Size = New System.Drawing.Size(56, 13)
+        Me.lblGLN.TabIndex = 210
+        Me.lblGLN.Text = "GLN/ZSR"
+        '
+        'txtGLN
+        '
+        Me.txtGLN.Location = New System.Drawing.Point(342, 171)
+        Me.txtGLN.Name = "txtGLN"
+        Me.txtGLN.Size = New System.Drawing.Size(107, 20)
+        Me.txtGLN.TabIndex = 23
+        '
+        'txtZSR
+        '
+        Me.txtZSR.Location = New System.Drawing.Point(455, 171)
+        Me.txtZSR.Name = "txtZSR"
+        Me.txtZSR.Size = New System.Drawing.Size(49, 20)
+        Me.txtZSR.TabIndex = 24
+        '
        'cbboxNRArbeitgeber
        '
        Me.cbboxNRArbeitgeber.Dataselection = Nothing
@@ -590,17 +633,17 @@ Partial Class PatientDetails
        Me.cbboxNRArbeitgeber.TableAlias = ""
        Me.cbboxNRArbeitgeber.Valuemember = Nothing
        '
-        'cbboxNrGeschlecht
+        'cbboxGeschlecht
        '
-        Me.cbboxNrGeschlecht.Dataselection = Nothing
-        Me.cbboxNrGeschlecht.Displaymember = Nothing
-        Me.cbboxNrGeschlecht.Location = New System.Drawing.Point(74, 405)
-        Me.cbboxNrGeschlecht.Name = "cbboxNrGeschlecht"
-        Me.cbboxNrGeschlecht.Size = New System.Drawing.Size(162, 21)
-        Me.cbboxNrGeschlecht.TabIndex = 16
-        Me.cbboxNrGeschlecht.Table = Nothing
-        Me.cbboxNrGeschlecht.TableAlias = ""
-        Me.cbboxNrGeschlecht.Valuemember = Nothing
+        Me.cbboxGeschlecht.Dataselection = Nothing
+        Me.cbboxGeschlecht.Displaymember = Nothing
+        Me.cbboxGeschlecht.Location = New System.Drawing.Point(74, 405)
+        Me.cbboxGeschlecht.Name = "cbboxGeschlecht"
+        Me.cbboxGeschlecht.Size = New System.Drawing.Size(162, 21)
+        Me.cbboxGeschlecht.TabIndex = 16
+        Me.cbboxGeschlecht.Table = Nothing
+        Me.cbboxGeschlecht.TableAlias = ""
+        Me.cbboxGeschlecht.Valuemember = Nothing
        '
        'cbboxSprache
        '
@@ -650,49 +693,6 @@ Partial Class PatientDetails
        Me.cbboxNrAnrede.TableAlias = ""
        Me.cbboxNrAnrede.Valuemember = Nothing
        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.BackColor = System.Drawing.Color.Transparent
-        Me.Label3.Location = New System.Drawing.Point(3, 225)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(41, 13)
-        Me.Label3.TabIndex = 208
-        Me.Label3.Text = "Kanton"
-        '
-        'cbtxtboxKanton
-        '
-        Me.cbtxtboxKanton.FormattingEnabled = True
-        Me.cbtxtboxKanton.Items.AddRange(New Object() {"AG", "AR", "AI", "BL", "BS", "BE", "FR", "GE", "GL", "GR", "JU", "LU", "NE", "NW", "OW", "SG", "SH", "SZ", "SO", "TG", "TI", "UR", "VD", "VS", "ZG", "ZH"})
-        Me.cbtxtboxKanton.Location = New System.Drawing.Point(74, 221)
-        Me.cbtxtboxKanton.Name = "cbtxtboxKanton"
-        Me.cbtxtboxKanton.Size = New System.Drawing.Size(162, 21)
-        Me.cbtxtboxKanton.TabIndex = 9
-        '
-        'lblGLN
-        '
-        Me.lblGLN.AutoSize = True
-        Me.lblGLN.BackColor = System.Drawing.Color.Transparent
-        Me.lblGLN.Location = New System.Drawing.Point(272, 174)
-        Me.lblGLN.Name = "lblGLN"
-        Me.lblGLN.Size = New System.Drawing.Size(56, 13)
-        Me.lblGLN.TabIndex = 210
-        Me.lblGLN.Text = "GLN/ZSR"
-        '
-        'txtGLN
-        '
-        Me.txtGLN.Location = New System.Drawing.Point(342, 171)
-        Me.txtGLN.Name = "txtGLN"
-        Me.txtGLN.Size = New System.Drawing.Size(107, 20)
-        Me.txtGLN.TabIndex = 23
-        '
-        'txtZSR
-        '
-        Me.txtZSR.Location = New System.Drawing.Point(455, 171)
-        Me.txtZSR.Name = "txtZSR"
-        Me.txtZSR.Size = New System.Drawing.Size(49, 20)
-        Me.txtZSR.TabIndex = 24
-        '
        'PatientDetails
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -703,7 +703,7 @@ Partial Class PatientDetails
        Me.Controls.Add(Me.cbtxtboxKanton)
        Me.Controls.Add(Me.Label3)
        Me.Controls.Add(Me.cbboxNRArbeitgeber)
-        Me.Controls.Add(Me.cbboxNrGeschlecht)
+        Me.Controls.Add(Me.cbboxGeschlecht)
        Me.Controls.Add(Me.cbboxSprache)
        Me.Controls.Add(Me.cbboxStatus)
        Me.Controls.Add(Me.cbboxNRTitel)
@@ -828,7 +828,7 @@ Partial Class PatientDetails
    Friend WithEvents cbboxNRTitel As DPM2016.MyCombobox
    Friend WithEvents cbboxStatus As DPM2016.MyCombobox
    Friend WithEvents cbboxSprache As DPM2016.MyCombobox
-    Friend WithEvents cbboxNrGeschlecht As DPM2016.MyCombobox
+    Friend WithEvents cbboxGeschlecht As DPM2016.MyCombobox
    Friend WithEvents cbboxNRArbeitgeber As DPM2016.MyCombobox
    Friend WithEvents Label3 As Label
    Friend WithEvents cbtxtboxKanton As ComboBox
--- a/DPM2016/Patient/PatientDetails.vb
+++ b/DPM2016/Patient/PatientDetails.vb
@@ -222,9 +222,9 @@ Public Class PatientDetails
        Me.cbboxStatus.Displaymember = "Status"
        Me.cbboxStatus.Valuemember = "nrstatus"

-        Me.cbboxNrGeschlecht.Table = "Geschlecht"
-        Me.cbboxNrGeschlecht.Displaymember = "Geschlecht"
-        Me.cbboxNrGeschlecht.Valuemember = "NrGeschlecht"
+        Me.cbboxGeschlecht.Table = "Geschlecht"
+        Me.cbboxGeschlecht.Displaymember = "Geschlecht"
+        Me.cbboxGeschlecht.Valuemember = "NrGeschlecht"

        Me.cbboxNRArbeitgeber.Dataselection = DB.Get_SQL(1)
        Me.cbboxNRArbeitgeber.Table = "Arbeitgeber"
@@ -284,11 +284,23 @@ Public Class PatientDetails
                        log.Writelog("--Partnerdtails: Get_Data: " + Ctl.Name + " " + c.ColumnName, clsLog.Logtype.Information)
                        Dim dt As DateTimePicker
                        dt = Ctl
+                        'Try
+                        '    dt.Value = r(c.ColumnName)
+                        'Catch
+                        '    dt.Value = "  .  .    "
+                        'End Try
+
                        Try
                            dt.Value = r(c.ColumnName)
+                            dt.Format = DateTimePickerFormat.Short
                        Catch
+
+                            dt.CustomFormat = " "  'An empty SPACE
+                            dt.Format = DateTimePickerFormat.Custom
+
                        End Try

+
                        Exit For
                    End If
                Next
@@ -467,4 +479,12 @@ Public Class PatientDetails
    Private Sub txtPLZ_Leave(sender As Object, e As EventArgs) Handles txtPLZ.Leave
        If Me.txtOrt.Text = "" Then IntTables.Get_Ort_Kantton(Me.txtPLZ.Text, Me.txtOrt, Me.cbtxtboxKanton)
    End Sub
+
+    Private Sub PatientDetails_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+
+    End Sub
+
+    Private Sub cbboxNrAnrede_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbboxNrAnrede.SelectedIndexChanged
+        If Me.cbboxNrAnrede.Text = "Herr" Then Me.cbboxGeschlecht.SelectedValue = 2 Else Me.cbboxGeschlecht.SelectedValue = 1
+    End Sub
 End Class