Update Version 1.2

2020-10-20 19:54:00 +02:00
parent 0de48aa360
commit 7893b0a9ac
1061 changed files with 52984 additions and 24417 deletions
--- a/DPM2016/Patient/Patient.Designer.vb
+++ b/DPM2016/Patient/Patient.Designer.vb
@@ -153,6 +153,7 @@ Partial Class Patient
        '
        'tstxtsuche
        '
+        Me.tstxtsuche.Font = New System.Drawing.Font("Segoe UI", 9.0!)
        Me.tstxtsuche.Name = "tstxtsuche"
        Me.tstxtsuche.Size = New System.Drawing.Size(100, 25)
        '
--- a/DPM2016/Patient/Patient.vb
+++ b/DPM2016/Patient/Patient.vb
@@ -74,6 +74,15 @@
            Me.tsbtnVTX.Visible = True
            Me.btnVTX.Visible = True
        End If
+        Dim db1 As New clsDB
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+            'Me.PatientDetails1.chklbAdresstyp.Visible = False
+            Me.PatientDetails1.Label13.Visible = False
+            Me.SuperTabControl1.Tabs("Behandlungen").Text = "Projekte"
+            Me.SuperTabControl1.Tabs("Recall").Visible = False
+            Me.SuperTabControl1.Tabs("Abrechnung").Visible = False
+            Me.PatientDetails1.lblName.Text = "Name/Firma"
+        End If
    End Sub

    Private Sub ToolStripButton6_Click(sender As Object, e As EventArgs) Handles tsbtnSave.Click
--- a/DPM2016/Patient/PatientDetails.Designer.vb
+++ b/DPM2016/Patient/PatientDetails.Designer.vb
@@ -82,6 +82,8 @@ Partial Class PatientDetails
        Me.lblGLN = New System.Windows.Forms.Label()
        Me.txtGLN = New System.Windows.Forms.TextBox()
        Me.txtZSR = New System.Windows.Forms.TextBox()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.chkMail_Kommunikation = New System.Windows.Forms.CheckBox()
        Me.cbboxNRArbeitgeber = New DPM2016.MyCombobox()
        Me.cbboxGeschlecht = New DPM2016.MyCombobox()
        Me.cbboxSprache = New DPM2016.MyCombobox()
@@ -621,6 +623,25 @@ Partial Class PatientDetails
        Me.txtZSR.Size = New System.Drawing.Size(49, 20)
        Me.txtZSR.TabIndex = 24
        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.BackColor = System.Drawing.Color.Transparent
+        Me.Label4.Location = New System.Drawing.Point(528, 308)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(101, 13)
+        Me.Label4.TabIndex = 211
+        Me.Label4.Text = "Mail-Kommunikation"
+        '
+        'chkMail_Kommunikation
+        '
+        Me.chkMail_Kommunikation.AutoSize = True
+        Me.chkMail_Kommunikation.Location = New System.Drawing.Point(706, 308)
+        Me.chkMail_Kommunikation.Name = "chkMail_Kommunikation"
+        Me.chkMail_Kommunikation.Size = New System.Drawing.Size(15, 14)
+        Me.chkMail_Kommunikation.TabIndex = 212
+        Me.chkMail_Kommunikation.UseVisualStyleBackColor = True
+        '
        'cbboxNRArbeitgeber
        '
        Me.cbboxNRArbeitgeber.Dataselection = Nothing
@@ -697,6 +718,8 @@ Partial Class PatientDetails
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.Controls.Add(Me.chkMail_Kommunikation)
+        Me.Controls.Add(Me.Label4)
        Me.Controls.Add(Me.txtZSR)
        Me.Controls.Add(Me.txtGLN)
        Me.Controls.Add(Me.lblGLN)
@@ -835,4 +858,6 @@ Partial Class PatientDetails
    Friend WithEvents lblGLN As Label
    Friend WithEvents txtGLN As TextBox
    Friend WithEvents txtZSR As TextBox
+    Friend WithEvents Label4 As Label
+    Friend WithEvents chkMail_Kommunikation As CheckBox
 End Class
--- a/DPM2016/Patient/PatientDetails.vb
+++ b/DPM2016/Patient/PatientDetails.vb
@@ -205,6 +205,11 @@ Public Class PatientDetails
 #Region "Daten_Laden"

    Public Sub Fill_Stammdaten()
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+            chklbAdresstyp.Items.Clear()
+            chklbAdresstyp.Items.Add("Leistungserbringer")
+
+        End If
        log.Writelog("PartnerDetails: Fill_Stammdaten", clsLog.Logtype.Information)
        Me.cbboxNrAnrede.Table = "Anrede"
        Me.cbboxNrAnrede.Displaymember = "Anrede_D"
@@ -242,7 +247,9 @@ Public Class PatientDetails
            DB.Get_Tabledata("privat", " where nrprivat=" + Me.PatientNr.ToString)
            Dim r As DataRow = DB.dsDaten.Tables(0).Rows(0)
            For Each c As DataColumn In DB.dsDaten.Tables(0).Columns
+
                colname = c.ColumnName
+                Debug.Print(colname)
                For Each Ctl As Control In Me.Controls
                    'Dim objtype As System.Type = Ctl.GetType
                    'If objtype.Name = "Label" Then
@@ -303,40 +310,64 @@ Public Class PatientDetails

                        Exit For
                    End If
-                Next
+                    'If UCase(Ctl.Name) = "CHKMAIL_KOMMUNIKATION" Then
+                    '    MsgBox("Hallo")
+                    'End If
+                    'If UCase(r(c.ColumnName)) = "MAIL_KOMMUNIKATION" Then
+                    '    MsgBox("Bello")
+                    'End If
+                    If UCase(Ctl.Name) = "CHK" + UCase(c.ColumnName) Then
+                        Dim cb As CheckBox
+                        cb = Ctl

-                Select Case LCase(c.ColumnName)
-                    Case "patient"
+                        Try
+                            cb.Checked = r(c.ColumnName)
+                        Catch ex As Exception
+
+                        End Try
+                        Exit For
+                    End If
+                Next
+                If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+                    If LCase(c.ColumnName) = "behandler" Then
                        Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "garant"
-                        Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "gesvertreter"
-                        Set_Adresstype("Ges. Vertreter", r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "hausarzt"
-                        Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "zahnarzt"
-                        Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "behandler"
-                        Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "dhpat"
-                        Set_Adresstype("DH-Patient", r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "nichtaufbieten"
-                        Set_Adresstype("Nicht Aufbieten", r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "nichtannehmen"
-                        Set_Adresstype("Nicht annehmen", r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                    Case "betreibung"
-                        Set_Adresstype("Betreibung vorhanden", r(c.ColumnName).ToString)
-                        log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
-                End Select
+                    End If
+                Else
+
+                        Select Case LCase(c.ColumnName)
+                        Case "patient"
+                            Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "garant"
+                            Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "gesvertreter"
+                            Set_Adresstype("Ges. Vertreter", r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "hausarzt"
+                            Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "zahnarzt"
+                            Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "behandler"
+                            Set_Adresstype(c.ColumnName, r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "dhpat"
+                            Set_Adresstype("DH-Patient", r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "nichtaufbieten"
+                            Set_Adresstype("Nicht Aufbieten", r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "nichtannehmen"
+                            Set_Adresstype("Nicht annehmen", r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                        Case "betreibung"
+                            Set_Adresstype("Betreibung vorhanden", r(c.ColumnName).ToString)
+                            log.Writelog("--Partnerdtails: Get_Data Set_Adresstyp: " + c.ColumnName, clsLog.Logtype.Information)
+                    End Select
+                End If
+
            Next
        Catch ex As Exception
            log.Writelog("Privatdetails: Get_Data: " + ctlname + " / " + colname + " " + ex.Message, clsLog.Logtype.ApplError)
@@ -344,6 +375,10 @@ Public Class PatientDetails
    End Sub

    Private Sub Set_Adresstype(ByVal feldname, value)
+        If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+            If value <> False Then chklbAdresstyp.SetItemCheckState(0, CheckState.Checked) Else chklbAdresstyp.SetItemCheckState(0, CheckState.Unchecked)
+
+        End If
        Dim i As Integer
        For i = 0 To Me.chklbAdresstyp.Items.Count - 1
            If UCase(chklbAdresstyp.Items(i).ToString) = UCase(feldname) Then
@@ -400,29 +435,44 @@ Public Class PatientDetails
                    r(c.ColumnName) = dt.Value
                    Exit For
                End If
+
+                If UCase(Ctl.Name) = "CHK" + UCase(c.ColumnName) Then
+                    Dim cb As CheckBox
+                    cb = Ctl
+                    r(c.ColumnName) = cb.Checked
+                    Exit For
+                End If
            Next
-            Select Case LCase(c.ColumnName)
-                Case "patient"
-                    r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
-                Case "garant"
-                    r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
-                Case "gesvertreter"
-                    r(c.ColumnName) = Get_Adresstype("Ges. Vertreter", r(c.ColumnName))
-                Case "hausarzt"
-                    r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
-                Case "zahnarzt"
-                    r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
-                Case "behandler"
-                    r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
-                Case "dhpat"
-                    r(c.ColumnName) = Get_Adresstype("DH-Patient", r(c.ColumnName))
-                Case "nichtaufbieten"
-                    r(c.ColumnName) = Get_Adresstype("nicht aufbieten", r(c.ColumnName))
-                Case "nichtannehmen"
-                    r(c.ColumnName) = Get_Adresstype("nicht annehmen", r(c.ColumnName))
-                Case "betreibung"
-                    r(c.ColumnName) = Get_Adresstype("Betreibung vorhanden", r(c.ColumnName))
-            End Select
+            If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+                Select Case LCase(c.ColumnName)
+                    Case "behandler"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                End Select
+            Else
+                Select Case LCase(c.ColumnName)
+                    Case "patient"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                    Case "garant"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                    Case "gesvertreter"
+                        r(c.ColumnName) = Get_Adresstype("Ges. Vertreter", r(c.ColumnName))
+                    Case "hausarzt"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                    Case "zahnarzt"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                    Case "behandler"
+                        r(c.ColumnName) = Get_Adresstype(c.ColumnName, r(c.ColumnName))
+                    Case "dhpat"
+                        r(c.ColumnName) = Get_Adresstype("DH-Patient", r(c.ColumnName))
+                    Case "nichtaufbieten"
+                        r(c.ColumnName) = Get_Adresstype("nicht aufbieten", r(c.ColumnName))
+                    Case "nichtannehmen"
+                        r(c.ColumnName) = Get_Adresstype("nicht annehmen", r(c.ColumnName))
+                    Case "betreibung"
+                        r(c.ColumnName) = Get_Adresstype("Betreibung vorhanden", r(c.ColumnName))
+                End Select
+            End If
+
        Next
        r("Mutiert_am") = Now
        r("mutierer") = Globals.ActUser
@@ -433,12 +483,16 @@ Public Class PatientDetails

    Private Function Get_Adresstype(ByVal feldname, value) As Integer
        Try
-            Dim i As Integer
-            For i = 0 To Me.chklbAdresstyp.Items.Count - 1
-                If UCase(chklbAdresstyp.Items(i).ToString) = UCase(feldname) Then
-                    Return chklbAdresstyp.GetItemChecked(i)
-                End If
-            Next
+            If Globals.Applicationtype = ApplicationTypes.Projektabrechnung Then
+                If UCase(feldname) = "BEHANDLER" Then Return chklbAdresstyp.GetItemChecked(0)
+            Else
+                Dim i As Integer
+                For i = 0 To Me.chklbAdresstyp.Items.Count - 1
+                    If UCase(chklbAdresstyp.Items(i).ToString) = UCase(feldname) Then
+                        Return chklbAdresstyp.GetItemChecked(i)
+                    End If
+                Next
+            End If
        Catch
            Return -1
        End Try