Version 20180904

2018-09-08 22:54:55 +02:00
parent 7c22a2e6d1
commit d74444b027
138 changed files with 1975 additions and 28474 deletions
--- a/DPM2016/Patient/Patient.Designer.vb
+++ b/DPM2016/Patient/Patient.Designer.vb
@@ -41,27 +41,27 @@ 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.Finanzen1 = New DPM2016.Finanzen()
        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.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()
@@ -255,6 +255,17 @@ 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 = "0   "
+        Me.PatientDetails1.PatientNr = 0
+        Me.PatientDetails1.Size = New System.Drawing.Size(1278, 612)
+        Me.PatientDetails1.TabIndex = 17
+        '
        'Stammdaten
        '
        Me.Stammdaten.AttachedControl = Me.SuperTabControlPanel1
@@ -272,6 +283,16 @@ 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
@@ -289,6 +310,16 @@ Partial Class Patient
        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(1278, 612)
+        Me.PatientAbrechnung1.TabIndex = 0
+        '
        'Abrechnung
        '
        Me.Abrechnung.AttachedControl = Me.SuperTabControlPanel2
@@ -306,6 +337,15 @@ Partial Class Patient
        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(1278, 612)
+        Me.Finanzen1.TabIndex = 0
+        '
        'Finanzen
        '
        Me.Finanzen.AttachedControl = Me.SuperTabControlPanel5
@@ -323,6 +363,15 @@ Partial Class Patient
        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(1278, 612)
+        Me.Krankengeschichte1.TabIndex = 0
+        '
        'Krankengeschichte
        '
        Me.Krankengeschichte.AttachedControl = Me.SuperTabControlPanel4
@@ -341,6 +390,15 @@ Partial Class Patient
        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(1278, 612)
+        Me.Recall1.TabIndex = 0
+        '
        'Recall
        '
        Me.Recall.AttachedControl = Me.SuperTabControlPanel6
@@ -382,64 +440,6 @@ Partial Class Patient
        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!)
--- a/DPM2016/Patient/Patient.vb
+++ b/DPM2016/Patient/Patient.vb
@@ -60,7 +60,7 @@
                Me.Behandlungen.Visible = False
                Me.Finanzen.Visible = False
        End Select
-        Me.tsbtnfirst_Click(sender, e)
+        ' Me.tsbtnfirst_Click(sender, e)
        Dim db As New clsDB
        If db.Get_Option(9999) = "" Then
            Me.tsbtnVTX.Visible = False
@@ -108,8 +108,8 @@
        Me.Label1.Text = PatientDetails1.Patientname
    End Sub

- 
-    Private Sub tsbtnfirst_Click(sender As Object, e As EventArgs) Handles tsbtnfirst.Click
+
+    Public 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", "", "Select top 1 * from privat where nrprivat>0 order by name, vorname, ort,nrprivat")
@@ -188,6 +188,7 @@
        db.dsDaten.Tables(0).Rows(0).Item("mutierer") = Globals.ActUser
        db.dsDaten.Tables(0).Rows(0).Item("aktiv") = True
        db.dsDaten.Tables(0).Rows(0).Item("Gueltigab") = Now
+        db.dsDaten.Tables(0).Rows(0).Item("GEBDAT") = Now
        db.dsDaten.Tables(0).Rows.Add(r)
        db.Update_Data()
        Me.PatientNr = newkey
--- a/DPM2016/Patient/PatientDetails.vb
+++ b/DPM2016/Patient/PatientDetails.vb
@@ -487,4 +487,6 @@ Public Class PatientDetails
    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