-移除筛查功能

-软移除筛查功能
-历史记录页面只显示评测记录而不显示筛查记录
-将所有的“评估”改为“评测”
+PDF报告封面添加单位名称和病例信息

WpfTest1/MainWindow.xaml

@@ -96,7 +96,7 @@
                             </DataTemplate>
                         </Button.ContentTemplate>
                     </Button>
-                    <Button x:Name="buttonHomePageFilterFunction" Content="Button" HorizontalAlignment="Left" Margin="699,178,0,0" VerticalAlignment="Top" Width="160" Height="150" Background="#008b7b" Click="buttonHomePageFilterFunction_Click">
+                    <!--<Button x:Name="buttonHomePageFilterFunction" Content="Button" HorizontalAlignment="Left" Margin="699,178,0,0" VerticalAlignment="Top" Width="160" Height="150" Background="#008b7b" Click="buttonHomePageFilterFunction_Click">
                         <Button.ContentTemplate>
                             <DataTemplate>
                                 <StackPanel>
@@ -109,8 +109,8 @@
                                 </StackPanel>
                             </DataTemplate>
                         </Button.ContentTemplate>
-                    </Button>
-                    <Button x:Name="buttonHomePageEvaluationFunction" Content="Button" HorizontalAlignment="Left" Margin="886,178,0,0" VerticalAlignment="Top" Width="160" Height="150" Background="#daa520" Click="buttonHomePageEvaluationFunction_Click">
+                    </Button>-->
+                    <Button x:Name="buttonHomePageEvaluationFunction" Content="Button" HorizontalAlignment="Left" Margin="699,178,0,0" VerticalAlignment="Top" Width="160" Height="150" Background="#daa520" Click="buttonHomePageEvaluationFunction_Click">
                         <Button.ContentTemplate>
                             <DataTemplate>
                                 <StackPanel>
@@ -119,7 +119,7 @@
                                             <VisualBrush Visual="{StaticResource appbar_magnify_browse}" Stretch="Fill" />
                                         </Rectangle.OpacityMask>
                                     </Rectangle>
-                                    <TextBlock Text="详细评估"  Margin="5 10 4 4" VerticalAlignment="Center" FontSize="20" Foreground="White" />
+                                    <TextBlock Text="   评测"  Margin="5 10 4 4" VerticalAlignment="Center" FontSize="20" Foreground="White" />
                                 </StackPanel>
                             </DataTemplate>
                         </Button.ContentTemplate>
@@ -166,7 +166,7 @@
                             </DataTemplate>
                         </Button.ContentTemplate>
                     </Button>
-                    <Button x:Name="buttonHomePageHelp" Content="Button" HorizontalAlignment="Left" Margin="886,359,0,0" VerticalAlignment="Top" Width="160" Height="150" Background="#008080" Click="buttonHomePageHelp_Click">
+                    <Button x:Name="buttonHomePageHelp" Content="Button" HorizontalAlignment="Left" Margin="886,178,0,0" VerticalAlignment="Top" Width="160" Height="150" Background="#008080" Click="buttonHomePageHelp_Click">
                         <Button.ContentTemplate>
                             <DataTemplate>
                                 <StackPanel>
@@ -197,7 +197,7 @@
                 </TabControl>
             </TabItem>
             <!--快筛-->
-            <TabItem Header="快速筛查" Style="{StaticResource smallHeader}" >
+            <TabItem Header="快速筛查" Style="{StaticResource smallHeader}" Visibility="Hidden" Width="5" >
                 <TabControl x:Name="tabFilter" HorizontalAlignment="Left" Height="645" Width="1338" Margin="10,-5,0,0" VerticalAlignment="Top" >
                     <TabItem  Header="选择用户" Style="{StaticResource smallerHeader}"  IsEnabled="False" >
                         <Grid Background="White" Margin="0,0,0,0">
@@ -240,7 +240,7 @@
 
             </TabItem>
             <!--评估-->
-            <TabItem Header="详细评估" Style="{StaticResource smallHeader}" >
+            <TabItem Header="评测" Style="{StaticResource smallHeader}" >
                 <TabControl x:Name="tabEvaluation" HorizontalAlignment="Left" Height="645" Width="1338" Margin="10,-5,0,0" VerticalAlignment="Top" >
                     <TabItem  Header="选择用户" Style="{StaticResource smallerHeader}"  IsEnabled="False" >
                         <Grid Background="White" Margin="0,0,0,0">
@@ -290,7 +290,11 @@
                     </TabItem>
                     <TabItem  Header="选择记录" Style="{StaticResource smallerHeader}"  IsEnabled="False" >
                         <Grid Background="White" Margin="0,0,0,0">
-                            <DataGrid x:Name="dataGridRecords" AutoGenerateColumns="False" IsReadOnly="True"  HorizontalAlignment="Left" Margin="299,10,0,0" VerticalAlignment="Top" Height="603" Width="1039" Loaded="LoadDoctorDataGrid" MouseDoubleClick="dataGridRecords_MouseDoubleClick">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="10*"/>
+                                <ColumnDefinition Width="257*"/>
+                            </Grid.ColumnDefinitions>
+                            <DataGrid x:Name="dataGridRecords" AutoGenerateColumns="False" IsReadOnly="True"  HorizontalAlignment="Left" Margin="249.5,10,-4,-4" VerticalAlignment="Top" Height="603" Width="1039" MouseDoubleClick="dataGridRecords_MouseDoubleClick" Grid.Column="1">
                                 <DataGrid.Columns>
                                     <DataGridTextColumn Header="报告编号" Binding="{Binding r_id}" Width="180"/>
                                     <DataGridTextColumn Header="报告类型" Binding="{Binding r_type_d}" Width="150"/>
@@ -298,11 +302,11 @@
                                     <DataGridTextColumn Header="已生成次数" Binding="{Binding r_count}" Width="120"/>
                                 </DataGrid.Columns>
                             </DataGrid>
-                            <Button x:Name="buttonRegenerateReport" FontSize="18" Content="生成该报告" HorizontalAlignment="Left" Margin="26,40,0,0" VerticalAlignment="Top" Width="236" Height="38" Click="buttonRegenerateReport_Click"/>
-                            <Button x:Name="buttonHistoryBack" FontSize="18" Content="返回上一级" HorizontalAlignment="Left" Margin="26,98,0,0" VerticalAlignment="Top" Width="236" Height="38" Click="buttonHistoryBackToSelectUser_Click"/>
+                            <Button x:Name="buttonRegenerateReport" FontSize="18" Content="生成该报告" HorizontalAlignment="Left" Margin="26,40,0,0" VerticalAlignment="Top" Width="236" Height="38" Click="buttonRegenerateReport_Click" Grid.ColumnSpan="2"/>
+                            <Button x:Name="buttonHistoryBack" FontSize="18" Content="返回上一级" HorizontalAlignment="Left" Margin="26,98,0,0" VerticalAlignment="Top" Width="236" Height="38" Click="buttonHistoryBackToSelectUser_Click" Grid.ColumnSpan="2"/>
                         </Grid>
                     </TabItem>
-                    <TabItem  Header="评估报告" Style="{StaticResource smallerHeader}"  IsEnabled="False" >
+                    <TabItem  Header="评测报告" Style="{StaticResource smallerHeader}"  IsEnabled="False" >
                         <Grid Background="White" Margin="0,0,0,0">
                             <Label x:Name="labelPDFH" Content="该报告已在第三方软件中打开" HorizontalAlignment="Left" Margin="543,133,0,0" VerticalAlignment="Top" FontSize="18"/>
                             <Button x:Name="buttonHistoryBackToSelectUser" Content="重新选择病例" HorizontalAlignment="Left" Margin="400,550,0,0" VerticalAlignment="Top" Width="130" Height="50" FontSize="18" Click="buttonHistoryBackToSelectUser_Click" />
@@ -355,7 +359,7 @@
                     </TabItem>
                 </TabControl>
             </TabItem>
-            
+
 
 
         </TabControl>

WpfTest1/MainWindow.xaml.cs

@@ -255,7 +255,8 @@ namespace WpfTest1
         {
             //System.Diagnostics.Process.Start("https://www.baidu.com");
             Record one_record = SQLiteModel.getRecordByID(24);
-            ReportGenerater.generateReport_constum(one_record);
+            Patient one_patient = SQLiteModel.getPatientById("5");
+            ReportGenerater.generateReport_constum(one_record, one_patient,cfg);
         }
 
 
@@ -581,7 +582,7 @@ namespace WpfTest1
                 {
                     Record targetRecord = SQLiteModel.getRecordByID(inserted_r_id);
                     //ReportGenerater.generateReport(1, filterPatient, loginDoctor, targetRecord, cfg.organization_name);
-                    ReportGenerater.generateReport_constum(targetRecord);
+                    ReportGenerater.generateReport_constum(targetRecord, filterPatient, cfg);
                     SQLiteModel.plusOneCountOnRecordByRid(inserted_r_id);
                 }
                 catch (Exception err)
@@ -654,8 +655,10 @@ namespace WpfTest1
                 filterUserSelection.Clear();
                 evaluationUserSelection.Clear();
                 //这里尝试加载用户的筛查记录
-                filterReportForEvaluation = SQLiteModel.getLatestXTypeRecordInYDays(evaluationPatient.p_id, 1, 7);
-                if(filterReportForEvaluation == null)
+                /*20200507：根据甲方要求不再提供初筛功能，这里停止加载最新的筛查记录，所有人都做最复杂的问卷*/
+                //filterReportForEvaluation = SQLiteModel.getLatestXTypeRecordInYDays(evaluationPatient.p_id, 1, 7);
+                filterReportForEvaluation = null;
+                if (filterReportForEvaluation == null)
                 {
                     flagEvaluationWithoutFilter = true;
                     foreach (QuestionAnswerPair qa in filterQuestionaire)
@@ -683,7 +686,8 @@ namespace WpfTest1
             }
             if (flagEvaluationWithoutFilter)
             {
-                MessageBox.Show("发现该病例一周内未进行初筛，评估过程中将自动进行初筛。","提示");
+                /*20200507：根据甲方要求不再提供初筛功能，这里停止加载最新的筛查记录，所有人都做最复杂的问卷*/
+                //MessageBox.Show("发现该病例一周内未进行初筛，评估过程中将自动进行初筛。","提示");
             }
             else
             {
@@ -983,7 +987,7 @@ namespace WpfTest1
                     Record targetRecord = SQLiteModel.getRecordByID(inserted_r_id);
                     SQLiteModel.plusOneCountOnRecordByRid(inserted_r_id);
                     //ReportGenerater.generateReport(2, evaluationPatient, loginDoctor, targetRecord, cfg.organization_name);
-                    ReportGenerater.generateReport_constum(targetRecord);
+                    ReportGenerater.generateReport_constum(targetRecord, evaluationPatient, cfg);
                 }
                 catch (Exception err)
                 {
@@ -1063,7 +1067,7 @@ namespace WpfTest1
             {
                 var target = (DataRowView)this.selectUserHistory.dataGrid.SelectedItem;
                 historyPatient = SQLiteModel.getPatientById(Convert.ToString(target["p_id"]));
-                recordsFromOnePatient = SQLiteModel.getRecordsByPid(Convert.ToInt32(target["p_id"]));
+                recordsFromOnePatient = SQLiteModel.getRecordsByPid(Convert.ToInt32(target["p_id"]),true);
             }
             catch (Exception err)
             {
@@ -1138,7 +1142,7 @@ namespace WpfTest1
             try
             {
                 //ReportGenerater.generateReport(targetRecord.r_type, historyPatient, loginDoctor, targetRecord, cfg.organization_name);
-                ReportGenerater.generateReport_constum(targetRecord);
+                ReportGenerater.generateReport_constum(targetRecord, historyPatient, cfg);
                 SQLiteModel.plusOneCountOnRecordByRid(targetRecord.r_id);
             }
             catch(Exception err)

WpfTest1/SQLite/SQLiteModel.cs

@@ -530,9 +530,14 @@ namespace WpfTest1.SQLite
         /// 根据ID返回一份报告记录
         /// </summary>
         /// <param name="r_id">记录ID</param>
-        public static List<Record> getRecordsByPid(int p_id)
+        public static List<Record> getRecordsByPid(int p_id, bool evaluation_only)
         {
-            string sql = "SELECT * FROM Record WHERE p_id=@p_id order by r_time desc";
+            string condition = "";
+            if (evaluation_only)
+            {
+                condition = "and r_type=2 ";
+            }
+            string sql = "SELECT * FROM Record WHERE p_id=@p_id "+ condition + "order by r_time desc";
             SQLiteHelper db = new SQLiteHelper(dbPath);
             SQLiteParameter[] parameters = new SQLiteParameter[]{
                                                                new SQLiteParameter("@p_id",p_id),
@@ -546,7 +551,7 @@ namespace WpfTest1.SQLite
                     temp.r_id = reader.IsDBNull(0) ? 0 : reader.GetInt32(0);
                     temp.r_type = reader.IsDBNull(1) ? 0 : reader.GetInt32(1);
                     if (temp.r_type == 2)
-                        temp.r_type_d = "评估报告";
+                        temp.r_type_d = "评测报告";
                     else
                         temp.r_type_d = "筛查报告";
                     temp.p_id = reader.IsDBNull(2) ? 0 : reader.GetInt32(2);

WpfTest1/Toolkits/Constants.cs

@@ -12,7 +12,7 @@ namespace WpfTest1.Toolkits
         //软件名称
         public static string softwareName = "劳拉核心体姿评测系统";
         //编译版本
-        public static string version = "0.2.0.0";
+        public static string version = "0.3.0.0";
         //编译日期
         public static string compileDate = "20200514";
         //加密狗验证所使用的pid

WpfTest1/Toolkits/ReportGenerater.cs

@@ -145,7 +145,7 @@ namespace WpfTest1.Toolkits
             System.Diagnostics.Process.Start(fileName);
         }
 
-        public static void generateReport_constum(SQLite.Record oneRecord)
+        public static void generateReport_constum(SQLite.Record oneRecord, SQLite.Patient onePatient, Config cfg)
         {
             string fileName = Constants.reportPath + "\\" + oneRecord.r_id.ToString() + ".pdf";
             Document document = new Document(PageSize.A4);
@@ -170,6 +170,38 @@ namespace WpfTest1.Toolkits
                 PdfImportedPage newPage = writer.GetImportedPage(readerTemp, 1);
                 PdfContentByte cb = writer.DirectContent;
                 cb.AddTemplate(newPage, 0, 0);
+                //加载文本
+                cb.BeginText();
+                cb.SetTextRenderingMode(0);
+                //设置文本为中文、和字体大小
+                cb.SetRGBColorFill(39, 64, 90);
+                cb.SetFontAndSize(baseFont, 15);
+
+                int patient_info_align_left = 250;
+                int patient_info_align_bottom = 330;
+                int patient_info_align_vect_diff = 20;
+                //int hospital_align_left = 50;
+
+                //设置文本绝对坐标
+                cb.SetTextMatrix(patient_info_align_left, patient_info_align_bottom);
+                //设置文本
+                cb.ShowText("姓名："+ onePatient.p_name);
+                cb.SetTextMatrix(patient_info_align_left, patient_info_align_bottom- patient_info_align_vect_diff);
+                cb.ShowText("性别："+ onePatient.p_gender);
+
+                cb.SetFontAndSize(baseFont, 18);
+                int general_text_count_limit = 33;
+                float hospital_align_left = (float)(general_text_count_limit - cfg.organization_name.Length) / 2 / general_text_count_limit * PageSize.A4.Width;
+                if (hospital_align_left < 0)
+                    hospital_align_left = 0;
+
+                cb.SetTextMatrix(hospital_align_left, 80);
+                //一行33个字？
+                cb.ShowText(cfg.organization_name);
+                //cb.SetTextMatrix(0, 50);
+                //string testTxt = "一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十一二三四五六七八九十";
+                //cb.ShowText(testTxt);
+                cb.EndText();
             }
             //||page1:检测结果
             templateName = Constants.template_custom + "\\page1.pdf";