update 20231114

2023-11-14 06:56:22 +01:00
parent 5d67339261
commit bedd741642
99 changed files with 1602 additions and 16330 deletions
--- a/DPM2016/Patient/Patient.Designer.vb
+++ b/DPM2016/Patient/Patient.Designer.vb
@@ -40,11 +40,15 @@ Partial Class Patient
        Me.tsbtnVTX = New System.Windows.Forms.ToolStripButton()
        Me.tsrbprivat = New Syncfusion.Windows.Forms.Tools.ToolStripRadioButton()
        Me.tsrbunternehmen = New Syncfusion.Windows.Forms.Tools.ToolStripRadioButton()
+        Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
        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.SuperTabControlPanel8 = New DevComponents.DotNetBar.SuperTabControlPanel()
        Me.PatientDetailsFirma1 = New DPM2016.PatientDetailsFirma()
        Me.Stammdaten_Firma = New DevComponents.DotNetBar.SuperTabItem()
@@ -60,9 +64,6 @@ Partial Class Patient
        Me.SuperTabControlPanel6 = New DevComponents.DotNetBar.SuperTabControlPanel()
        Me.Recall1 = New DPM2016.Recall()
        Me.Recall = 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()
@@ -74,12 +75,12 @@ Partial Class Patient
        CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuperTabControl1.SuspendLayout()
        Me.SuperTabControlPanel1.SuspendLayout()
+        Me.SuperTabControlPanel3.SuspendLayout()
        Me.SuperTabControlPanel8.SuspendLayout()
        Me.SuperTabControlPanel5.SuspendLayout()
        Me.SuperTabControlPanel4.SuspendLayout()
        Me.SuperTabControlPanel7.SuspendLayout()
        Me.SuperTabControlPanel6.SuspendLayout()
-        Me.SuperTabControlPanel3.SuspendLayout()
        Me.SuperTabControlPanel2.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.SuspendLayout()
@@ -88,7 +89,7 @@ Partial Class Patient
        '
        Me.ToolStrip1.AllowDrop = True
        Me.ToolStrip1.ImageScalingSize = New System.Drawing.Size(20, 20)
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnquit, Me.tsbtnnew, Me.tsbtnSave, Me.ToolStripButton4, Me.tstxtsuche, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripLabel1, Me.tsbtnfirst, Me.tsbtprev, Me.tsbtnnext, Me.tsbtnlast, Me.ToolStripSeparator1, Me.tsbtnVTX, Me.tsrbprivat, Me.tsrbunternehmen})
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnquit, Me.tsbtnnew, Me.tsbtnSave, Me.ToolStripButton4, Me.tstxtsuche, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripLabel1, Me.tsbtnfirst, Me.tsbtprev, Me.tsbtnnext, Me.tsbtnlast, Me.ToolStripSeparator1, Me.tsbtnVTX, Me.tsrbprivat, Me.tsrbunternehmen, Me.ToolStripButton1})
        Me.ToolStrip1.Location = New System.Drawing.Point(0, 24)
        Me.ToolStrip1.Name = "ToolStrip1"
        Me.ToolStrip1.Size = New System.Drawing.Size(1278, 27)
@@ -228,6 +229,15 @@ Partial Class Patient
        Me.tsrbunternehmen.Size = New System.Drawing.Size(98, 24)
        Me.tsrbunternehmen.Text = "Unternehmen"
        '
+        'ToolStripButton1
+        '
+        Me.ToolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.ToolStripButton1.Image = CType(resources.GetObject("ToolStripButton1.Image"), System.Drawing.Image)
+        Me.ToolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButton1.Name = "ToolStripButton1"
+        Me.ToolStripButton1.Size = New System.Drawing.Size(24, 24)
+        Me.ToolStripButton1.Text = "ToolStripButton1"
+        '
        'SuperTabControl1
        '
        '
@@ -244,12 +254,12 @@ Partial Class Patient
        Me.SuperTabControl1.ControlBox.Name = ""
        Me.SuperTabControl1.ControlBox.SubItems.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.SuperTabControl1.ControlBox.MenuBox, Me.SuperTabControl1.ControlBox.CloseBox})
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel1)
+        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel3)
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel8)
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel5)
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel4)
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel7)
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel6)
-        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel3)
        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel2)
        Me.SuperTabControl1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.SuperTabControl1.Location = New System.Drawing.Point(0, 51)
@@ -302,6 +312,35 @@ Partial Class Patient
        Me.Stammdaten.Name = "Stammdaten"
        Me.Stammdaten.Text = "Stammdaten"
        '
+        'SuperTabControlPanel3
+        '
+        Me.SuperTabControlPanel3.Controls.Add(Me.Behandlung1)
+        Me.SuperTabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SuperTabControlPanel3.Location = New System.Drawing.Point(0, 25)
+        Me.SuperTabControlPanel3.Name = "SuperTabControlPanel3"
+        Me.SuperTabControlPanel3.Size = New System.Drawing.Size(1278, 610)
+        Me.SuperTabControlPanel3.TabIndex = 0
+        Me.SuperTabControlPanel3.TabItem = Me.Behandlungen
+        '
+        'Behandlung1
+        '
+        Me.Behandlung1.Auftragsmanagement = False
+        Me.Behandlung1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Behandlung1.HasChanges = False
+        Me.Behandlung1.Location = New System.Drawing.Point(0, 0)
+        Me.Behandlung1.Margin = New System.Windows.Forms.Padding(4)
+        Me.Behandlung1.Name = "Behandlung1"
+        Me.Behandlung1.PatientNr = 0
+        Me.Behandlung1.Size = New System.Drawing.Size(1278, 610)
+        Me.Behandlung1.TabIndex = 0
+        '
+        'Behandlungen
+        '
+        Me.Behandlungen.AttachedControl = Me.SuperTabControlPanel3
+        Me.Behandlungen.GlobalItem = False
+        Me.Behandlungen.Name = "Behandlungen"
+        Me.Behandlungen.Text = "Behandlungen"
+        '
        'SuperTabControlPanel8
        '
        Me.SuperTabControlPanel8.Controls.Add(Me.PatientDetailsFirma1)
@@ -318,7 +357,7 @@ Partial Class Patient
        Me.PatientDetailsFirma1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.PatientDetailsFirma1.HasChanges = False
        Me.PatientDetailsFirma1.Location = New System.Drawing.Point(0, 0)
-        Me.PatientDetailsFirma1.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2)
+        Me.PatientDetailsFirma1.Margin = New System.Windows.Forms.Padding(2)
        Me.PatientDetailsFirma1.Name = "PatientDetailsFirma1"
        Me.PatientDetailsFirma1.Patientname = "0 Hutter Stefan Pfäffikon SZ"
        Me.PatientDetailsFirma1.PatientNr = 0
@@ -440,35 +479,6 @@ Partial Class Patient
        Me.Recall.Name = "Recall"
        Me.Recall.Text = "Recall"
        '
-        'SuperTabControlPanel3
-        '
-        Me.SuperTabControlPanel3.Controls.Add(Me.Behandlung1)
-        Me.SuperTabControlPanel3.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SuperTabControlPanel3.Location = New System.Drawing.Point(0, 23)
-        Me.SuperTabControlPanel3.Name = "SuperTabControlPanel3"
-        Me.SuperTabControlPanel3.Size = New System.Drawing.Size(1278, 613)
-        Me.SuperTabControlPanel3.TabIndex = 0
-        Me.SuperTabControlPanel3.TabItem = Me.Behandlungen
-        '
-        'Behandlung1
-        '
-        Me.Behandlung1.Auftragsmanagement = False
-        Me.Behandlung1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.Behandlung1.HasChanges = False
-        Me.Behandlung1.Location = New System.Drawing.Point(0, 0)
-        Me.Behandlung1.Margin = New System.Windows.Forms.Padding(4)
-        Me.Behandlung1.Name = "Behandlung1"
-        Me.Behandlung1.PatientNr = 0
-        Me.Behandlung1.Size = New System.Drawing.Size(1278, 613)
-        Me.Behandlung1.TabIndex = 0
-        '
-        'Behandlungen
-        '
-        Me.Behandlungen.AttachedControl = Me.SuperTabControlPanel3
-        Me.Behandlungen.GlobalItem = False
-        Me.Behandlungen.Name = "Behandlungen"
-        Me.Behandlungen.Text = "Behandlungen"
-        '
        'SuperTabControlPanel2
        '
        Me.SuperTabControlPanel2.Controls.Add(Me.PatientAbrechnung1)
@@ -552,12 +562,12 @@ Partial Class Patient
        CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SuperTabControl1.ResumeLayout(False)
        Me.SuperTabControlPanel1.ResumeLayout(False)
+        Me.SuperTabControlPanel3.ResumeLayout(False)
        Me.SuperTabControlPanel8.ResumeLayout(False)
        Me.SuperTabControlPanel5.ResumeLayout(False)
        Me.SuperTabControlPanel4.ResumeLayout(False)
        Me.SuperTabControlPanel7.ResumeLayout(False)
        Me.SuperTabControlPanel6.ResumeLayout(False)
-        Me.SuperTabControlPanel3.ResumeLayout(False)
        Me.SuperTabControlPanel2.ResumeLayout(False)
        Me.MenuStrip1.ResumeLayout(False)
        Me.MenuStrip1.PerformLayout()
@@ -612,4 +622,5 @@ Partial Class Patient
    Friend WithEvents PatientDetailsFirma1 As PatientDetailsFirma
    Friend WithEvents tsrbprivat As Syncfusion.Windows.Forms.Tools.ToolStripRadioButton
    Friend WithEvents tsrbunternehmen As Syncfusion.Windows.Forms.Tools.ToolStripRadioButton
+    Friend WithEvents ToolStripButton1 As ToolStripButton
 End Class
--- a/DPM2016/Patient/Patient.resx
+++ b/DPM2016/Patient/Patient.resx
@@ -397,6 +397,21 @@
        ruPA2WH0nj2LvqFRHLPcx7HTUzhy+hEODd7FgTM30D58Ge0XRlBPpW0+fwed5x+ga/g+1fkR+nh/0GJ9
        DWaApTVwZpjxE06fsTIsr0L4zmuW4T+HuPbVeuuAGMJDB3nPMngOg0JYXt4fsFpwckgIKz3OTzhpFfZ6
        GcJvhiynXoE5jv8CAmnSUbkb83QAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="ToolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
+        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
+        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
+        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
+        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
+        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
+        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
+        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
+        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
+        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="btnVTX.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/DPM2016/Patient/Patient.vb
+++ b/DPM2016/Patient/Patient.vb
@@ -141,7 +141,9 @@
    Private Sub tstxtsuche_KeyDown(sender As Object, e As KeyEventArgs) Handles tstxtsuche.KeyDown
        If e.KeyCode = Keys.Enter Then
            Dim db As New clsDB
-            Dim nrprivat As Integer = db.Search("Patient", Me.tstxtsuche.Text)
+            'Dim nrprivat As Integer = db.Search("Patient", Me.tstxtsuche.Text)
+            Dim nrprivat As Integer = db.Search("Behandlungsgrund", Me.tstxtsuche.Text)
+
            If nrprivat <> -1 Then Me.PatientNr = nrprivat
            If Me.SuperTabControl1.SelectedTab.Name = "Dokumente" Then
                Me.ClsDokumente1.Patientnr = Me.PatientNr
@@ -354,9 +356,7 @@
        Me.Krankengeschichte1.Refresh_KG()
    End Sub

-    Private Sub ToolStrip1_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) Handles ToolStrip1.ItemClicked

-    End Sub

    Private Sub Patient_TextChanged(sender As Object, e As EventArgs) Handles MyBase.TextChanged
        Create_temp_form()
@@ -387,6 +387,8 @@
    End Sub

    Private Sub tsrbprivat_Click(sender As Object, e As EventArgs) Handles tsrbprivat.Click
+        'If Globals.OnLoad Then Exit Sub
+        'Me.PatientNr = Me.PatientNr
        If tsrbprivat.Checked Then
            Me.SuperTabControl1.Tabs("Stammdaten").Visible = True
            Me.SuperTabControl1.Tabs("Stammdaten_Firma").Visible = False
@@ -396,8 +398,12 @@
    End Sub

    Private Sub tsrbunternehmen_Click(sender As Object, e As EventArgs) Handles tsrbunternehmen.Click
+        '-- If Globals.OnLoad Then Exit Sub
+        ' Me.PatientNr = Me.PatientNr
        Globals.is_stammdatenen_firma = False
+
        If tsrbunternehmen.Checked Then
+
            Globals.is_stammdatenen_firma = True
            'Me.PatientDetails1.chklbAdresstyp.Visible = False
            Me.SuperTabControl1.Tabs("Stammdaten").Visible = False
@@ -412,8 +418,8 @@
        End If

    End Sub
-
-    Private Sub ToolStripLabel1_Click(sender As Object, e As EventArgs) Handles ToolStripLabel1.Click
+    Private Sub ToolStrip1_ItemClicked(sender As Object, e As ToolStripItemClickedEventArgs) Handles ToolStrip1.ItemClicked

    End Sub
+
 End Class