20180920

2018-09-20 21:50:15 +02:00
parent a98929c82a
commit b593e1f082
161 changed files with 2183 additions and 330736 deletions
--- a/DPM2016/Patient/Patient.Designer.vb
+++ b/DPM2016/Patient/Patient.Designer.vb
@@ -25,8 +25,8 @@ Partial Class Patient
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Patient))
        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
        Me.tsbtnquit = New System.Windows.Forms.ToolStripButton()
-        Me.tsbtnSave = New System.Windows.Forms.ToolStripButton()
        Me.tsbtnnew = New System.Windows.Forms.ToolStripButton()
+        Me.tsbtnSave = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripButton4 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
        Me.ToolStripButton3 = New System.Windows.Forms.ToolStripButton()
@@ -43,6 +43,15 @@ Partial Class Patient
        Me.btnVTX = New System.Windows.Forms.Button()
        Me.PatientDetails1 = New DPM2016.PatientDetails()
        Me.Stammdaten = New DevComponents.DotNetBar.SuperTabItem()
+        Me.SuperTabControlPanel7 = New DevComponents.DotNetBar.SuperTabControlPanel()
+        Me.ClsDokumente1 = New DPM2016.clsDokumente()
+        Me.Dokumente = New DevComponents.DotNetBar.SuperTabItem()
+        Me.SuperTabControlPanel6 = New DevComponents.DotNetBar.SuperTabControlPanel()
+        Me.Recall1 = New DPM2016.Recall()
+        Me.Recall = New DevComponents.DotNetBar.SuperTabItem()
+        Me.SuperTabControlPanel4 = New DevComponents.DotNetBar.SuperTabControlPanel()
+        Me.Krankengeschichte1 = New DPM2016.Krankengeschichte()
+        Me.Krankengeschichte = New DevComponents.DotNetBar.SuperTabItem()
        Me.SuperTabControlPanel3 = New DevComponents.DotNetBar.SuperTabControlPanel()
        Me.Behandlung1 = New DPM2016.Behandlung()
        Me.Behandlungen = New DevComponents.DotNetBar.SuperTabItem()
@@ -52,12 +61,6 @@ Partial Class Patient
        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()
@@ -66,18 +69,19 @@ Partial Class Patient
        CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuperTabControl1.SuspendLayout()
        Me.SuperTabControlPanel1.SuspendLayout()
+        Me.SuperTabControlPanel7.SuspendLayout()
+        Me.SuperTabControlPanel6.SuspendLayout()
+        Me.SuperTabControlPanel4.SuspendLayout()
        Me.SuperTabControlPanel3.SuspendLayout()
        Me.SuperTabControlPanel2.SuspendLayout()
        Me.SuperTabControlPanel5.SuspendLayout()
-        Me.SuperTabControlPanel4.SuspendLayout()
-        Me.SuperTabControlPanel6.SuspendLayout()
        Me.MenuStrip1.SuspendLayout()
        Me.SuspendLayout()
        '
        'ToolStrip1
        '
        Me.ToolStrip1.AllowDrop = True
-        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnquit, Me.tsbtnSave, Me.tsbtnnew, Me.ToolStripButton4, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripLabel1, Me.tstxtsuche, Me.tsbtnfirst, Me.tsbtprev, Me.tsbtnnext, Me.tsbtnlast, Me.ToolStripSeparator1, Me.tsbtnVTX})
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnquit, Me.tsbtnnew, Me.tsbtnSave, Me.ToolStripButton4, Me.ToolStripButton2, Me.ToolStripButton3, Me.ToolStripLabel1, Me.tstxtsuche, Me.tsbtnfirst, Me.tsbtprev, Me.tsbtnnext, Me.tsbtnlast, Me.ToolStripSeparator1, Me.tsbtnVTX})
        Me.ToolStrip1.Location = New System.Drawing.Point(0, 24)
        Me.ToolStrip1.Name = "ToolStrip1"
        Me.ToolStrip1.Size = New System.Drawing.Size(1278, 25)
@@ -93,15 +97,6 @@ Partial Class Patient
        Me.tsbtnquit.Size = New System.Drawing.Size(23, 22)
        Me.tsbtnquit.Text = "Schliessen"
        '
-        'tsbtnSave
-        '
-        Me.tsbtnSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.tsbtnSave.Image = CType(resources.GetObject("tsbtnSave.Image"), System.Drawing.Image)
-        Me.tsbtnSave.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnSave.Name = "tsbtnSave"
-        Me.tsbtnSave.Size = New System.Drawing.Size(23, 22)
-        Me.tsbtnSave.Text = "Speichern"
-        '
        'tsbtnnew
        '
        Me.tsbtnnew.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -111,6 +106,15 @@ Partial Class Patient
        Me.tsbtnnew.Size = New System.Drawing.Size(23, 22)
        Me.tsbtnnew.Text = "Neuer Datensatz"
        '
+        'tsbtnSave
+        '
+        Me.tsbtnSave.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.tsbtnSave.Image = CType(resources.GetObject("tsbtnSave.Image"), System.Drawing.Image)
+        Me.tsbtnSave.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnSave.Name = "tsbtnSave"
+        Me.tsbtnSave.Size = New System.Drawing.Size(23, 22)
+        Me.tsbtnSave.Text = "Speichern"
+        '
        'ToolStripButton4
        '
        Me.ToolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -218,11 +222,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.SuperTabControlPanel7)
+        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel6)
+        Me.SuperTabControl1.Controls.Add(Me.SuperTabControlPanel4)
        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.Dock = System.Windows.Forms.DockStyle.Fill
        Me.SuperTabControl1.Location = New System.Drawing.Point(0, 49)
        Me.SuperTabControl1.Name = "SuperTabControl1"
@@ -232,7 +237,7 @@ Partial Class Patient
        Me.SuperTabControl1.Size = New System.Drawing.Size(1278, 637)
        Me.SuperTabControl1.TabFont = New System.Drawing.Font("Microsoft Sans Serif", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.SuperTabControl1.TabIndex = 18
-        Me.SuperTabControl1.Tabs.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.Stammdaten, Me.Abrechnung, Me.Behandlungen, Me.Finanzen, Me.Recall, Me.Krankengeschichte})
+        Me.SuperTabControl1.Tabs.AddRange(New DevComponents.DotNetBar.BaseItem() {Me.Stammdaten, Me.Abrechnung, Me.Behandlungen, Me.Finanzen, Me.Recall, Me.Dokumente, Me.Krankengeschichte})
        Me.SuperTabControl1.Text = "SuperTabControl1"
        '
        'SuperTabControlPanel1
@@ -273,6 +278,85 @@ Partial Class Patient
        Me.Stammdaten.Name = "Stammdaten"
        Me.Stammdaten.Text = "Stammdaten"
        '
+        'SuperTabControlPanel7
+        '
+        Me.SuperTabControlPanel7.Controls.Add(Me.ClsDokumente1)
+        Me.SuperTabControlPanel7.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SuperTabControlPanel7.Location = New System.Drawing.Point(0, 25)
+        Me.SuperTabControlPanel7.Name = "SuperTabControlPanel7"
+        Me.SuperTabControlPanel7.Size = New System.Drawing.Size(1278, 612)
+        Me.SuperTabControlPanel7.TabIndex = 0
+        Me.SuperTabControlPanel7.TabItem = Me.Dokumente
+        '
+        'ClsDokumente1
+        '
+        Me.ClsDokumente1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.ClsDokumente1.Location = New System.Drawing.Point(0, 0)
+        Me.ClsDokumente1.Name = "ClsDokumente1"
+        Me.ClsDokumente1.Patientnr = 0
+        Me.ClsDokumente1.Size = New System.Drawing.Size(1278, 612)
+        Me.ClsDokumente1.TabIndex = 0
+        '
+        'Dokumente
+        '
+        Me.Dokumente.AttachedControl = Me.SuperTabControlPanel7
+        Me.Dokumente.GlobalItem = False
+        Me.Dokumente.Name = "Dokumente"
+        Me.Dokumente.Text = "Dokumente"
+        '
+        'SuperTabControlPanel6
+        '
+        Me.SuperTabControlPanel6.Controls.Add(Me.Recall1)
+        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(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(1278, 612)
+        Me.Recall1.TabIndex = 0
+        '
+        'Recall
+        '
+        Me.Recall.AttachedControl = Me.SuperTabControlPanel6
+        Me.Recall.GlobalItem = False
+        Me.Recall.Name = "Recall"
+        Me.Recall.Text = "Recall"
+        '
+        '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(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(1278, 612)
+        Me.Krankengeschichte1.TabIndex = 0
+        '
+        'Krankengeschichte
+        '
+        Me.Krankengeschichte.AttachedControl = Me.SuperTabControlPanel4
+        Me.Krankengeschichte.Enabled = False
+        Me.Krankengeschichte.GlobalItem = False
+        Me.Krankengeschichte.Name = "Krankengeschichte"
+        Me.Krankengeschichte.Text = "Krankengeschichte"
+        '
        'SuperTabControlPanel3
        '
        Me.SuperTabControlPanel3.Controls.Add(Me.Behandlung1)
@@ -353,59 +437,6 @@ Partial Class Patient
        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(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(1278, 612)
-        Me.Krankengeschichte1.TabIndex = 0
-        '
-        'Krankengeschichte
-        '
-        Me.Krankengeschichte.AttachedControl = Me.SuperTabControlPanel4
-        Me.Krankengeschichte.Enabled = False
-        Me.Krankengeschichte.GlobalItem = False
-        Me.Krankengeschichte.Name = "Krankengeschichte"
-        Me.Krankengeschichte.Text = "Krankengeschichte"
-        '
-        'SuperTabControlPanel6
-        '
-        Me.SuperTabControlPanel6.Controls.Add(Me.Recall1)
-        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(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(1278, 612)
-        Me.Recall1.TabIndex = 0
-        '
-        'Recall
-        '
-        Me.Recall.AttachedControl = Me.SuperTabControlPanel6
-        Me.Recall.GlobalItem = False
-        Me.Recall.Name = "Recall"
-        Me.Recall.Text = "Recall"
-        '
        'MenuStrip1
        '
        Me.MenuStrip1.AllowMerge = False
@@ -459,11 +490,12 @@ Partial Class Patient
        CType(Me.SuperTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SuperTabControl1.ResumeLayout(False)
        Me.SuperTabControlPanel1.ResumeLayout(False)
+        Me.SuperTabControlPanel7.ResumeLayout(False)
+        Me.SuperTabControlPanel6.ResumeLayout(False)
+        Me.SuperTabControlPanel4.ResumeLayout(False)
        Me.SuperTabControlPanel3.ResumeLayout(False)
        Me.SuperTabControlPanel2.ResumeLayout(False)
        Me.SuperTabControlPanel5.ResumeLayout(False)
-        Me.SuperTabControlPanel4.ResumeLayout(False)
-        Me.SuperTabControlPanel6.ResumeLayout(False)
        Me.MenuStrip1.ResumeLayout(False)
        Me.MenuStrip1.PerformLayout()
        Me.ResumeLayout(False)
@@ -509,4 +541,7 @@ Partial Class Patient
    Friend WithEvents tsbtnVTX As ToolStripButton
    Friend WithEvents btnVTX As Button
    Friend WithEvents Label1 As Label
+    Friend WithEvents SuperTabControlPanel7 As DevComponents.DotNetBar.SuperTabControlPanel
+    Friend WithEvents Dokumente As DevComponents.DotNetBar.SuperTabItem
+    Friend WithEvents ClsDokumente1 As clsDokumente
 End Class
--- a/DPM2016/Patient/Patient.resx
+++ b/DPM2016/Patient/Patient.resx
@@ -137,14 +137,6 @@
        inG/zkNfdS43jnrob40x3hZJEYjO0rVsKSmlJLaDkq3bksRMCou3c69W5uYxhe4qNzfrQ0y0FyJ0XUfX
        QmhaGFWdxVyrmtmrSVSz31igsy8W4EKFYv5AmatHcpns2jw/xIVSpqfvrzyw8vf0hVhqhAXUEpM0IYTl
        DzXbwlLPDlfpAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABSSURBVDhP3YxbCgAgCAQ9ukfzZkXBlkIv7Sf6GNB1HRKR
-        dEMVEFEII2Du4Yr2eCMAdUfoEejubwIcVujeUHDKVFDmHSFB6ekuskcEOHgxghiSMjk0Kh+omBHQAAAA
-        AElFTkSuQmCC
 </value>
  </data>
  <data name="tsbtnnew.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -160,6 +152,14 @@
        qRWPZ9jAZ8EgBA4HIGBEwfYMLOGHmN7UPeb4X/eY67/7ciZQLKCqgWAcABiNiecY3nS8YvgPwj5rGEhP
        B7kXBN4s+CT/f/5H+f9hG3lJNyBpr+6bOQ89/oNwwCJ1Eg1gYGCSymXYYdjGcAOExeIZ5kHFSQIsDCoM
        7GDMwMAMEUIHDAwArmHzT5KTHe0AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAABSSURBVDhP3YxbCgAgCAQ9ukfzZkXBlkIv7Sf6GNB1HRKR
+        dEMVEFEII2Du4Yr2eCMAdUfoEejubwIcVujeUHDKVFDmHSFB6ekuskcEOHgxghiSMjk0Kh+omBHQAAAA
+        AElFTkSuQmCC
 </value>
  </data>
  <data name="ToolStripButton4.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
@@ -60,6 +60,10 @@
                Me.Behandlungen.Visible = False
                Me.Finanzen.Visible = False
        End Select
+        If Globals.License.DMS = False Then
+            Me.SuperTabControl1.Tabs("Dokumente").Visible = False
+        End If
+
        ' Me.tsbtnfirst_Click(sender, e)
        Dim db As New clsDB
        If db.Get_Option(9999) = "" Then
@@ -85,6 +89,10 @@
            Dim db As New clsDB
            Dim nrprivat As Integer = db.Search("Patient", Me.tstxtsuche.Text)
            If nrprivat <> -1 Then Me.PatientNr = nrprivat
+            If Me.SuperTabControl1.SelectedTab.Name = "Dokumente" Then
+                Me.ClsDokumente1.Patientnr = Me.PatientNr
+                Me.ClsDokumente1.Refresh_Grid()
+            End If
            db.Dispose()
        End If
    End Sub
@@ -104,8 +112,11 @@
    End Sub

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


@@ -204,6 +215,10 @@
        If SuperTabControl1.SelectedTab.Name = "Finanzen" Then
            Me.Finanzen1.Refresh_Data()
        End If
+        If SuperTabControl1.SelectedTab.Name = "Dokumente" Then
+            Me.ClsDokumente1.Patientnr = Me.PatientNr
+            Me.ClsDokumente1.Refreshdata()
+        End If
    End Sub

    Private Sub evh_Recall_Anzeigen(Datum As Date, patient As Integer, behandler As Integer) Handles evh.Recall_Anzeigen