From 57ac7c65311ee84904800407095a24f0f0aaf739 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Wed, 29 May 2024 16:54:06 +0800
Subject: [PATCH] 0529

---
 QZWebApi/Models/GetTjxxModel.cs   | 4 ++--
 QZWebApi/Models/SqlSugarHelper.cs | 8 +++++---
 QZWebApi/Web.config               | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/QZWebApi/Models/GetTjxxModel.cs b/QZWebApi/Models/GetTjxxModel.cs
index 86523ef..26c4c6c 100644
--- a/QZWebApi/Models/GetTjxxModel.cs
+++ b/QZWebApi/Models/GetTjxxModel.cs
@@ -70,8 +70,8 @@ namespace QZWebApi.Models
     /// </summary>
     public class JkTjxxBean
     {
-        //用户ID
-        public long id;
+        ////用户ID
+        //public long id;
 
         // 体检项目名称
         public string tjxmMc;
diff --git a/QZWebApi/Models/SqlSugarHelper.cs b/QZWebApi/Models/SqlSugarHelper.cs
index 553ee0b..d893322 100644
--- a/QZWebApi/Models/SqlSugarHelper.cs
+++ b/QZWebApi/Models/SqlSugarHelper.cs
@@ -47,7 +47,7 @@ namespace QZWebApi.Models
             });
 
 
-            var dt = WebDb.Ado.GetDataTable($"select b.sum_summary_header_id,b.summary_title from patient_register as a left join sum_summary_header as b " +
+            var dt = WebDb.Ado.GetDataTable($"select b.sum_summary_header_id,b.summary_title from patient_register as a inner join sum_summary_header as b " +
                $"on a.patient_register_id=b.patient_register_id where a.third_register_id='{planUserId}' and complete_flag='3'  order by b.display_order");
 
             if (dt.Rows.Count > 0)
@@ -97,7 +97,7 @@ namespace QZWebApi.Models
             });
 
 
-            var dt = WebDb.Ado.GetDataTable($"select b.sum_suggestion_header_id,b.suggestion_title from patient_register as a left join sum_suggestion_header as b " +
+            var dt = WebDb.Ado.GetDataTable($"select b.sum_suggestion_header_id,b.suggestion_title from patient_register as a inner join sum_suggestion_header as b " +
                $"on a.patient_register_id=b.patient_register_id where a.third_register_id='{planUserId}' and complete_flag='3'  order by b.display_order");
 
             if (dt.Rows.Count > 0)
@@ -106,7 +106,7 @@ namespace QZWebApi.Models
                 {
                     sb.Append($"  *  {row["suggestion_title"].ToString()}：");
                     var dt2 = WebDb.Ado.GetDataTable($"select b.suggestion_content from  sum_suggestion_header as a " +
-            $"left join sum_suggestion_content as b on a.sum_suggestion_header_id=b.sum_suggestion_header_id where a.sum_suggestion_header_id='{row["sum_suggestion_header_id"].ToString()}' order by b.display_order");
+            $"inner join sum_suggestion_content as b on a.sum_suggestion_header_id=b.sum_suggestion_header_id where a.sum_suggestion_header_id='{row["sum_suggestion_header_id"].ToString()}' order by b.display_order");
                     if (dt2.Rows.Count > 0)
                     {
                         foreach (DataRow row2 in dt2.Rows)
@@ -224,6 +224,8 @@ namespace QZWebApi.Models
 
                             jkTjxxBeanList.Add(jkTjxxBean);
                         }
+
+                        tjjlPackages.items = jkTjxxBeanList;
                     }
 
                     tjjlPackagesList.Add(tjjlPackages);
diff --git a/QZWebApi/Web.config b/QZWebApi/Web.config
index df84c7c..8af6f0e 100644
--- a/QZWebApi/Web.config
+++ b/QZWebApi/Web.config
@@ -10,7 +10,7 @@
     <add key="ClientValidationEnabled" value="true" />
     <add key="UnobtrusiveJavaScriptEnabled" value="true" />
     <!--<add key="ConnectionString" value="Data Source=.;Initial Catalog=webmypeis;Integrated Security=True;"/>-->
-	<add key="ConnectionString" value="Host=10.1.12.140;Port=5432;Database=WebPeis0520;User ID=postgres;Password=st123;" />
+	<add key="ConnectionString" value="Host=62.156.10.86;Port=5432;Database=WebPeis0520;User ID=postgres;Password=st123;" />
 	<add key="WebApiUrl" value="http://10.1.12.140:44382" />
     <add key="AESJavaToNetKey" value="UI8fBaf29gkLa9bJx/nUmg==" />
     <add key="AESKey" value="tL8lQ87QGJq9HoouWeVGs7TX8Cg3568f" />